Commits

Nikolaj Sjujskij committed 844f397

Add record-chunk-non-ASCII patch

Comments (0)

Files changed (2)

+record: fix display of non-ASCII names in chunk selection
+
+b013baa3898e fixed display of non-ASCII names in file-selecting prompt, but
+display in chunk selection remained broken. The reason is that using '%r' in
+string formatting results in calling `repr` on file names, thus mangling
+non-ASCII ones.
+
+diff --git a/hgext/record.py b/hgext/record.py
+--- a/hgext/record.py
++++ b/hgext/record.py
+@@ -393,11 +393,11 @@
+             if skipfile is None and skipall is None:
+                 chunk.pretty(ui)
+             if total == 1:
+-                msg = _('record this change to %r?') % chunk.filename()
++                msg = _("record this change to '%s'?") % chunk.filename()
+             else:
+                 idx = pos - len(h.hunks) + i
+-                msg = _('record change %d/%d to %r?') % (idx, total,
+-                                                         chunk.filename())
++                msg = _("record change %d/%d to '%s'?") % (idx, total,
++                                                           chunk.filename())
+             r, skipfile, skipall, newpatches = prompt(skipfile,
+                     skipall, msg, chunk)
+             if r:
+record-nonascii