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