61
62
self.build_tree_contents([('b/a', 'initial\nmore\n')])
62
63
b_tree.commit(message='more')
64
def run_missing(args, retcode=1, working_dir=None):
65
out, err = self.run_bzr(['missing'] + args,
66
retcode=retcode, working_dir=working_dir)
67
# we do not expect any error output.
68
self.assertEqual('', err)
69
return out.splitlines()
71
def run_missing_a(args, retcode=1):
72
return run_missing(['../a'] + args,
73
retcode=retcode, working_dir='b')
75
def run_missing_b(args, retcode=1):
76
return run_missing(['../b'] + args,
77
retcode=retcode, working_dir='a')
79
65
# run missing in a against b
80
66
# this should not require missing to take out a write lock on a
81
67
# or b. So we take a write lock on both to test that at the same
102
91
a_tree.commit(message='merge')
104
93
# compare again, but now we have the 'merge' commit extra
105
lines = run_missing_b([])
106
self.assertEqual(extra_one, lines[0])
107
self.assertLength(8, lines)
109
lines2 = run_missing_b(['--mine-only'])
94
lines = self.run_bzr('missing ../b', retcode=1)[0].splitlines()
95
self.assertEqual("You have 1 extra revision(s):", lines[0])
96
self.assertEqual(8, len(lines))
97
lines2 = self.run_bzr('missing ../b --mine-only', retcode=1)[0]
98
lines2 = lines2.splitlines()
110
99
self.assertEqual(lines, lines2)
112
lines3 = run_missing_b(['--theirs-only'], retcode=0)
113
self.assertEqualDiff('Other branch has no new revisions.', lines3[0])
100
lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
101
self.assertEqualDiff('Other branch is up to date.\n', lines3)
115
103
# relative to a, missing the 'merge' commit
116
lines = run_missing_a([])
117
self.assertEqual(missing_one, lines[0])
118
self.assertLength(8, lines)
120
lines2 = run_missing_a(['--theirs-only'])
105
lines = self.run_bzr('missing ../a', retcode=1)[0].splitlines()
106
self.assertEqual(missing, lines[0])
107
self.assertEqual(8, len(lines))
108
lines2 = self.run_bzr('missing ../a --theirs-only', retcode=1)[0]
109
lines2 = lines2.splitlines()
121
110
self.assertEqual(lines, lines2)
123
lines3 = run_missing_a(['--mine-only'], retcode=0)
124
self.assertEqualDiff('This branch has no new revisions.', lines3[0])
126
lines4 = run_missing_a(['--short'])
127
self.assertLength(4, lines4)
129
lines4a = run_missing_a(['-S'])
111
lines3 = self.run_bzr('missing ../a --mine-only', retcode=0)[0]
112
self.assertEqualDiff('This branch is up to date.\n', lines3)
113
lines4 = self.run_bzr('missing ../a --short', retcode=1)[0]
114
lines4 = lines4.splitlines()
115
self.assertEqual(4, len(lines4))
116
lines4a = self.run_bzr('missing ../a -S', retcode=1)[0]
117
lines4a = lines4a.splitlines()
130
118
self.assertEqual(lines4, lines4a)
132
lines5 = run_missing_a(['--line'])
133
self.assertLength(2, lines5)
135
lines6 = run_missing_a(['--reverse'])
119
lines5 = self.run_bzr('missing ../a --line', retcode=1)[0]
120
lines5 = lines5.splitlines()
121
self.assertEqual(2, len(lines5))
122
lines6 = self.run_bzr('missing ../a --reverse', retcode=1)[0]
123
lines6 = lines6.splitlines()
136
124
self.assertEqual(lines6, lines)
138
lines7 = run_missing_a(['--show-ids'])
139
self.assertLength(11, lines7)
141
lines8 = run_missing_a(['--verbose'])
125
lines7 = self.run_bzr('missing ../a --show-ids', retcode=1)[0]
126
lines7 = lines7.splitlines()
127
self.assertEqual(11, len(lines7))
128
lines8 = self.run_bzr('missing ../a --verbose', retcode=1)[0]
129
lines8 = lines8.splitlines()
142
130
self.assertEqual("modified:", lines8[-2])
143
131
self.assertEqual(" a", lines8[-1])
145
self.assertEqualDiff('Other branch has no new revisions.',
146
run_missing_b(['--theirs-only'], retcode=0)[0])
134
self.assertEqualDiff('Other branch is up to date.\n',
135
self.run_bzr('missing ../b --theirs-only')[0])
148
137
# after a pull we're back on track
149
138
b_tree.pull(a_branch)
150
self.assertEqualDiff("Branches are up to date.",
151
run_missing_b([], retcode=0)[0])
152
self.assertEqualDiff('Branches are up to date.',
153
run_missing_a([], retcode=0)[0])
139
self.assertEqualDiff("Branches are up to date.\n",
140
self.run_bzr('missing ../b')[0])
142
self.assertEqualDiff('Branches are up to date.\n',
143
self.run_bzr('missing ../a')[0])
154
144
# If you supply mine or theirs you only know one side is up to date
155
self.assertEqualDiff('This branch has no new revisions.',
156
run_missing_a(['--mine-only'], retcode=0)[0])
157
self.assertEqualDiff('Other branch has no new revisions.',
158
run_missing_a(['--theirs-only'], retcode=0)[0])
145
self.assertEqualDiff('This branch is up to date.\n',
146
self.run_bzr('missing ../a --mine-only')[0])
147
self.assertEqualDiff('Other branch is up to date.\n',
148
self.run_bzr('missing ../a --theirs-only')[0])
160
150
def test_missing_filtered(self):
161
151
# create a source branch
170
160
a_tree.commit(message='a%d' % i)
171
161
b_tree.commit(message='b%d' % i)
174
out,err = self.run_bzr('missing ../b --my-revision 3',
175
retcode=1, working_dir='a')
165
out,err = self.run_bzr('missing ../b --my-revision 3', retcode=1)
176
166
self.assertMessages(out, ('a3', 'b2', 'b3', 'b4', 'b5'), ('a2', 'a4'))
178
out,err = self.run_bzr('missing ../b --my-revision 3..4',
179
retcode=1, working_dir='a')
168
out,err = self.run_bzr('missing ../b --my-revision 3..4', retcode=1)
180
169
self.assertMessages(out, ('a3', 'a4'), ('a2', 'a5'))
183
out,err = self.run_bzr('missing ../b -r 3',
184
retcode=1, working_dir='a')
172
out,err = self.run_bzr('missing ../b -r 3', retcode=1)
185
173
self.assertMessages(out, ('a2', 'a3', 'a4', 'a5', 'b3'), ('b2', 'b4'))
187
out,err = self.run_bzr('missing ../b -r 3..4',
188
retcode=1, working_dir='a')
175
out,err = self.run_bzr('missing ../b -r 3..4', retcode=1)
189
176
self.assertMessages(out, ('b3', 'b4'), ('b2', 'b5'))
192
179
out,err = self.run_bzr('missing ../b --my-revision 3..4 -r 3..4',
193
retcode=1, working_dir='a')
194
181
self.assertMessages(out, ('a3', 'a4', 'b3', 'b4'),
195
182
('a2', 'a5', 'b2', 'b5'))
229
217
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
230
218
self.build_tree_contents([('b/a', 'initial\nmore\n')])
231
219
b_tree.commit(message='more')
233
221
out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
234
out1, err1 = self.run_bzr('missing ../b', retcode=1, working_dir='a')
223
out1, err1 = self.run_bzr('missing ../b', retcode=1)
235
224
self.assertEqualDiff(out1, out2)
236
225
self.assertEqualDiff(err1, err2)
238
def test_missing_tags(self):
239
"""Test showing tags"""
241
# create a source branch
242
a_tree = self.make_branch_and_tree('a')
243
self.build_tree_contents([('a/a', 'initial\n')])
245
a_tree.commit(message='initial')
247
# clone and add a differing revision
248
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
249
self.build_tree_contents([('b/a', 'initial\nmore\n')])
250
b_tree.commit(message='more')
251
b_tree.branch.tags.set_tag('a-tag', b_tree.last_revision())
253
for log_format in ['long', 'short', 'line']:
254
out, err = self.run_bzr(
255
'missing --log-format={0} ../a'.format(log_format),
256
working_dir='b', retcode=1)
257
self.assertContainsString(out, 'a-tag')
259
out, err = self.run_bzr(
260
'missing --log-format={0} ../b'.format(log_format),
261
working_dir='a', retcode=1)
262
self.assertContainsString(out, 'a-tag')