[Python-apps-commits] r11095 - in packages/mercurial/trunk/debian/patches (6 files)

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sat Aug 2 10:13:23 UTC 2014 

    Date: Saturday, August 2, 2014 @ 10:13:22
  Author: vicho
Revision: 11095

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
  packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2014-08-02 10:06:22 UTC (rev 11094)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2014-08-02 10:13:22 UTC (rev 11095)
@@ -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/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2014-08-02 10:06:22 UTC (rev 11094)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2014-08-02 10:13:22 UTC (rev 11095)
@@ -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)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-08-02 10:06:22 UTC (rev 11094)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-08-02 10:13:22 UTC (rev 11095)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -496,7 +496,7 @@ funcs = {
+@@ -530,7 +530,7 @@ funcs = {
  
  # template engine
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-08-02 10:06:22 UTC (rev 11094)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-08-02 10:13:22 UTC (rev 11095)
@@ -13,9 +13,9 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2212,8 +2212,8 @@ def debuginstall(ui):
+@@ -2249,8 +2249,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"))
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11984,8 +11984,8 @@ msgstr " (テンプレートのインス
+@@ -12012,8 +12012,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"
-@@ -18609,11 +18609,12 @@ msgstr ""
+@@ -18886,11 +18886,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19772,7 +19773,7 @@ msgid ""
+@@ -20093,7 +20094,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"
-@@ -19780,7 +19781,7 @@ msgstr ""
+@@ -20101,7 +20102,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12162,10 +12162,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12199,10 +12199,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 ""
-@@ -18963,10 +18963,12 @@ msgstr ""
+@@ -19251,10 +19251,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20156,7 +20158,7 @@ msgid ""
+@@ -20489,7 +20491,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"
-@@ -20164,7 +20166,7 @@ msgstr ""
+@@ -20497,7 +20499,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"
@@ -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
-@@ -1178,7 +1178,8 @@ User interface controls.
+@@ -1247,7 +1247,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

Modified: packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-08-02 10:06:22 UTC (rev 11094)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-08-02 10:13:22 UTC (rev 11095)
@@ -9,12 +9,12 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -440,7 +440,7 @@ def usecorrectpython():
-              sys.executable)
-         mypython = os.path.join(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:
+@@ -1632,7 +1632,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/trunk/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2014-08-02 10:06:22 UTC (rev 11094)
+++ packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch	2014-08-02 10:13:22 UTC (rev 11095)
@@ -7,7 +7,7 @@
 
 --- a/tests/test-shelve.t
 +++ b/tests/test-shelve.t
-@@ -77,11 +77,11 @@ the common case - no options or filename
+@@ -79,11 +79,11 @@ the common case - no options or filename
  ensure that our shelved changes exist
  
    $ hg shelve -l

More information about the Python-apps-commits mailing list