|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
1 |
import os |
2 |
||
|
974.1.56
by aaron.bentley at utoronto
Added merge test |
3 |
from bzrlib.branch import Branch |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
4 |
from bzrlib.builtins import merge |
|
974.1.56
by aaron.bentley at utoronto
Added merge test |
5 |
from bzrlib.commit import commit |
|
1185.24.3
by Aaron Bentley
Integrated reprocessing into the rest of the merge stuff |
6 |
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
7 |
from bzrlib.merge import transform_tree |
|
1185.31.32
by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ |
8 |
from bzrlib.osutils import pathjoin |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
9 |
from bzrlib.revision import common_ancestor |
10 |
from bzrlib.tests import TestCaseWithTransport |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
11 |
from bzrlib.workingtree import WorkingTree |
12 |
||
13 |
||
14 |
class TestMerge(TestCaseWithTransport): |
|
|
974.1.56
by aaron.bentley at utoronto
Added merge test |
15 |
"""Test appending more than one revision"""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
16 |
|
|
974.1.56
by aaron.bentley at utoronto
Added merge test |
17 |
def test_pending(self): |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
18 |
wt = self.make_branch_and_tree('.') |
19 |
wt.commit("lala!") |
|
20 |
self.assertEquals(len(wt.pending_merges()), 0) |
|
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
21 |
merge([u'.', -1], [None, None]) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
22 |
self.assertEquals(len(wt.pending_merges()), 0) |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
23 |
|
24 |
def test_nocommits(self): |
|
25 |
self.test_pending() |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
26 |
wt2 = self.make_branch_and_tree('branch2') |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
27 |
self.assertRaises(NoCommits, merge, ['branch2', -1], |
28 |
[None, None]) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
29 |
return wt2 |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
30 |
|
31 |
def test_unrelated(self): |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
32 |
wt2 = self.test_nocommits() |
33 |
wt2.commit("blah") |
|
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
34 |
self.assertRaises(UnrelatedBranches, merge, ['branch2', -1], |
35 |
[None, None]) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
36 |
return wt2 |
|
974.1.80
by Aaron Bentley
Improved merge error handling and testing |
37 |
|
|
974.1.88
by Aaron Bentley
Set a pending_merge if the merge base is forced to revno 0 |
38 |
def test_pending_with_null(self): |
39 |
"""When base is forced to revno 0, pending_merges is set"""
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
40 |
wt2 = self.test_unrelated() |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
41 |
wt1 = WorkingTree.open('.') |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
42 |
br1 = wt1.branch |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
43 |
br1.fetch(wt2.branch) |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
44 |
# merge all of branch 2 into branch 1 even though they
|
45 |
# are not related.
|
|
|
1185.24.3
by Aaron Bentley
Integrated reprocessing into the rest of the merge stuff |
46 |
self.assertRaises(BzrCommandError, merge, ['branch2', -1], |
47 |
['branch2', 0], reprocess=True, show_base=True) |
|
48 |
merge(['branch2', -1], ['branch2', 0], reprocess=True) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
49 |
self.assertEquals(len(wt1.pending_merges()), 1) |
50 |
return (wt1, wt2.branch) |
|
|
974.1.89
by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root. |
51 |
|
52 |
def test_two_roots(self): |
|
53 |
"""Merge base is sane when two unrelated branches are merged"""
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
54 |
wt1, br2 = self.test_pending_with_null() |
55 |
wt1.commit("blah") |
|
56 |
last = wt1.branch.last_revision() |
|
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
57 |
self.assertEquals(common_ancestor(last, last, wt1.branch.repository), last) |
|
1185.46.1
by Aaron Bentley
Test case when file to be renamed is also deleted |
58 |
|
59 |
def test_create_rename(self): |
|
60 |
"""Rename an inventory entry while creating the file"""
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
61 |
tree =self.make_branch_and_tree('.') |
|
1185.46.1
by Aaron Bentley
Test case when file to be renamed is also deleted |
62 |
file('name1', 'wb').write('Hello') |
63 |
tree.add('name1') |
|
64 |
tree.commit(message="hello") |
|
65 |
tree.rename_one('name1', 'name2') |
|
66 |
os.unlink('name2') |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
67 |
transform_tree(tree, tree.branch.basis_tree()) |
|
1185.46.2
by Aaron Bentley
Added test for renaming both parent and child |
68 |
|
69 |
def test_layered_rename(self): |
|
70 |
"""Rename both child and parent at same time"""
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
71 |
tree =self.make_branch_and_tree('.') |
|
1185.46.2
by Aaron Bentley
Added test for renaming both parent and child |
72 |
os.mkdir('dirname1') |
73 |
tree.add('dirname1') |
|
|
1185.31.32
by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ |
74 |
filename = pathjoin('dirname1', 'name1') |
|
1185.46.2
by Aaron Bentley
Added test for renaming both parent and child |
75 |
file(filename, 'wb').write('Hello') |
76 |
tree.add(filename) |
|
77 |
tree.commit(message="hello") |
|
|
1185.31.32
by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ |
78 |
filename2 = pathjoin('dirname1', 'name2') |
|
1185.46.2
by Aaron Bentley
Added test for renaming both parent and child |
79 |
tree.rename_one(filename, filename2) |
80 |
tree.rename_one('dirname1', 'dirname2') |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
81 |
transform_tree(tree, tree.branch.basis_tree()) |