class BranchTravellingTest(DownIterateTest):
"""test the order of revs when going along multiple branches.
We want depth-first along branches, but then we want to
terminate all branches at their branch point before continuing
to the nodes preceding that branch.
"""
def setUp(self):
self.map = RevisionMap(lambda: [
Revision("a1", ()),
Revision("a2", ("a1", )),
Revision("a3", ("a2", )),
Revision("b1", ("a3", )),
Revision("b2", ("a3", )),
Revision("cb1", ("b1", )),
Revision("cb2", ("b2", )),
Revision("db1", ("cb1", )),
Revision("db2", ("cb2", )),
Revision("e1b1", ("db1", )),
Revision("fe1b1", ("e1b1", )),
Revision("e2b1", ("db1", )),
Revision("e2b2", ("db2", )),
Revision("merge", ("e2b1", "e2b2")),
])
def test_iterate_one_branch_both_to_merge(self):
# test that when we hit a merge point, implicit base will
# ensure all branches that supply the merge point are filled in
self._assert_iteration(
"merge",
"db1",
["merge", "e2b1", "db1", "e2b2", "db2", "cb2", "b2"],
implicit_base=True,
)
def test_three_branches_end_in_single_branch(self):
self._assert_iteration(
["merge", "fe1b1"],
"a3",
[
"merge",
"e2b1",
"e2b2",
"db2",
"cb2",
"b2",
"fe1b1",
"e1b1",
"db1",
"cb1",
"b1",
"a3",
],
)
def test_two_branches_to_root(self):
# here we want 'a3' as a "stop" branch point, but *not*
# 'db1', as we don't have multiple traversals on db1
self._assert_iteration(
"merge",
"a1",
[
"merge",
"e2b1",
"db1",
"cb1",
"b1", # e2b1 branch
"e2b2",
"db2",
"cb2",
"b2", # e2b2 branch
"a3", # both terminate at a3
"a2",
"a1", # finish out
], # noqa
)
def test_two_branches_end_in_branch(self):
self._assert_iteration(
"merge",
"b1",
# 'b1' is local to 'e2b1'
# branch so that is all we get
["merge", "e2b1", "db1", "cb1", "b1"], # noqa
)
def test_two_branches_end_behind_branch(self):
self._assert_iteration(
"merge",
"a2",
[
"merge",
"e2b1",
"db1",
"cb1",
"b1", # e2b1 branch
"e2b2",
"db2",
"cb2",
"b2", # e2b2 branch
"a3", # both terminate at a3
"a2",
], # noqa
)
def test_three_branches_to_root(self):
# in this case, both "a3" and "db1" are stop points
self._assert_iteration(
["merge", "fe1b1"],
"a1",
[
"merge",
"e2b1", # e2b1 branch
"e2b2",
"db2",
"cb2",
"b2", # e2b2 branch
"fe1b1",
"e1b1", # fe1b1 branch
"db1", # fe1b1 and e2b1 branches terminate at db1
"cb1",
"b1", # e2b1 branch continued....might be nicer
# if this was before the e2b2 branch...
"a3", # e2b1 and e2b2 branches terminate at a3
"a2",
"a1", # finish out
], # noqa
)
def test_three_branches_end_multiple_bases(self):
# in this case, both "a3" and "db1" are stop points
self._assert_iteration(
["merge", "fe1b1"],
["cb1", "cb2"],
[
"merge",
"e2b1",
"e2b2",
"db2",
"cb2",
"fe1b1",
"e1b1",
"db1",
"cb1",
],
)
def test_three_branches_end_multiple_bases_exclusive(self):
self._assert_iteration(
["merge", "fe1b1"],
["cb1", "cb2"],
["merge", "e2b1", "e2b2", "db2", "fe1b1", "e1b1", "db1"],
inclusive=False,
)
def test_detect_invalid_head_selection(self):
# db1 is an ancestor of fe1b1
assert_raises_message(
RevisionError,
"Requested revision fe1b1 overlaps "
"with other requested revisions",
list,
self.map._iterate_revisions(["db1", "b2", "fe1b1"], ()),
)
def test_three_branches_end_multiple_bases_exclusive_blank(self):
self._assert_iteration(
["e2b1", "b2", "fe1b1"],
(),
[
"e2b1",
"b2",
"fe1b1",
"e1b1",
"db1",
"cb1",
"b1",
"a3",
"a2",
"a1",
],
inclusive=False,
)
def test_iterate_to_symbolic_base(self):
self._assert_iteration(
["fe1b1"],
"base",
["fe1b1", "e1b1", "db1", "cb1", "b1", "a3", "a2", "a1"],
inclusive=False,
)
def test_ancestor_nodes(self):
merge = self.map.get_revision("merge")
eq_(
set(rev.revision
for rev in self.map._get_ancestor_nodes([merge], check=True)),
set([
"a1",
"e2b2",
"e2b1",
"cb2",
"merge",
"a3",
"a2",
"b1",
"b2",
"db1",
"db2",
"cb1",
]),
)
class BranchTravellingTest(DownIterateTest):
"""test the order of revs when going along multiple branches.
We want depth-first along branches, but then we want to
terminate all branches at their branch point before continuing
to the nodes preceding that branch.
"""
def setUp(self):
self.map = RevisionMap(
lambda: [
Revision('a1', ()),
Revision('a2', ('a1',)),
Revision('a3', ('a2',)),
Revision('b1', ('a3',)),
Revision('b2', ('a3',)),
Revision('cb1', ('b1',)),
Revision('cb2', ('b2',)),
Revision('db1', ('cb1',)),
Revision('db2', ('cb2',)),
Revision('e1b1', ('db1',)),
Revision('fe1b1', ('e1b1',)),
Revision('e2b1', ('db1',)),
Revision('e2b2', ('db2',)),
Revision("merge", ('e2b1', 'e2b2'))
]
)
def test_iterate_one_branch_both_to_merge(self):
# test that when we hit a merge point, implicit base will
# ensure all branches that supply the merge point are filled in
self._assert_iteration(
"merge", "db1",
['merge',
'e2b1', 'db1',
'e2b2', 'db2', 'cb2', 'b2'],
implicit_base=True
)
def test_three_branches_end_in_single_branch(self):
self._assert_iteration(
["merge", "fe1b1"], "a3",
['merge', 'e2b1', 'e2b2', 'db2', 'cb2', 'b2',
'fe1b1', 'e1b1', 'db1', 'cb1', 'b1', 'a3']
)
def test_two_branches_to_root(self):
# here we want 'a3' as a "stop" branch point, but *not*
# 'db1', as we don't have multiple traversals on db1
self._assert_iteration(
"merge", "a1",
['merge',
'e2b1', 'db1', 'cb1', 'b1', # e2b1 branch
'e2b2', 'db2', 'cb2', 'b2', # e2b2 branch
'a3', # both terminate at a3
'a2', 'a1' # finish out
] # noqa
)
def test_two_branches_end_in_branch(self):
self._assert_iteration(
"merge", "b1",
# 'b1' is local to 'e2b1'
# branch so that is all we get
['merge', 'e2b1', 'db1', 'cb1', 'b1',
] # noqa
)
def test_two_branches_end_behind_branch(self):
self._assert_iteration(
"merge", "a2",
['merge',
'e2b1', 'db1', 'cb1', 'b1', # e2b1 branch
'e2b2', 'db2', 'cb2', 'b2', # e2b2 branch
'a3', # both terminate at a3
'a2'
] # noqa
)
def test_three_branches_to_root(self):
# in this case, both "a3" and "db1" are stop points
self._assert_iteration(
["merge", "fe1b1"], "a1",
['merge',
'e2b1', # e2b1 branch
'e2b2', 'db2', 'cb2', 'b2', # e2b2 branch
'fe1b1', 'e1b1', # fe1b1 branch
'db1', # fe1b1 and e2b1 branches terminate at db1
'cb1', 'b1', # e2b1 branch continued....might be nicer
# if this was before the e2b2 branch...
'a3', # e2b1 and e2b2 branches terminate at a3
'a2', 'a1' # finish out
] # noqa
)
def test_three_branches_end_multiple_bases(self):
# in this case, both "a3" and "db1" are stop points
self._assert_iteration(
["merge", "fe1b1"], ["cb1", "cb2"],
[
'merge',
'e2b1',
'e2b2', 'db2', 'cb2',
'fe1b1', 'e1b1',
'db1',
'cb1'
]
)
def test_three_branches_end_multiple_bases_exclusive(self):
self._assert_iteration(
["merge", "fe1b1"], ["cb1", "cb2"],
[
'merge',
'e2b1',
'e2b2', 'db2',
'fe1b1', 'e1b1',
'db1',
],
inclusive=False
)
def test_detect_invalid_head_selection(self):
# db1 is an ancestor of fe1b1
assert_raises_message(
RevisionError,
"Requested revision fe1b1 overlaps "
"with other requested revisions",
list,
self.map._iterate_revisions(["db1", "b2", "fe1b1"], ())
)
def test_three_branches_end_multiple_bases_exclusive_blank(self):
self._assert_iteration(
["e2b1", "b2", "fe1b1"], (),
[
'e2b1',
'b2',
'fe1b1', 'e1b1',
'db1', 'cb1', 'b1', 'a3', 'a2', 'a1'
],
inclusive=False
)
def test_iterate_to_symbolic_base(self):
self._assert_iteration(
["fe1b1"], "base",
['fe1b1', 'e1b1', 'db1', 'cb1', 'b1', 'a3', 'a2', 'a1'],
inclusive=False
)
def test_ancestor_nodes(self):
merge = self.map.get_revision("merge")
eq_(
set(
rev.revision
for rev in self.map._get_ancestor_nodes([merge], check=True)
),
set(['a1', 'e2b2', 'e2b1', 'cb2', 'merge',
'a3', 'a2', 'b1', 'b2', 'db1', 'db2', 'cb1'])
)
