Merge lp:~abentley/bzr/vpipe into lp:~bzr/bzr/trunk-old

[Aaron Bentley]

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch extracts get_merger_from_uncommitted from cmd_merge, so that
bzr-pipeline can subclass cmd_merge and override it.

It also makes Shelver.__init__ take a manager parameter so that
bzr-pipeline can supply it.

With these changes, bzr-pipeline doesn't need to do any monkey patching
to provide its improvements.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpCIgMACgkQ0F+nu1YWqI1OtACfa7D5AkcJrotvDIyyj1A6nnBK
BZYAn1xpyAmCJgqaGdiCGcuMnAqfTBZG
=vw/K
-----END PGP SIGNATURE-----

[Ian Clatworthy (ian-clatworthy)]

review: Approve

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2009-06-19 09:06:56 +0000
+++ bzrlib/builtins.py	2009-06-20 16:24:18 +0000
@@ -3603,13 +3603,9 @@
                 if revision is not None and len(revision) > 0:
                     raise errors.BzrCommandError('Cannot use --uncommitted and'
                         ' --revision at the same time.')
-                location = self._select_branch_location(tree, location)[0]
-                other_tree, other_path = WorkingTree.open_containing(location)
-                merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
-                    pb)
+                merger = self.get_merger_from_uncommitted(tree, location, pb,
+                                                          cleanups)
                 allow_pending = False
-                if other_path != '':
-                    merger.interesting_files = [other_path]
 
             if merger is None:
                 merger, allow_pending = self._get_merger_from_branch(tree,
@@ -3728,6 +3724,22 @@
             allow_pending = True
         return merger, allow_pending
 
+    def get_merger_from_uncommitted(self, tree, location, pb, cleanups):
+        """Get a merger for uncommitted changes.
+
+        :param tree: The tree the merger should apply to.
+        :param location: The location containing uncommitted changes.
+        :param pb: The progress bar to use for showing progress.
+        :param cleanups: A list of operations to perform to clean up the
+            temporary directories, unfinalized objects, etc.
+        """
+        location = self._select_branch_location(tree, location)[0]
+        other_tree, other_path = WorkingTree.open_containing(location)
+        merger = _mod_merge.Merger.from_uncommitted(tree, other_tree, pb)
+        if other_path != '':
+            merger.interesting_files = [other_path]
+        return merger
+
     def _select_branch_location(self, tree, user_location, revision=None,
                                 index=None):
         """Select a branch location, according to possible inputs.

=== modified file 'bzrlib/shelf_ui.py'
--- bzrlib/shelf_ui.py	2009-03-23 14:59:43 +0000
+++ bzrlib/shelf_ui.py	2009-06-20 17:00:49 +0000
@@ -40,7 +40,7 @@
 
     def __init__(self, work_tree, target_tree, diff_writer=None, auto=False,
                  auto_apply=False, file_list=None, message=None,
-                 destroy=False):
+                 destroy=False, manager=None):
         """Constructor.
 
         :param work_tree: The working tree to shelve changes from.
@@ -52,13 +52,16 @@
         :param message: The message to associate with the shelved changes.
         :param destroy: Change the working tree without storing the shelved
             changes.
+        :param manager: The shelf manager to use.
         """
         self.work_tree = work_tree
         self.target_tree = target_tree
         self.diff_writer = diff_writer
         if self.diff_writer is None:
             self.diff_writer = sys.stdout
-        self.manager = work_tree.get_shelf_manager()
+        if manager is None:
+            manager = work_tree.get_shelf_manager()
+        self.manager = manager
         self.auto = auto
         self.auto_apply = auto_apply
         self.file_list = file_list