« back to all changes in this revision
Viewing changes to bzrlib/tests/blackbox/test_log.py
- browse files at revision 2580
- compare with another revision
- compare with revision 6574
- download diff
- download tarball
- view history from revision 2580
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-07-04 04:10:11 UTC
- mfrom: (2578.2.1 kent-bug-4663)
- Revision ID: pqm@pqm.ubuntu.com-20070704041011-o8aw2m812hzhz8yr
(Kent Gibson) Fix bug #4663: bzr log -r to support selecting merge revisions.
added
removed
bzrlib/tests/blackbox/test_log.py
93
93
log = self.run_bzr("log -r 1..3")[0]
94
94
self.assertEqualDiff(self.full_log, log)
95
95
96
def test_log_reversed_revspecs(self):
97
self._prepare()
98
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
99
'the end revision.\n',),
100
'log', '-r3..1')
101
96
102
def test_log_revno_n_path(self):
97
103
os.mkdir('branch1')
98
104
os.chdir('branch1')
148
154
self.run_bzr('commit -m merge_branch_1')
149
155
log = self.run_bzr("log -r-1")[0]
150
156
self.assertContainsRe(log, r' tags: tag1')
157
log = self.run_bzr("log -r3.1.1")[0]
158
self.assertContainsRe(log, r' tags: tag1')
151
159
152
160
def test_log_limit(self):
153
161
self._prepare()
156
164
self.assertTrue('revno: 2\n' in log)
157
165
self.assertTrue('revno: 3\n' in log)
158
166
159
167
class TestLogMerges(ExternalBase):
168
169
def _prepare(self):
170
self.build_tree(['parent/'])
171
self.run_bzr('init', 'parent')
172
self.run_bzr('commit', '-m', 'first post', '--unchanged', 'parent')
173
self.run_bzr('branch', 'parent', 'child')
174
self.run_bzr('commit', '-m', 'branch 1', '--unchanged', 'child')
175
self.run_bzr('branch', 'child', 'smallerchild')
176
self.run_bzr('commit', '-m', 'branch 2', '--unchanged', 'smallerchild')
177
os.chdir('child')
178
self.run_bzr('merge', '../smallerchild')
179
self.run_bzr('commit', '-m', 'merge branch 2')
180
os.chdir('../parent')
181
self.run_bzr('merge', '../child')
182
self.run_bzr('commit', '-m', 'merge branch 1')
183
184
def test_merges_are_indented_by_level(self):
185
self._prepare()
186
out,err = self.run_bzr('log')
187
# the log will look something like:
188
# self.assertEqual("""\
189
#------------------------------------------------------------
190
#revno: 2
191
#committer: Robert Collins <foo@example.com>
192
#branch nick: parent
193
#timestamp: Tue 2006-03-28 22:31:40 +1100
194
#message:
195
# merge branch 1
196
# ------------------------------------------------------------
197
# revno: 1.1.2
198
# committer: Robert Collins <foo@example.com>
199
# branch nick: child
200
# timestamp: Tue 2006-03-28 22:31:40 +1100
201
# message:
202
# merge branch 2
203
# ------------------------------------------------------------
204
# revno: 1.1.1.1
205
# committer: Robert Collins <foo@example.com>
206
# branch nick: smallerchild
207
# timestamp: Tue 2006-03-28 22:31:40 +1100
208
# message:
209
# branch 2
210
# ------------------------------------------------------------
211
# revno: 1.1.1
212
# committer: Robert Collins <foo@example.com>
213
# branch nick: child
214
# timestamp: Tue 2006-03-28 22:31:40 +1100
215
# message:
216
# branch 1
217
#------------------------------------------------------------
218
#revno: 1
219
#committer: Robert Collins <foo@example.com>
220
#branch nick: parent
221
#timestamp: Tue 2006-03-28 22:31:39 +1100
222
#message:
223
# first post
224
#""", out)
225
# but we dont have a nice pattern matcher hooked up yet, so:
226
# we check for the indenting of the commit message and the
227
# revision numbers
228
self.assertTrue('revno: 2' in out)
229
self.assertTrue(' merge branch 1' in out)
230
self.assertTrue(' revno: 1.1.2' in out)
231
self.assertTrue(' merge branch 2' in out)
232
self.assertTrue(' revno: 1.1.1.1' in out)
233
self.assertTrue(' branch 2' in out)
234
self.assertTrue(' revno: 1.1.1' in out)
235
self.assertTrue(' branch 1' in out)
236
self.assertTrue('revno: 1\n' in out)
237
self.assertTrue(' first post' in out)
238
self.assertEqual('', err)
239
240
def test_merges_single_merge_rev(self):
241
self._prepare()
242
out,err = self.run_bzr('log', '-r1.1.2')
243
# the log will look something like:
244
# self.assertEqual("""\
245
# ------------------------------------------------------------
246
# revno: 1.1.2
247
# committer: Robert Collins <foo@example.com>
248
# branch nick: child
249
# timestamp: Tue 2006-03-28 22:31:40 +1100
250
# message:
251
# merge branch 2
252
# ------------------------------------------------------------
253
# revno: 1.1.1.1
254
# committer: Robert Collins <foo@example.com>
255
# branch nick: smallerchild
256
# timestamp: Tue 2006-03-28 22:31:40 +1100
257
# message:
258
# branch 2
259
#""", out)
260
# but we dont have a nice pattern matcher hooked up yet, so:
261
# we check for the indenting of the commit message and the
262
# revision numbers
263
self.assertTrue('revno: 2' not in out)
264
self.assertTrue(' merge branch 1' not in out)
265
self.assertTrue(' revno: 1.1.2' in out)
266
self.assertTrue(' merge branch 2' in out)
267
self.assertTrue(' revno: 1.1.1.1' in out)
268
self.assertTrue(' branch 2' in out)
269
self.assertTrue(' revno: 1.1.1\n' not in out)
270
self.assertTrue(' branch 1' not in out)
271
self.assertTrue('revno: 1\n' not in out)
272
self.assertTrue(' first post' not in out)
273
self.assertEqual('', err)
274
275
def test_merges_partial_range(self):
276
self._prepare()
277
out,err = self.run_bzr('log', '-r1.1.1..1.1.2')
278
# the log will look something like:
279
# self.assertEqual("""\
280
# ------------------------------------------------------------
281
# revno: 1.1.2
282
# committer: Robert Collins <foo@example.com>
283
# branch nick: child
284
# timestamp: Tue 2006-03-28 22:31:40 +1100
285
# message:
286
# merge branch 2
287
# ------------------------------------------------------------
288
# revno: 1.1.1.1
289
# committer: Robert Collins <foo@example.com>
290
# branch nick: smallerchild
291
# timestamp: Tue 2006-03-28 22:31:40 +1100
292
# message:
293
# branch 2
294
# ------------------------------------------------------------
295
# revno: 1.1.1
296
# committer: Robert Collins <foo@example.com>
297
# branch nick: child
298
# timestamp: Tue 2006-03-28 22:31:40 +1100
299
# message:
300
# branch 1
301
#""", out)
302
# but we dont have a nice pattern matcher hooked up yet, so:
303
# we check for the indenting of the commit message and the
304
# revision numbers
305
self.assertTrue('revno: 2' not in out)
306
self.assertTrue(' merge branch 1' not in out)
307
self.assertTrue(' revno: 1.1.2' in out)
308
self.assertTrue(' merge branch 2' in out)
309
self.assertTrue(' revno: 1.1.1.1' in out)
310
self.assertTrue(' branch 2' in out)
311
self.assertTrue(' revno: 1.1.1' in out)
312
self.assertTrue(' branch 1' in out)
313
self.assertTrue('revno: 1\n' not in out)
314
self.assertTrue(' first post' not in out)
315
self.assertEqual('', err)
316
317
160
318
class TestLogEncodings(TestCaseInTempDir):
161
319
162
320
_mu = u'\xb5'
285
443
os.chdir('parent')
286
444
self.run_bzr('merge', '../child')
287
445
self.run_bzr('commit', '-m', 'merge child branch')
288
446
289
447
log = self.run_bzr('log', 'file1')[0]
290
448
self.assertContainsRe(log, 'revno: 1\n')
291
449
self.assertNotContainsRe(log, 'revno: 2\n')
304
462
self.assertContainsRe(log, 'revno: 3\n')
305
463
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
306
464
self.assertNotContainsRe(log, 'revno: 4\n')
465
log = self.run_bzr('log', '-r3.1.1', 'file2')[0]
466
self.assertNotContainsRe(log, 'revno: 1\n')
467
self.assertNotContainsRe(log, 'revno: 2\n')
468
self.assertNotContainsRe(log, 'revno: 3\n')
469
self.assertContainsRe(log, 'revno: 3.1.1\n')
470
self.assertNotContainsRe(log, 'revno: 4\n')
471
log = self.run_bzr('log', '-r4', 'file2')[0]
472
self.assertNotContainsRe(log, 'revno: 1\n')
473
self.assertNotContainsRe(log, 'revno: 2\n')
474
self.assertNotContainsRe(log, 'revno: 3\n')
475
self.assertContainsRe(log, 'revno: 3.1.1\n')
476
self.assertContainsRe(log, 'revno: 4\n')
477
log = self.run_bzr('log', '-r3..', 'file2')[0]
478
self.assertNotContainsRe(log, 'revno: 1\n')
479
self.assertNotContainsRe(log, 'revno: 2\n')
480
self.assertNotContainsRe(log, 'revno: 3\n')
481
self.assertContainsRe(log, 'revno: 3.1.1\n')
482
self.assertContainsRe(log, 'revno: 4\n')
483
log = self.run_bzr('log', '-r..3', 'file2')[0]
484
self.assertNotContainsRe(log, 'revno: 1\n')
485
self.assertContainsRe(log, 'revno: 2\n')
486
self.assertNotContainsRe(log, 'revno: 3\n')
487
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
488
self.assertNotContainsRe(log, 'revno: 4\n')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1