← 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: John Arbash Meinel
  • Date: 2010-11-05 20:54:32 UTC
  • mfrom: (5526 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5527.
  • Revision ID: john@arbash-meinel.com-20101105205432-rmyozu8sthyhmri8
Merge bzr.dev to resolve bzr-2.3.txt (aka NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
41
41
        self.assertEqual('', err)
42
42
        self.assertEqual('  1: Foo\n', out)
43
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
 
44
52
    def test_shelve_no_message(self):
45
53
        tree = self.make_branch_and_tree('.')
46
54
        creator = self.make_creator(tree)
95
103
contents of file
96
104
''')
97
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)
98
125
 
99
126
 
100
127
class TestShelveRelpath(TestCaseWithTransport):
106
133
        os.chdir('tree/dir')
107
134
        self.run_bzr('shelve --all ../file')
108
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
 
109
142
 
110
143
class TestShelveUnshelve(TestCaseWithTransport):
111
144