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  | 
| 
1141
by Martin Pool
 - rename FunctionalTest to TestCaseInTempDir  | 
18  | 
from bzrlib.selftest import TestCaseInTempDir  | 
| 
974.1.81
by Aaron Bentley
 Added ancestor revision namepsace  | 
19  | 
from bzrlib.errors import NoCommonAncestor, NoCommits  | 
20  | 
from bzrlib.branch import copy_branch  | 
|
21  | 
from bzrlib.merge import merge  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
22  | 
|
| 
1141
by Martin Pool
 - rename FunctionalTest to TestCaseInTempDir  | 
23  | 
class TestRevisionNamespaces(TestCaseInTempDir):  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
24  | 
def test_revision_namespaces(self):  | 
25  | 
"""Functional tests for hashcache"""  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
26  | 
from bzrlib.errors import NoSuchRevision  | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
27  | 
from bzrlib.branch import Branch  | 
28  | 
||
29  | 
b = Branch('.', init=True)  | 
|
30  | 
||
31  | 
b.commit('Commit one', rev_id='a@r-0-1')  | 
|
32  | 
b.commit('Commit two', rev_id='a@r-0-2')  | 
|
33  | 
b.commit('Commit three', rev_id='a@r-0-3')  | 
|
34  | 
||
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
35  | 
self.assertEquals(b.get_revision_info(None), (0, None))  | 
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
36  | 
self.assertEquals(b.get_revision_info(1), (1, 'a@r-0-1'))  | 
37  | 
self.assertEquals(b.get_revision_info('revno:1'), (1, 'a@r-0-1'))  | 
|
38  | 
self.assertEquals(b.get_revision_info('revid:a@r-0-1'), (1, 'a@r-0-1'))  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
39  | 
self.assertRaises(NoSuchRevision, b.get_revision_info, 'revid:a@r-0-0')  | 
40  | 
self.assertRaises(TypeError, b.get_revision_info, object)  | 
|
| 
897
by Martin Pool
 - merge john's revision-naming code  | 
41  | 
|
42  | 
self.assertEquals(b.get_revision_info('date:-tomorrow'), (3, 'a@r-0-3'))  | 
|
43  | 
self.assertEquals(b.get_revision_info('date:+today'), (1, 'a@r-0-1'))  | 
|
44  | 
||
45  | 
self.assertEquals(b.get_revision_info('last:1'), (3, 'a@r-0-3'))  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
46  | 
self.assertEquals(b.get_revision_info('-1'), (3, 'a@r-0-3'))  | 
47  | 
||
48  | 
os.mkdir('newbranch')  | 
|
49  | 
b2 = Branch('newbranch', init=True)  | 
|
50  | 
self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')  | 
|
| 
974.1.81
by Aaron Bentley
 Added ancestor revision namepsace  | 
51  | 
|
52  | 
self.assertRaises(NoCommits, b2.lookup_revision, 'ancestor:.')  | 
|
53  | 
self.assertEquals(b.lookup_revision('ancestor:.'), 'a@r-0-3')  | 
|
54  | 
os.mkdir('copy')  | 
|
55  | 
b3 = copy_branch(b, 'copy')  | 
|
56  | 
b3.commit('Commit four', rev_id='b@r-0-4')  | 
|
57  | 
self.assertEquals(b3.lookup_revision('ancestor:.'), 'a@r-0-3')  | 
|
58  | 
merge(['copy', -1], [None, None])  | 
|
59  | 
b.commit('Commit five', rev_id='a@r-0-4')  | 
|
60  | 
self.assertEquals(b.lookup_revision('ancestor:copy'), 'b@r-0-4')  | 
|
61  | 
self.assertEquals(b3.lookup_revision('ancestor:.'), 'b@r-0-4')  |