Merge lp:~jelmer/brz/more-deprecations into lp:brz

[Jelmer Vernooij]

Remove some more already deprecated arguments.

Remove some more already deprecated arguments.

Be consistent in what various "missing" functions return - include the merge_depth.

[Martin Packman (gz)]

Looks good.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-06-19 14:35:58 +0000
+++ breezy/builtins.py	2017-06-27 10:27:58 +0000
@@ -1411,8 +1411,6 @@
 
     To retrieve the branch as of a particular revision, supply the --revision
     parameter, as in "branch foo/bar -r 5".
-
-    The synonyms 'clone' and 'get' for this command are deprecated.
     """
 
     _see_also = ['checkout']
@@ -4406,7 +4404,7 @@
                     raise errors.BzrCommandError(gettext(
                         'Cannot use -r with merge directives or bundles'))
                 merger, verified = _mod_merge.Merger.from_mergeable(tree,
-                   mergeable, None)
+                   mergeable)
 
         if merger is None and uncommitted:
             if revision is not None and len(revision) > 0:
@@ -4561,7 +4559,7 @@
         # Merge tags (but don't set them in the master branch yet, the user
         # might revert this merge).  Commit will propagate them.
         other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
-        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
+        merger = _mod_merge.Merger.from_revision_ids(tree,
             other_revision_id, base_revision_id, other_branch, base_branch)
         if other_path != '':
             allow_pending = False
@@ -4713,7 +4711,7 @@
         # have not yet been seen.
         tree.set_parent_ids(parents[:1])
         try:
-            merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
+            merger = _mod_merge.Merger.from_revision_ids(tree, parents[1])
             merger.interesting_ids = interesting_ids
             merger.merge_type = merge_type
             merger.show_base = show_base

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2017-06-10 01:39:46 +0000
+++ breezy/merge.py	2017-06-27 10:27:58 +0000
@@ -280,7 +280,7 @@
     hooks = MergeHooks()
 
     def __init__(self, this_branch, other_tree=None, base_tree=None,
-                 this_tree=None, pb=None, change_reporter=None,
+                 this_tree=None, change_reporter=None,
                  recurse='down', revision_graph=None):
         object.__init__(self)
         self.this_branch = this_branch
@@ -299,8 +299,6 @@
         self.interesting_files = None
         self.show_base = False
         self.reprocess = False
-        if pb is not None:
-            warnings.warn("pb parameter to Merger() is deprecated and ignored")
         self.pp = None
         self.recurse = recurse
         self.change_reporter = change_reporter
@@ -354,30 +352,28 @@
                                       _set_base_is_other_ancestor)
 
     @staticmethod
-    def from_uncommitted(tree, other_tree, pb=None, base_tree=None):
+    def from_uncommitted(tree, other_tree, base_tree=None):
         """Return a Merger for uncommitted changes in other_tree.
 
         :param tree: The tree to merge into
         :param other_tree: The tree to get uncommitted changes from
-        :param pb: A progress indicator
         :param base_tree: The basis to use for the merge.  If unspecified,
             other_tree.basis_tree() will be used.
         """
         if base_tree is None:
             base_tree = other_tree.basis_tree()
-        merger = Merger(tree.branch, other_tree, base_tree, tree, pb)
+        merger = Merger(tree.branch, other_tree, base_tree, tree)
         merger.base_rev_id = merger.base_tree.get_revision_id()
         merger.other_rev_id = None
         merger.other_basis = merger.base_rev_id
         return merger
 
     @classmethod
-    def from_mergeable(klass, tree, mergeable, pb):
+    def from_mergeable(klass, tree, mergeable):
         """Return a Merger for a bundle or merge directive.
 
         :param tree: The tree to merge changes into
         :param mergeable: A merge directive or bundle
-        :param pb: A progress indicator
         """
         mergeable.install_revisions(tree.branch.repository)
         base_revision_id, other_revision_id, verified =\
@@ -390,18 +386,17 @@
                 base_revision_id = None
             else:
                 trace.warning('Performing cherrypick')
-        merger = klass.from_revision_ids(pb, tree, other_revision_id,
+        merger = klass.from_revision_ids(tree, other_revision_id,
                                          base_revision_id, revision_graph=
                                          revision_graph)
         return merger, verified
 
     @staticmethod
-    def from_revision_ids(pb, tree, other, base=None, other_branch=None,
+    def from_revision_ids(tree, other, base=None, other_branch=None,
                           base_branch=None, revision_graph=None,
                           tree_branch=None):
         """Return a Merger for revision-ids.
 
-        :param pb: A progress indicator
         :param tree: The tree to merge changes into
         :param other: The revision-id to use as OTHER
         :param base: The revision-id to use as BASE.  If not specified, will
@@ -417,7 +412,7 @@
         """
         if tree_branch is None:
             tree_branch = tree.branch
-        merger = Merger(tree_branch, this_tree=tree, pb=pb,
+        merger = Merger(tree_branch, this_tree=tree,
                         revision_graph=revision_graph)
         if other_branch is None:
             other_branch = tree.branch
@@ -642,8 +637,7 @@
         if self._is_criss_cross and getattr(self.merge_type,
                                             'supports_lca_trees', False):
             kwargs['lca_trees'] = self._lca_trees
-        return self.merge_type(pb=None,
-                               change_reporter=self.change_reporter,
+        return self.merge_type(change_reporter=self.change_reporter,
                                **kwargs)
 
     def _do_merge_to(self):
@@ -725,8 +719,7 @@
 
     def __init__(self, working_tree, this_tree, base_tree, other_tree,
                  interesting_ids=None, reprocess=False, show_base=False,
-                 pb=None, pp=None, change_reporter=None,
-                 interesting_files=None, do_merge=True,
+                 change_reporter=None, interesting_files=None, do_merge=True,
                  cherrypick=False, lca_trees=None, this_branch=None,
                  other_branch=None):
         """Initialize the merger object and perform the merge.
@@ -744,8 +737,6 @@
         :param: reprocess If True, perform conflict-reduction processing.
         :param show_base: If True, show the base revision in text conflicts.
             (incompatible with reprocess)
-        :param pb: ignored
-        :param pp: A ProgressPhase object
         :param change_reporter: An object that should report changes made
         :param interesting_files: The tree-relative paths of files that should
             participate in the merge.  If these paths refer to directories,
@@ -785,10 +776,6 @@
         self.cherrypick = cherrypick
         if do_merge:
             self.do_merge()
-        if pp is not None:
-            warnings.warn("pp argument to Merge3Merger is deprecated")
-        if pb is not None:
-            warnings.warn("pb argument to Merge3Merger is deprecated")
 
     def do_merge(self):
         operation = cleanup.OperationWithCleanups(self._do_merge)
@@ -1922,7 +1909,6 @@
                 other_rev_id=None,
                 interesting_files=None,
                 this_tree=None,
-                pb=None,
                 change_reporter=None):
     """Primary interface for merging.
 
@@ -1935,7 +1921,7 @@
         raise errors.BzrError("breezy.merge.merge_inner requires a this_tree "
                               "parameter")
     merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree,
-                    pb=pb, change_reporter=change_reporter)
+                    change_reporter=change_reporter)
     merger.backup_files = backup_files
     merger.merge_type = merge_type
     merger.interesting_ids = interesting_ids

=== modified file 'breezy/missing.py'
--- breezy/missing.py	2017-05-30 19:16:23 +0000
+++ breezy/missing.py	2017-06-27 10:27:58 +0000
@@ -30,14 +30,7 @@
 
     if rev_tag_dict is None:
         rev_tag_dict = {}
-    for rev in revisions:
-        # We need the following for backward compatibilty (hopefully
-        # this will be deprecated soon :-/) -- vila 080911
-        if len(rev) == 2:
-            revno, rev_id = rev
-            merge_depth = 0
-        else:
-            revno, rev_id, merge_depth = rev
+    for revno, rev_id, merge_depth in revisions:
         rev = revision_source.get_revision(rev_id)
         if verbose:
             delta = revision_source.get_revision_delta(rev_id)
@@ -97,7 +90,7 @@
     :param tip: The tip of mainline
     :param backward: Show oldest versions first when True, newest versions
         first when False.
-    :return: [(revno, revision_id)] for all revisions in ancestry that
+    :return: [(revno, revision_id, 0)] for all revisions in ancestry that
         are left-hand parents from tip, or None if ancestry is None.
     """
     if ancestry is None:
@@ -117,7 +110,7 @@
         parents = parent_map.get(cur)
         if not parents:
             break # Ghost, we are done
-        mainline.append((str(cur_revno), cur))
+        mainline.append((str(cur_revno), cur, 0))
         cur = parents[0]
         cur_revno -= 1
     if not backward:

=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2017-06-08 23:30:31 +0000
+++ breezy/shelf.py	2017-06-27 10:27:58 +0000
@@ -344,11 +344,11 @@
         tt.deserialize(records)
         return klass(tree, base_tree, tt, metadata.get('message'))
 
-    def make_merger(self, task=None):
+    def make_merger(self):
         """Return a merger that can unshelve the changes."""
         target_tree = self.transform.get_preview_tree()
         merger = merge.Merger.from_uncommitted(self.tree, target_tree,
-            task, self.base_tree)
+            self.base_tree)
         merger.merge_type = merge.Merge3Merger
         return merger
 

=== modified file 'breezy/shelf_ui.py'
--- breezy/shelf_ui.py	2017-05-22 00:56:52 +0000
+++ breezy/shelf_ui.py	2017-06-27 10:27:58 +0000
@@ -466,7 +466,7 @@
                 if unshelver.message is not None:
                     trace.note(gettext('Message: %s') % unshelver.message)
                 change_reporter = delta._ChangeReporter()
-                merger = unshelver.make_merger(None)
+                merger = unshelver.make_merger()
                 merger.change_reporter = change_reporter
                 if self.apply_changes:
                     merger.do_merge()

=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2017-06-14 23:29:06 +0000
+++ breezy/tests/per_branch/test_branch.py	2017-06-27 10:27:58 +0000
@@ -1028,7 +1028,7 @@
         checkout.commit('bar')
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        merger = merge.Merger.from_revision_ids(None, tree,
+        merger = merge.Merger.from_revision_ids(tree,
                                                 branch.last_revision(),
                                                 other_branch=branch)
         merger.merge_type = merge.Merge3Merger

=== modified file 'breezy/tests/per_merger.py'
--- breezy/tests/per_merger.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/per_merger.py	2017-06-27 10:27:58 +0000
@@ -44,7 +44,7 @@
 class TestMergeImplementation(TestCaseWithTransport):
 
     def do_merge(self, target_tree, source_tree, **kwargs):
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             target_tree, source_tree.last_revision(),
             other_branch=source_tree.branch)
         merger.merge_type=self.merge_type

=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2017-06-20 00:26:58 +0000
+++ breezy/tests/test_merge.py	2017-06-27 10:27:58 +0000
@@ -373,7 +373,7 @@
 
     def test_weave_cherrypick(self):
         this_tree, other_tree = self.prepare_cherrypick()
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev3b', 'rev2b', other_tree.branch)
         merger.merge_type = _mod_merge.WeaveMerger
         merger.do_merge()
@@ -381,14 +381,14 @@
 
     def test_weave_cannot_reverse_cherrypick(self):
         this_tree, other_tree = self.prepare_cherrypick()
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev2b', 'rev3b', other_tree.branch)
         merger.merge_type = _mod_merge.WeaveMerger
         self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
 
     def test_merge3_can_reverse_cherrypick(self):
         this_tree, other_tree = self.prepare_cherrypick()
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev2b', 'rev3b', other_tree.branch)
         merger.merge_type = _mod_merge.Merge3Merger
         merger.do_merge()
@@ -406,7 +406,7 @@
         this_tree.lock_write()
         self.addCleanup(this_tree.unlock)
 
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev3b', 'rev2b', other_tree.branch)
         merger.merge_type = _mod_merge.Merge3Merger
         merger.do_merge()
@@ -424,7 +424,7 @@
         self.build_tree(['a'])
         tree.add('a')
         first_rev = tree.commit("added a")
-        merger = _mod_merge.Merger.from_revision_ids(None, tree,
+        merger = _mod_merge.Merger.from_revision_ids(tree,
                                           _mod_revision.NULL_REVISION,
                                           first_rev)
         merger.merge_type = _mod_merge.Merge3Merger
@@ -444,7 +444,7 @@
         other_tree.commit('rev2', rev_id='rev2b')
         this_tree.lock_write()
         self.addCleanup(this_tree.unlock)
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev2b', other_branch=other_tree.branch)
         merger.merge_type = _mod_merge.Merge3Merger
         tree_merger = merger.make_merger()
@@ -467,7 +467,7 @@
         other_tree.commit('rev2', rev_id='rev2b')
         this_tree.lock_write()
         self.addCleanup(this_tree.unlock)
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev2b', other_branch=other_tree.branch)
         merger.merge_type = _mod_merge.Merge3Merger
         tree_merger = merger.make_merger()
@@ -497,7 +497,7 @@
         other_tree.commit('rev2', rev_id='rev2b')
         this_tree.lock_write()
         self.addCleanup(this_tree.unlock)
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             this_tree, 'rev2b', other_branch=other_tree.branch)
         merger.merge_type = _mod_merge.Merge3Merger
         tree_merger = merger.make_merger()
@@ -516,7 +516,7 @@
         tree.add('a')
         first_rev = tree.commit("added a")
         old_root_id = tree.get_root_id()
-        merger = _mod_merge.Merger.from_revision_ids(None, tree,
+        merger = _mod_merge.Merger.from_revision_ids(tree,
                                           _mod_revision.NULL_REVISION,
                                           first_rev)
         merger.merge_type = _mod_merge.Merge3Merger
@@ -1270,7 +1270,7 @@
         mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch())
         mem_tree.lock_write()
         self.addCleanup(mem_tree.unlock)
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             mem_tree, other_revision_id)
         merger.set_interesting_files(interesting_files)
         # It seems there is no matching function for set_interesting_ids
@@ -2072,7 +2072,7 @@
 
     def do_merge(self, builder, other_revision_id):
         wt = self.get_wt_from_builder(builder)
-        merger = _mod_merge.Merger.from_revision_ids(None,
+        merger = _mod_merge.Merger.from_revision_ids(
             wt, other_revision_id)
         merger.merge_type = _mod_merge.Merge3Merger
         return wt, merger.do_merge()
@@ -2338,8 +2338,7 @@
         wt.commit('D merges B & C', rev_id='D-id')
         self.assertEqual('barry', wt.id2path('foo-id'))
         # Check the output of the Merger object directly
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'F-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'F-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         root_id = wt.path2id('')
@@ -2394,8 +2393,7 @@
         wt.commit('F foo => bing', rev_id='F-id')
 
         # Check the output of the Merger object directly
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'E-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         # Nothing interesting happened in OTHER relative to BASE
@@ -2445,8 +2443,7 @@
         list(wt.iter_changes(wt.basis_tree()))
         wt.commit('D merges B & C, makes it a file', rev_id='D-id')
 
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'E-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         entries = list(merge_obj._entries_lca())
@@ -2660,8 +2657,7 @@
         wt.branch.set_last_revision_info(2, 'B-id')
         wt.commit('D', rev_id='D-id', recursive=None)
 
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'E-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         entries = list(merge_obj._entries_lca())
@@ -2697,8 +2693,7 @@
         wt.branch.set_last_revision_info(2, 'B-id')
         wt.commit('D', rev_id='D-id', recursive=None)
 
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'E-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         entries = list(merge_obj._entries_lca())
@@ -2737,8 +2732,7 @@
         wt.branch.set_last_revision_info(2, 'B-id')
         wt.commit('D', rev_id='D-id', recursive=None)
 
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'E-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         entries = list(merge_obj._entries_lca())
@@ -2782,8 +2776,7 @@
         wt.branch.set_last_revision_info(2, 'B-id')
         wt.commit('D', rev_id='D-id', recursive=None)
 
-        merger = _mod_merge.Merger.from_revision_ids(None,
-            wt, 'E-id')
+        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
         merger.merge_type = _mod_merge.Merge3Merger
         merge_obj = merger.make_merger()
         entries = list(merge_obj._entries_lca())

=== modified file 'breezy/tests/test_merge_core.py'
--- breezy/tests/test_merge_core.py	2017-06-10 00:52:08 +0000
+++ breezy/tests/test_merge_core.py	2017-06-27 10:27:58 +0000
@@ -773,14 +773,14 @@
     def test_from_revision_ids(self):
         this, other = self.set_up_trees()
         self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids,
-                          None, this, 'rev2b')
+                          this, 'rev2b')
         this.lock_write()
         self.addCleanup(this.unlock)
-        merger = Merger.from_revision_ids(None, this,
+        merger = Merger.from_revision_ids(this,
             'rev2b', other_branch=other.branch)
         self.assertEqual('rev2b', merger.other_rev_id)
         self.assertEqual('rev1', merger.base_rev_id)
-        merger = Merger.from_revision_ids(None, this,
+        merger = Merger.from_revision_ids(this,
             'rev2b', 'rev2a', other_branch=other.branch)
         self.assertEqual('rev2a', merger.base_rev_id)
 
@@ -804,17 +804,14 @@
             other.branch.repository, 'rev3', 0, 0, 'this')
         other.lock_read()
         self.addCleanup(other.unlock)
-        merger, verified = Merger.from_mergeable(this, md,
-            None)
+        merger, verified = Merger.from_mergeable(this, md)
         md.patch = None
-        merger, verified = Merger.from_mergeable(this, md,
-            None)
+        merger, verified = Merger.from_mergeable(this, md)
         self.assertEqual('inapplicable', verified)
         self.assertEqual('rev3', merger.other_rev_id)
         self.assertEqual('rev1', merger.base_rev_id)
         md.base_revision_id = 'rev2b'
-        merger, verified = Merger.from_mergeable(this, md,
-            None)
+        merger, verified = Merger.from_mergeable(this, md)
         self.assertEqual('rev2b', merger.base_rev_id)
 
     def test_from_mergeable_old_merge_directive(self):
@@ -823,7 +820,6 @@
         self.addCleanup(other.unlock)
         md = merge_directive.MergeDirective.from_objects(
             other.branch.repository, 'rev3', 0, 0, 'this')
-        merger, verified = Merger.from_mergeable(this, md,
-            None)
+        merger, verified = Merger.from_mergeable(this, md)
         self.assertEqual('rev3', merger.other_rev_id)
         self.assertEqual('rev1', merger.base_rev_id)

=== modified file 'breezy/tests/test_missing.py'
--- breezy/tests/test_missing.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/test_missing.py	2017-06-27 10:27:58 +0000
@@ -41,26 +41,26 @@
         merger = merger_tree.branch
         self.assertUnmerged(([], []), original, puller)
         original_tree.commit('a', rev_id='a')
-        self.assertUnmerged(([('1', 'a')], []), original, puller)
+        self.assertUnmerged(([('1', 'a', 0)], []), original, puller)
         puller_tree.pull(original)
         self.assertUnmerged(([], []), original, puller)
         merger_tree.pull(original)
         original_tree.commit('b', rev_id='b')
         original_tree.commit('c', rev_id='c')
-        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
+        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
                             original, puller)
-        self.assertUnmerged(([('3', 'c'), ('2', 'b')], []),
+        self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []),
                             original, puller, backward=True)
 
         puller_tree.pull(original)
         self.assertUnmerged(([], []), original, puller)
-        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
+        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
                             original, merger)
         merger_tree.merge_from_branch(original)
-        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
+        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
                             original, merger)
         merger_tree.commit('d', rev_id='d')
-        self.assertUnmerged(([], [('2', 'd')]), original, merger)
+        self.assertUnmerged(([], [('2', 'd', 0)]), original, merger)
 
     def test_iter_log_revisions(self):
         base_tree = self.make_branch_and_tree('base')
@@ -159,17 +159,17 @@
         rev1 = tree.commit('one')
         tree2 = tree.controldir.sprout('tree2').open_workingtree()
         rev2 = tree2.commit('two')
-        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
-        self.assertUnmerged([('2', rev2)], [], tree2.branch, tree.branch)
+        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
+        self.assertUnmerged([('2', rev2, 0)], [], tree2.branch, tree.branch)
 
     def test_restrict(self):
         tree = self.make_branch_and_tree('tree')
         rev1 = tree.commit('one')
         tree2 = tree.controldir.sprout('tree2').open_workingtree()
         rev2 = tree2.commit('two')
-        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
+        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
         self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
-        self.assertUnmerged(None, [('2', rev2)], tree.branch, tree2.branch,
+        self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch,
                                                'remote')
 
     def test_merged(self):
@@ -181,8 +181,8 @@
         tree.merge_from_branch(tree2.branch)
         rev4 = tree.commit('four')
 
-        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch)
-        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch,
+        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch)
+        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch,
             local_revid_range=(rev4, rev4))
         self.assertUnmerged([], [], tree.branch, tree2.branch,
             local_revid_range=(rev1, rev1))
@@ -239,8 +239,8 @@
         lrevid2 = local.commit('two')
         lrevid3 = local.commit('three')
         lrevid4 = local.commit('four')
-        local_extra = [('2', lrevid2), ('3', lrevid3), ('4', lrevid4)]
-        remote_extra = [('2', rrevid2), ('3', rrevid3), ('4', rrevid4)]
+        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
+        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)]
 
         # control
         self.assertUnmerged(local_extra, remote_extra,
@@ -250,32 +250,32 @@
             remote_revid_range=(None, None))
 
         # exclude local revisions
-        self.assertUnmerged([('2', lrevid2)], remote_extra,
+        self.assertUnmerged([('2', lrevid2, 0)], remote_extra,
             local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
-        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], remote_extra,
+        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
             local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
-        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], None,
+        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None,
             local.branch, remote.branch, 'local',
             local_revid_range=(lrevid2, lrevid3))
 
         # exclude remote revisions
-        self.assertUnmerged(local_extra, [('2', rrevid2)],
+        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
             local.branch, remote.branch, remote_revid_range=(None, rrevid2))
-        self.assertUnmerged(local_extra, [('2', rrevid2)],
+        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
             local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
-        self.assertUnmerged(local_extra, [('2', rrevid2)],
+        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
             local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
-        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
+        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
             local.branch, remote.branch, remote_revid_range=(None, rrevid3))
-        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
+        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
             local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
-        self.assertUnmerged(local_extra, [('3', rrevid3)],
+        self.assertUnmerged(local_extra, [('3', rrevid3, 0)],
             local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
-        self.assertUnmerged(None, [('2', rrevid2), ('3', rrevid3)],
+        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
             local.branch, remote.branch, 'remote',
             remote_revid_range=(rrevid2, rrevid3))
 
         # exclude local and remote revisions
-        self.assertUnmerged([('3', lrevid3)], [('3', rrevid3)],
+        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
             local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
             remote_revid_range=(rrevid3, rrevid3))

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2017-06-11 02:27:01 +0000
+++ breezy/tests/test_transform.py	2017-06-27 10:27:58 +0000
@@ -3230,7 +3230,7 @@
         preview.delete_contents(file_trans_id)
         preview.create_file('a\nb\n', file_trans_id)
         preview_tree = preview.get_preview_tree()
-        merger = Merger.from_revision_ids(None, preview_tree,
+        merger = Merger.from_revision_ids(preview_tree,
                                           child_tree.branch.last_revision(),
                                           other_branch=child_tree.branch,
                                           tree_branch=work_tree.branch)
@@ -3249,7 +3249,7 @@
         tree2 = self.make_branch_and_tree('tree2')
         tree2.set_root_id('TREE_ROOT')
         merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
-                                         None, tree.basis_tree())
+                                         tree.basis_tree())
         merger.merge_type = Merge3Merger
         merger.do_merge()
 
@@ -3265,9 +3265,8 @@
         tt.create_file('baz', trans_id)
         tree2 = tree.controldir.sprout('tree2').open_workingtree()
         self.build_tree_contents([('tree2/foo', 'qux')])
-        pb = None
         merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
-                                         pb, tree.basis_tree())
+                                         tree.basis_tree())
         merger.merge_type = Merge3Merger
         merger.do_merge()
 

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2017-06-14 23:29:06 +0000
+++ breezy/workingtree.py	2017-06-27 10:27:58 +0000
@@ -955,7 +955,6 @@
                                 new_basis_tree,
                                 basis_tree,
                                 this_tree=self,
-                                pb=None,
                                 change_reporter=change_reporter,
                                 show_base=show_base)
                     basis_root_id = basis_tree.get_root_id()