← 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: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
 
19
19
from bzrlib import shelf
20
20
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests.script import ScriptRunner
 
22
 
21
23
 
22
24
class TestShelveList(TestCaseWithTransport):
23
25
 
57
59
        self.assertEqual('', err)
58
60
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
59
61
 
 
62
    def test_shelve_destroy(self):
 
63
        tree = self.make_branch_and_tree('.')
 
64
        self.build_tree(['file'])
 
65
        tree.add('file')
 
66
        self.run_bzr('shelve --all --destroy')
 
67
        self.failIfExists('file')
 
68
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
 
69
 
 
70
    def test_unshelve_keep(self):
 
71
        # https://bugs.edge.launchpad.net/bzr/+bug/492091
 
72
        tree = self.make_branch_and_tree('.')
 
73
        # shelve apparently unhappy working with a tree with no root yet
 
74
        tree.commit('make root')
 
75
        self.build_tree(['file'])
 
76
 
 
77
        sr = ScriptRunner()
 
78
        sr.run_script(self, '''
 
79
$ bzr add file
 
80
$ bzr shelve --all -m Foo
 
81
$ bzr shelve --list
 
82
  1: Foo
 
83
$ bzr unshelve --keep
 
84
$ bzr shelve --list
 
85
  1: Foo
 
86
$ cat file
 
87
contents of file
 
88
''')
 
89
 
 
90
 
60
91
 
61
92
class TestShelveRelpath(TestCaseWithTransport):
62
93