Mercurial > hg

diff hgext/convert/convcmd.py @ 26812:58a309e9cf80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: fix Python syntax in 'splice in' message Instead of reporting spliced in ['82544090e14fe18091e04f1fb0f0d7991cbe6e7e'] as parents of 369fd983d9e13330e9f12d9fce820deae84ea223 report spliced in 82544090e14fe18091e04f1fb0f0d7991cbe6e7e as parents of 369fd983d9e13330e9f12d9fce820deae84ea223
author Mads Kiilerich <madski@unity3d.com>
date Mon, 19 Oct 2015 16:49:54 +0200
parents 56b2bcea2529
children c43c5e7167a2
line wrap: on
line diff
--- a/hgext/convert/convcmd.py	Mon Oct 19 16:29:35 2015 +0200
+++ b/hgext/convert/convcmd.py	Mon Oct 19 16:49:54 2015 +0200
@@ -440,7 +440,7 @@
         try:
             parents = self.splicemap[rev]
             self.ui.status(_('spliced in %s as parents of %s\n') %
-                           (parents, rev))
+                           (_(' and ').join(parents), rev))
             parents = [self.map.get(p, p) for p in parents]
         except KeyError:
             parents = [b[0] for b in pbranches]