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 |
||
1260
by Martin Pool
- some updates for fetch/update function |
17 |
|
18 |
import os |
|
19 |
||
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
20 |
from bzrlib.selftest import TestCaseInTempDir |
1260
by Martin Pool
- some updates for fetch/update function |
21 |
from bzrlib.branch import Branch |
22 |
from bzrlib.trace import mutter |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
23 |
|
24 |
||
25 |
class TestAppendRevisions(TestCaseInTempDir): |
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
26 |
"""Test appending more than one revision"""
|
1102
by Martin Pool
- merge test refactoring from robertc |
27 |
def test_append_revisions(self): |
905
by Martin Pool
- merge aaron's append_multiple.patch |
28 |
from bzrlib.branch import Branch |
29 |
br = Branch(".", init=True) |
|
30 |
br.append_revision("rev1") |
|
31 |
self.assertEquals(br.revision_history(), ["rev1",]) |
|
32 |
br.append_revision("rev2", "rev3") |
|
33 |
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"]) |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
34 |
|
35 |
||
1260
by Martin Pool
- some updates for fetch/update function |
36 |
|
37 |
class TestFetch(TestCaseInTempDir): |
|
38 |
def test_fetch_revisions(self): |
|
39 |
"""Test fetch-revision operation."""
|
|
40 |
from bzrlib.fetch import Fetcher |
|
41 |
os.mkdir('b1') |
|
42 |
os.mkdir('b2') |
|
43 |
b1 = Branch('b1', init=True) |
|
44 |
b2 = Branch('b2', init=True) |
|
45 |
file(os.sep.join(['b1', 'foo']), 'w').write('hello') |
|
46 |
b1.add(['foo'], ['foo-id']) |
|
47 |
b1.commit('lala!', rev_id='revision-1', allow_pointless=False) |
|
48 |
||
49 |
mutter('start fetch') |
|
50 |
f = Fetcher(from_branch=b1, to_branch=b2) |
|
51 |
eq = self.assertEquals |
|
52 |
eq(f.count_copied, 1) |
|
53 |
eq(f.last_revision, 'revision-1') |
|
54 |
||
55 |
rev = b2.get_revision('revision-1') |
|
56 |
tree = b2.revision_tree('revision-1') |
|
57 |
eq(tree.get_file_text('foo-id'), 'hello') |
|
58 |
||
59 |
||
1110
by Martin Pool
- merge aaron's merge improvements: |
60 |
# TODO: rewrite this as a regular unittest, without relying on the displayed output
|
61 |
# >>> from bzrlib.commit import commit
|
|
62 |
# >>> bzrlib.trace.silent = True
|
|
63 |
# >>> br1 = ScratchBranch(files=['foo', 'bar'])
|
|
64 |
# >>> br1.add('foo')
|
|
65 |
# >>> br1.add('bar')
|
|
66 |
# >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
|
|
67 |
# >>> br2 = ScratchBranch()
|
|
68 |
# >>> br2.update_revisions(br1)
|
|
69 |
# Added 2 texts.
|
|
70 |
# Added 1 inventories.
|
|
71 |
# Added 1 revisions.
|
|
72 |
# >>> br2.revision_history()
|
|
73 |
# [u'REVISION-ID-1']
|
|
74 |
# >>> br2.update_revisions(br1)
|
|
75 |
# Added 0 revisions.
|
|
76 |
# >>> br1.text_store.total_size() == br2.text_store.total_size()
|
|
77 |
# True
|