← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-21 10:00:42 UTC
  • mfrom: (4978.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100121100042-77858a88k2zpec7b
(nmb) Add documentation for multi-parent merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_whitebox.py
1
 
#! /usr/bin/python
 
1
# Copyright (C) 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2
16
 
3
17
import os
4
18
import unittest
5
19
 
6
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
 
from bzrlib.branch import ScratchBranch, Branch
8
 
from bzrlib.errors import NotBranchError, NotVersionedError
9
 
 
10
 
 
11
 
class TestBranch(TestCaseInTempDir):
12
 
 
13
 
    def test_unknowns(self):
14
 
        b = Branch('.', init=True)
15
 
 
16
 
        self.build_tree(['hello.txt',
17
 
                         'hello.txt~'])
18
 
 
19
 
        self.assertEquals(list(b.unknowns()),
20
 
                          ['hello.txt'])
21
 
 
22
 
    def test_no_changes(self):
23
 
        from bzrlib.errors import PointlessCommit
24
 
        
25
 
        b = Branch('.', init=True)
26
 
 
27
 
        self.build_tree(['hello.txt'])
28
 
 
29
 
        self.assertRaises(PointlessCommit,
30
 
                          b.commit,
31
 
                          'commit without adding',
32
 
                          allow_pointless=False)
33
 
 
34
 
        b.commit('commit pointless tree',
35
 
                 allow_pointless=True)
36
 
 
37
 
        b.add('hello.txt')
38
 
        
39
 
        b.commit('commit first added file',
40
 
                 allow_pointless=False)
41
 
        
42
 
        self.assertRaises(PointlessCommit,
43
 
                          b.commit,
44
 
                          'commit after adding file',
45
 
                          allow_pointless=False)
46
 
        
47
 
        b.commit('commit pointless revision with one file',
48
 
                 allow_pointless=True)
49
 
 
50
 
        b.add_pending_merge('mbp@892739123-2005-123123')
51
 
        b.commit('commit new merge with no text changes',
52
 
                 allow_pointless=False)
53
 
        
54
 
 
55
 
 
56
 
class TestRevisionId(TestCase):
57
 
    
58
 
    def test_validate_revision_id(self):
59
 
        from bzrlib.revision import validate_revision_id
60
 
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
61
 
        self.assertRaises(ValueError,
62
 
                          validate_revision_id,
63
 
                          ' asdkjas')
64
 
        self.assertRaises(ValueError,
65
 
                          validate_revision_id,
66
 
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
67
 
        self.assertRaises(ValueError,
68
 
                          validate_revision_id,
69
 
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
70
 
        self.assertRaises(ValueError,
71
 
                          validate_revision_id,
72
 
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
73
 
 
74
 
 
75
 
class PendingMerges(TestCaseInTempDir):
76
 
 
77
 
    def test_pending_merges(self):
78
 
        """Tracking pending-merged revisions."""
79
 
        b = Branch('.', init=True)
80
 
 
81
 
        self.assertEquals(b.pending_merges(), [])
82
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
85
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
86
 
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
87
 
        self.assertEquals(b.pending_merges(),
88
 
                          ['foo@azkhazan-123123-abcabc',
89
 
                           'wibble@fofof--20050401--1928390812'])
90
 
        b.commit("commit from base with two merges")
91
 
        rev = b.get_revision(b.revision_history()[0])
92
 
        self.assertEquals(len(rev.parents), 2)
93
 
        self.assertEquals(rev.parents[0].revision_id,
94
 
                          'foo@azkhazan-123123-abcabc')
95
 
        self.assertEquals(rev.parents[1].revision_id,
96
 
                           'wibble@fofof--20050401--1928390812')
97
 
        # list should be cleared when we do a commit
98
 
        self.assertEquals(b.pending_merges(), [])
99
 
        
100
 
    def test_revert(self):
101
 
        """Test selected-file revert"""
102
 
        b = Branch('.', init=True)
103
 
 
104
 
        self.build_tree(['hello.txt'])
105
 
        file('hello.txt', 'w').write('initial hello')
106
 
 
107
 
        self.assertRaises(NotVersionedError,
108
 
                          b.revert, ['hello.txt'])
109
 
        
110
 
        b.add(['hello.txt'])
111
 
        b.commit('create initial hello.txt')
112
 
 
113
 
        self.check_file_contents('hello.txt', 'initial hello')
114
 
        file('hello.txt', 'w').write('new hello')
115
 
        self.check_file_contents('hello.txt', 'new hello')
116
 
 
117
 
        # revert file modified since last revision
118
 
        b.revert(['hello.txt'])
119
 
        self.check_file_contents('hello.txt', 'initial hello')
120
 
        self.check_file_contents('hello.txt~', 'new hello')
121
 
 
122
 
        # reverting again clobbers the backup
123
 
        b.revert(['hello.txt'])
124
 
        self.check_file_contents('hello.txt', 'initial hello')
125
 
        self.check_file_contents('hello.txt~', 'initial hello')
126
 
 
127
 
    def test_rename_dirs(self):
128
 
        """Test renaming directories and the files within them."""
129
 
        b = Branch('.', init=True)
130
 
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
131
 
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
132
 
 
133
 
        b.commit('create initial state')
134
 
 
135
 
        # TODO: lift out to a test helper that checks the shape of
136
 
        # an inventory
137
 
        
138
 
        revid = b.revision_history()[0]
139
 
        self.log('first revision_id is {%s}' % revid)
140
 
        
141
 
        inv = b.get_revision_inventory(revid)
142
 
        self.log('contents of inventory: %r' % inv.entries())
143
 
 
144
 
        self.check_inventory_shape(inv,
145
 
                                   ['dir', 'dir/sub', 'dir/sub/file'])
146
 
 
147
 
        b.rename_one('dir', 'newdir')
148
 
 
149
 
        self.check_inventory_shape(b.inventory,
150
 
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
151
 
 
152
 
        b.rename_one('newdir/sub', 'newdir/newsub')
153
 
        self.check_inventory_shape(b.inventory,
154
 
                                   ['newdir', 'newdir/newsub',
155
 
                                    'newdir/newsub/file'])
 
20
from bzrlib import (
 
21
    osutils,
 
22
    )
 
23
from bzrlib.tests import TestCaseWithTransport, TestCase
 
24
from bzrlib.branch import Branch
 
25
from bzrlib.errors import PathNotChild
 
26
from bzrlib.osutils import relpath, pathjoin, abspath, realpath
 
27
 
 
28
 
 
29
class MoreTests(TestCaseWithTransport):
156
30
 
157
31
    def test_relpath(self):
158
32
        """test for branch path lookups
159
 
    
160
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
33
 
 
34
        bzrlib.osutils._relpath do a simple but subtle
161
35
        job: given a path (either relative to cwd or absolute), work out
162
36
        if it is inside a branch and return the path relative to the base.
163
37
        """
164
 
        from bzrlib.branch import _relpath
165
 
        import tempfile, shutil
166
 
        
 
38
        import tempfile
 
39
 
167
40
        savedir = os.getcwdu()
168
 
        dtmp = tempfile.mkdtemp()
 
41
        dtmp = osutils.mkdtemp()
169
42
        # On Mac OSX, /tmp actually expands to /private/tmp
170
 
        dtmp = os.path.realpath(dtmp)
 
43
        dtmp = realpath(dtmp)
171
44
 
172
45
        def rp(p):
173
 
            return _relpath(dtmp, p)
174
 
        
 
46
            return relpath(dtmp, p)
 
47
 
175
48
        try:
176
49
            # check paths inside dtmp while standing outside it
177
 
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
 
50
            self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
178
51
 
179
52
            # root = nothing
180
53
            self.assertEqual(rp(dtmp), '')
181
54
 
182
 
            self.assertRaises(NotBranchError,
 
55
            self.assertRaises(PathNotChild,
183
56
                              rp,
184
57
                              '/etc')
185
58
 
186
59
            # now some near-miss operations -- note that
187
60
            # os.path.commonprefix gets these wrong!
188
 
            self.assertRaises(NotBranchError,
 
61
            self.assertRaises(PathNotChild,
189
62
                              rp,
190
63
                              dtmp.rstrip('\\/') + '2')
191
64
 
192
 
            self.assertRaises(NotBranchError,
 
65
            self.assertRaises(PathNotChild,
193
66
                              rp,
194
67
                              dtmp.rstrip('\\/') + '2/foo')
195
68
 
203
76
 
204
77
            self.assertEqual(rp('./foo'), 'foo')
205
78
 
206
 
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
 
79
            self.assertEqual(rp(abspath('foo')), 'foo')
207
80
 
208
 
            self.assertRaises(NotBranchError,
 
81
            self.assertRaises(PathNotChild,
209
82
                              rp, '../foo')
210
83
 
211
84
        finally:
212
85
            os.chdir(savedir)
213
 
            shutil.rmtree(dtmp)
 
86
            osutils.rmtree(dtmp)