~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Lukáš Lalinsky
  • Date: 2007-08-23 19:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 2776.
  • Revision ID: lalinsky@gmail.com-20070823194135-sd784wf9vhbuplv2
New option -C/--change for diff and status to show changes in one revision. (#56299)

Show diffs side-by-side

added added

removed removed

Lines of Context:
310
310
        result = self.run_bzr("status -r 0..1")[0]
311
311
        self.assertContainsRe(result, "added:\n  hello.txt\n")
312
312
 
 
313
        result = self.run_bzr("status -C 1")[0]
 
314
        self.assertContainsRe(result, "added:\n  hello.txt\n")
 
315
 
313
316
        self.build_tree(['world.txt'])
314
317
        result = self.run_bzr("status -r 0")[0]
315
318
        self.assertContainsRe(result, "added:\n  hello.txt\n" \
379
382
        rmdir('directory')
380
383
        self.assertStatusContains('RD  file => directory')
381
384
 
 
385
    def test_status_illegal_revision_specifiers(self):
 
386
        out, err = self.run_bzr('status -r 1..23..123', retcode=3)
 
387
        self.assertContainsRe(err, 'one or two revision specifiers')
 
388
 
 
389
    def test_status_revision_and_change(self):
 
390
        out, err = self.run_bzr('status -r 1..23 -C 22', retcode=3)
 
391
        self.assertContainsRe(err, '--revision or --change, not both')
 
392
 
382
393
 
383
394
class TestStatusEncodings(TestCaseWithTransport):
384
395