← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_shelve.py

  • Committer: Patch Queue Manager
  • Date: 2014-04-09 13:36:25 UTC
  • mfrom: (6592.1.2 1303879-py27-issues)
  • Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
 
1
# Copyright (C) 2008, 2009, 2010 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
 
16
 
 
17
import os
 
18
 
 
19
from bzrlib import shelf
 
20
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests.script import ScriptRunner
 
22
 
 
23
 
 
24
class TestShelveList(TestCaseWithTransport):
 
25
 
 
26
    def test_no_shelved_changes(self):
 
27
        tree = self.make_branch_and_tree('.')
 
28
        err = self.run_bzr('shelve --list')[1]
 
29
        self.assertEqual('No shelved changes.\n', err)
 
30
 
 
31
    def make_creator(self, tree):
 
32
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
 
33
        self.addCleanup(creator.finalize)
 
34
        return creator
 
35
 
 
36
    def test_shelve_one(self):
 
37
        tree = self.make_branch_and_tree('.')
 
38
        creator = self.make_creator(tree)
 
39
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
40
        out, err = self.run_bzr('shelve --list', retcode=1)
 
41
        self.assertEqual('', err)
 
42
        self.assertEqual('  1: Foo\n', out)
 
43
 
 
44
    def test_shelve_list_via_directory(self):
 
45
        tree = self.make_branch_and_tree('tree')
 
46
        creator = self.make_creator(tree)
 
47
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
48
        out, err = self.run_bzr('shelve -d tree --list', retcode=1)
 
49
        self.assertEqual('', err)
 
50
        self.assertEqual('  1: Foo\n', out)
 
51
 
 
52
    def test_shelve_no_message(self):
 
53
        tree = self.make_branch_and_tree('.')
 
54
        creator = self.make_creator(tree)
 
55
        shelf_id = tree.get_shelf_manager().shelve_changes(creator)
 
56
        out, err = self.run_bzr('shelve --list', retcode=1)
 
57
        self.assertEqual('', err)
 
58
        self.assertEqual('  1: <no message>\n', out)
 
59
 
 
60
    def test_shelf_order(self):
 
61
        tree = self.make_branch_and_tree('.')
 
62
        creator = self.make_creator(tree)
 
63
        tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
64
        creator = self.make_creator(tree)
 
65
        tree.get_shelf_manager().shelve_changes(creator, 'Bar')
 
66
        out, err = self.run_bzr('shelve --list', retcode=1)
 
67
        self.assertEqual('', err)
 
68
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
 
69
 
 
70
    def test_shelve_destroy(self):
 
71
        tree = self.make_branch_and_tree('.')
 
72
        self.build_tree(['file'])
 
73
        tree.add('file')
 
74
        self.run_bzr('shelve --all --destroy')
 
75
        self.assertPathDoesNotExist('file')
 
76
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
 
77
 
 
78
    def test_unshelve_keep(self):
 
79
        # https://bugs.launchpad.net/bzr/+bug/492091
 
80
        tree = self.make_branch_and_tree('.')
 
81
        # shelve apparently unhappy working with a tree with no root yet
 
82
        tree.commit('make root')
 
83
        self.build_tree(['file'])
 
84
 
 
85
        sr = ScriptRunner()
 
86
        sr.run_script(self, '''
 
87
$ bzr add file
 
88
adding file
 
89
$ bzr shelve --all -m Foo
 
90
2>Selected changes:
 
91
2>-D  file
 
92
2>Changes shelved with id "1".
 
93
$ bzr shelve --list
 
94
  1: Foo
 
95
$ bzr unshelve --keep
 
96
2>Using changes with id "1".
 
97
2>Message: Foo
 
98
2>+N  file
 
99
2>All changes applied successfully.
 
100
$ bzr shelve --list
 
101
  1: Foo
 
102
$ cat file
 
103
contents of file
 
104
''')
 
105
 
 
106
class TestUnshelvePreview(TestCaseWithTransport):
 
107
    
 
108
    def test_non_ascii(self):
 
109
        """Test that we can show a non-ascii diff that would result from unshelving"""
 
110
        
 
111
        init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode('utf-8')
 
112
        more_content = u'More: \u0415\u0449\u0451\n'.encode('utf-8')
 
113
        next_content = init_content + more_content
 
114
        diff_part = '@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)
 
115
        
 
116
        tree = self.make_branch_and_tree('.')
 
117
        self.build_tree_contents([('a_file', init_content)])
 
118
        tree.add('a_file')
 
119
        tree.commit(message='committed')
 
120
        self.build_tree_contents([('a_file', next_content)])
 
121
        self.run_bzr(['shelve', '--all'])
 
122
        out, err = self.run_bzr(['unshelve', '--preview'], encoding='latin-1')
 
123
        
 
124
        self.assertContainsString(out, diff_part)
 
125
 
 
126
 
 
127
class TestShelveRelpath(TestCaseWithTransport):
 
128
 
 
129
    def test_shelve_in_subdir(self):
 
130
        tree = self.make_branch_and_tree('tree')
 
131
        self.build_tree(['tree/file', 'tree/dir/'])
 
132
        tree.add('file')
 
133
        os.chdir('tree/dir')
 
134
        self.run_bzr('shelve --all ../file')
 
135
 
 
136
    def test_shelve_via_directory(self):
 
137
        tree = self.make_branch_and_tree('tree')
 
138
        self.build_tree(['tree/file', 'tree/dir/'])
 
139
        tree.add('file')
 
140
        self.run_bzr('shelve -d tree/dir --all ../file')
 
141
 
 
142
 
 
143
class TestShelveUnshelve(TestCaseWithTransport):
 
144
 
 
145
    def test_directory(self):
 
146
        """Test --directory option"""
 
147
        tree = self.make_branch_and_tree('tree')
 
148
        self.build_tree_contents([('tree/a', 'initial\n')])
 
149
        tree.add('a')
 
150
        tree.commit(message='committed')
 
151
        self.build_tree_contents([('tree/a', 'initial\nmore\n')])
 
152
        self.run_bzr('shelve -d tree --all')
 
153
        self.assertFileEqual('initial\n', 'tree/a')
 
154
        self.run_bzr('unshelve --directory tree')
 
155
        self.assertFileEqual('initial\nmore\n', 'tree/a')