← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2006-06-26 18:01:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1823.
  • Revision ID: abentley@panoramicfeedback.com-20060626180107-ec9e2e851569e2d8
Clean up bundle revision specification

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bundle.py
45
45
        stdout, stderr = self.run_bzr('bundle')
46
46
        self.assertEqual(stderr.count('Using saved location'), 1)
47
47
        br = read_bundle(StringIO(stdout))
48
 
        self.assertEqual(br.revisions[0].revision_id, 'revision3')
49
 
        self.assertEqual(len(br.revisions), 1)
 
48
        self.assertRevisions(br, ['revision3'])
 
49
 
 
50
    def assertRevisions(self, bi, expected):
 
51
        self.assertEqual([r.revision_id for r in bi.revisions], expected)
50
52
 
51
53
    def test_uses_submit(self):
52
54
        """Submit location can be used and set"""
53
 
        
54
55
        self.make_trees()        
55
56
        os.chdir('branch')
56
57
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
57
 
        self.assertEqual(br.revisions[0].revision_id, 'revision3')
58
 
        self.assertEqual(len(br.revisions), 1)
 
58
        self.assertRevisions(br, ['revision3'])
59
59
        br = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
60
 
        self.assertEqual(len(br.revisions), 2)
 
60
        self.assertRevisions(br, ['revision3', 'revision2'])
61
61
        # submit location should be auto-remembered
62
62
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
63
 
        self.assertEqual(len(br.revisions), 2)
 
63
        self.assertRevisions(br, ['revision3', 'revision2'])
64
64
        self.run_bzr('bundle', '../parent')
65
65
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
66
 
        self.assertEqual(len(br.revisions), 2)
 
66
        self.assertRevisions(br, ['revision3', 'revision2'])
67
67
        self.run_bzr('bundle', '../parent', '--remember')
68
68
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
69
 
        self.assertEqual(len(br.revisions), 1)
 
69
        self.assertRevisions(br, ['revision3'])
70
70
        err = self.run_bzr('bundle', '--remember', retcode=3)[1]
71
71
        self.assertContainsRe(err, 
72
72
                              '--remember requires a branch to be specified.')
 
73
 
 
74
    def test_revision_branch_interaction(self):
 
75
        self.make_trees()        
 
76
        os.chdir('branch')
 
77
        bi = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
 
78
        self.assertRevisions(bi, ['revision3', 'revision2'])
 
79
        out = StringIO(self.run_bzr('bundle', '../grandparent', '-r', '-2')[0])
 
80
        bi = read_bundle(out)
 
81
        self.assertRevisions(bi, ['revision2'])
 
82
        bi = read_bundle(StringIO(self.run_bzr('bundle', '-r', '-2..-1')[0]))
 
83
        self.assertRevisions(bi, ['revision3'])
 
84
        self.run_bzr('bundle', '../grandparent', '-r', '-2..-1', retcode=3)