Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 15829:2c480532f36e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
annotate: append newline after non newline-terminated file listings The last line of a non newline-terminated file would mix with the first line of the next file in multiple-file listings before this patch. Possible compatibility issue: no longer possible to tell from the annotate output if the file is terminated by new line or not.
author Ion Savin <ion.savin@tora.com>
date Tue, 10 Jan 2012 10:18:19 +0200
parents 713ee57f817b
children 8ed112ed774a
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jan 10 13:48:42 2012 -0600
+++ b/mercurial/commands.py	Tue Jan 10 10:18:19 2012 +0200
@@ -299,6 +299,9 @@
             for p, l in zip(zip(*pieces), lines):
                 ui.write("%s: %s" % ("".join(p), l[1]))
 
+            if lines and not lines[-1][1].endswith('\n'):
+                ui.write('\n')
+
 @command('archive',
     [('', 'no-decode', None, _('do not pass files through decoders')),
     ('p', 'prefix', '', _('directory prefix for files in archive'),