← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests.py

  • Committer: Michael Ellerman
  • Date: 2006-03-12 00:35:10 UTC
  • mto: (325.1.2 bzrtools) (0.3.1 shelf-dev)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20060312003510-4244ca233f07b93a
After extensive user testing, ie. me using it, I've decided --pick should be
the default, not --all. So switch back to prompting by default, and --all gets
the shelve all behaviour.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests.py
46
46
                self.DIFF_HEADER + self.DIFF_1 + '\n')
47
47
 
48
48
            # Shelve the changes
49
 
            self.run_bzr('shelve', retcode=0)
 
49
            self.run_bzr('shelve', '--all', retcode=0)
50
50
 
51
51
            # Make sure there is no diff anymore
52
52
            self.assertEqual(self.capture('diff', retcode=0), '')
61
61
            self.assertEqual(shelf, self.DIFF_1)
62
62
 
63
63
            # Unshelve
64
 
            self.run_bzr('unshelve', retcode=0)
 
64
            self.run_bzr('unshelve', '--all', retcode=0)
65
65
 
66
66
            # Check the diff is right again
67
67
            self.assertEqual(self.capture('diff', retcode=1),
76
76
        self.__create_and_add_test_file(tree)
77
77
 
78
78
        # Shelve the changes
79
 
        self.run_bzr('shelve', retcode=3)
 
79
        self.run_bzr('shelve', '--all', retcode=3)
80
80
 
81
81
        if os.path.exists(os.path.join(tree.branch.base,
82
82
                '.shelf/shelves/default/00')):
97
97
        tree.commit(message='update test_file')
98
98
 
99
99
        # Shelve the changes
100
 
        self.run_bzr('shelve', '-r', '1', retcode=0)
 
100
        self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
101
101
 
102
102
        # Check the diff is right
103
103
        self.assertEqual(self.capture('diff', retcode=1),
107
107
        self.assertEqual(file('test_file').read(), self.ORIGINAL)
108
108
 
109
109
        # Unshelve
110
 
        self.run_bzr('unshelve', retcode=0)
 
110
        self.run_bzr('unshelve', '--all', retcode=0)
111
111
 
112
112
        # Make sure the file is back the way it should be
113
113
        self.assertEqual(file('test_file').read(), self.MODIFIED)
115
115
    def test_shelf_with_two_revisions(self):
116
116
        tree = self.make_branch_and_tree('.')
117
117
 
118
 
        cmd = 'shelve -r 1..2'
 
118
        cmd = 'shelve --all -r 1..2'
119
119
        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
120
120
 
121
121
        self.assertEqual(stderr.split('\n')[0],
131
131
        self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
132
132
 
133
133
        # Shelve the changes
134
 
        self.run_bzr('shelve', retcode=0)
 
134
        self.run_bzr('shelve', '--all', retcode=0)
135
135
 
136
136
        # Make sure there is no diff anymore
137
137
        self.assertEqual(self.capture('diff', retcode=0), '')
175
175
        file('test_file', 'w').write(self.MODIFIED)
176
176
 
177
177
        # Shelve the changes
178
 
        self.run_bzr('shelve', retcode=0)
 
178
        self.run_bzr('shelve', '--all', retcode=0)
179
179
 
180
180
        # Write an unapplyable patch into the shelf
181
181
        shelf = open(os.path.join(tree.branch.base,
184
184
        shelf.close()
185
185
 
186
186
        # Unshelve, should fail
187
 
        self.run_bzr('unshelve', retcode=3)
 
187
        self.run_bzr('unshelve', '--all', retcode=3)
188
188
 
189
189
        # Make sure the patch is still there, eventhough it's broken
190
190
        shelf = open(os.path.join(tree.branch.base,
206
206
        file('test_file2', 'w').write(self.MODIFIED)
207
207
 
208
208
        # Shelve the changes
209
 
        self.run_bzr('shelve', retcode=0)
 
209
        self.run_bzr('shelve', '--all', retcode=0)
210
210
 
211
211
        # Put the changes to test_file back, the shelved patch won't apply now
212
212
        file('test_file', 'w').write(self.MODIFIED)
213
213
        tree.commit(message='screw up test_file')
214
214
 
215
215
        # Unshelve, should fail
216
 
        self.run_bzr('unshelve', retcode=3)
 
216
        self.run_bzr('unshelve', '--all', retcode=3)
217
217
 
218
218
        # Working tree should be unchanged
219
219
        diff = self.capture('diff', retcode=0)