Merge lp:~jelmer/brz/more-deprecations into lp:brz
- more-deprecations
- Merge into trunk
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Jelmer Vernooij |
| Approved revision: | no longer in the source branch. |
| Merge reported by: | The Breezy Bot |
| Merged at revision: | not available |
| Proposed branch: | lp:~jelmer/brz/more-deprecations |
| Merge into: | lp:brz |
| Diff against target: |
671 lines (+74/-110) 12 files modified
breezy/builtins.py (+3/-5) breezy/merge.py (+10/-24) breezy/missing.py (+3/-10) breezy/shelf.py (+2/-2) breezy/shelf_ui.py (+1/-1) breezy/tests/per_branch/test_branch.py (+1/-1) breezy/tests/per_merger.py (+1/-1) breezy/tests/test_merge.py (+18/-25) breezy/tests/test_merge_core.py (+7/-11) breezy/tests/test_missing.py (+25/-25) breezy/tests/test_transform.py (+3/-4) breezy/workingtree.py (+0/-1) |
| To merge this branch: | bzr merge lp:~jelmer/brz/more-deprecations |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman | Approve | ||
|
Review via email:
|
|||
Commit message
Remove some more already deprecated arguments.
Description of the change
Remove some more already deprecated arguments.
Be consistent in what various "missing" functions return - include the merge_depth.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'breezy/builtins.py' | |||
| 2 | --- breezy/builtins.py 2017-06-19 14:35:58 +0000 | |||
| 3 | +++ breezy/builtins.py 2017-06-27 10:27:58 +0000 | |||
| 4 | @@ -1411,8 +1411,6 @@ | |||
| 5 | 1411 | 1411 | ||
| 6 | 1412 | To retrieve the branch as of a particular revision, supply the --revision | 1412 | To retrieve the branch as of a particular revision, supply the --revision |
| 7 | 1413 | parameter, as in "branch foo/bar -r 5". | 1413 | parameter, as in "branch foo/bar -r 5". |
| 8 | 1414 | |||
| 9 | 1415 | The synonyms 'clone' and 'get' for this command are deprecated. | ||
| 10 | 1416 | """ | 1414 | """ |
| 11 | 1417 | 1415 | ||
| 12 | 1418 | _see_also = ['checkout'] | 1416 | _see_also = ['checkout'] |
| 13 | @@ -4406,7 +4404,7 @@ | |||
| 14 | 4406 | raise errors.BzrCommandError(gettext( | 4404 | raise errors.BzrCommandError(gettext( |
| 15 | 4407 | 'Cannot use -r with merge directives or bundles')) | 4405 | 'Cannot use -r with merge directives or bundles')) |
| 16 | 4408 | merger, verified = _mod_merge.Merger.from_mergeable(tree, | 4406 | merger, verified = _mod_merge.Merger.from_mergeable(tree, |
| 18 | 4409 | mergeable, None) | 4407 | mergeable) |
| 19 | 4410 | 4408 | ||
| 20 | 4411 | if merger is None and uncommitted: | 4409 | if merger is None and uncommitted: |
| 21 | 4412 | if revision is not None and len(revision) > 0: | 4410 | if revision is not None and len(revision) > 0: |
| 22 | @@ -4561,7 +4559,7 @@ | |||
| 23 | 4561 | # Merge tags (but don't set them in the master branch yet, the user | 4559 | # Merge tags (but don't set them in the master branch yet, the user |
| 24 | 4562 | # might revert this merge). Commit will propagate them. | 4560 | # might revert this merge). Commit will propagate them. |
| 25 | 4563 | other_branch.tags.merge_to(tree.branch.tags, ignore_master=True) | 4561 | other_branch.tags.merge_to(tree.branch.tags, ignore_master=True) |
| 27 | 4564 | merger = _mod_merge.Merger.from_revision_ids(pb, tree, | 4562 | merger = _mod_merge.Merger.from_revision_ids(tree, |
| 28 | 4565 | other_revision_id, base_revision_id, other_branch, base_branch) | 4563 | other_revision_id, base_revision_id, other_branch, base_branch) |
| 29 | 4566 | if other_path != '': | 4564 | if other_path != '': |
| 30 | 4567 | allow_pending = False | 4565 | allow_pending = False |
| 31 | @@ -4713,7 +4711,7 @@ | |||
| 32 | 4713 | # have not yet been seen. | 4711 | # have not yet been seen. |
| 33 | 4714 | tree.set_parent_ids(parents[:1]) | 4712 | tree.set_parent_ids(parents[:1]) |
| 34 | 4715 | try: | 4713 | try: |
| 36 | 4716 | merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1]) | 4714 | merger = _mod_merge.Merger.from_revision_ids(tree, parents[1]) |
| 37 | 4717 | merger.interesting_ids = interesting_ids | 4715 | merger.interesting_ids = interesting_ids |
| 38 | 4718 | merger.merge_type = merge_type | 4716 | merger.merge_type = merge_type |
| 39 | 4719 | merger.show_base = show_base | 4717 | merger.show_base = show_base |
| 40 | 4720 | 4718 | ||
| 41 | === modified file 'breezy/merge.py' | |||
| 42 | --- breezy/merge.py 2017-06-10 01:39:46 +0000 | |||
| 43 | +++ breezy/merge.py 2017-06-27 10:27:58 +0000 | |||
| 44 | @@ -280,7 +280,7 @@ | |||
| 45 | 280 | hooks = MergeHooks() | 280 | hooks = MergeHooks() |
| 46 | 281 | 281 | ||
| 47 | 282 | def __init__(self, this_branch, other_tree=None, base_tree=None, | 282 | def __init__(self, this_branch, other_tree=None, base_tree=None, |
| 49 | 283 | this_tree=None, pb=None, change_reporter=None, | 283 | this_tree=None, change_reporter=None, |
| 50 | 284 | recurse='down', revision_graph=None): | 284 | recurse='down', revision_graph=None): |
| 51 | 285 | object.__init__(self) | 285 | object.__init__(self) |
| 52 | 286 | self.this_branch = this_branch | 286 | self.this_branch = this_branch |
| 53 | @@ -299,8 +299,6 @@ | |||
| 54 | 299 | self.interesting_files = None | 299 | self.interesting_files = None |
| 55 | 300 | self.show_base = False | 300 | self.show_base = False |
| 56 | 301 | self.reprocess = False | 301 | self.reprocess = False |
| 57 | 302 | if pb is not None: | ||
| 58 | 303 | warnings.warn("pb parameter to Merger() is deprecated and ignored") | ||
| 59 | 304 | self.pp = None | 302 | self.pp = None |
| 60 | 305 | self.recurse = recurse | 303 | self.recurse = recurse |
| 61 | 306 | self.change_reporter = change_reporter | 304 | self.change_reporter = change_reporter |
| 62 | @@ -354,30 +352,28 @@ | |||
| 63 | 354 | _set_base_is_other_ancestor) | 352 | _set_base_is_other_ancestor) |
| 64 | 355 | 353 | ||
| 65 | 356 | @staticmethod | 354 | @staticmethod |
| 67 | 357 | def from_uncommitted(tree, other_tree, pb=None, base_tree=None): | 355 | def from_uncommitted(tree, other_tree, base_tree=None): |
| 68 | 358 | """Return a Merger for uncommitted changes in other_tree. | 356 | """Return a Merger for uncommitted changes in other_tree. |
| 69 | 359 | 357 | ||
| 70 | 360 | :param tree: The tree to merge into | 358 | :param tree: The tree to merge into |
| 71 | 361 | :param other_tree: The tree to get uncommitted changes from | 359 | :param other_tree: The tree to get uncommitted changes from |
| 72 | 362 | :param pb: A progress indicator | ||
| 73 | 363 | :param base_tree: The basis to use for the merge. If unspecified, | 360 | :param base_tree: The basis to use for the merge. If unspecified, |
| 74 | 364 | other_tree.basis_tree() will be used. | 361 | other_tree.basis_tree() will be used. |
| 75 | 365 | """ | 362 | """ |
| 76 | 366 | if base_tree is None: | 363 | if base_tree is None: |
| 77 | 367 | base_tree = other_tree.basis_tree() | 364 | base_tree = other_tree.basis_tree() |
| 79 | 368 | merger = Merger(tree.branch, other_tree, base_tree, tree, pb) | 365 | merger = Merger(tree.branch, other_tree, base_tree, tree) |
| 80 | 369 | merger.base_rev_id = merger.base_tree.get_revision_id() | 366 | merger.base_rev_id = merger.base_tree.get_revision_id() |
| 81 | 370 | merger.other_rev_id = None | 367 | merger.other_rev_id = None |
| 82 | 371 | merger.other_basis = merger.base_rev_id | 368 | merger.other_basis = merger.base_rev_id |
| 83 | 372 | return merger | 369 | return merger |
| 84 | 373 | 370 | ||
| 85 | 374 | @classmethod | 371 | @classmethod |
| 87 | 375 | def from_mergeable(klass, tree, mergeable, pb): | 372 | def from_mergeable(klass, tree, mergeable): |
| 88 | 376 | """Return a Merger for a bundle or merge directive. | 373 | """Return a Merger for a bundle or merge directive. |
| 89 | 377 | 374 | ||
| 90 | 378 | :param tree: The tree to merge changes into | 375 | :param tree: The tree to merge changes into |
| 91 | 379 | :param mergeable: A merge directive or bundle | 376 | :param mergeable: A merge directive or bundle |
| 92 | 380 | :param pb: A progress indicator | ||
| 93 | 381 | """ | 377 | """ |
| 94 | 382 | mergeable.install_revisions(tree.branch.repository) | 378 | mergeable.install_revisions(tree.branch.repository) |
| 95 | 383 | base_revision_id, other_revision_id, verified =\ | 379 | base_revision_id, other_revision_id, verified =\ |
| 96 | @@ -390,18 +386,17 @@ | |||
| 97 | 390 | base_revision_id = None | 386 | base_revision_id = None |
| 98 | 391 | else: | 387 | else: |
| 99 | 392 | trace.warning('Performing cherrypick') | 388 | trace.warning('Performing cherrypick') |
| 101 | 393 | merger = klass.from_revision_ids(pb, tree, other_revision_id, | 389 | merger = klass.from_revision_ids(tree, other_revision_id, |
| 102 | 394 | base_revision_id, revision_graph= | 390 | base_revision_id, revision_graph= |
| 103 | 395 | revision_graph) | 391 | revision_graph) |
| 104 | 396 | return merger, verified | 392 | return merger, verified |
| 105 | 397 | 393 | ||
| 106 | 398 | @staticmethod | 394 | @staticmethod |
| 108 | 399 | def from_revision_ids(pb, tree, other, base=None, other_branch=None, | 395 | def from_revision_ids(tree, other, base=None, other_branch=None, |
| 109 | 400 | base_branch=None, revision_graph=None, | 396 | base_branch=None, revision_graph=None, |
| 110 | 401 | tree_branch=None): | 397 | tree_branch=None): |
| 111 | 402 | """Return a Merger for revision-ids. | 398 | """Return a Merger for revision-ids. |
| 112 | 403 | 399 | ||
| 113 | 404 | :param pb: A progress indicator | ||
| 114 | 405 | :param tree: The tree to merge changes into | 400 | :param tree: The tree to merge changes into |
| 115 | 406 | :param other: The revision-id to use as OTHER | 401 | :param other: The revision-id to use as OTHER |
| 116 | 407 | :param base: The revision-id to use as BASE. If not specified, will | 402 | :param base: The revision-id to use as BASE. If not specified, will |
| 117 | @@ -417,7 +412,7 @@ | |||
| 118 | 417 | """ | 412 | """ |
| 119 | 418 | if tree_branch is None: | 413 | if tree_branch is None: |
| 120 | 419 | tree_branch = tree.branch | 414 | tree_branch = tree.branch |
| 122 | 420 | merger = Merger(tree_branch, this_tree=tree, pb=pb, | 415 | merger = Merger(tree_branch, this_tree=tree, |
| 123 | 421 | revision_graph=revision_graph) | 416 | revision_graph=revision_graph) |
| 124 | 422 | if other_branch is None: | 417 | if other_branch is None: |
| 125 | 423 | other_branch = tree.branch | 418 | other_branch = tree.branch |
| 126 | @@ -642,8 +637,7 @@ | |||
| 127 | 642 | if self._is_criss_cross and getattr(self.merge_type, | 637 | if self._is_criss_cross and getattr(self.merge_type, |
| 128 | 643 | 'supports_lca_trees', False): | 638 | 'supports_lca_trees', False): |
| 129 | 644 | kwargs['lca_trees'] = self._lca_trees | 639 | kwargs['lca_trees'] = self._lca_trees |
| 132 | 645 | return self.merge_type(pb=None, | 640 | return self.merge_type(change_reporter=self.change_reporter, |
| 131 | 646 | change_reporter=self.change_reporter, | ||
| 133 | 647 | **kwargs) | 641 | **kwargs) |
| 134 | 648 | 642 | ||
| 135 | 649 | def _do_merge_to(self): | 643 | def _do_merge_to(self): |
| 136 | @@ -725,8 +719,7 @@ | |||
| 137 | 725 | 719 | ||
| 138 | 726 | def __init__(self, working_tree, this_tree, base_tree, other_tree, | 720 | def __init__(self, working_tree, this_tree, base_tree, other_tree, |
| 139 | 727 | interesting_ids=None, reprocess=False, show_base=False, | 721 | interesting_ids=None, reprocess=False, show_base=False, |
| 142 | 728 | pb=None, pp=None, change_reporter=None, | 722 | change_reporter=None, interesting_files=None, do_merge=True, |
| 141 | 729 | interesting_files=None, do_merge=True, | ||
| 143 | 730 | cherrypick=False, lca_trees=None, this_branch=None, | 723 | cherrypick=False, lca_trees=None, this_branch=None, |
| 144 | 731 | other_branch=None): | 724 | other_branch=None): |
| 145 | 732 | """Initialize the merger object and perform the merge. | 725 | """Initialize the merger object and perform the merge. |
| 146 | @@ -744,8 +737,6 @@ | |||
| 147 | 744 | :param: reprocess If True, perform conflict-reduction processing. | 737 | :param: reprocess If True, perform conflict-reduction processing. |
| 148 | 745 | :param show_base: If True, show the base revision in text conflicts. | 738 | :param show_base: If True, show the base revision in text conflicts. |
| 149 | 746 | (incompatible with reprocess) | 739 | (incompatible with reprocess) |
| 150 | 747 | :param pb: ignored | ||
| 151 | 748 | :param pp: A ProgressPhase object | ||
| 152 | 749 | :param change_reporter: An object that should report changes made | 740 | :param change_reporter: An object that should report changes made |
| 153 | 750 | :param interesting_files: The tree-relative paths of files that should | 741 | :param interesting_files: The tree-relative paths of files that should |
| 154 | 751 | participate in the merge. If these paths refer to directories, | 742 | participate in the merge. If these paths refer to directories, |
| 155 | @@ -785,10 +776,6 @@ | |||
| 156 | 785 | self.cherrypick = cherrypick | 776 | self.cherrypick = cherrypick |
| 157 | 786 | if do_merge: | 777 | if do_merge: |
| 158 | 787 | self.do_merge() | 778 | self.do_merge() |
| 159 | 788 | if pp is not None: | ||
| 160 | 789 | warnings.warn("pp argument to Merge3Merger is deprecated") | ||
| 161 | 790 | if pb is not None: | ||
| 162 | 791 | warnings.warn("pb argument to Merge3Merger is deprecated") | ||
| 163 | 792 | 779 | ||
| 164 | 793 | def do_merge(self): | 780 | def do_merge(self): |
| 165 | 794 | operation = cleanup.OperationWithCleanups(self._do_merge) | 781 | operation = cleanup.OperationWithCleanups(self._do_merge) |
| 166 | @@ -1922,7 +1909,6 @@ | |||
| 167 | 1922 | other_rev_id=None, | 1909 | other_rev_id=None, |
| 168 | 1923 | interesting_files=None, | 1910 | interesting_files=None, |
| 169 | 1924 | this_tree=None, | 1911 | this_tree=None, |
| 170 | 1925 | pb=None, | ||
| 171 | 1926 | change_reporter=None): | 1912 | change_reporter=None): |
| 172 | 1927 | """Primary interface for merging. | 1913 | """Primary interface for merging. |
| 173 | 1928 | 1914 | ||
| 174 | @@ -1935,7 +1921,7 @@ | |||
| 175 | 1935 | raise errors.BzrError("breezy.merge.merge_inner requires a this_tree " | 1921 | raise errors.BzrError("breezy.merge.merge_inner requires a this_tree " |
| 176 | 1936 | "parameter") | 1922 | "parameter") |
| 177 | 1937 | merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree, | 1923 | merger = Merger(this_branch, other_tree, base_tree, this_tree=this_tree, |
| 179 | 1938 | pb=pb, change_reporter=change_reporter) | 1924 | change_reporter=change_reporter) |
| 180 | 1939 | merger.backup_files = backup_files | 1925 | merger.backup_files = backup_files |
| 181 | 1940 | merger.merge_type = merge_type | 1926 | merger.merge_type = merge_type |
| 182 | 1941 | merger.interesting_ids = interesting_ids | 1927 | merger.interesting_ids = interesting_ids |
| 183 | 1942 | 1928 | ||
| 184 | === modified file 'breezy/missing.py' | |||
| 185 | --- breezy/missing.py 2017-05-30 19:16:23 +0000 | |||
| 186 | +++ breezy/missing.py 2017-06-27 10:27:58 +0000 | |||
| 187 | @@ -30,14 +30,7 @@ | |||
| 188 | 30 | 30 | ||
| 189 | 31 | if rev_tag_dict is None: | 31 | if rev_tag_dict is None: |
| 190 | 32 | rev_tag_dict = {} | 32 | rev_tag_dict = {} |
| 199 | 33 | for rev in revisions: | 33 | for revno, rev_id, merge_depth in revisions: |
| 192 | 34 | # We need the following for backward compatibilty (hopefully | ||
| 193 | 35 | # this will be deprecated soon :-/) -- vila 080911 | ||
| 194 | 36 | if len(rev) == 2: | ||
| 195 | 37 | revno, rev_id = rev | ||
| 196 | 38 | merge_depth = 0 | ||
| 197 | 39 | else: | ||
| 198 | 40 | revno, rev_id, merge_depth = rev | ||
| 200 | 41 | rev = revision_source.get_revision(rev_id) | 34 | rev = revision_source.get_revision(rev_id) |
| 201 | 42 | if verbose: | 35 | if verbose: |
| 202 | 43 | delta = revision_source.get_revision_delta(rev_id) | 36 | delta = revision_source.get_revision_delta(rev_id) |
| 203 | @@ -97,7 +90,7 @@ | |||
| 204 | 97 | :param tip: The tip of mainline | 90 | :param tip: The tip of mainline |
| 205 | 98 | :param backward: Show oldest versions first when True, newest versions | 91 | :param backward: Show oldest versions first when True, newest versions |
| 206 | 99 | first when False. | 92 | first when False. |
| 208 | 100 | :return: [(revno, revision_id)] for all revisions in ancestry that | 93 | :return: [(revno, revision_id, 0)] for all revisions in ancestry that |
| 209 | 101 | are left-hand parents from tip, or None if ancestry is None. | 94 | are left-hand parents from tip, or None if ancestry is None. |
| 210 | 102 | """ | 95 | """ |
| 211 | 103 | if ancestry is None: | 96 | if ancestry is None: |
| 212 | @@ -117,7 +110,7 @@ | |||
| 213 | 117 | parents = parent_map.get(cur) | 110 | parents = parent_map.get(cur) |
| 214 | 118 | if not parents: | 111 | if not parents: |
| 215 | 119 | break # Ghost, we are done | 112 | break # Ghost, we are done |
| 217 | 120 | mainline.append((str(cur_revno), cur)) | 113 | mainline.append((str(cur_revno), cur, 0)) |
| 218 | 121 | cur = parents[0] | 114 | cur = parents[0] |
| 219 | 122 | cur_revno -= 1 | 115 | cur_revno -= 1 |
| 220 | 123 | if not backward: | 116 | if not backward: |
| 221 | 124 | 117 | ||
| 222 | === modified file 'breezy/shelf.py' | |||
| 223 | --- breezy/shelf.py 2017-06-08 23:30:31 +0000 | |||
| 224 | +++ breezy/shelf.py 2017-06-27 10:27:58 +0000 | |||
| 225 | @@ -344,11 +344,11 @@ | |||
| 226 | 344 | tt.deserialize(records) | 344 | tt.deserialize(records) |
| 227 | 345 | return klass(tree, base_tree, tt, metadata.get('message')) | 345 | return klass(tree, base_tree, tt, metadata.get('message')) |
| 228 | 346 | 346 | ||
| 230 | 347 | def make_merger(self, task=None): | 347 | def make_merger(self): |
| 231 | 348 | """Return a merger that can unshelve the changes.""" | 348 | """Return a merger that can unshelve the changes.""" |
| 232 | 349 | target_tree = self.transform.get_preview_tree() | 349 | target_tree = self.transform.get_preview_tree() |
| 233 | 350 | merger = merge.Merger.from_uncommitted(self.tree, target_tree, | 350 | merger = merge.Merger.from_uncommitted(self.tree, target_tree, |
| 235 | 351 | task, self.base_tree) | 351 | self.base_tree) |
| 236 | 352 | merger.merge_type = merge.Merge3Merger | 352 | merger.merge_type = merge.Merge3Merger |
| 237 | 353 | return merger | 353 | return merger |
| 238 | 354 | 354 | ||
| 239 | 355 | 355 | ||
| 240 | === modified file 'breezy/shelf_ui.py' | |||
| 241 | --- breezy/shelf_ui.py 2017-05-22 00:56:52 +0000 | |||
| 242 | +++ breezy/shelf_ui.py 2017-06-27 10:27:58 +0000 | |||
| 243 | @@ -466,7 +466,7 @@ | |||
| 244 | 466 | if unshelver.message is not None: | 466 | if unshelver.message is not None: |
| 245 | 467 | trace.note(gettext('Message: %s') % unshelver.message) | 467 | trace.note(gettext('Message: %s') % unshelver.message) |
| 246 | 468 | change_reporter = delta._ChangeReporter() | 468 | change_reporter = delta._ChangeReporter() |
| 248 | 469 | merger = unshelver.make_merger(None) | 469 | merger = unshelver.make_merger() |
| 249 | 470 | merger.change_reporter = change_reporter | 470 | merger.change_reporter = change_reporter |
| 250 | 471 | if self.apply_changes: | 471 | if self.apply_changes: |
| 251 | 472 | merger.do_merge() | 472 | merger.do_merge() |
| 252 | 473 | 473 | ||
| 253 | === modified file 'breezy/tests/per_branch/test_branch.py' | |||
| 254 | --- breezy/tests/per_branch/test_branch.py 2017-06-14 23:29:06 +0000 | |||
| 255 | +++ breezy/tests/per_branch/test_branch.py 2017-06-27 10:27:58 +0000 | |||
| 256 | @@ -1028,7 +1028,7 @@ | |||
| 257 | 1028 | checkout.commit('bar') | 1028 | checkout.commit('bar') |
| 258 | 1029 | tree.lock_write() | 1029 | tree.lock_write() |
| 259 | 1030 | self.addCleanup(tree.unlock) | 1030 | self.addCleanup(tree.unlock) |
| 261 | 1031 | merger = merge.Merger.from_revision_ids(None, tree, | 1031 | merger = merge.Merger.from_revision_ids(tree, |
| 262 | 1032 | branch.last_revision(), | 1032 | branch.last_revision(), |
| 263 | 1033 | other_branch=branch) | 1033 | other_branch=branch) |
| 264 | 1034 | merger.merge_type = merge.Merge3Merger | 1034 | merger.merge_type = merge.Merge3Merger |
| 265 | 1035 | 1035 | ||
| 266 | === modified file 'breezy/tests/per_merger.py' | |||
| 267 | --- breezy/tests/per_merger.py 2017-06-10 00:17:06 +0000 | |||
| 268 | +++ breezy/tests/per_merger.py 2017-06-27 10:27:58 +0000 | |||
| 269 | @@ -44,7 +44,7 @@ | |||
| 270 | 44 | class TestMergeImplementation(TestCaseWithTransport): | 44 | class TestMergeImplementation(TestCaseWithTransport): |
| 271 | 45 | 45 | ||
| 272 | 46 | def do_merge(self, target_tree, source_tree, **kwargs): | 46 | def do_merge(self, target_tree, source_tree, **kwargs): |
| 274 | 47 | merger = _mod_merge.Merger.from_revision_ids(None, | 47 | merger = _mod_merge.Merger.from_revision_ids( |
| 275 | 48 | target_tree, source_tree.last_revision(), | 48 | target_tree, source_tree.last_revision(), |
| 276 | 49 | other_branch=source_tree.branch) | 49 | other_branch=source_tree.branch) |
| 277 | 50 | merger.merge_type=self.merge_type | 50 | merger.merge_type=self.merge_type |
| 278 | 51 | 51 | ||
| 279 | === modified file 'breezy/tests/test_merge.py' | |||
| 280 | --- breezy/tests/test_merge.py 2017-06-20 00:26:58 +0000 | |||
| 281 | +++ breezy/tests/test_merge.py 2017-06-27 10:27:58 +0000 | |||
| 282 | @@ -373,7 +373,7 @@ | |||
| 283 | 373 | 373 | ||
| 284 | 374 | def test_weave_cherrypick(self): | 374 | def test_weave_cherrypick(self): |
| 285 | 375 | this_tree, other_tree = self.prepare_cherrypick() | 375 | this_tree, other_tree = self.prepare_cherrypick() |
| 287 | 376 | merger = _mod_merge.Merger.from_revision_ids(None, | 376 | merger = _mod_merge.Merger.from_revision_ids( |
| 288 | 377 | this_tree, 'rev3b', 'rev2b', other_tree.branch) | 377 | this_tree, 'rev3b', 'rev2b', other_tree.branch) |
| 289 | 378 | merger.merge_type = _mod_merge.WeaveMerger | 378 | merger.merge_type = _mod_merge.WeaveMerger |
| 290 | 379 | merger.do_merge() | 379 | merger.do_merge() |
| 291 | @@ -381,14 +381,14 @@ | |||
| 292 | 381 | 381 | ||
| 293 | 382 | def test_weave_cannot_reverse_cherrypick(self): | 382 | def test_weave_cannot_reverse_cherrypick(self): |
| 294 | 383 | this_tree, other_tree = self.prepare_cherrypick() | 383 | this_tree, other_tree = self.prepare_cherrypick() |
| 296 | 384 | merger = _mod_merge.Merger.from_revision_ids(None, | 384 | merger = _mod_merge.Merger.from_revision_ids( |
| 297 | 385 | this_tree, 'rev2b', 'rev3b', other_tree.branch) | 385 | this_tree, 'rev2b', 'rev3b', other_tree.branch) |
| 298 | 386 | merger.merge_type = _mod_merge.WeaveMerger | 386 | merger.merge_type = _mod_merge.WeaveMerger |
| 299 | 387 | self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge) | 387 | self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge) |
| 300 | 388 | 388 | ||
| 301 | 389 | def test_merge3_can_reverse_cherrypick(self): | 389 | def test_merge3_can_reverse_cherrypick(self): |
| 302 | 390 | this_tree, other_tree = self.prepare_cherrypick() | 390 | this_tree, other_tree = self.prepare_cherrypick() |
| 304 | 391 | merger = _mod_merge.Merger.from_revision_ids(None, | 391 | merger = _mod_merge.Merger.from_revision_ids( |
| 305 | 392 | this_tree, 'rev2b', 'rev3b', other_tree.branch) | 392 | this_tree, 'rev2b', 'rev3b', other_tree.branch) |
| 306 | 393 | merger.merge_type = _mod_merge.Merge3Merger | 393 | merger.merge_type = _mod_merge.Merge3Merger |
| 307 | 394 | merger.do_merge() | 394 | merger.do_merge() |
| 308 | @@ -406,7 +406,7 @@ | |||
| 309 | 406 | this_tree.lock_write() | 406 | this_tree.lock_write() |
| 310 | 407 | self.addCleanup(this_tree.unlock) | 407 | self.addCleanup(this_tree.unlock) |
| 311 | 408 | 408 | ||
| 313 | 409 | merger = _mod_merge.Merger.from_revision_ids(None, | 409 | merger = _mod_merge.Merger.from_revision_ids( |
| 314 | 410 | this_tree, 'rev3b', 'rev2b', other_tree.branch) | 410 | this_tree, 'rev3b', 'rev2b', other_tree.branch) |
| 315 | 411 | merger.merge_type = _mod_merge.Merge3Merger | 411 | merger.merge_type = _mod_merge.Merge3Merger |
| 316 | 412 | merger.do_merge() | 412 | merger.do_merge() |
| 317 | @@ -424,7 +424,7 @@ | |||
| 318 | 424 | self.build_tree(['a']) | 424 | self.build_tree(['a']) |
| 319 | 425 | tree.add('a') | 425 | tree.add('a') |
| 320 | 426 | first_rev = tree.commit("added a") | 426 | first_rev = tree.commit("added a") |
| 322 | 427 | merger = _mod_merge.Merger.from_revision_ids(None, tree, | 427 | merger = _mod_merge.Merger.from_revision_ids(tree, |
| 323 | 428 | _mod_revision.NULL_REVISION, | 428 | _mod_revision.NULL_REVISION, |
| 324 | 429 | first_rev) | 429 | first_rev) |
| 325 | 430 | merger.merge_type = _mod_merge.Merge3Merger | 430 | merger.merge_type = _mod_merge.Merge3Merger |
| 326 | @@ -444,7 +444,7 @@ | |||
| 327 | 444 | other_tree.commit('rev2', rev_id='rev2b') | 444 | other_tree.commit('rev2', rev_id='rev2b') |
| 328 | 445 | this_tree.lock_write() | 445 | this_tree.lock_write() |
| 329 | 446 | self.addCleanup(this_tree.unlock) | 446 | self.addCleanup(this_tree.unlock) |
| 331 | 447 | merger = _mod_merge.Merger.from_revision_ids(None, | 447 | merger = _mod_merge.Merger.from_revision_ids( |
| 332 | 448 | this_tree, 'rev2b', other_branch=other_tree.branch) | 448 | this_tree, 'rev2b', other_branch=other_tree.branch) |
| 333 | 449 | merger.merge_type = _mod_merge.Merge3Merger | 449 | merger.merge_type = _mod_merge.Merge3Merger |
| 334 | 450 | tree_merger = merger.make_merger() | 450 | tree_merger = merger.make_merger() |
| 335 | @@ -467,7 +467,7 @@ | |||
| 336 | 467 | other_tree.commit('rev2', rev_id='rev2b') | 467 | other_tree.commit('rev2', rev_id='rev2b') |
| 337 | 468 | this_tree.lock_write() | 468 | this_tree.lock_write() |
| 338 | 469 | self.addCleanup(this_tree.unlock) | 469 | self.addCleanup(this_tree.unlock) |
| 340 | 470 | merger = _mod_merge.Merger.from_revision_ids(None, | 470 | merger = _mod_merge.Merger.from_revision_ids( |
| 341 | 471 | this_tree, 'rev2b', other_branch=other_tree.branch) | 471 | this_tree, 'rev2b', other_branch=other_tree.branch) |
| 342 | 472 | merger.merge_type = _mod_merge.Merge3Merger | 472 | merger.merge_type = _mod_merge.Merge3Merger |
| 343 | 473 | tree_merger = merger.make_merger() | 473 | tree_merger = merger.make_merger() |
| 344 | @@ -497,7 +497,7 @@ | |||
| 345 | 497 | other_tree.commit('rev2', rev_id='rev2b') | 497 | other_tree.commit('rev2', rev_id='rev2b') |
| 346 | 498 | this_tree.lock_write() | 498 | this_tree.lock_write() |
| 347 | 499 | self.addCleanup(this_tree.unlock) | 499 | self.addCleanup(this_tree.unlock) |
| 349 | 500 | merger = _mod_merge.Merger.from_revision_ids(None, | 500 | merger = _mod_merge.Merger.from_revision_ids( |
| 350 | 501 | this_tree, 'rev2b', other_branch=other_tree.branch) | 501 | this_tree, 'rev2b', other_branch=other_tree.branch) |
| 351 | 502 | merger.merge_type = _mod_merge.Merge3Merger | 502 | merger.merge_type = _mod_merge.Merge3Merger |
| 352 | 503 | tree_merger = merger.make_merger() | 503 | tree_merger = merger.make_merger() |
| 353 | @@ -516,7 +516,7 @@ | |||
| 354 | 516 | tree.add('a') | 516 | tree.add('a') |
| 355 | 517 | first_rev = tree.commit("added a") | 517 | first_rev = tree.commit("added a") |
| 356 | 518 | old_root_id = tree.get_root_id() | 518 | old_root_id = tree.get_root_id() |
| 358 | 519 | merger = _mod_merge.Merger.from_revision_ids(None, tree, | 519 | merger = _mod_merge.Merger.from_revision_ids(tree, |
| 359 | 520 | _mod_revision.NULL_REVISION, | 520 | _mod_revision.NULL_REVISION, |
| 360 | 521 | first_rev) | 521 | first_rev) |
| 361 | 522 | merger.merge_type = _mod_merge.Merge3Merger | 522 | merger.merge_type = _mod_merge.Merge3Merger |
| 362 | @@ -1270,7 +1270,7 @@ | |||
| 363 | 1270 | mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch()) | 1270 | mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch()) |
| 364 | 1271 | mem_tree.lock_write() | 1271 | mem_tree.lock_write() |
| 365 | 1272 | self.addCleanup(mem_tree.unlock) | 1272 | self.addCleanup(mem_tree.unlock) |
| 367 | 1273 | merger = _mod_merge.Merger.from_revision_ids(None, | 1273 | merger = _mod_merge.Merger.from_revision_ids( |
| 368 | 1274 | mem_tree, other_revision_id) | 1274 | mem_tree, other_revision_id) |
| 369 | 1275 | merger.set_interesting_files(interesting_files) | 1275 | merger.set_interesting_files(interesting_files) |
| 370 | 1276 | # It seems there is no matching function for set_interesting_ids | 1276 | # It seems there is no matching function for set_interesting_ids |
| 371 | @@ -2072,7 +2072,7 @@ | |||
| 372 | 2072 | 2072 | ||
| 373 | 2073 | def do_merge(self, builder, other_revision_id): | 2073 | def do_merge(self, builder, other_revision_id): |
| 374 | 2074 | wt = self.get_wt_from_builder(builder) | 2074 | wt = self.get_wt_from_builder(builder) |
| 376 | 2075 | merger = _mod_merge.Merger.from_revision_ids(None, | 2075 | merger = _mod_merge.Merger.from_revision_ids( |
| 377 | 2076 | wt, other_revision_id) | 2076 | wt, other_revision_id) |
| 378 | 2077 | merger.merge_type = _mod_merge.Merge3Merger | 2077 | merger.merge_type = _mod_merge.Merge3Merger |
| 379 | 2078 | return wt, merger.do_merge() | 2078 | return wt, merger.do_merge() |
| 380 | @@ -2338,8 +2338,7 @@ | |||
| 381 | 2338 | wt.commit('D merges B & C', rev_id='D-id') | 2338 | wt.commit('D merges B & C', rev_id='D-id') |
| 382 | 2339 | self.assertEqual('barry', wt.id2path('foo-id')) | 2339 | self.assertEqual('barry', wt.id2path('foo-id')) |
| 383 | 2340 | # Check the output of the Merger object directly | 2340 | # Check the output of the Merger object directly |
| 386 | 2341 | merger = _mod_merge.Merger.from_revision_ids(None, | 2341 | merger = _mod_merge.Merger.from_revision_ids(wt, 'F-id') |
| 385 | 2342 | wt, 'F-id') | ||
| 387 | 2343 | merger.merge_type = _mod_merge.Merge3Merger | 2342 | merger.merge_type = _mod_merge.Merge3Merger |
| 388 | 2344 | merge_obj = merger.make_merger() | 2343 | merge_obj = merger.make_merger() |
| 389 | 2345 | root_id = wt.path2id('') | 2344 | root_id = wt.path2id('') |
| 390 | @@ -2394,8 +2393,7 @@ | |||
| 391 | 2394 | wt.commit('F foo => bing', rev_id='F-id') | 2393 | wt.commit('F foo => bing', rev_id='F-id') |
| 392 | 2395 | 2394 | ||
| 393 | 2396 | # Check the output of the Merger object directly | 2395 | # Check the output of the Merger object directly |
| 396 | 2397 | merger = _mod_merge.Merger.from_revision_ids(None, | 2396 | merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id') |
| 395 | 2398 | wt, 'E-id') | ||
| 397 | 2399 | merger.merge_type = _mod_merge.Merge3Merger | 2397 | merger.merge_type = _mod_merge.Merge3Merger |
| 398 | 2400 | merge_obj = merger.make_merger() | 2398 | merge_obj = merger.make_merger() |
| 399 | 2401 | # Nothing interesting happened in OTHER relative to BASE | 2399 | # Nothing interesting happened in OTHER relative to BASE |
| 400 | @@ -2445,8 +2443,7 @@ | |||
| 401 | 2445 | list(wt.iter_changes(wt.basis_tree())) | 2443 | list(wt.iter_changes(wt.basis_tree())) |
| 402 | 2446 | wt.commit('D merges B & C, makes it a file', rev_id='D-id') | 2444 | wt.commit('D merges B & C, makes it a file', rev_id='D-id') |
| 403 | 2447 | 2445 | ||
| 406 | 2448 | merger = _mod_merge.Merger.from_revision_ids(None, | 2446 | merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id') |
| 405 | 2449 | wt, 'E-id') | ||
| 407 | 2450 | merger.merge_type = _mod_merge.Merge3Merger | 2447 | merger.merge_type = _mod_merge.Merge3Merger |
| 408 | 2451 | merge_obj = merger.make_merger() | 2448 | merge_obj = merger.make_merger() |
| 409 | 2452 | entries = list(merge_obj._entries_lca()) | 2449 | entries = list(merge_obj._entries_lca()) |
| 410 | @@ -2660,8 +2657,7 @@ | |||
| 411 | 2660 | wt.branch.set_last_revision_info(2, 'B-id') | 2657 | wt.branch.set_last_revision_info(2, 'B-id') |
| 412 | 2661 | wt.commit('D', rev_id='D-id', recursive=None) | 2658 | wt.commit('D', rev_id='D-id', recursive=None) |
| 413 | 2662 | 2659 | ||
| 416 | 2663 | merger = _mod_merge.Merger.from_revision_ids(None, | 2660 | merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id') |
| 415 | 2664 | wt, 'E-id') | ||
| 417 | 2665 | merger.merge_type = _mod_merge.Merge3Merger | 2661 | merger.merge_type = _mod_merge.Merge3Merger |
| 418 | 2666 | merge_obj = merger.make_merger() | 2662 | merge_obj = merger.make_merger() |
| 419 | 2667 | entries = list(merge_obj._entries_lca()) | 2663 | entries = list(merge_obj._entries_lca()) |
| 420 | @@ -2697,8 +2693,7 @@ | |||
| 421 | 2697 | wt.branch.set_last_revision_info(2, 'B-id') | 2693 | wt.branch.set_last_revision_info(2, 'B-id') |
| 422 | 2698 | wt.commit('D', rev_id='D-id', recursive=None) | 2694 | wt.commit('D', rev_id='D-id', recursive=None) |
| 423 | 2699 | 2695 | ||
| 426 | 2700 | merger = _mod_merge.Merger.from_revision_ids(None, | 2696 | merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id') |
| 425 | 2701 | wt, 'E-id') | ||
| 427 | 2702 | merger.merge_type = _mod_merge.Merge3Merger | 2697 | merger.merge_type = _mod_merge.Merge3Merger |
| 428 | 2703 | merge_obj = merger.make_merger() | 2698 | merge_obj = merger.make_merger() |
| 429 | 2704 | entries = list(merge_obj._entries_lca()) | 2699 | entries = list(merge_obj._entries_lca()) |
| 430 | @@ -2737,8 +2732,7 @@ | |||
| 431 | 2737 | wt.branch.set_last_revision_info(2, 'B-id') | 2732 | wt.branch.set_last_revision_info(2, 'B-id') |
| 432 | 2738 | wt.commit('D', rev_id='D-id', recursive=None) | 2733 | wt.commit('D', rev_id='D-id', recursive=None) |
| 433 | 2739 | 2734 | ||
| 436 | 2740 | merger = _mod_merge.Merger.from_revision_ids(None, | 2735 | merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id') |
| 435 | 2741 | wt, 'E-id') | ||
| 437 | 2742 | merger.merge_type = _mod_merge.Merge3Merger | 2736 | merger.merge_type = _mod_merge.Merge3Merger |
| 438 | 2743 | merge_obj = merger.make_merger() | 2737 | merge_obj = merger.make_merger() |
| 439 | 2744 | entries = list(merge_obj._entries_lca()) | 2738 | entries = list(merge_obj._entries_lca()) |
| 440 | @@ -2782,8 +2776,7 @@ | |||
| 441 | 2782 | wt.branch.set_last_revision_info(2, 'B-id') | 2776 | wt.branch.set_last_revision_info(2, 'B-id') |
| 442 | 2783 | wt.commit('D', rev_id='D-id', recursive=None) | 2777 | wt.commit('D', rev_id='D-id', recursive=None) |
| 443 | 2784 | 2778 | ||
| 446 | 2785 | merger = _mod_merge.Merger.from_revision_ids(None, | 2779 | merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id') |
| 445 | 2786 | wt, 'E-id') | ||
| 447 | 2787 | merger.merge_type = _mod_merge.Merge3Merger | 2780 | merger.merge_type = _mod_merge.Merge3Merger |
| 448 | 2788 | merge_obj = merger.make_merger() | 2781 | merge_obj = merger.make_merger() |
| 449 | 2789 | entries = list(merge_obj._entries_lca()) | 2782 | entries = list(merge_obj._entries_lca()) |
| 450 | 2790 | 2783 | ||
| 451 | === modified file 'breezy/tests/test_merge_core.py' | |||
| 452 | --- breezy/tests/test_merge_core.py 2017-06-10 00:52:08 +0000 | |||
| 453 | +++ breezy/tests/test_merge_core.py 2017-06-27 10:27:58 +0000 | |||
| 454 | @@ -773,14 +773,14 @@ | |||
| 455 | 773 | def test_from_revision_ids(self): | 773 | def test_from_revision_ids(self): |
| 456 | 774 | this, other = self.set_up_trees() | 774 | this, other = self.set_up_trees() |
| 457 | 775 | self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids, | 775 | self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids, |
| 459 | 776 | None, this, 'rev2b') | 776 | this, 'rev2b') |
| 460 | 777 | this.lock_write() | 777 | this.lock_write() |
| 461 | 778 | self.addCleanup(this.unlock) | 778 | self.addCleanup(this.unlock) |
| 463 | 779 | merger = Merger.from_revision_ids(None, this, | 779 | merger = Merger.from_revision_ids(this, |
| 464 | 780 | 'rev2b', other_branch=other.branch) | 780 | 'rev2b', other_branch=other.branch) |
| 465 | 781 | self.assertEqual('rev2b', merger.other_rev_id) | 781 | self.assertEqual('rev2b', merger.other_rev_id) |
| 466 | 782 | self.assertEqual('rev1', merger.base_rev_id) | 782 | self.assertEqual('rev1', merger.base_rev_id) |
| 468 | 783 | merger = Merger.from_revision_ids(None, this, | 783 | merger = Merger.from_revision_ids(this, |
| 469 | 784 | 'rev2b', 'rev2a', other_branch=other.branch) | 784 | 'rev2b', 'rev2a', other_branch=other.branch) |
| 470 | 785 | self.assertEqual('rev2a', merger.base_rev_id) | 785 | self.assertEqual('rev2a', merger.base_rev_id) |
| 471 | 786 | 786 | ||
| 472 | @@ -804,17 +804,14 @@ | |||
| 473 | 804 | other.branch.repository, 'rev3', 0, 0, 'this') | 804 | other.branch.repository, 'rev3', 0, 0, 'this') |
| 474 | 805 | other.lock_read() | 805 | other.lock_read() |
| 475 | 806 | self.addCleanup(other.unlock) | 806 | self.addCleanup(other.unlock) |
| 478 | 807 | merger, verified = Merger.from_mergeable(this, md, | 807 | merger, verified = Merger.from_mergeable(this, md) |
| 477 | 808 | None) | ||
| 479 | 809 | md.patch = None | 808 | md.patch = None |
| 482 | 810 | merger, verified = Merger.from_mergeable(this, md, | 809 | merger, verified = Merger.from_mergeable(this, md) |
| 481 | 811 | None) | ||
| 483 | 812 | self.assertEqual('inapplicable', verified) | 810 | self.assertEqual('inapplicable', verified) |
| 484 | 813 | self.assertEqual('rev3', merger.other_rev_id) | 811 | self.assertEqual('rev3', merger.other_rev_id) |
| 485 | 814 | self.assertEqual('rev1', merger.base_rev_id) | 812 | self.assertEqual('rev1', merger.base_rev_id) |
| 486 | 815 | md.base_revision_id = 'rev2b' | 813 | md.base_revision_id = 'rev2b' |
| 489 | 816 | merger, verified = Merger.from_mergeable(this, md, | 814 | merger, verified = Merger.from_mergeable(this, md) |
| 488 | 817 | None) | ||
| 490 | 818 | self.assertEqual('rev2b', merger.base_rev_id) | 815 | self.assertEqual('rev2b', merger.base_rev_id) |
| 491 | 819 | 816 | ||
| 492 | 820 | def test_from_mergeable_old_merge_directive(self): | 817 | def test_from_mergeable_old_merge_directive(self): |
| 493 | @@ -823,7 +820,6 @@ | |||
| 494 | 823 | self.addCleanup(other.unlock) | 820 | self.addCleanup(other.unlock) |
| 495 | 824 | md = merge_directive.MergeDirective.from_objects( | 821 | md = merge_directive.MergeDirective.from_objects( |
| 496 | 825 | other.branch.repository, 'rev3', 0, 0, 'this') | 822 | other.branch.repository, 'rev3', 0, 0, 'this') |
| 499 | 826 | merger, verified = Merger.from_mergeable(this, md, | 823 | merger, verified = Merger.from_mergeable(this, md) |
| 498 | 827 | None) | ||
| 500 | 828 | self.assertEqual('rev3', merger.other_rev_id) | 824 | self.assertEqual('rev3', merger.other_rev_id) |
| 501 | 829 | self.assertEqual('rev1', merger.base_rev_id) | 825 | self.assertEqual('rev1', merger.base_rev_id) |
| 502 | 830 | 826 | ||
| 503 | === modified file 'breezy/tests/test_missing.py' | |||
| 504 | --- breezy/tests/test_missing.py 2017-06-10 00:17:06 +0000 | |||
| 505 | +++ breezy/tests/test_missing.py 2017-06-27 10:27:58 +0000 | |||
| 506 | @@ -41,26 +41,26 @@ | |||
| 507 | 41 | merger = merger_tree.branch | 41 | merger = merger_tree.branch |
| 508 | 42 | self.assertUnmerged(([], []), original, puller) | 42 | self.assertUnmerged(([], []), original, puller) |
| 509 | 43 | original_tree.commit('a', rev_id='a') | 43 | original_tree.commit('a', rev_id='a') |
| 511 | 44 | self.assertUnmerged(([('1', 'a')], []), original, puller) | 44 | self.assertUnmerged(([('1', 'a', 0)], []), original, puller) |
| 512 | 45 | puller_tree.pull(original) | 45 | puller_tree.pull(original) |
| 513 | 46 | self.assertUnmerged(([], []), original, puller) | 46 | self.assertUnmerged(([], []), original, puller) |
| 514 | 47 | merger_tree.pull(original) | 47 | merger_tree.pull(original) |
| 515 | 48 | original_tree.commit('b', rev_id='b') | 48 | original_tree.commit('b', rev_id='b') |
| 516 | 49 | original_tree.commit('c', rev_id='c') | 49 | original_tree.commit('c', rev_id='c') |
| 518 | 50 | self.assertUnmerged(([('2', 'b'), ('3', 'c')], []), | 50 | self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []), |
| 519 | 51 | original, puller) | 51 | original, puller) |
| 521 | 52 | self.assertUnmerged(([('3', 'c'), ('2', 'b')], []), | 52 | self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []), |
| 522 | 53 | original, puller, backward=True) | 53 | original, puller, backward=True) |
| 523 | 54 | 54 | ||
| 524 | 55 | puller_tree.pull(original) | 55 | puller_tree.pull(original) |
| 525 | 56 | self.assertUnmerged(([], []), original, puller) | 56 | self.assertUnmerged(([], []), original, puller) |
| 527 | 57 | self.assertUnmerged(([('2', 'b'), ('3', 'c')], []), | 57 | self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []), |
| 528 | 58 | original, merger) | 58 | original, merger) |
| 529 | 59 | merger_tree.merge_from_branch(original) | 59 | merger_tree.merge_from_branch(original) |
| 531 | 60 | self.assertUnmerged(([('2', 'b'), ('3', 'c')], []), | 60 | self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []), |
| 532 | 61 | original, merger) | 61 | original, merger) |
| 533 | 62 | merger_tree.commit('d', rev_id='d') | 62 | merger_tree.commit('d', rev_id='d') |
| 535 | 63 | self.assertUnmerged(([], [('2', 'd')]), original, merger) | 63 | self.assertUnmerged(([], [('2', 'd', 0)]), original, merger) |
| 536 | 64 | 64 | ||
| 537 | 65 | def test_iter_log_revisions(self): | 65 | def test_iter_log_revisions(self): |
| 538 | 66 | base_tree = self.make_branch_and_tree('base') | 66 | base_tree = self.make_branch_and_tree('base') |
| 539 | @@ -159,17 +159,17 @@ | |||
| 540 | 159 | rev1 = tree.commit('one') | 159 | rev1 = tree.commit('one') |
| 541 | 160 | tree2 = tree.controldir.sprout('tree2').open_workingtree() | 160 | tree2 = tree.controldir.sprout('tree2').open_workingtree() |
| 542 | 161 | rev2 = tree2.commit('two') | 161 | rev2 = tree2.commit('two') |
| 545 | 162 | self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch) | 162 | self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch) |
| 546 | 163 | self.assertUnmerged([('2', rev2)], [], tree2.branch, tree.branch) | 163 | self.assertUnmerged([('2', rev2, 0)], [], tree2.branch, tree.branch) |
| 547 | 164 | 164 | ||
| 548 | 165 | def test_restrict(self): | 165 | def test_restrict(self): |
| 549 | 166 | tree = self.make_branch_and_tree('tree') | 166 | tree = self.make_branch_and_tree('tree') |
| 550 | 167 | rev1 = tree.commit('one') | 167 | rev1 = tree.commit('one') |
| 551 | 168 | tree2 = tree.controldir.sprout('tree2').open_workingtree() | 168 | tree2 = tree.controldir.sprout('tree2').open_workingtree() |
| 552 | 169 | rev2 = tree2.commit('two') | 169 | rev2 = tree2.commit('two') |
| 554 | 170 | self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch) | 170 | self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch) |
| 555 | 171 | self.assertUnmerged([], None, tree.branch, tree2.branch, 'local') | 171 | self.assertUnmerged([], None, tree.branch, tree2.branch, 'local') |
| 557 | 172 | self.assertUnmerged(None, [('2', rev2)], tree.branch, tree2.branch, | 172 | self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch, |
| 558 | 173 | 'remote') | 173 | 'remote') |
| 559 | 174 | 174 | ||
| 560 | 175 | def test_merged(self): | 175 | def test_merged(self): |
| 561 | @@ -181,8 +181,8 @@ | |||
| 562 | 181 | tree.merge_from_branch(tree2.branch) | 181 | tree.merge_from_branch(tree2.branch) |
| 563 | 182 | rev4 = tree.commit('four') | 182 | rev4 = tree.commit('four') |
| 564 | 183 | 183 | ||
| 567 | 184 | self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch) | 184 | self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch) |
| 568 | 185 | self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch, | 185 | self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch, |
| 569 | 186 | local_revid_range=(rev4, rev4)) | 186 | local_revid_range=(rev4, rev4)) |
| 570 | 187 | self.assertUnmerged([], [], tree.branch, tree2.branch, | 187 | self.assertUnmerged([], [], tree.branch, tree2.branch, |
| 571 | 188 | local_revid_range=(rev1, rev1)) | 188 | local_revid_range=(rev1, rev1)) |
| 572 | @@ -239,8 +239,8 @@ | |||
| 573 | 239 | lrevid2 = local.commit('two') | 239 | lrevid2 = local.commit('two') |
| 574 | 240 | lrevid3 = local.commit('three') | 240 | lrevid3 = local.commit('three') |
| 575 | 241 | lrevid4 = local.commit('four') | 241 | lrevid4 = local.commit('four') |
| 578 | 242 | local_extra = [('2', lrevid2), ('3', lrevid3), ('4', lrevid4)] | 242 | local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)] |
| 579 | 243 | remote_extra = [('2', rrevid2), ('3', rrevid3), ('4', rrevid4)] | 243 | remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)] |
| 580 | 244 | 244 | ||
| 581 | 245 | # control | 245 | # control |
| 582 | 246 | self.assertUnmerged(local_extra, remote_extra, | 246 | self.assertUnmerged(local_extra, remote_extra, |
| 583 | @@ -250,32 +250,32 @@ | |||
| 584 | 250 | remote_revid_range=(None, None)) | 250 | remote_revid_range=(None, None)) |
| 585 | 251 | 251 | ||
| 586 | 252 | # exclude local revisions | 252 | # exclude local revisions |
| 588 | 253 | self.assertUnmerged([('2', lrevid2)], remote_extra, | 253 | self.assertUnmerged([('2', lrevid2, 0)], remote_extra, |
| 589 | 254 | local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2)) | 254 | local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2)) |
| 591 | 255 | self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], remote_extra, | 255 | self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra, |
| 592 | 256 | local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3)) | 256 | local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3)) |
| 594 | 257 | self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], None, | 257 | self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None, |
| 595 | 258 | local.branch, remote.branch, 'local', | 258 | local.branch, remote.branch, 'local', |
| 596 | 259 | local_revid_range=(lrevid2, lrevid3)) | 259 | local_revid_range=(lrevid2, lrevid3)) |
| 597 | 260 | 260 | ||
| 598 | 261 | # exclude remote revisions | 261 | # exclude remote revisions |
| 600 | 262 | self.assertUnmerged(local_extra, [('2', rrevid2)], | 262 | self.assertUnmerged(local_extra, [('2', rrevid2, 0)], |
| 601 | 263 | local.branch, remote.branch, remote_revid_range=(None, rrevid2)) | 263 | local.branch, remote.branch, remote_revid_range=(None, rrevid2)) |
| 603 | 264 | self.assertUnmerged(local_extra, [('2', rrevid2)], | 264 | self.assertUnmerged(local_extra, [('2', rrevid2, 0)], |
| 604 | 265 | local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2)) | 265 | local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2)) |
| 606 | 266 | self.assertUnmerged(local_extra, [('2', rrevid2)], | 266 | self.assertUnmerged(local_extra, [('2', rrevid2, 0)], |
| 607 | 267 | local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2)) | 267 | local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2)) |
| 609 | 268 | self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)], | 268 | self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)], |
| 610 | 269 | local.branch, remote.branch, remote_revid_range=(None, rrevid3)) | 269 | local.branch, remote.branch, remote_revid_range=(None, rrevid3)) |
| 612 | 270 | self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)], | 270 | self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)], |
| 613 | 271 | local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3)) | 271 | local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3)) |
| 615 | 272 | self.assertUnmerged(local_extra, [('3', rrevid3)], | 272 | self.assertUnmerged(local_extra, [('3', rrevid3, 0)], |
| 616 | 273 | local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3)) | 273 | local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3)) |
| 618 | 274 | self.assertUnmerged(None, [('2', rrevid2), ('3', rrevid3)], | 274 | self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)], |
| 619 | 275 | local.branch, remote.branch, 'remote', | 275 | local.branch, remote.branch, 'remote', |
| 620 | 276 | remote_revid_range=(rrevid2, rrevid3)) | 276 | remote_revid_range=(rrevid2, rrevid3)) |
| 621 | 277 | 277 | ||
| 622 | 278 | # exclude local and remote revisions | 278 | # exclude local and remote revisions |
| 624 | 279 | self.assertUnmerged([('3', lrevid3)], [('3', rrevid3)], | 279 | self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)], |
| 625 | 280 | local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3), | 280 | local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3), |
| 626 | 281 | remote_revid_range=(rrevid3, rrevid3)) | 281 | remote_revid_range=(rrevid3, rrevid3)) |
| 627 | 282 | 282 | ||
| 628 | === modified file 'breezy/tests/test_transform.py' | |||
| 629 | --- breezy/tests/test_transform.py 2017-06-11 02:27:01 +0000 | |||
| 630 | +++ breezy/tests/test_transform.py 2017-06-27 10:27:58 +0000 | |||
| 631 | @@ -3230,7 +3230,7 @@ | |||
| 632 | 3230 | preview.delete_contents(file_trans_id) | 3230 | preview.delete_contents(file_trans_id) |
| 633 | 3231 | preview.create_file('a\nb\n', file_trans_id) | 3231 | preview.create_file('a\nb\n', file_trans_id) |
| 634 | 3232 | preview_tree = preview.get_preview_tree() | 3232 | preview_tree = preview.get_preview_tree() |
| 636 | 3233 | merger = Merger.from_revision_ids(None, preview_tree, | 3233 | merger = Merger.from_revision_ids(preview_tree, |
| 637 | 3234 | child_tree.branch.last_revision(), | 3234 | child_tree.branch.last_revision(), |
| 638 | 3235 | other_branch=child_tree.branch, | 3235 | other_branch=child_tree.branch, |
| 639 | 3236 | tree_branch=work_tree.branch) | 3236 | tree_branch=work_tree.branch) |
| 640 | @@ -3249,7 +3249,7 @@ | |||
| 641 | 3249 | tree2 = self.make_branch_and_tree('tree2') | 3249 | tree2 = self.make_branch_and_tree('tree2') |
| 642 | 3250 | tree2.set_root_id('TREE_ROOT') | 3250 | tree2.set_root_id('TREE_ROOT') |
| 643 | 3251 | merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(), | 3251 | merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(), |
| 645 | 3252 | None, tree.basis_tree()) | 3252 | tree.basis_tree()) |
| 646 | 3253 | merger.merge_type = Merge3Merger | 3253 | merger.merge_type = Merge3Merger |
| 647 | 3254 | merger.do_merge() | 3254 | merger.do_merge() |
| 648 | 3255 | 3255 | ||
| 649 | @@ -3265,9 +3265,8 @@ | |||
| 650 | 3265 | tt.create_file('baz', trans_id) | 3265 | tt.create_file('baz', trans_id) |
| 651 | 3266 | tree2 = tree.controldir.sprout('tree2').open_workingtree() | 3266 | tree2 = tree.controldir.sprout('tree2').open_workingtree() |
| 652 | 3267 | self.build_tree_contents([('tree2/foo', 'qux')]) | 3267 | self.build_tree_contents([('tree2/foo', 'qux')]) |
| 653 | 3268 | pb = None | ||
| 654 | 3269 | merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(), | 3268 | merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(), |
| 656 | 3270 | pb, tree.basis_tree()) | 3269 | tree.basis_tree()) |
| 657 | 3271 | merger.merge_type = Merge3Merger | 3270 | merger.merge_type = Merge3Merger |
| 658 | 3272 | merger.do_merge() | 3271 | merger.do_merge() |
| 659 | 3273 | 3272 | ||
| 660 | 3274 | 3273 | ||
| 661 | === modified file 'breezy/workingtree.py' | |||
| 662 | --- breezy/workingtree.py 2017-06-14 23:29:06 +0000 | |||
| 663 | +++ breezy/workingtree.py 2017-06-27 10:27:58 +0000 | |||
| 664 | @@ -955,7 +955,6 @@ | |||
| 665 | 955 | new_basis_tree, | 955 | new_basis_tree, |
| 666 | 956 | basis_tree, | 956 | basis_tree, |
| 667 | 957 | this_tree=self, | 957 | this_tree=self, |
| 668 | 958 | pb=None, | ||
| 669 | 959 | change_reporter=change_reporter, | 958 | change_reporter=change_reporter, |
| 670 | 960 | show_base=show_base) | 959 | show_base=show_base) |
| 671 | 961 | basis_root_id = basis_tree.get_root_id() | 960 | basis_root_id = basis_tree.get_root_id() |
Looks good.