1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
1 |
# Copyright (C) 2005 by Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
17 |
|
18 |
from cStringIO import StringIO |
|
19 |
import os |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
20 |
import sys |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
21 |
|
22 |
from bzrlib.tests import TestCase, TestCaseWithTransport |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
23 |
from bzrlib.branch import Branch |
1390
by Robert Collins
pair programming worx... merge integration and weave |
24 |
from bzrlib.revision import is_ancestor |
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
25 |
|
26 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
27 |
class TestAncestry(TestCaseWithTransport): |
1390
by Robert Collins
pair programming worx... merge integration and weave |
28 |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
29 |
def test_straightline_ancestry(self): |
30 |
"""Test ancestry file when just committing."""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
31 |
wt = self.make_branch_and_tree('.') |
32 |
b = wt.branch |
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
33 |
|
34 |
wt.commit(message='one', |
|
35 |
allow_pointless=True, |
|
36 |
rev_id='tester@foo--1') |
|
37 |
||
38 |
wt.commit(message='two', |
|
39 |
allow_pointless=True, |
|
40 |
rev_id='tester@foo--2') |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
41 |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
42 |
ancs = b.repository.get_ancestry('tester@foo--2') |
1415
by Robert Collins
remove the ancestry weave file |
43 |
self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs) |
44 |
self.assertEqual([None, 'tester@foo--1'], |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
45 |
b.repository.get_ancestry('tester@foo--1')) |
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
46 |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
47 |
def test_none_is_always_an_ancestor(self): |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
48 |
wt = self.make_branch_and_tree('.') |
49 |
b = wt.branch |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
50 |
# note this is tested before any commits are done.
|
51 |
self.assertEqual(True, is_ancestor(None, None, b)) |
|
1457.1.17
by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins) |
52 |
wt.commit(message='one', |
53 |
allow_pointless=True, |
|
54 |
rev_id='tester@foo--1') |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
55 |
self.assertEqual(True, is_ancestor(None, None, b)) |
56 |
self.assertEqual(True, is_ancestor('tester@foo--1', None, b)) |
|
57 |
self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b)) |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
58 |
|
59 |
||
60 |
# TODO: check that ancestry is updated to include indirectly merged revisions
|