6
from bzrlib.selftest import InTempDir, TestBase
 
 
7
from bzrlib.branch import ScratchBranch, Branch
 
 
8
from bzrlib.errors import NotBranchError, NotVersionedError
 
 
11
class Unknowns(InTempDir):
 
 
13
        b = Branch('.', init=True)
 
 
15
        self.build_tree(['hello.txt',
 
 
18
        self.assertEquals(list(b.unknowns()),
 
 
23
class ValidateRevisionId(TestBase):
 
 
25
        from bzrlib.revision import validate_revision_id
 
 
26
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
 
28
        self.assertRaises(ValueError,
 
 
33
        self.assertRaises(ValueError,
 
 
35
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
 
38
        self.assertRaises(ValueError,
 
 
40
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
 
42
        self.assertRaises(ValueError,
 
 
44
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
 
 
48
class PendingMerges(InTempDir):
 
 
49
    """Tracking pending-merged revisions."""
 
 
51
        b = Branch('.', init=True)
 
 
53
        self.assertEquals(b.pending_merges(), [])
 
 
55
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
 
57
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
 
59
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
 
61
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
 
63
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
 
64
        self.assertEquals(b.pending_merges(),
 
 
65
                          ['foo@azkhazan-123123-abcabc',
 
 
66
                           'wibble@fofof--20050401--1928390812'])
 
 
68
        b.commit("commit from base with two merges")
 
 
70
        rev = b.get_revision(b.revision_history()[0])
 
 
71
        self.assertEquals(len(rev.parents), 2)
 
 
72
        self.assertEquals(rev.parents[0].revision_id,
 
 
73
                          'foo@azkhazan-123123-abcabc')
 
 
74
        self.assertEquals(rev.parents[1].revision_id,
 
 
75
                           'wibble@fofof--20050401--1928390812')
 
 
77
        # list should be cleared when we do a commit
 
 
78
        self.assertEquals(b.pending_merges(), [])
 
 
83
class Revert(InTempDir):
 
 
84
    """Test selected-file revert"""
 
 
86
        b = Branch('.', init=True)
 
 
88
        self.build_tree(['hello.txt'])
 
 
89
        file('hello.txt', 'w').write('initial hello')
 
 
91
        self.assertRaises(NotVersionedError,
 
 
92
                          b.revert, ['hello.txt'])
 
 
95
        b.commit('create initial hello.txt')
 
 
97
        self.check_file_contents('hello.txt', 'initial hello')
 
 
98
        file('hello.txt', 'w').write('new hello')
 
 
99
        self.check_file_contents('hello.txt', 'new hello')
 
 
101
        # revert file modified since last revision
 
 
102
        b.revert(['hello.txt'])
 
 
103
        self.check_file_contents('hello.txt', 'initial hello')
 
 
104
        self.check_file_contents('hello.txt~', 'new hello')
 
 
106
        # reverting again clobbers the backup
 
 
107
        b.revert(['hello.txt'])
 
 
108
        self.check_file_contents('hello.txt', 'initial hello')
 
 
109
        self.check_file_contents('hello.txt~', 'initial hello')
 
 
113
class RenameDirs(InTempDir):
 
 
114
    """Test renaming directories and the files within them."""
 
 
116
        b = Branch('.', init=True)
 
 
117
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
 
 
118
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
 
 
120
        b.commit('create initial state')
 
 
122
        # TODO: lift out to a test helper that checks the shape of
 
 
125
        revid = b.revision_history()[0]
 
 
126
        self.log('first revision_id is {%s}' % revid)
 
 
128
        inv = b.get_revision_inventory(revid)
 
 
129
        self.log('contents of inventory: %r' % inv.entries())
 
 
131
        self.check_inventory_shape(inv,
 
 
132
                                   ['dir', 'dir/sub', 'dir/sub/file'])
 
 
134
        b.rename_one('dir', 'newdir')
 
 
136
        self.check_inventory_shape(b.inventory,
 
 
137
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
 
 
139
        b.rename_one('newdir/sub', 'newdir/newsub')
 
 
140
        self.check_inventory_shape(b.inventory,
 
 
141
                                   ['newdir', 'newdir/newsub',
 
 
142
                                    'newdir/newsub/file'])
 
 
147
class BranchPathTestCase(TestBase):
 
 
148
    """test for branch path lookups
 
 
150
    Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
 
151
    job: given a path (either relative to cwd or absolute), work out
 
 
152
    if it is inside a branch and return the path relative to the base.
 
 
156
        from bzrlib.branch import _relpath
 
 
157
        import tempfile, shutil
 
 
159
        savedir = os.getcwdu()
 
 
160
        dtmp = tempfile.mkdtemp()
 
 
163
            return _relpath(dtmp, p)
 
 
166
            # check paths inside dtmp while standing outside it
 
 
167
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
 
 
170
            self.assertEqual(rp(dtmp), '')
 
 
172
            self.assertRaises(NotBranchError,
 
 
176
            # now some near-miss operations -- note that
 
 
177
            # os.path.commonprefix gets these wrong!
 
 
178
            self.assertRaises(NotBranchError,
 
 
180
                              dtmp.rstrip('\\/') + '2')
 
 
182
            self.assertRaises(NotBranchError,
 
 
184
                              dtmp.rstrip('\\/') + '2/foo')
 
 
186
            # now operations based on relpath of files in current
 
 
187
            # directory, or nearby
 
 
190
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
 
192
            self.assertEqual(rp('foo'), 'foo')
 
 
194
            self.assertEqual(rp('./foo'), 'foo')
 
 
196
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
 
 
198
            self.assertRaises(NotBranchError,
 
 
208
TEST_CLASSES = [Unknowns,