~bzr-pqm/bzr/bzr.dev

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
"""\
Test the uncommit command.
"""

import os

from bzrlib.errors import BzrError
from bzrlib.tests import TestCaseInTempDir

class TestUncommit(TestCaseInTempDir):
    def test_uncommit(self):
        """Test uncommit functionality."""
        bzr = self.capture 
        os.mkdir('branch')
        os.chdir('branch')
        bzr('init')
        self.build_tree(['a', 'b', 'c'])

        bzr('add')
        bzr('commit -m initial')

        self.assertEquals(bzr('revno'), '1\n')

        open('a', 'wb').write('new contents of a\n')
        self.assertEquals(bzr('status'), 'modified:\n  a\n')
        bzr('commit -m second')

        self.assertEquals(bzr('status'), '')
        self.assertEquals(bzr('revno'), '2\n')

        txt = bzr('uncommit --dry-run --force')
        self.failIfEqual(txt.find('Dry-run'), -1)

        self.assertEquals(bzr('status'), '')
        self.assertEquals(bzr('revno'), '2\n')

        txt = bzr('uncommit --force')

        self.assertEquals(bzr('revno'), '1\n')
        self.assertEquals(bzr('status'), 'modified:\n  a\n')
        
        bzr('checkout . ../checkout')
        os.chdir('../checkout')
        self.assertEquals("", bzr('status'))
        self.assertEquals(bzr('revno'), '1\n')

        open('a', 'wb').write('new contents of a\n')
        self.assertEquals(bzr('status'), 'modified:\n  a\n')
        bzr('commit -m second')

        self.assertEquals(bzr('status'), '')
        self.assertEquals(bzr('revno'), '2\n')

        txt = bzr('uncommit --dry-run --force')
        self.failIfEqual(txt.find('Dry-run'), -1)

        self.assertEquals(bzr('status'), '')
        self.assertEquals(bzr('revno'), '2\n')

        txt = bzr('uncommit --force')

        self.assertEquals(bzr('revno'), '1\n')
        self.assertEquals(bzr('status'), 'modified:\n  a\n')