905
by Martin Pool
- merge aaron's append_multiple.patch |
1 |
# (C) 2005 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 |
||
17 |
from bzrlib.selftest import InTempDir |
|
18 |
||
19 |
||
20 |
||
21 |
class TestAppendRevisions(InTempDir): |
|
22 |
"""Test appending more than one revision"""
|
|
1102
by Martin Pool
- merge test refactoring from robertc |
23 |
def test_append_revisions(self): |
905
by Martin Pool
- merge aaron's append_multiple.patch |
24 |
from bzrlib.branch import Branch |
25 |
br = Branch(".", init=True) |
|
26 |
br.append_revision("rev1") |
|
27 |
self.assertEquals(br.revision_history(), ["rev1",]) |
|
28 |
br.append_revision("rev2", "rev3") |
|
29 |
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"]) |
|
30 |
||
31 |
||
32 |
||
33 |
TEST_CLASSES = [ |
|
34 |
TestAppendRevisions, |
|
35 |
]
|
|
1110
by Martin Pool
- merge aaron's merge improvements: |
36 |
|
37 |
||
38 |
||
39 |
# TODO: rewrite this as a regular unittest, without relying on the displayed output
|
|
40 |
# >>> from bzrlib.commit import commit
|
|
41 |
# >>> bzrlib.trace.silent = True
|
|
42 |
# >>> br1 = ScratchBranch(files=['foo', 'bar'])
|
|
43 |
# >>> br1.add('foo')
|
|
44 |
# >>> br1.add('bar')
|
|
45 |
# >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
|
|
46 |
# >>> br2 = ScratchBranch()
|
|
47 |
# >>> br2.update_revisions(br1)
|
|
48 |
# Added 2 texts.
|
|
49 |
# Added 1 inventories.
|
|
50 |
# Added 1 revisions.
|
|
51 |
# >>> br2.revision_history()
|
|
52 |
# [u'REVISION-ID-1']
|
|
53 |
# >>> br2.update_revisions(br1)
|
|
54 |
# Added 0 revisions.
|
|
55 |
# >>> br1.text_store.total_size() == br2.text_store.total_size()
|
|
56 |
# True
|