Rev 2485: Add [merge] after the timestamp for revisions with merges. in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/log_short_merges_83887

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/log_short_merges_83887

------------------------------------------------------------
revno: 2485
revision-id: john at arbash-meinel.com-20070508201017-w968czcnrzvjttze
parent: john at arbash-meinel.com-20070508193100-64xg2gv8oc40tiri
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 15:10:17 -0500
message:
  Add [merge] after the timestamp for revisions with merges.
modified:
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2007-04-23 19:23:14 +0000
+++ b/bzrlib/log.py	2007-05-08 20:10:17 +0000
@@ -480,10 +480,14 @@
         to_file = self.to_file
         date_str = format_date(rev.timestamp, rev.timezone or 0,
                             self.show_timezone)
-        print >>to_file, "%5s %s\t%s" % (revno, self.short_committer(rev),
+        is_merge = ''
+        if len(rev.parent_ids) > 1:
+            is_merge = ' [merge]'
+        print >>to_file, "%5s %s\t%s%s" % (revno, self.short_committer(rev),
                 format_date(rev.timestamp, rev.timezone or 0,
                             self.show_timezone, date_fmt="%Y-%m-%d",
-                           show_offset=False))
+                           show_offset=False),
+                           is_merge)
         if self.show_ids:
             print >>to_file,  '      revision-id:', rev.revision_id
         if not rev.message:

=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2007-05-08 19:31:00 +0000
+++ b/bzrlib/tests/test_log.py	2007-05-08 20:10:17 +0000
@@ -306,7 +306,7 @@
             show_log(wt.branch, formatter)
             logfile.flush()
             self.assertEqualDiff("""\
-    2 Joe Foo\t2005-11-22
+    2 Joe Foo\t2005-11-22 [merge]
       rev-2
 
     1 Joe Foo\t2005-11-22