/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.16.110 by Aaron Bentley
Implement ls-shelf command
1
# Copyright (C) 2008 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
0.16.120 by Aaron Bentley
Use relative paths with shelve
17
import os
18
0.16.110 by Aaron Bentley
Implement ls-shelf command
19
from bzrlib import shelf
20
from bzrlib.tests import TestCaseWithTransport
21
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
22
class TestShelveList(TestCaseWithTransport):
0.16.110 by Aaron Bentley
Implement ls-shelf command
23
24
    def test_no_shelved_changes(self):
25
        tree = self.make_branch_and_tree('.')
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
26
        err = self.run_bzr('shelve --list')[1]
0.16.110 by Aaron Bentley
Implement ls-shelf command
27
        self.assertEqual('No shelved changes.\n', err)
28
29
    def test_shelve_one(self):
30
        tree = self.make_branch_and_tree('.')
31
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
32
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
33
        out, err = self.run_bzr('shelve --list', retcode=1)
0.16.110 by Aaron Bentley
Implement ls-shelf command
34
        self.assertEqual('', err)
35
        self.assertEqual('  1: Foo\n', out)
36
37
    def test_shelve_no_message(self):
38
        tree = self.make_branch_and_tree('.')
39
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
40
        shelf_id = tree.get_shelf_manager().shelve_changes(creator)
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
41
        out, err = self.run_bzr('shelve --list', retcode=1)
0.16.110 by Aaron Bentley
Implement ls-shelf command
42
        self.assertEqual('', err)
43
        self.assertEqual('  1: <no message>\n', out)
44
45
    def test_shelf_order(self):
46
        tree = self.make_branch_and_tree('.')
47
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
48
        tree.get_shelf_manager().shelve_changes(creator, 'Foo')
49
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
50
        tree.get_shelf_manager().shelve_changes(creator, 'Bar')
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
51
        out, err = self.run_bzr('shelve --list', retcode=1)
0.16.110 by Aaron Bentley
Implement ls-shelf command
52
        self.assertEqual('', err)
53
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
0.16.120 by Aaron Bentley
Use relative paths with shelve
54
55
56
class TestShelveRelpath(TestCaseWithTransport):
57
58
    def test_shelve_in_subdir(self):
59
        tree = self.make_branch_and_tree('tree')
60
        self.build_tree(['tree/file', 'tree/dir/'])
61
        tree.add('file')
62
        os.chdir('tree/dir')
63
        self.run_bzr('shelve --all ../file')