|
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
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
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 |
||
|
3964.2.1
by Andrew Bennetts
Fix "LockableFiles ... was gc'd while unlocked" warning. |
29 |
def make_creator(self, tree): |
30 |
creator = shelf.ShelfCreator(tree, tree.basis_tree(), []) |
|
31 |
self.addCleanup(creator.finalize) |
|
32 |
return creator |
|
33 |
||
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
34 |
def test_shelve_one(self): |
35 |
tree = self.make_branch_and_tree('.') |
|
|
3964.2.1
by Andrew Bennetts
Fix "LockableFiles ... was gc'd while unlocked" warning. |
36 |
creator = self.make_creator(tree) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
37 |
shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo') |
|
0.16.113
by Aaron Bentley
Change ls-shelf to shelve --list |
38 |
out, err = self.run_bzr('shelve --list', retcode=1) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
39 |
self.assertEqual('', err) |
40 |
self.assertEqual(' 1: Foo\n', out) |
|
41 |
||
42 |
def test_shelve_no_message(self): |
|
43 |
tree = self.make_branch_and_tree('.') |
|
|
3964.2.1
by Andrew Bennetts
Fix "LockableFiles ... was gc'd while unlocked" warning. |
44 |
creator = self.make_creator(tree) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
45 |
shelf_id = tree.get_shelf_manager().shelve_changes(creator) |
|
0.16.113
by Aaron Bentley
Change ls-shelf to shelve --list |
46 |
out, err = self.run_bzr('shelve --list', retcode=1) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
47 |
self.assertEqual('', err) |
48 |
self.assertEqual(' 1: <no message>\n', out) |
|
49 |
||
50 |
def test_shelf_order(self): |
|
51 |
tree = self.make_branch_and_tree('.') |
|
|
3964.2.1
by Andrew Bennetts
Fix "LockableFiles ... was gc'd while unlocked" warning. |
52 |
creator = self.make_creator(tree) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
53 |
tree.get_shelf_manager().shelve_changes(creator, 'Foo') |
|
3964.2.1
by Andrew Bennetts
Fix "LockableFiles ... was gc'd while unlocked" warning. |
54 |
creator = self.make_creator(tree) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
55 |
tree.get_shelf_manager().shelve_changes(creator, 'Bar') |
|
0.16.113
by Aaron Bentley
Change ls-shelf to shelve --list |
56 |
out, err = self.run_bzr('shelve --list', retcode=1) |
|
0.16.110
by Aaron Bentley
Implement ls-shelf command |
57 |
self.assertEqual('', err) |
58 |
self.assertEqual(' 2: Bar\n 1: Foo\n', out) |
|
|
0.16.120
by Aaron Bentley
Use relative paths with shelve |
59 |
|
|
4100.3.1
by Aaron Bentley
Implement shelve --destroy |
60 |
def test_shelve_destroy(self): |
61 |
tree = self.make_branch_and_tree('.') |
|
62 |
self.build_tree(['file']) |
|
63 |
tree.add('file') |
|
64 |
self.run_bzr('shelve --all --destroy') |
|
65 |
self.failIfExists('file') |
|
66 |
self.assertIs(None, tree.get_shelf_manager().last_shelf()) |
|
67 |
||
|
0.16.120
by Aaron Bentley
Use relative paths with shelve |
68 |
|
69 |
class TestShelveRelpath(TestCaseWithTransport): |
|
70 |
||
71 |
def test_shelve_in_subdir(self): |
|
72 |
tree = self.make_branch_and_tree('tree') |
|
73 |
self.build_tree(['tree/file', 'tree/dir/']) |
|
74 |
tree.add('file') |
|
75 |
os.chdir('tree/dir') |
|
76 |
self.run_bzr('shelve --all ../file') |