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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
"""\
Test the uncommit command.
"""
import os
from bzrlib.bzrdir import BzrDirMetaFormat1
from bzrlib.errors import BzrError, BoundBranchOutOfDate
from bzrlib.uncommit import uncommit
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')
def test_uncommit_bound(self):
os.mkdir('a')
a = BzrDirMetaFormat1().initialize('a')
a.create_repository()
a.create_branch()
t = a.create_workingtree()
t.commit('commit 1')
t.commit('commit 2')
t.commit('commit 3')
b = t.bzrdir.sprout('b').open_branch()
b.bind(t.branch)
uncommit(b)
t.set_last_revision(t.branch.last_revision())
self.assertEqual(len(b.revision_history()), 2)
self.assertEqual(len(t.branch.revision_history()), 2)
t.commit('commit 3b')
self.assertRaises(BoundBranchOutOfDate, uncommit, b)
b.pull(t.branch)
uncommit(b)
|