~bzr-pqm/bzr/bzr.dev

1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
1
# Copyright (C) 2005 by 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
17
"""Black-box tests for bzr revert."""
18
19
import os
20
21
from bzrlib.tests.blackbox import ExternalBase
22
from bzrlib.trace import mutter
23
24
25
class TestRevert(ExternalBase):
26
27
    def _prepare_tree(self):
28
        self.runbzr('init')
29
        self.runbzr('mkdir dir')
30
31
        f = file('dir/file', 'wb')
32
        f.write('spam')
33
        f.close()
34
        self.runbzr('add dir/file')
35
36
        self.runbzr('commit -m1')
37
38
        # modify file
39
        f = file('dir/file', 'wb')
40
        f.write('eggs')
41
        f.close()
42
43
        # check status
44
        self.assertEquals('modified:\n  dir/file\n', self.capture('status'))
45
46
    def helper(self, param=''):
47
        self._prepare_tree()
48
        # change dir
49
        # revert to default revision for file in subdir does work
50
        os.chdir('dir')
51
        mutter('cd dir\n')
52
53
        self.assertEquals('1\n', self.capture('revno'))
54
        self.runbzr('revert %s file' % param)
55
        self.assertEquals('spam', open('file', 'rb').read())
56
57
    def test_revert_in_subdir(self):
58
        self.helper()
59
60
    def test_revert_to_revision_in_subdir(self):
61
        # test case for bug #29424:
62
        # revert to specific revision for file in subdir does not work
63
        self.helper('-r 1')