bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
1  | 
# Copyright (C) 2004, 2005 by Canonical Ltd
 | 
2  | 
||
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.
 | 
|
7  | 
||
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.
 | 
|
12  | 
||
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  | 
||
| 
974.1.52
by aaron.bentley at utoronto
 Merged mpool's latest changes (~0.0.7)  | 
17  | 
import os  | 
| 
1185.1.39
by Robert Collins
 Robey Pointers before: namespace to clear up usage of dates in revision parameters  | 
18  | 
import time  | 
| 
1432
by Robert Collins
 branch: namespace  | 
19  | 
|
| 
1534.1.16
by Robert Collins
 Merge from jam-integration.  | 
20  | 
from bzrlib.builtins import merge  | 
| 
1432
by Robert Collins
 branch: namespace  | 
21  | 
from bzrlib.branch import Branch  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
22  | 
from bzrlib.tests import TestCaseWithTransport  | 
| 
974.1.81
by Aaron Bentley
 Added ancestor revision namepsace  | 
23  | 
from bzrlib.errors import NoCommonAncestor, NoCommits  | 
| 
1432
by Robert Collins
 branch: namespace  | 
24  | 
from bzrlib.errors import NoSuchRevision  | 
25  | 
from bzrlib.revisionspec import RevisionSpec  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
26  | 
|
27  | 
||
28  | 
class TestRevisionNamespaces(TestCaseWithTransport):  | 
|
| 
1185.1.28
by Robert Collins
 revert out the revision spec from revision spec change  | 
29  | 
|
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
30  | 
def test_revision_namespaces(self):  | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
31  | 
"""Test revision specifiers.  | 
32  | 
||
33  | 
        These identify revisions by date, etc."""
 | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
34  | 
wt = self.make_branch_and_tree('.')  | 
35  | 
b = wt.branch  | 
|
36  | 
||
37  | 
wt.commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)  | 
|
38  | 
wt.commit('Commit two', rev_id='a@r-0-2')  | 
|
39  | 
wt.commit('Commit three', rev_id='a@r-0-3')  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
40  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
41  | 
self.assertEquals(RevisionSpec(None).in_history(b), (0, None))  | 
42  | 
self.assertEquals(RevisionSpec(1).in_history(b), (1, 'a@r-0-1'))  | 
|
43  | 
self.assertEquals(RevisionSpec('revno:1').in_history(b),  | 
|
44  | 
(1, 'a@r-0-1'))  | 
|
45  | 
self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),  | 
|
46  | 
(1, 'a@r-0-1'))  | 
|
47  | 
self.assertRaises(NoSuchRevision,  | 
|
48  | 
RevisionSpec('revid:a@r-0-0').in_history, b)  | 
|
49  | 
self.assertRaises(TypeError, RevisionSpec, object)  | 
|
50  | 
||
| 
1185.1.39
by Robert Collins
 Robey Pointers before: namespace to clear up usage of dates in revision parameters  | 
51  | 
self.assertEquals(RevisionSpec('date:today').in_history(b),  | 
52  | 
(2, 'a@r-0-2'))  | 
|
53  | 
self.assertEquals(RevisionSpec('date:yesterday').in_history(b),  | 
|
54  | 
(1, 'a@r-0-1'))  | 
|
55  | 
self.assertEquals(RevisionSpec('before:date:today').in_history(b),  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
56  | 
(1, 'a@r-0-1'))  | 
57  | 
||
58  | 
self.assertEquals(RevisionSpec('last:1').in_history(b),  | 
|
59  | 
(3, 'a@r-0-3'))  | 
|
60  | 
self.assertEquals(RevisionSpec('-1').in_history(b), (3, 'a@r-0-3'))  | 
|
61  | 
#        self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))
 | 
|
62  | 
#        self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))
 | 
|
63  | 
||
64  | 
self.assertEquals(RevisionSpec('ancestor:.').in_history(b).rev_id,  | 
|
65  | 
'a@r-0-3')  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
66  | 
|
67  | 
os.mkdir('newbranch')  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
68  | 
wt2 = self.make_branch_and_tree('newbranch')  | 
69  | 
b2 = wt2.branch  | 
|
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
70  | 
self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)  | 
| 
974.1.81
by Aaron Bentley
 Added ancestor revision namepsace  | 
71  | 
|
| 
1534.4.50
by Robert Collins
 Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.  | 
72  | 
d3 = b.bzrdir.sprout('copy')  | 
73  | 
b3 = d3.open_branch()  | 
|
74  | 
wt3 = d3.open_workingtree()  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
75  | 
wt3.commit('Commit four', rev_id='b@r-0-4')  | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
76  | 
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,  | 
77  | 
'a@r-0-3')  | 
|
| 
974.1.81
by Aaron Bentley
 Added ancestor revision namepsace  | 
78  | 
merge(['copy', -1], [None, None])  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
79  | 
wt.commit('Commit five', rev_id='a@r-0-4')  | 
| 
1185.11.5
by John Arbash Meinel
 Merged up-to-date against mainline, still broken.  | 
80  | 
self.assertEquals(RevisionSpec('ancestor:copy').in_history(b).rev_id,  | 
81  | 
'b@r-0-4')  | 
|
82  | 
self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,  | 
|
83  | 
'b@r-0-4')  | 
|
| 
1432
by Robert Collins
 branch: namespace  | 
84  | 
|
| 
1185.62.5
by John Arbash Meinel
 Updated -r revid:foo so that it can match revisions which aren't in the revision history  | 
85  | 
        # This should be in the revision store, but not in revision-history
 | 
86  | 
self.assertEquals((None, 'b@r-0-4'),  | 
|
87  | 
RevisionSpec('revid:b@r-0-4').in_history(b))  | 
|
88  | 
||
| 
1432
by Robert Collins
 branch: namespace  | 
89  | 
def test_branch_namespace(self):  | 
90  | 
"""Ensure that the branch namespace pulls in the requisite content."""  | 
|
91  | 
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
92  | 
wt = self.make_branch_and_tree('branch1')  | 
93  | 
branch = wt.branch  | 
|
94  | 
wt.add(['file'])  | 
|
95  | 
wt.commit('add file')  | 
|
| 
1534.4.50
by Robert Collins
 Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.  | 
96  | 
d2 = branch.bzrdir.sprout('branch2')  | 
| 
1432
by Robert Collins
 branch: namespace  | 
97  | 
print >> open('branch2/file', 'w'), 'new content'  | 
| 
1534.4.50
by Robert Collins
 Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.  | 
98  | 
branch2 = d2.open_branch()  | 
99  | 
d2.open_workingtree().commit('update file', rev_id='A')  | 
|
| 
1432
by Robert Collins
 branch: namespace  | 
100  | 
spec = RevisionSpec('branch:./branch2/.bzr/../')  | 
101  | 
rev_info = spec.in_history(branch)  | 
|
102  | 
self.assertEqual(rev_info, (None, 'A'))  | 
|
103  |