From cfcb60ea851dbd1c62ce66fb12882fe7dab63941 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Sat, 15 Oct 2011 05:59:09 -0700
Subject: [PATCH] merge: Make global commands local

add_global_command() is only used in one place now.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 cola/cmds.py             |  2 ++
 cola/merge/controller.py |  5 -----
 cola/merge/model.py      | 11 +++++++----
 cola/merge/view.py       | 19 +++++++------------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/cola/cmds.py b/cola/cmds.py
index f43e0eee..bb44b3b0 100644
--- a/cola/cmds.py
+++ b/cola/cmds.py
@@ -877,6 +877,8 @@ class VisualizePaths(Command):
         utils.fork(self.argv)
 
 
+visualize_revision = 'visualize_revision'
+
 class VisualizeRevision(Command):
     """Visualize a specific revision."""
     def __init__(self, revision, paths=None):
diff --git a/cola/merge/controller.py b/cola/merge/controller.py
index 0f97cb1d..a3507277 100644
--- a/cola/merge/controller.py
+++ b/cola/merge/controller.py
@@ -1,13 +1,8 @@
 """Translate signals from the merge dialog."""
-
-from cola import signals
 from cola.ctrl import Controller
 from cola.merge.model import command_directory
 
-
 class MergeController(Controller):
     def __init__(self, model, view):
         Controller.__init__(self, model, view)
-
         self.add_commands(command_directory)
-        self.add_global_command(signals.visualize_revision)
diff --git a/cola/merge/model.py b/cola/merge/model.py
index 5c3c3c8e..9961c472 100644
--- a/cola/merge/model.py
+++ b/cola/merge/model.py
@@ -1,12 +1,11 @@
 import cola
-from cola.cmds import BaseCommand
 from cola import gitcmds
 from cola import observable
 from cola import signals
+from cola.cmds import BaseCommand, VisualizeRevision, visualize_revision
 
 
 class MergeModel(observable.Observable):
-    message_merge = 'merge'
     message_updated = 'updated'
 
     def __init__(self):
@@ -45,7 +44,10 @@ class MergeModel(observable.Observable):
         return status, output
 
 
-class MergeRevision(BaseCommand):
+# Merge command
+merge = 'merge'
+
+class Merge(BaseCommand):
     def __init__(self, revision, no_commit, squash):
         BaseCommand.__init__(self)
         self.revision = revision
@@ -63,5 +65,6 @@ class MergeRevision(BaseCommand):
 
 
 command_directory = {
-    MergeModel.message_merge: MergeRevision,
+    merge: Merge,
+    visualize_revision: VisualizeRevision,
 }
diff --git a/cola/merge/view.py b/cola/merge/view.py
index 623827e1..7bc2a639 100644
--- a/cola/merge/view.py
+++ b/cola/merge/view.py
@@ -3,22 +3,21 @@ from PyQt4.QtCore import Qt
 from PyQt4.QtCore import SIGNAL
 
 from cola import qtutils
-from cola import signals
 from cola.qt import GitRefLineEdit
 from cola.qtutils import tr
+from cola.merge.model import merge, visualize_revision
+
 
 class MergeView(QtGui.QDialog):
     """Provides a dialog for merging branches."""
     def __init__(self, model, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.model = model
-
         self.setWindowModality(Qt.WindowModal)
         self.resize(700, 400)
 
         # Widgets
         self.title_label = QtGui.QLabel()
-
         self.revision_label = QtGui.QLabel()
         self.revision_label.setText(tr('Revision To Merge'))
 
@@ -27,10 +26,8 @@ class MergeView(QtGui.QDialog):
         self.radio_local = QtGui.QRadioButton()
         self.radio_local.setText(tr('Local Branch'))
         self.radio_local.setChecked(True)
-
         self.radio_remote = QtGui.QRadioButton()
         self.radio_remote.setText(tr('Tracking Branch'))
-
         self.radio_tag = QtGui.QRadioButton()
         self.radio_tag.setText(tr('Tag'))
 
@@ -113,11 +110,10 @@ class MergeView(QtGui.QDialog):
                      self.viz_revision)
 
         # Observer messages
-        msg = model.message_updated
-        model.add_message_observer(msg, self.update_from_model)
-        self.update_from_model()
+        model.add_message_observer(model.message_updated, self.update_all)
+        self.update_all()
 
-    def update_from_model(self):
+    def update_all(self):
         """Set the branch name for the window title and label."""
         self.update_title()
         self.update_revisions()
@@ -175,7 +171,7 @@ class MergeView(QtGui.QDialog):
             qtutils.information('No Revision Specified',
                                 'You must specify a revision to view')
             return
-        self.emit(SIGNAL(signals.visualize_revision), revision)
+        self.emit(SIGNAL(visualize_revision), revision)
 
     def merge_revision(self):
         """Merge the selected revision/branch"""
@@ -187,6 +183,5 @@ class MergeView(QtGui.QDialog):
 
         do_commit = self.checkbox_commit.isChecked()
         squash = self.checkbox_squash.isChecked()
-        self.emit(SIGNAL(self.model.message_merge),
-                  revision, not(do_commit), squash)
+        self.emit(SIGNAL(merge), revision, not(do_commit), squash)
         self.accept()
-- 
2.11.4.GIT