/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-10-07 12:45:51 UTC
  • mfrom: (5459.4.1 561061-ssh-protocol)
  • Revision ID: pqm@pqm.ubuntu.com-20101007124551-zfqhlkqdegiy7otp
(vila) Don't force openssh to use protocol=2 (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
68
68
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
69
69
 
70
70
    def test_unshelve_keep(self):
71
 
        # https://bugs.edge.launchpad.net/bzr/+bug/492091
 
71
        # https://bugs.launchpad.net/bzr/+bug/492091
72
72
        tree = self.make_branch_and_tree('.')
73
73
        # shelve apparently unhappy working with a tree with no root yet
74
74
        tree.commit('make root')
87
87
contents of file
88
88
''')
89
89
 
 
90
class TestUnshelvePreview(TestCaseWithTransport):
 
91
    
 
92
    def test_non_ascii(self):
 
93
        """Test that we can show a non-ascii diff that would result from unshelving"""
 
94
        
 
95
        init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode('utf-8')
 
96
        more_content = u'More: \u0415\u0449\u0451\n'.encode('utf-8')
 
97
        next_content = init_content + more_content
 
98
        diff_part = '@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)
 
99
        
 
100
        tree = self.make_branch_and_tree('.')
 
101
        self.build_tree_contents([('a_file', init_content)])
 
102
        tree.add('a_file')
 
103
        tree.commit(message='committed')
 
104
        self.build_tree_contents([('a_file', next_content)])
 
105
        self.run_bzr(['shelve', '--all'])
 
106
        out, err = self.run_bzr(['unshelve', '--preview'], encoding='latin-1')
 
107
        
 
108
        self.assertContainsString(out, diff_part)
90
109
 
91
110
 
92
111
class TestShelveRelpath(TestCaseWithTransport):
97
116
        tree.add('file')
98
117
        os.chdir('tree/dir')
99
118
        self.run_bzr('shelve --all ../file')
 
119
 
 
120
 
 
121
class TestShelveUnshelve(TestCaseWithTransport):
 
122
 
 
123
    def test_directory(self):
 
124
        """Test --directory option"""
 
125
        tree = self.make_branch_and_tree('tree')
 
126
        self.build_tree_contents([('tree/a', 'initial\n')])
 
127
        tree.add('a')
 
128
        tree.commit(message='committed')
 
129
        self.build_tree_contents([('tree/a', 'initial\nmore\n')])
 
130
        self.run_bzr('shelve -d tree --all')
 
131
        self.assertFileEqual('initial\n', 'tree/a')
 
132
        self.run_bzr('unshelve --directory tree')
 
133
        self.assertFileEqual('initial\nmore\n', 'tree/a')