[Python-apps-commits] r11448 - in packages/mercurial/branches/wheezy-backports/debian (17 files)

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sun Oct 19 16:36:13 UTC 2014 

    Date: Sunday, October 19, 2014 @ 16:36:12
  Author: vicho
Revision: 11448

Incorporate changes by Julien Cristau for mercurial_3.1.1-1~bpo70+1

Modified:
  packages/mercurial/branches/wheezy-backports/debian/changelog
  packages/mercurial/branches/wheezy-backports/debian/control
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/series
  packages/mercurial/branches/wheezy-backports/debian/rules
  packages/mercurial/branches/wheezy-backports/debian/tests/control
  packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion
  packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git
  packages/mercurial/branches/wheezy-backports/debian/tests/testsuite

Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog	2014-10-19 16:36:12 UTC (rev 11448)
@@ -1,3 +1,114 @@
+mercurial (3.1.1-1~bpo70+1) wheezy-backports; urgency=medium
+
+  * Rebuild for wheezy-backports.
+  * Restore munging of /usr/bin/hg's shebang in debian/rules to ensure it uses
+    python instead of python2.6 (closes: #750871).
+
+ -- Julien Cristau <jcristau at debian.org>  Tue, 30 Sep 2014 10:15:17 +0200
+
+mercurial (3.1.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove test_patchbomb from blacklisted tests (fixed upstream in
+    http://selenic.com/repo/hg/rev/f8fc5df6a8cf)
+  * Add patch from_upstream__test-
+    patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
+    which fixes the patchbomb test
+
+ -- Javi Merino <vicho at debian.org>  Thu, 04 Sep 2014 09:04:08 +0200
+
+mercurial (3.1-2) unstable; urgency=medium
+
+  * gcc and python2.7-dev now needed to pass the testsuite in autopkgtest
+  * mercurial-git versions prior to 0.6.1 don't work with mercurial-3.1,
+    update breaks
+  * Fix hgsubversion autopkgtest
+  * Remove darcs from the autopkgtest testsuite as gnutls fails to
+    initialize random number generator in the schroot and is very verbose
+    about it.
+
+ -- Javi Merino <vicho at debian.org>  Mon, 25 Aug 2014 14:54:24 -0700
+
+mercurial (3.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Sat, 02 Aug 2014 11:29:22 +0100
+
+mercurial (3.0.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Sun, 13 Jul 2014 13:12:26 +0200
+
+mercurial (3.0.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #750444)
+  * Update breaks of hgview to hgview-common << 1.8.1 (Thanks Julien Cristau)
+
+ -- Javi Merino <vicho at debian.org>  Tue, 17 Jun 2014 22:55:05 +0100
+
+mercurial (3.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Rever breaks of hgsubversion to versions prior to 1.6
+  * Upload to unstable
+
+ -- Javi Merino <vicho at debian.org>  Fri, 02 May 2014 08:33:00 +0100
+
+mercurial (3.0~rc1-1) experimental; urgency=medium
+
+  * New upstream release
+  * Don't explicitly change the python interpreter in debian/rules, it's
+    already handled by dh_python2
+  * Drop patch deb_specific__fix_hg-ssh_interpreter.patch as dh_python2
+    fixes the interpreter for us
+  * Fix "fatal: empty ident name (for <babar at jungle.org>) not allowed"
+    error in the mercurial-git autopkgtest
+  * Blacklist test-patchbomb from the testsuite autopkgtest as it is
+    known to fail
+  * Don't install tmplrewrite.py in examples any more.  It was useful
+    for the 1.3 transition, but no longer relevant
+  * Mercurial 3.0 breaks current hgsubversion (1.6)
+
+ -- Javi Merino <vicho at debian.org>  Sat, 19 Apr 2014 18:53:34 +0100
+
+mercurial (2.9.2-1) unstable; urgency=low
+
+  [ Javi Merino ]
+  * New upstream release
+  * Fix "please downgrade 'wish' Recommends to Suggests" by removing the
+    Recommends from the mercurial package (but keeping the Suggests in
+    mercurial-common) (Closes: #741514)
+  * Drop Suggests of vim or emacs
+  * Fix "autopkgtest hgsubversion shouldn't need network connectivity"
+    by making the test create a local svn repository (Closes: #735578)
+  * Mercurial 2.9 breaks hgsubversion prior to 1.6
+
+  [ Julien Cristau ]
+  * mercurial-common Replaces mercurial << 2.6.3 (the bash_completion file and
+    /etc/mercurial/hgrc moved) (Closes: #743288)
+
+ -- Javi Merino <vicho at debian.org>  Thu, 03 Apr 2014 08:11:58 +0100
+
+mercurial (2.9.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * mercurial 2.9 breaks current hgsubversion (1.5-1)
+  * Blacklist test-patchbomb.t as it failed sporadically in mips buildd
+    for 2.9-1 and is now failing for me.
+
+ -- Javi Merino <vicho at debian.org>  Mon, 03 Mar 2014 22:52:12 +0000
+
+mercurial (2.9-1) unstable; urgency=medium
+
+  * blacklist check_pyflakes instead of deleting the test
+  * Add "allow-stderr" restriction to "testsuite" as it prints out a
+    "Tested with unexpected mercurial lib:" warning.  Thanks to Martin
+    Pitt <martin.pitt at ubuntu.com>.
+
+ -- Javi Merino <vicho at debian.org>  Mon, 10 Feb 2014 22:37:30 +0000
+
 mercurial (2.8.2-1~bpo70+1) wheezy-backports; urgency=medium
 
   * Rebuild for wheezy-backports.

Modified: packages/mercurial/branches/wheezy-backports/debian/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/control	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/control	2014-10-19 16:36:12 UTC (rev 11448)
@@ -20,18 +20,20 @@
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
 X-Python-Version: >= 2.4
+# Can go away once dpkg 1.17.11 hits stable
 XS-Testsuite: autopkgtest
 
 Package: mercurial-common
 Architecture: all 
 Depends: ${misc:Depends}, ${python:Depends}
 Recommends: mercurial (>= ${source:Version}), ca-certificates
-Suggests: wish,
+Suggests:
+ wish,
  python-mysqldb, 
  python-pygments,
  python-openssl
 Breaks: mercurial (<< ${source:Version})
-Replaces: mercurial (<< 1.4)
+Replaces: mercurial (<< 2.6.3)
 Description: easy-to-use, scalable distributed version control system (common files)
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.
@@ -44,13 +46,11 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020),
  mercurial-common (= ${source:Version})
 Recommends: openssh-client,
- wish,
-Suggests: qct, 
- vim | emacs,
+Suggests: qct,
  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
-Breaks: hgsubversion (<< 1.5~),
- hgview (<< 1.7.1-1~),
- mercurial-git (<< 0.4.0-1~),
+Breaks: hgsubversion (<< 1.6~),
+ hgview-common (<< 1.8.1),
+ mercurial-git (<< 0.6.1-1~),
  qct (<< 1.7-2~),
 Description: easy-to-use, scalable distributed version control system
  Mercurial is a fast, lightweight Source Control Management system designed

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.examples	2014-10-19 16:36:12 UTC (rev 11448)
@@ -10,7 +10,6 @@
 contrib/simplemerge
 contrib/tcsh_completion
 contrib/tcsh_completion_build.sh
-contrib/tmplrewrite.py
 contrib/undumprevlog
 contrib/vim
 contrib/zsh_completion

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -413,7 +413,6 @@ cmdclass = {'build': hgbuild,
+@@ -422,7 +422,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -313,7 +313,7 @@ def view(ui, repo, *etc, **opts):
+@@ -343,6 +343,6 @@ def view(ui, repo, *etc, **opts):
      "start interactive history viewer"
      os.chdir(repo.root)
      optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
@@ -10,4 +10,3 @@
 +    cmd = ui.config("hgk", "path", "/usr/share/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
      ui.debug("running %s\n" % cmd)
      util.system(cmd)
- 

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2014-10-19 16:36:12 UTC (rev 11448)
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -79,7 +79,7 @@ class convert_git(converter_source):
+@@ -94,7 +94,7 @@ class convert_git(converter_source):
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  
@@ -116,7 +116,7 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -237,16 +238,19 @@ class svn_source(converter_source):
+@@ -278,16 +279,19 @@ class svn_source(converter_source):
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1025,6 +1029,8 @@ class svn_sink(converter_sink, commandli
+@@ -1069,6 +1073,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -131,9 +131,11 @@ def loaddoc(topic):
+@@ -134,9 +134,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -375,7 +375,7 @@ funcs = {
+@@ -530,7 +530,7 @@ funcs = {
  
  # template engine
  

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -13,9 +13,9 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2095,8 +2095,8 @@ def debuginstall(ui):
+@@ -2256,8 +2256,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
-     cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
+     cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
 -        if editor == 'vi':
 -            ui.write(_(" No commit editor set and can't find vi in PATH\n"))
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -755,7 +755,7 @@ class ui(object):
+@@ -791,7 +791,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -67,19 +67,19 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -13738,8 +13738,8 @@ msgid "checking commit editor...\n"
+@@ -11683,8 +11683,8 @@ msgstr " (Vorlagen scheinen falsch insta
+ msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
- #: mercurial/commands.py:2093
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Kein Editor für Versionsmeldungen angegeben und vi nicht im PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
  
- #: mercurial/commands.py:2094 mercurial/commands.py:2098
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -20474,7 +20474,8 @@ msgstr ""
- #: mercurial/help/config.txt:1156
+ msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
+@@ -17242,7 +17242,8 @@ msgstr ""
+ 
  msgid ""
  "``editor``\n"
 -"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
@@ -87,8 +87,8 @@
 +"    ``sensible-editor``."
  msgstr ""
  
- #: mercurial/help/config.txt:1159
-@@ -21471,7 +21472,7 @@ msgid ""
+ msgid ""
+@@ -18120,7 +18121,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,15 +97,15 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -21480,7 +21481,7 @@ msgstr ""
+@@ -18129,7 +18130,7 @@ msgstr ""
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
 -"    wird die Voreinstellung 'vi' verwendet."
 +"    wird die Voreinstellung 'sensible-editor' verwendet."
  
- #: mercurial/help/environment.txt:99
  msgid ""
+ "PYTHONPATH\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
 @@ -274,7 +274,7 @@ msgid ""
@@ -153,9 +153,9 @@
  msgstr "Sto controllando l'editor per il commit...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
--msgstr "Nessun editor per il commit trovato e non trovo vi in PATH\n"
+-msgstr " Nessun editor per il commit trovato e non trovo vi in PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr "Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n"
++msgstr " Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11954,8 +11954,8 @@ msgstr " (テンプレートのインス
+@@ -12019,8 +12019,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -18499,11 +18499,12 @@ msgstr ""
+@@ -18904,11 +18904,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -190,13 +190,13 @@
 +"    ``sensible-editor``."
  msgstr ""
  "``editor``\n"
- "    コミットログ入力用エディタ。 無指定の場合、 ``$EDITOR`` ないし\n"
+ "    コミットログ入力用エディタ。 無指定の場合、 ``$EDITOR`` または\n"
 -"    ``vi`` が使用されます。"
 +"    ``sensible-editor`` が使用されます。"
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19662,7 +19663,7 @@ msgid ""
+@@ -20111,7 +20112,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"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -19670,7 +19671,7 @@ msgstr ""
+@@ -20119,7 +20120,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12122,10 +12122,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12206,10 +12206,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -18837,10 +18837,12 @@ msgstr ""
+@@ -19270,10 +19270,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20030,7 +20032,7 @@ msgid ""
+@@ -20508,7 +20510,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"
@@ -253,7 +253,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -20038,7 +20040,7 @@ msgstr ""
+@@ -20516,7 +20518,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"
@@ -275,7 +275,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
-@@ -14852,7 +14852,8 @@ msgstr ""
+@@ -14851,7 +14851,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -285,7 +285,7 @@
  msgstr ""
  
  msgid ""
-@@ -15564,7 +15565,7 @@ msgid ""
+@@ -15563,7 +15564,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"
@@ -316,18 +316,18 @@
  msgid ""
 --- a/i18n/zh_TW.po
 +++ b/i18n/zh_TW.po
-@@ -6760,8 +6760,8 @@ msgstr ""
+@@ -6759,8 +6759,8 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr "檢查提交訊息編輯器...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
--msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n"
+-msgstr " 沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有sensible-editor\n"
++msgstr " 沒有設定提交訊息編輯器,然後在PATH中也沒有sensible-editor\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr "(在你的設定檔指明一個用來編輯提交訊息的編輯器)\n"
-@@ -9710,7 +9710,7 @@ msgid ""
+ msgstr " (在你的設定檔指明一個用來編輯提交訊息的編輯器)\n"
+@@ -9709,7 +9709,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"
@@ -349,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
-@@ -1154,7 +1154,8 @@ User interface controls.
+@@ -1247,7 +1247,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -12019,8 +12019,8 @@ msgstr " (шаблоны, похоже,
+@@ -12441,8 +12441,8 @@ msgstr " (шаблоны, похоже,
  msgid "checking commit editor...\n"
  msgstr "проверка редактора сообщений фиксации...\n"
  
@@ -402,7 +402,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (задайте редактор сообщений в вашем конфиге)\n"
-@@ -18656,10 +18656,12 @@ msgstr ""
+@@ -19430,10 +19430,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19832,14 +19834,14 @@ msgid ""
+@@ -20651,14 +20653,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"

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -9,12 +9,12 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -430,7 +430,7 @@ def usecorrectpython():
-              sys.executable)
-         mypython = os.path.join(BINDIR, pyexename)
-         try:
--            if os.readlink(mypython) == sys.executable:
-+            if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
-                 return
-             os.unlink(mypython)
-         except OSError, err:
+@@ -1635,7 +1635,7 @@ class TestRunner(object):
+                  sys.executable)
+             mypython = os.path.join(self._tmpbindir, pyexename)
+             try:
+-                if os.readlink(mypython) == sys.executable:
++                if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
+                     return
+                 os.unlink(mypython)
+             except OSError, err:

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch	2014-10-19 16:36:12 UTC (rev 11448)
@@ -5,24 +5,20 @@
  failure. This patch makes the spacing be matched more leniently.
 Bug: http://bz.selenic.com/show_bug.cgi?id=4124
 
-Index: mercurial-2.8.1/tests/test-shelve.t
-===================================================================
---- mercurial-2.8.1.orig/tests/test-shelve.t	2013-12-02 04:51:10.000000000 +0200
-+++ mercurial-2.8.1/tests/test-shelve.t	2013-12-08 01:28:17.505760594 +0200
-@@ -80,12 +80,12 @@
- 
+--- a/tests/test-shelve.t
++++ b/tests/test-shelve.t
+@@ -79,11 +79,11 @@ the common case - no options or filename
  ensure that our shelved changes exist
  
--  $ hg shelve -l
--  default-01      (*)    [mq]: second.patch (glob)
--  default         (*)    [mq]: second.patch (glob)
-+  $ sleep 10 && hg shelve -l
-+  default-01      (*)* [mq]: second.patch (glob)
-+  default         (*)* [mq]: second.patch (glob)
+   $ hg shelve -l
+-  default-01      (*)    changes to '[mq]: second.patch' (glob)
+-  default         (*)    changes to '[mq]: second.patch' (glob)
++  default-01      (*)* changes to '[mq]: second.patch' (glob)
++  default         (*)* changes to '[mq]: second.patch' (glob)
  
    $ hg shelve -l -p default
--  default         (*)    [mq]: second.patch (glob)
-+  default         (*)* [mq]: second.patch (glob)
+-  default         (*)    changes to '[mq]: second.patch' (glob)
++  default         (*)* changes to '[mq]: second.patch' (glob)
    
    diff --git a/a/a b/a/a
    --- a/a/a

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/series	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/series	2014-10-19 16:36:12 UTC (rev 11448)
@@ -6,6 +6,6 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__support_mo_in_fhs.patch
 deb_specific__disable_libdir_replacement.patch
-deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 for_upstream__lenient_test-shelve.patch
+from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch

Modified: packages/mercurial/branches/wheezy-backports/debian/rules
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/rules	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/rules	2014-10-19 16:36:12 UTC (rev 11448)
@@ -39,7 +39,7 @@
 		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
 endif
 
-	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS)"
+	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
 	rename.ul .deb-backup '' $(CURDIR)/tests/*
 endif
@@ -103,10 +103,6 @@
 	mv mercurial/__version__.py.save mercurial/__version__.py
 	$(RM) -rv tmp/
 
-override_dh_clean:
-	dh_clean
-	-rm -f tests/test-check-pyflakes.t
-
 mercurial/__version__.py:
 	@echo "$@ is missing (you probably call 'make clean' directly)."
 	@echo "Restore it from sources before building the package"

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/control	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/control	2014-10-19 16:36:12 UTC (rev 11448)
@@ -1,5 +1,6 @@
 Tests: testsuite
-Depends: @, zip, unzip, netbase, python-subversion, monotone, cvs, bzr, tla, darcs
+Depends: @, zip, unzip, netbase, python-subversion, monotone, cvs, bzr, tla, gcc, python2.7-dev
+Restrictions: allow-stderr
 
 Tests: hgsubversion
 Depends: @, hgsubversion

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion	2014-10-19 16:36:12 UTC (rev 11448)
@@ -1,3 +1,48 @@
 #!/bin/sh
 
-exec hg --config extensions.hgsubversion= clone svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
+# This actually tests that hgsubversion is not broken and it really
+# belongs in the hgsubversion package (it's there).  I'm copying it
+# here because that way I can test if a new version of mercurial
+# breaks hgsubversion and update Breaks accordingly.  There's probably
+# a better way of doing this.
+
+set -e
+
+SVN_ROOT=$(mktemp --tmpdir -d hgsubversion.XXXXX)
+mkdir -p $SVN_ROOT
+
+PID_FILE=/tmp/svnmock.pid
+
+# Create a local svn server with an empty repo
+svnadmin create $SVN_ROOT/celesteville
+cat > $SVN_ROOT/celesteville/conf/svnserve.conf << EOF
+[general]
+anon-access = write
+EOF
+svnserve -d --pid-file $PID_FILE -r $SVN_ROOT
+
+# Put some content in the repository
+svn co svn://127.0.0.1/celesteville
+cd celesteville
+mkdir trunk tags branches
+svn add trunk tags branches
+svn commit -m "Initial commit"
+echo Cornelius > trunk/people
+svn add trunk/people
+svn commit -m "Add people"
+cd ..
+rm -r celesteville
+
+# Now test hgsubversion
+hg --config extensions.hgsubversion= clone svn://127.0.0.1/celesteville
+cd celesteville
+echo Arthur >> people
+hg commit -u "Babar <babar at jungle.org>" -m "Add more people"
+hg --config extensions.hgsubversion= push
+cd ..
+
+# Kill the server and cleanup
+kill $(cat $PID_FILE)
+rm -r $SVN_ROOT
+
+rm -r celesteville

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git	2014-10-19 16:36:12 UTC (rev 11448)
@@ -1,10 +1,16 @@
 #!/bin/sh
 
+# Basic test to see if the mercurial-git extension still works.
+
+# Setup a git repository with some content
 git init try
 cd try
+git config user.name Babar
 git config user.email babar at jungle.org
 echo a >a
 git add a
 git commit -m a
 cd ..
+
+# Now try to clone it with mercurial-git
 exec hg --config extensions.git= clone try try2

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/testsuite
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/testsuite	2014-10-16 21:22:27 UTC (rev 11447)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/testsuite	2014-10-19 16:36:12 UTC (rev 11448)
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-exec make tests TESTFLAGS="--with-hg=/usr/bin/hg"
+set -e
+
+# Blacklist patchbomb (see http://bz.selenic.com/show_bug.cgi?id=4188)
+BLACKLISTED=$(mktemp --tmpdir mercurial_testsuite_blacklist.XXXXXXXX)
+echo test-patchbomb.t > $BLACKLISTED
+
+exec make tests TESTFLAGS="--with-hg=/usr/bin/hg --blacklist=$BLACKLISTED"

More information about the Python-apps-commits mailing list