← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-05-01 22:03:39 UTC
  • mfrom: (4287.1.11 1.15-lru-gc)
  • Revision ID: pqm@pqm.ubuntu.com-20090501220339-msx1b0ouap06xsp9
(jam) Change the _LRUNode implementation to avoid cyclic refs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
301
301
    1 Joe Foo\t2005-11-22
302
302
      rev-1
303
303
 
304
 
Use --levels 0 (or -n0) to see merged revisions.
 
304
""",
 
305
                             logfile.getvalue())
 
306
 
 
307
    def test_short_log_with_merges_and_advice(self):
 
308
        wt = self._prepare_tree_with_merges()
 
309
        logfile = self.make_utf8_encoded_stringio()
 
310
        formatter = log.ShortLogFormatter(to_file=logfile,
 
311
            show_advice=True)
 
312
        log.show_log(wt.branch, formatter)
 
313
        self.assertEqualDiff("""\
 
314
    2 Joe Foo\t2005-11-22 [merge]
 
315
      rev-2
 
316
 
 
317
    1 Joe Foo\t2005-11-22
 
318
      rev-1
 
319
 
 
320
Use --include-merges or -n0 to see merged revisions.
305
321
""",
306
322
                             logfile.getvalue())
307
323
 
340
356
    2 Joe Foo\t2005-11-22 [merge]
341
357
      rev-2b
342
358
 
343
 
Use --levels 0 (or -n0) to see merged revisions.
344
359
""",
345
360
                             logfile.getvalue())
346
361
 
359
374
    1 Joe Foo\t2005-11-22
360
375
      rev-1
361
376
 
362
 
Use --levels 0 (or -n0) to see merged revisions.
363
377
""",
364
378
                             logfile.getvalue())
365
379
 
886
900
added:
887
901
  f1
888
902
  f2
889
 
------------------------------------------------------------
890
 
Use --levels 0 (or -n0) to see merged revisions.
891
903
""",
892
904
                             the_log)
893
905