[Python-apps-commits] r8837 - in packages/mercurial/branches/squeeze-backports/debian (13 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Mon Jun 4 07:25:11 UTC 2012
Date: Monday, June 4, 2012 @ 07:25:09
Author: vicho
Revision: 8837
Merge revs 8424:8825 from trunk into squeeze-backports
Modified:
packages/mercurial/branches/squeeze-backports/debian/changelog
packages/mercurial/branches/squeeze-backports/debian/control
packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist
packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately
packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch
packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately
packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies
packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch
packages/mercurial/branches/squeeze-backports/debian/patches/series
packages/mercurial/branches/squeeze-backports/debian/rules
Deleted:
packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
Modified: packages/mercurial/branches/squeeze-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/changelog 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/changelog 2012-06-04 07:25:09 UTC (rev 8837)
@@ -1,3 +1,42 @@
+mercurial (2.2.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Javi Merino <vicho at debian.org> Sun, 03 Jun 2012 09:17:36 +0100
+
+mercurial (2.2.1-2) unstable; urgency=low
+
+ * Blacklist test-convert-git.t as it is known to fail with git 1.7.10
+ and it's making it fail to build in armel.
+ * Build-depend on python-roman (Closes: #671611)
+
+ -- Javi Merino <vicho at debian.org> Sun, 06 May 2012 17:31:51 +0100
+
+mercurial (2.2.1-1) unstable; urgency=low
+
+ * New upstream release that fixes a memory leak in hgweb
+ * Refresh i18n/{de,da,ja}.po translations in
+ deb_specific__use_sensible-editor.patch
+
+ -- Javi Merino <vicho at debian.org> Fri, 04 May 2012 21:57:42 +0100
+
+mercurial (2.2-2) unstable; urgency=low
+
+ * Don't patch test-pull-pull-corruption2.t in kfreebsd-i386, armel,
+ sparc or mips, it's now integrated into test-pull-pull-corruption.t
+
+ -- Javi Merino <vicho at debian.org> Wed, 02 May 2012 19:21:40 +0100
+
+mercurial (2.2-1) unstable; urgency=low
+
+ * New upstream release 2.2
+ * Delete patches for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
+ and from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
+ which are now included upstream
+ * Refresh patches
+
+ -- Javi Merino <vicho at debian.org> Wed, 02 May 2012 08:08:32 +0100
+
mercurial (2.1.2-2~bpo60+1) squeeze-backports; urgency=low
* Rebuild for squeeze-backports.
Modified: packages/mercurial/branches/squeeze-backports/debian/control
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/control 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/control 2012-06-04 07:25:09 UTC (rev 8837)
@@ -5,9 +5,13 @@
Uploaders: Vincent Danjean <vdanjean at debian.org>,
Javi Merino <vicho at debian.org>
Build-Depends: debhelper (>= 8.0.0),
- patchutils (>= 0.2.25), gettext,
- python-all-dev (>= 2.6.6-3~), python-docutils,
- zip, unzip
+ patchutils (>= 0.2.25),
+ gettext,
+ python-all-dev (>= 2.6.6-3~),
+ python-docutils,
+ python-roman,
+ zip,
+ unzip
Standards-Version: 3.9.3
Homepage: http://mercurial.selenic.com/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk
Modified: packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist 2012-06-04 07:25:09 UTC (rev 8837)
@@ -17,6 +17,7 @@
test-hgwebdirsym.t
test-interhg.t
test-keyword.t
+test-largefiles.t
test-mq-qclone-http.t
test-mq-qimport.t
test-newcgi.t
@@ -45,3 +46,8 @@
# I'm missing some locales or something (?)
test-i18n.t
+
+# test-convert-git.t fails with git 1.7.10
+# (http://mercurial.selenic.com/bts/issue3427) and some buildds (such
+# as ancina) have git installed and run this test
+test-convert-git.t
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch 2012-06-04 07:25:09 UTC (rev 8837)
@@ -12,7 +12,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -375,8 +375,7 @@
+@@ -381,8 +381,7 @@
'build_mo': hgbuildmo,
'build_ext': hgbuildext,
'build_py': hgbuildpy,
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately 2012-06-04 07:25:09 UTC (rev 8837)
@@ -2,7 +2,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -418,8 +418,7 @@
+@@ -424,8 +424,7 @@
extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch 2012-06-04 07:25:09 UTC (rev 8837)
@@ -12,7 +12,7 @@
break
--- a/setup.py
+++ b/setup.py
-@@ -418,7 +418,7 @@
+@@ -424,7 +424,7 @@
extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately 2012-06-04 07:25:09 UTC (rev 8837)
@@ -13,7 +13,7 @@
def _flatten(thing):
--- a/setup.py
+++ b/setup.py
-@@ -424,14 +424,6 @@
+@@ -430,14 +430,6 @@
def ordinarypath(p):
return p and p[0] != '.' and p[-1] != '~'
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies 2012-06-04 07:25:09 UTC (rev 8837)
@@ -2,7 +2,7 @@
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
-@@ -316,7 +316,8 @@
+@@ -352,7 +352,8 @@
import MySQLdb as mysql
bzmysql._MySQLdb = mysql
except ImportError, err:
@@ -16,7 +16,7 @@
+++ b/hgext/convert/bzr.py
@@ -44,7 +44,8 @@
# access bzrlib stuff
- branch
+ bzrdir
except NameError:
- raise NoRepo(_('Bazaar modules could not be loaded'))
+ raise NoRepo(_('Bazaar modules could not be loaded') +
@@ -108,7 +108,7 @@
if self.automatestdio:
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
-@@ -21,6 +21,7 @@
+@@ -18,6 +18,7 @@
from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
from common import commandline, converter_source, converter_sink, mapfile
@@ -116,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -230,16 +231,19 @@
+@@ -227,16 +228,19 @@
raise NoRepo(_("%s does not look like a Subversion repository")
% url)
if svn is None:
@@ -139,7 +139,7 @@
self.lastrevs = {}
-@@ -979,6 +983,8 @@
+@@ -1001,6 +1005,8 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch 2012-06-04 07:25:09 UTC (rev 8837)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -1902,8 +1902,8 @@
+@@ -1970,8 +1970,8 @@ def debuginstall(ui):
editor = ui.geteditor()
cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
if not cmdpath:
@@ -26,18 +26,18 @@
else:
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -687,7 +687,7 @@
+@@ -693,7 +693,7 @@ class ui(object):
+ # avoid confusion.
+ editor = 'E'
+ else:
+- editor = 'vi'
++ editor = 'sensible-editor'
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
-- os.environ.get("EDITOR", "vi"))
-+ os.environ.get("EDITOR", "sensible-editor"))
-
- def progress(self, topic, pos, item="", unit="", total=None):
- '''show a progress message
--- a/i18n/da.po
+++ b/i18n/da.po
-@@ -8752,7 +8752,7 @@
+@@ -8752,7 +8752,7 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr ""
@@ -46,7 +46,17 @@
msgstr ""
msgid " (specify a commit editor in your configuration file)\n"
-@@ -14194,7 +14194,7 @@
+@@ -13521,7 +13521,8 @@ msgstr ""
+
+ msgid ""
+ "``editor``\n"
+-" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++" The editor to use during a commit. Default is ``$EDITOR`` or\n"
++" ``sensible-editor``."
+ msgstr ""
+
+ msgid ""
+@@ -14194,7 +14195,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -57,7 +67,7 @@
msgid ""
--- a/i18n/de.po
+++ b/i18n/de.po
-@@ -9951,8 +9951,8 @@
+@@ -10140,8 +10140,8 @@ msgstr "(Vorlagen scheinen falsch instal
msgid "Checking commit editor...\n"
msgstr "Prüfe Editor für Versionsmeldungen...\n"
@@ -68,7 +78,17 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -15794,7 +15794,7 @@
+@@ -15292,7 +15292,8 @@ msgstr ""
+
+ msgid ""
+ "``editor``\n"
+-" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++" The editor to use during a commit. Default is ``$EDITOR`` or\n"
++" ``sensible-editor``."
+ msgstr ""
+
+ msgid ""
+@@ -16050,7 +16051,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -77,18 +97,18 @@
msgstr ""
"EDITOR\n"
" Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -15802,7 +15802,7 @@
- " Nachricht geschrieben wird. Der verwendete Editor wird aus den drei\n"
- " Umgebungsvariablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge)\n"
- " ermittelt. Der erste nicht-leere wird verwendet. Wenn alle Angaben\n"
--" leer sind, wird der Standard 'vi' verwendet."
-+" leer sind, wird der Standard 'sensible-editor' verwendet."
+@@ -16059,7 +16060,7 @@ msgstr ""
+ " variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
+ "ermittelt.\n"
+ " Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind, wird\n"
+-" der Standard 'vi' verwendet."
++" der Standard 'sensible-editor' verwendet."
msgid ""
"PYTHONPATH\n"
--- a/i18n/el.po
+++ b/i18n/el.po
-@@ -274,7 +274,7 @@
+@@ -274,7 +274,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -97,7 +117,7 @@
msgstr ""
msgid ""
-@@ -11500,7 +11500,7 @@
+@@ -11500,7 +11500,7 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr ""
@@ -108,7 +128,7 @@
msgid " (specify a commit editor in your .hgrc file)\n"
--- a/i18n/fr.po
+++ b/i18n/fr.po
-@@ -299,7 +299,7 @@
+@@ -299,7 +299,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -117,7 +137,7 @@
msgstr ""
msgid ""
-@@ -8228,7 +8228,7 @@
+@@ -8228,7 +8228,7 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr ""
@@ -128,7 +148,7 @@
msgid " (specify a commit editor in your .hgrc file)\n"
--- a/i18n/it.po
+++ b/i18n/it.po
-@@ -7157,8 +7157,8 @@
+@@ -7157,8 +7157,8 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr "Sto controllando l'editor per il commit...\n"
@@ -139,7 +159,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
-@@ -10462,7 +10462,7 @@
+@@ -10462,7 +10462,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -150,7 +170,7 @@
msgid ""
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -10104,8 +10104,8 @@
+@@ -10595,8 +10595,8 @@ msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹
msgid "Checking commit editor...\n"
msgstr "メッセージ入力用エディタã®æ¤œè¨¼ä¸...\n"
@@ -161,7 +181,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (コミットメッセージ用エディタをè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -16117,7 +16117,8 @@
+@@ -16815,11 +16815,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -171,7 +191,12 @@
msgstr ""
"``editor``\n"
" コミットãƒã‚°å…¥åŠ›ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã€‚ 無指定ã®å ´åˆã€ ``$EDITOR`` ãªã„ã—\n"
-@@ -17116,7 +17117,7 @@
+-" ``vi`` ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
++" ``sensible-editor`` ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+
+ msgid ""
+ "``fallbackencoding``\n"
+@@ -17841,7 +17842,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -180,7 +205,7 @@
msgstr ""
"EDITOR\n"
" コミット時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ エディタã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€\n"
-@@ -17124,7 +17125,7 @@
+@@ -17849,7 +17850,7 @@ msgstr ""
" ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€ HGEDITOR〠VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚\n"
@@ -191,7 +216,7 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -10417,10 +10417,10 @@
+@@ -10745,10 +10745,10 @@ msgstr " (modelos parecem ter sido insta
msgid "Checking commit editor...\n"
msgstr "Verificando editor para consolidação...\n"
@@ -204,7 +229,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
-@@ -16580,10 +16580,12 @@
+@@ -17119,10 +17119,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -219,7 +244,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -17603,7 +17605,7 @@
+@@ -18174,7 +18176,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -228,7 +253,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -17611,7 +17613,7 @@
+@@ -18182,7 +18184,7 @@ msgstr ""
" mensagens de consolidação. O editor usado é determinado pela\n"
" consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
" nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -239,7 +264,7 @@
"PYTHONPATH\n"
--- a/i18n/sv.po
+++ b/i18n/sv.po
-@@ -8717,8 +8717,8 @@
+@@ -8717,8 +8717,8 @@ msgstr " (mallar verkar vara inkorrekt i
msgid "Checking commit editor...\n"
msgstr "Kontrollerar arkiveringseditor...\n"
@@ -250,7 +275,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
-@@ -13794,7 +13794,8 @@
+@@ -13794,7 +13794,8 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -260,7 +285,7 @@
msgstr ""
msgid ""
-@@ -14477,7 +14478,7 @@
+@@ -14477,7 +14478,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -271,7 +296,7 @@
msgid ""
--- a/i18n/zh_CN.po
+++ b/i18n/zh_CN.po
-@@ -5880,7 +5880,7 @@
+@@ -5880,7 +5880,7 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr ""
@@ -280,7 +305,7 @@
msgstr ""
msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8768,7 +8768,7 @@
+@@ -8768,7 +8768,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -291,7 +316,7 @@
msgid ""
--- a/i18n/zh_TW.po
+++ b/i18n/zh_TW.po
-@@ -6760,8 +6760,8 @@
+@@ -6760,8 +6760,8 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr "檢查æ交訊æ¯ç·¨è¼¯å™¨...\n"
@@ -302,7 +327,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr "(åœ¨ä½ çš„è¨å®šæª”指明一個用來編輯æ交訊æ¯çš„編輯器)\n"
-@@ -9710,7 +9710,7 @@
+@@ -9710,7 +9710,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -313,7 +338,7 @@
msgid ""
--- a/mercurial/help/environment.txt
+++ b/mercurial/help/environment.txt
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ EDITOR
editor it uses is determined by looking at the environment
variables HGEDITOR, VISUAL and EDITOR, in that order. The first
non-empty one is chosen. If all of them are empty, the editor
@@ -324,7 +349,7 @@
This is used by Python to find imported modules and may need to be
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
-@@ -1055,7 +1055,8 @@
+@@ -1121,7 +1121,8 @@ User interface controls.
Print debugging information. True or False. Default is False.
``editor``
@@ -336,7 +361,7 @@
Encoding to try if it's not possible to decode the changelog using
--- a/i18n/ro.po
+++ b/i18n/ro.po
-@@ -7722,7 +7722,7 @@
+@@ -7722,7 +7722,7 @@ msgstr ""
msgid "Checking commit editor...\n"
msgstr "Se verifică editorul pentru commit...\n"
@@ -345,7 +370,7 @@
msgstr ""
msgid " (specify a commit editor in your configuration file)\n"
-@@ -11925,7 +11925,8 @@
+@@ -11925,7 +11925,8 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -355,7 +380,7 @@
msgstr ""
msgid ""
-@@ -12570,7 +12571,7 @@
+@@ -12570,7 +12571,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -366,7 +391,7 @@
msgid ""
--- a/i18n/ru.po
+++ b/i18n/ru.po
-@@ -10573,8 +10573,8 @@
+@@ -10969,8 +10969,8 @@ msgstr " (шаблоны, похоже,
msgid "Checking commit editor...\n"
msgstr "Проверка редактора Ñообщений фикÑации...\n"
@@ -377,7 +402,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (задайте редактор Ñообщений в вашем конфиге)\n"
-@@ -16647,10 +16647,12 @@
+@@ -17256,10 +17256,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -392,7 +417,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -17652,14 +17654,14 @@
+@@ -18290,14 +18292,14 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
Deleted: packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch 2012-06-04 07:25:09 UTC (rev 8837)
@@ -1,19 +0,0 @@
-Author: Javi Merino <vicho at debian.org>
-Description: Don't run test-gpg if not in a working directory
- test-gpg has to be run in a mercurial working directory as it uses
- that to verify that it hasn't modified the trustdb.gpg file. Skip
- the test if it is running in an exploded tarball.
-Forwarded: http://www.selenic.com/pipermail/mercurial-devel/2012-April/038941.html
---- a/tests/test-gpg.t
-+++ b/tests/test-gpg.t
-@@ -1,6 +1,10 @@
- Test the GPG extension
-
- $ "$TESTDIR/hghave" gpg || exit 80
-+ $ if ! hg identify -q > /dev/null; then
-+ > echo "skipped: not a Mercurial working dir" >&2
-+ > exit 80
-+ > fi
- $ cat <<EOF >> $HGRCPATH
- > [extensions]
- > gpg=
Deleted: packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch 2012-06-04 07:25:09 UTC (rev 8837)
@@ -1,14 +0,0 @@
-Author: Matt Mackall <mpm at selenic.com>
-Description: tests: re-silence test-bad-pull log messages
-Origin: upstream, http://selenic.com/hg/rev/91eec29dd7de
-
-diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
---- a/tests/test-bad-pull.t
-+++ b/tests/test-bad-pull.t
-@@ -25,6 +25,3 @@
- abort: HTTP Error 404: * (glob)
- [255]
- $ wait $P
-- $ cat log
-- localhost - - [*] code 404, message File not found (glob)
-- localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)
Modified: packages/mercurial/branches/squeeze-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/series 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/series 2012-06-04 07:25:09 UTC (rev 8837)
@@ -7,5 +7,3 @@
deb_specific__install-mo-fhs.patch
deb_specific__disable_libdir_replacement.patch
deb_specific__fix_hg-ssh_interpreter.patch
-for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
-from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
Modified: packages/mercurial/branches/squeeze-backports/debian/rules
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/rules 2012-06-03 22:50:46 UTC (rev 8836)
+++ packages/mercurial/branches/squeeze-backports/debian/rules 2012-06-04 07:25:09 UTC (rev 8837)
@@ -23,15 +23,15 @@
ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
override_dh_auto_test:
-# Some tests try to execute two hg commands at the same time to test
-# for corruption. They do so by running an hg command in the
-# background, sleeping one second and running the second command. In
-# architectures with slow buildds, one second is not enough and the
-# second test starts before the first one has started printing. This
-# is hacky and we just enhance the hack by incrementing the sleep time
-# in those architectures.
+# test-pull-pull-corruption tries to execute two hg commands at the
+# same time to test for corruption. It does so by running an hg
+# command in the background, sleeping one second and running the
+# second command. In architectures with slow buildds, one second is
+# not enough and the second test starts before the first one has
+# started printing. This is hacky and we just enhance the hack by
+# incrementing the sleep time in those architectures.
ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
- sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t $(CURDIR)/tests/test-pull-pull-corruption2.t
+ sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
endif
dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
More information about the Python-apps-commits
mailing list