[Python-apps-commits] r8269 - in packages/mercurial/trunk/debian (4 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Fri Mar 9 00:15:11 UTC 2012
Date: Friday, March 9, 2012 @ 00:15:08
Author: vicho
Revision: 8269
Fix "UnicodeDecodeError when refusing to update" by adding patches from_upstream__dont_translate_the_abort_message_twice.patch and from_upstream__fix_all_remaining_uses_of_inside.patch (Closes: #662207)
Added:
packages/mercurial/trunk/debian/patches/from_upstream__dont_translate_the_abort_message_twice.patch
packages/mercurial/trunk/debian/patches/from_upstream__fix_all_remaining_uses_of_inside.patch
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/series
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2012-03-07 23:29:58 UTC (rev 8268)
+++ packages/mercurial/trunk/debian/changelog 2012-03-09 00:15:08 UTC (rev 8269)
@@ -3,8 +3,11 @@
* Add kfreebsd-i386 to the list of slow architectures for the test suite.
* Improve the fix for the test-inherit-mode.t patch based on
suggestions from upstream
+ * Fix "UnicodeDecodeError when refusing to update" by adding patches
+ from_upstream__dont_translate_the_abort_message_twice.patch and
+ from_upstream__fix_all_remaining_uses_of_inside.patch (Closes: #662207)
- -- Javi Merino <vicho at debian.org> Sun, 04 Mar 2012 22:19:16 +0000
+ -- Javi Merino <vicho at debian.org> Fri, 09 Mar 2012 00:12:33 +0000
mercurial (2.1.1-1) unstable; urgency=low
Added: packages/mercurial/trunk/debian/patches/from_upstream__dont_translate_the_abort_message_twice.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__dont_translate_the_abort_message_twice.patch (rev 0)
+++ packages/mercurial/trunk/debian/patches/from_upstream__dont_translate_the_abort_message_twice.patch 2012-03-09 00:15:08 UTC (rev 8269)
@@ -0,0 +1,31 @@
+Author: Javi Merino <vicho at debian.org>
+Description: update: don't translate the abort message twice
+ The string representation of util.Abort() is translated when
+ merge.update() raises the exception. For languages with characters
+ out of the valid ascii range, if we feed them again to i18n.gettext()
+ mercurial dies with:
+ .
+ [...]
+ File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/commands.py", line 4287, in postincoming
+ ui.warn(_("not updating: %s\n" % str(inst)))
+ File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/i18n.py", line 42, in gettext
+ u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
+ File "/usr/lib/python2.7/gettext.py", line 404, in ugettext
+ return unicode(message)
+ UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14: ordinal not in range(128)
+Origin: upstream, http://selenic.com/hg/rev/d4d35fd0889d
+Bug-Debian: https://bugs.debian.org/662207
+
+diff --git a/mercurial/commands.py b/mercurial/commands.py
+--- a/mercurial/commands.py
++++ b/mercurial/commands.py
+@@ -4269,7 +4269,7 @@ def postincoming(ui, repo, modheads, opt
+ try:
+ ret = hg.update(repo, checkout)
+ except util.Abort, inst:
+- ui.warn(_("not updating: %s\n" % str(inst)))
++ ui.warn(_("not updating: %s\n") % str(inst))
+ return 0
+ if not ret and not checkout:
+ if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
+
Added: packages/mercurial/trunk/debian/patches/from_upstream__fix_all_remaining_uses_of_inside.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__fix_all_remaining_uses_of_inside.patch (rev 0)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_all_remaining_uses_of_inside.patch 2012-03-09 00:15:08 UTC (rev 8269)
@@ -0,0 +1,109 @@
+Author: Matt Mackall <mpm at selenic.com>
+Description: i18n: fix all remaining uses of % inside _()
+Origin: upstream, http://selenic.com/hg/rev/ce292f1379ba
+
+diff --git a/hgext/churn.py b/hgext/churn.py
+--- a/hgext/churn.py
++++ b/hgext/churn.py
+@@ -135,7 +135,7 @@ def churn(ui, repo, *pats, **opts):
+ except ValueError:
+ l = l.strip()
+ if l:
+- ui.warn(_("skipping malformed alias: %s\n" % l))
++ ui.warn(_("skipping malformed alias: %s\n") % l)
+ continue
+
+ rate = countrate(ui, repo, amap, *pats, **opts).items()
+diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
+--- a/hgext/convert/monotone.py
++++ b/hgext/convert/monotone.py
+@@ -113,7 +113,7 @@ class monotone_source(converter_source,
+
+ stream = self.mtnreadfp.read(1)
+ if stream not in 'mewptl':
+- raise util.Abort(_('bad mtn packet - bad stream type %s' % stream))
++ raise util.Abort(_('bad mtn packet - bad stream type %s') % stream)
+
+ read = self.mtnreadfp.read(1)
+ if read != ':':
+diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py
+--- a/hgext/largefiles/lfcommands.py
++++ b/hgext/largefiles/lfcommands.py
+@@ -309,7 +309,7 @@ def _converttags(ui, revmap, data):
+ newdata.append('%s %s\n' % (node.hex(revmap[newid]),
+ name))
+ except KeyError:
+- ui.warn(_('no mapping for id %s\n' % id))
++ ui.warn(_('no mapping for id %s\n') % id)
+ continue
+ return ''.join(newdata)
+
+diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
+--- a/hgext/largefiles/overrides.py
++++ b/hgext/largefiles/overrides.py
+@@ -157,7 +157,7 @@ def remove_largefiles(ui, repo, *pats, *
+ # If this is being called by addremove, notify the user that we
+ # are removing the file.
+ if getattr(repo, "_isaddremove", False):
+- ui.status(_('removing %s\n' % f))
++ ui.status(_('removing %s\n') % f)
+ if os.path.exists(repo.wjoin(f)):
+ util.unlinkpath(repo.wjoin(f))
+ lfdirstate.remove(f)
+@@ -673,7 +673,7 @@ def override_pull(orig, ui, repo, source
+ for head in newheads:
+ (cached, missing) = lfcommands.cachelfiles(ui, repo, head)
+ numcached += len(cached)
+- ui.status(_("%d largefiles cached\n" % numcached))
++ ui.status(_("%d largefiles cached\n") % numcached)
+ return result
+
+ def override_rebase(orig, ui, repo, **opts):
+diff --git a/hgext/mq.py b/hgext/mq.py
+--- a/hgext/mq.py
++++ b/hgext/mq.py
+@@ -1192,7 +1192,8 @@ class queue(object):
+ root = self.series[start]
+ target = patchheader(self.join(root), self.plainmode).parent
+ if not target:
+- raise util.Abort(_("%s does not have a parent recorded" % root))
++ raise util.Abort(
++ _("%s does not have a parent recorded") % root)
+ if not repo[target] == repo['.']:
+ hg.update(repo, target)
+
+diff --git a/mercurial/commands.py b/mercurial/commands.py
+--- a/mercurial/commands.py
++++ b/mercurial/commands.py
+@@ -2904,7 +2904,7 @@ def heads(ui, repo, *branchrevs, **opts)
+ headless = ', '.join(b for b in branches - haveheads)
+ msg = _('no open branch heads found on branches %s')
+ if opts.get('rev'):
+- msg += _(' (started at %s)' % opts['rev'])
++ msg += _(' (started at %s)') % opts['rev']
+ ui.warn((msg + '\n') % headless)
+
+ if not heads:
+@@ -2997,7 +2997,7 @@ def help_(ui, name=None, unknowncmd=Fals
+ msg = _('use "hg help" for the full list of commands '
+ 'or "hg -v" for details')
+ elif name and not full:
+- msg = _('use "hg help %s" to show the full help text' % name)
++ msg = _('use "hg help %s" to show the full help text') % name
+ elif aliases:
+ msg = _('use "hg -v help%s" to show builtin aliases and '
+ 'global options') % (name and " " + name or "")
+diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
+--- a/tests/test-check-code-hg.t
++++ b/tests/test-check-code-hg.t
+@@ -209,9 +209,6 @@
+ > if os.path.exists(self.wjoin(lfutil.standin(lfile))):
+ warning: line over 80 characters
+ hgext/mq.py:0:
+- > raise util.Abort(_("%s does not have a parent recorded" % root))
+- warning: line over 80 characters
+- hgext/mq.py:0:
+ > raise util.Abort(_("cannot push --exact with applied patches"))
+ warning: line over 80 characters
+ hgext/mq.py:0:
+
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2012-03-07 23:29:58 UTC (rev 8268)
+++ packages/mercurial/trunk/debian/patches/series 2012-03-09 00:15:08 UTC (rev 8269)
@@ -9,3 +9,5 @@
deb_specific__no_optim_bdiff_armel.patch
deb_specific__fix_hg-ssh_interpreter.patch
for_upstream__fix_kfreebsd_test_inherit.patch
+from_upstream__dont_translate_the_abort_message_twice.patch
+from_upstream__fix_all_remaining_uses_of_inside.patch
More information about the Python-apps-commits
mailing list