← Back to branch summary

~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull

« back to all changes in this revision

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

  • Committer: Guilhem Bichot
  • Date: 2009-12-09 09:34:41 UTC
  • mfrom: (4784.1.3 2.1.0b4-pull-v)
  • Revision ID: guilhem@mysql.com-20091209093441-8zteh0eerdtsuwvh
merge changes from John Arbash Meinel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
397
397
        rev2 = parent.commit(message='second commit', rev_id='number-two')
398
398
        parent.bzrdir.sprout('branch', revision_id=rev1)
399
399
        out = self.run_bzr('pull -d branch -v')[0]
400
 
        self.assertContainsRe(out, 'Tip revision before pull was:'
401
 
                              ' 1, revid:%s' % rev1)
 
400
        self.assertContainsRe(out, 'Tip revision before pull was: 1')
 
401
 
 
402
    def test_pull_verbose_prints_dotted_tip(self):
 
403
        builder = self.make_branch_builder('source')
 
404
        builder.start_series()
 
405
        builder.build_snapshot('A', None, [
 
406
            ('add', ('', 'TREE_ROOT', 'directory', None))])
 
407
        builder.build_snapshot('B', ['A'], [])
 
408
        builder.build_snapshot('C', ['B'], [])
 
409
        builder.build_snapshot('D', ['A', 'C'], [])
 
410
        builder.finish_series()
 
411
        b = builder.get_branch()
 
412
        b.lock_write()
 
413
        self.addCleanup(b.unlock)
 
414
        b.bzrdir.sprout('target', revision_id='C')
 
415
        out = self.run_bzr('pull -d target -v')[0]
 
416
        self.assertContainsRe(out, 'Tip revision before pull was: 1.1.2')
402
417
 
403
418
    def test_pull_verbose_does_not_print_tip_when_nothing_is_pulled(self):
404
419
        parent = self.make_branch_and_tree('parent')