~bzr-pqm/bzr/bzr.dev

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
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
17
import os
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
18
from bzrlib.branch import Branch
19
from bzrlib.clone import copy_branch
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
20
from bzrlib.commit import commit
21
from bzrlib.errors import NoSuchRevision, UnlistableBranch
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
22
from bzrlib.selftest import TestCaseInTempDir
1260 by Martin Pool
- some updates for fetch/update function
23
from bzrlib.trace import mutter
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
24
1092.2.25 by Robert Collins
support ghosts in commits
25
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
26
class TestBranch(TestCaseInTempDir):
27
1102 by Martin Pool
- merge test refactoring from robertc
28
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
29
        """Test appending more than one revision"""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
30
        br = Branch.initialize(".")
905 by Martin Pool
- merge aaron's append_multiple.patch
31
        br.append_revision("rev1")
32
        self.assertEquals(br.revision_history(), ["rev1",])
33
        br.append_revision("rev2", "rev3")
34
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
1110 by Martin Pool
- merge aaron's merge improvements:
35
1260 by Martin Pool
- some updates for fetch/update function
36
    def test_fetch_revisions(self):
37
        """Test fetch-revision operation."""
38
        from bzrlib.fetch import Fetcher
39
        os.mkdir('b1')
40
        os.mkdir('b2')
1390 by Robert Collins
pair programming worx... merge integration and weave
41
        b1 = Branch.initialize('b1')
42
        b2 = Branch.initialize('b2')
1260 by Martin Pool
- some updates for fetch/update function
43
        file(os.sep.join(['b1', 'foo']), 'w').write('hello')
44
        b1.add(['foo'], ['foo-id'])
45
        b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
46
47
        mutter('start fetch')
48
        f = Fetcher(from_branch=b1, to_branch=b2)
49
        eq = self.assertEquals
50
        eq(f.count_copied, 1)
51
        eq(f.last_revision, 'revision-1')
52
53
        rev = b2.get_revision('revision-1')
54
        tree = b2.revision_tree('revision-1')
55
        eq(tree.get_file_text('foo-id'), 'hello')
56
1391 by Robert Collins
merge from integration
57
    def test_push_stores(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
58
        """Copy the stores from one branch to another"""
59
        os.mkdir('a')
60
        br_a = Branch.initialize("a")
61
        file('a/b', 'wb').write('b')
62
        br_a.add('b')
63
        commit(br_a, "silly commit")
64
65
        os.mkdir('b')
66
        br_b = Branch.initialize("b")
67
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
68
                          br_a.revision_history()[0])
1391 by Robert Collins
merge from integration
69
        br_a.push_stores(br_b)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
70
        rev = br_b.get_revision(br_a.revision_history()[0])
71
        tree = br_b.revision_tree(br_a.revision_history()[0])
72
        for file_id in tree:
73
            if tree.inventory[file_id].kind == "file":
74
                tree.get_file(file_id).read()
75
        return br_a, br_b
76
77
    def test_copy_branch(self):
78
        """Copy the stores from one branch to another"""
1391 by Robert Collins
merge from integration
79
        br_a, br_b = self.test_push_stores()
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
80
        commit(br_b, "silly commit")
81
        os.mkdir('c')
82
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
83
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
1393.1.20 by Martin Pool
- faster branch command that just copies whole weaves without unpacking them
84
        ## # basis branches currently disabled for weave format
85
        ## self.assertFalse(br_b.last_revision() in br_c.revision_history())
86
        ## br_c.get_revision(br_b.last_revision())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
87
88
    def test_copy_partial(self):
89
        """Copy only part of the history of a branch."""
90
        self.build_tree(['a/', 'a/one'])
91
        br_a = Branch.initialize('a')
92
        br_a.add(['one'])
93
        br_a.commit('commit one', rev_id='u@d-1')
94
        self.build_tree(['a/two'])
95
        br_a.add(['two'])
96
        br_a.commit('commit two', rev_id='u@d-2')
97
        br_b = copy_branch(br_a, 'b', revision='u@d-1')
98
        self.assertEqual(br_b.last_revision(), 'u@d-1')
99
        self.assertTrue(os.path.exists('b/one'))
100
        self.assertFalse(os.path.exists('b/two'))
101
        
1092.2.25 by Robert Collins
support ghosts in commits
102
103
    def test_record_initial_ghost_merge(self):
104
        """A pending merge with no revision present is still a merge."""
105
        branch = Branch.initialize('.')
106
        branch.add_pending_merge('non:existent@rev--ision--0--2')
107
        branch.commit('pretend to merge nonexistent-revision', rev_id='first')
108
        rev = branch.get_revision(branch.last_revision())
109
        self.assertEqual(len(rev.parent_ids), 1)
110
        # parent_sha1s is not populated now, WTF. rbc 20051003
111
        self.assertEqual(len(rev.parent_sha1s), 0)
112
        self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
113
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
114
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
115
# compare the gpg-to-sign info for a commit with a ghost and 
116
#     an identical tree without a ghost
117
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
118
        
1092.2.27 by Robert Collins
reenable pending merge tests in testbranch.py
119
    def test_pending_merges(self):
120
        """Tracking pending-merged revisions."""
121
        b = Branch.initialize('.')
122
123
        self.assertEquals(b.pending_merges(), [])
124
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
125
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
126
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
127
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
128
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
129
        self.assertEquals(b.pending_merges(),
130
                          ['foo@azkhazan-123123-abcabc',
131
                           'wibble@fofof--20050401--1928390812'])
132
        b.commit("commit from base with two merges")
133
        rev = b.get_revision(b.revision_history()[0])
134
        self.assertEquals(len(rev.parent_ids), 2)
135
        self.assertEquals(rev.parent_ids[0],
136
                          'foo@azkhazan-123123-abcabc')
137
        self.assertEquals(rev.parent_ids[1],
138
                           'wibble@fofof--20050401--1928390812')
139
        # list should be cleared when we do a commit
140
        self.assertEquals(b.pending_merges(), [])
141
 
142
1110 by Martin Pool
- merge aaron's merge improvements:
143
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
144
#         >>> from bzrlib.commit import commit
145
#         >>> bzrlib.trace.silent = True
146
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
147
#         >>> br1.add('foo')
148
#         >>> br1.add('bar')
149
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
150
#         >>> br2 = ScratchBranch()
151
#         >>> br2.update_revisions(br1)
152
#         Added 2 texts.
153
#         Added 1 inventories.
154
#         Added 1 revisions.
155
#         >>> br2.revision_history()
156
#         [u'REVISION-ID-1']
157
#         >>> br2.update_revisions(br1)
158
#         Added 0 revisions.
159
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
160
#         True