[Python-apps-commits] r8418 - in packages/mercurial/trunk/debian (5 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Mon Apr 2 20:43:46 UTC 2012
Date: Monday, April 2, 2012 @ 20:43:45
Author: vicho
Revision: 8418
Remove patches for_upstream__fix_kfreebsd_test_inherit.patch, from_upstream__dont_translate_the_abort_message_twice.patch and from_upstream__fix_all_remaining_uses_of_inside.patch which are now included upstream
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/series
Deleted:
packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch
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/changelog 2012-04-02 20:43:37 UTC (rev 8417)
+++ packages/mercurial/trunk/debian/changelog 2012-04-02 20:43:45 UTC (rev 8418)
@@ -5,8 +5,12 @@
* Drop patch "deb_specific__no_optim_bdiff_armel.patch" as gcc no
longer miscompiles bdiff in armel
* Remove confusing entry in Debian.NEWS (Closes: #666549)
+ * Remove patches for_upstream__fix_kfreebsd_test_inherit.patch,
+ from_upstream__dont_translate_the_abort_message_twice.patch and
+ from_upstream__fix_all_remaining_uses_of_inside.patch which are now
+ included upstream
- -- Javi Merino <vicho at debian.org> Mon, 02 Apr 2012 21:28:18 +0100
+ -- Javi Merino <vicho at debian.org> Mon, 02 Apr 2012 21:38:52 +0100
mercurial (2.1.1-2) unstable; urgency=low
Deleted: packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch 2012-04-02 20:43:37 UTC (rev 8417)
+++ packages/mercurial/trunk/debian/patches/for_upstream__fix_kfreebsd_test_inherit.patch 2012-04-02 20:43:45 UTC (rev 8418)
@@ -1,20 +0,0 @@
-Author: Javi Merino <vicho at debian.org>
-Description: Ignore the return code of chmod in test-inherit-mode
- In freebsd, a newly created directory has the same group as the parent
- directory by default. That means that the test directory created by
- test-inherit-mode.t is owned by root's group, so "chmod g+s .hg/store"
- fails to set the SGID bit and returns 1. If we ignore chmod's return
- code, the testsuite passes again.
-Origin: upstream, http://selenic.com/hg/rev/7cf8de5a82d8
-
---- a/tests/test-inherit-mode.t
-+++ b/tests/test-inherit-mode.t
-@@ -138,7 +138,7 @@ just check that directories have the sam
- $ hg init setgid
- $ cd setgid
- $ chmod g+rwx .hg/store
-- $ chmod g+s .hg/store 2> /dev/null
-+ $ chmod g+s .hg/store 2> /dev/null || true
- $ mkdir dir
- $ touch dir/file
- $ hg ci -qAm 'add dir/file'
Deleted: 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 2012-04-02 20:43:37 UTC (rev 8417)
+++ packages/mercurial/trunk/debian/patches/from_upstream__dont_translate_the_abort_message_twice.patch 2012-04-02 20:43:45 UTC (rev 8418)
@@ -1,29 +0,0 @@
-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
-
---- a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -4268,7 +4268,7 @@
- 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()):
Deleted: 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 2012-04-02 20:43:37 UTC (rev 8417)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_all_remaining_uses_of_inside.patch 2012-04-02 20:43:45 UTC (rev 8418)
@@ -1,101 +0,0 @@
-Author: Matt Mackall <mpm at selenic.com>
-Description: i18n: fix all remaining uses of % inside _()
-Origin: upstream, http://selenic.com/hg/rev/ce292f1379ba
-
---- a/hgext/churn.py
-+++ b/hgext/churn.py
-@@ -135,7 +135,7 @@
- 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()
---- a/hgext/convert/monotone.py
-+++ b/hgext/convert/monotone.py
-@@ -113,7 +113,7 @@
-
- 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 != ':':
---- a/hgext/largefiles/lfcommands.py
-+++ b/hgext/largefiles/lfcommands.py
-@@ -309,7 +309,7 @@
- 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)
-
---- a/hgext/largefiles/overrides.py
-+++ b/hgext/largefiles/overrides.py
-@@ -157,7 +157,7 @@
- # 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 @@
- 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):
---- a/hgext/mq.py
-+++ b/hgext/mq.py
-@@ -1192,7 +1192,8 @@
- 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)
-
---- a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -2903,7 +2903,7 @@
- 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:
-@@ -2996,7 +2996,7 @@
- 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 "")
---- 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-04-02 20:43:37 UTC (rev 8417)
+++ packages/mercurial/trunk/debian/patches/series 2012-04-02 20:43:45 UTC (rev 8418)
@@ -7,6 +7,3 @@
deb_specific__install-mo-fhs.patch
deb_specific__disable_libdir_replacement.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