← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_missing.py
29
29
class TestMissing(TestCaseWithTransport):
30
30
 
31
31
    def test_missing(self):
 
32
        def bzr(*args, **kwargs):
 
33
            return self.run_bzr(*args, **kwargs)[0]
32
34
        missing = "You are missing 1 revision(s):"
33
35
 
34
36
        # create a source branch
35
 
        a_tree = self.make_branch_and_tree('a')
36
 
        self.build_tree_contents([('a/a', 'initial\n')])
37
 
        a_tree.add('a')
38
 
        a_tree.commit(message='initial')
 
37
        os.mkdir('a')
 
38
        os.chdir('a')
 
39
        bzr('init')
 
40
        open('a', 'wb').write('initial\n')
 
41
        bzr('add', 'a')
 
42
        bzr('commit', '-m', 'inital')
39
43
 
40
44
        # clone and add a differing revision
41
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
42
 
        self.build_tree_contents([('b/a', 'initial\nmore\n')])
43
 
        b_tree.commit(message='more')
 
45
        bzr('branch', '.', '../b')
 
46
        os.chdir('../b')
 
47
        open('a', 'ab').write('more\n')
 
48
        bzr('commit', '-m', 'more')
44
49
 
45
50
        # run missing in a against b
 
51
        os.chdir('../a')
46
52
        # this should not require missing to take out a write lock on a 
47
53
        # or b. So we take a write lock on both to test that at the same
48
54
        # time. This may let the test pass while the default branch is an
49
55
        # os-locking branch, but it will trigger failures with lockdir based
50
56
        # branches.
51
 
        a_branch = a_tree.branch
52
 
        a_branch.lock_write()
53
 
        b_branch = b_tree.branch
54
 
        b_branch.lock_write()
55
 
        os.chdir('a')
56
 
        out,err = self.run_bzr('missing ../b', retcode=1)
 
57
        branch_a = Branch.open('.')
 
58
        branch_a.lock_write()
 
59
        branch_b = Branch.open('../b')
 
60
        branch_b.lock_write()
 
61
        out,err = self.run_bzr('missing', '../b', retcode=1)
57
62
        lines = out.splitlines()
58
63
        # we're missing the extra revision here
59
64
        self.assertEqual(missing, lines[0])
63
68
        # we do not expect any error output.
64
69
        self.assertEqual('', err)
65
70
        # unlock the branches for the rest of the test
66
 
        a_branch.unlock()
67
 
        b_branch.unlock()
 
71
        branch_a.unlock()
 
72
        branch_b.unlock()
68
73
 
69
74
        # get extra revision from b
70
 
        a_tree.merge_from_branch(b_branch)
71
 
        a_tree.commit(message='merge')
 
75
        bzr('merge', '../b')
 
76
        bzr('commit', '-m', 'merge')
72
77
 
73
78
        # compare again, but now we have the 'merge' commit extra
74
 
        lines = self.run_bzr('missing ../b', retcode=1)[0].splitlines()
 
79
        lines = bzr('missing', '../b', retcode=1).splitlines()
75
80
        self.assertEqual("You have 1 extra revision(s):", lines[0])
76
81
        self.assertEqual(8, len(lines))
77
 
        lines2 = self.run_bzr('missing ../b --mine-only', retcode=1)[0]
 
82
        lines2 = bzr('missing', '../b', '--mine-only', retcode=1)
78
83
        lines2 = lines2.splitlines()
79
84
        self.assertEqual(lines, lines2)
80
 
        lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
81
 
        self.assertEqualDiff('Other branch is up to date.\n', lines3)
 
85
        lines3 = bzr('missing', '../b', '--theirs-only', retcode=1)
 
86
        lines3 = lines3.splitlines()
 
87
        self.assertEqual(0, len(lines3))
82
88
 
83
89
        # relative to a, missing the 'merge' commit 
84
90
        os.chdir('../b')
85
 
        lines = self.run_bzr('missing ../a', retcode=1)[0].splitlines()
 
91
        lines = bzr('missing', '../a', retcode=1).splitlines()
86
92
        self.assertEqual(missing, lines[0])
87
93
        self.assertEqual(8, len(lines))
88
 
        lines2 = self.run_bzr('missing ../a --theirs-only', retcode=1)[0]
 
94
        lines2 = bzr('missing', '../a', '--theirs-only', retcode=1)
89
95
        lines2 = lines2.splitlines()
90
96
        self.assertEqual(lines, lines2)
91
 
        lines3 = self.run_bzr('missing ../a --mine-only', retcode=0)[0]
92
 
        self.assertEqualDiff('This branch is up to date.\n', lines3)
93
 
        lines4 = self.run_bzr('missing ../a --short', retcode=1)[0]
 
97
        lines3 = bzr('missing', '../a', '--mine-only', retcode=1)
 
98
        lines3 = lines3.splitlines()
 
99
        self.assertEqual(0, len(lines3))
 
100
        lines4 = bzr('missing', '../a', '--short', retcode=1)
94
101
        lines4 = lines4.splitlines()
95
102
        self.assertEqual(4, len(lines4))
96
 
        lines5 = self.run_bzr('missing ../a --line', retcode=1)[0]
 
103
        lines5 = bzr('missing', '../a', '--line', retcode=1)
97
104
        lines5 = lines5.splitlines()
98
105
        self.assertEqual(2, len(lines5))
99
 
        lines6 = self.run_bzr('missing ../a --reverse', retcode=1)[0]
 
106
        lines6 = bzr('missing', '../a', '--reverse', retcode=1)
100
107
        lines6 = lines6.splitlines()
101
108
        self.assertEqual(lines6, lines)
102
 
        lines7 = self.run_bzr('missing ../a --show-ids', retcode=1)[0]
 
109
        lines7 = bzr('missing', '../a', '--show-ids', retcode=1)
103
110
        lines7 = lines7.splitlines()
104
111
        self.assertEqual(11, len(lines7))
105
 
        lines8 = self.run_bzr('missing ../a --verbose', retcode=1)[0]
 
112
        lines8 = bzr('missing', '../a', '--verbose', retcode=1)
106
113
        lines8 = lines8.splitlines()
107
114
        self.assertEqual("modified:", lines8[-2])
108
115
        self.assertEqual("  a", lines8[-1])
109
116
 
110
 
        os.chdir('../a')
111
 
        self.assertEqualDiff('Other branch is up to date.\n',
112
 
                             self.run_bzr('missing ../b --theirs-only')[0])
113
 
 
 
117
        
114
118
        # after a pull we're back on track
115
 
        b_tree.pull(a_branch)
116
 
        self.assertEqualDiff("Branches are up to date.\n",
117
 
                             self.run_bzr('missing ../b')[0])
118
 
        os.chdir('../b')
119
 
        self.assertEqualDiff('Branches are up to date.\n',
120
 
                             self.run_bzr('missing ../a')[0])
121
 
        # If you supply mine or theirs you only know one side is up to date
122
 
        self.assertEqualDiff('This branch is up to date.\n',
123
 
                             self.run_bzr('missing ../a --mine-only')[0])
124
 
        self.assertEqualDiff('Other branch is up to date.\n',
125
 
                             self.run_bzr('missing ../a --theirs-only')[0])
 
119
        bzr('pull')
 
120
        self.assertEqual("Branches are up to date.\n", 
 
121
                         bzr('missing', '../a'))
126
122
 
127
123
    def test_missing_check_last_location(self):
128
124
        # check that last location shown as filepath not file URL
129
125
 
130
126
        # create a source branch
131
 
        wt = self.make_branch_and_tree('a')
 
127
        os.mkdir('a')
 
128
        os.chdir('a')
 
129
        wt = self.make_branch_and_tree('.')
132
130
        b = wt.branch
133
 
        self.build_tree(['a/foo'])
 
131
        self.build_tree(['foo'])
134
132
        wt.add('foo')
135
133
        wt.commit('initial')
136
134
 
137
 
        os.chdir('a')
138
135
        location = osutils.getcwd() + '/'
139
136
 
140
137
        # clone