[Python-apps-commits] r11895 - in packages/mercurial/trunk/debian/patches (1 file)

[vicho at users.alioth.debian.org]

    Date: Saturday, May 2, 2015 @ 08:15:26
  Author: vicho
Revision: 11895

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-05-02 08:15:24 UTC (rev 11894)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-05-02 08:15:26 UTC (rev 11895)
@@ -13,8 +13,8 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2372,8 +2372,8 @@ def debuginstall(ui):
-     editor = ui.geteditor()
+@@ -2373,8 +2373,8 @@ def debuginstall(ui):
+     editor = util.expandpath(editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
 -        if editor == 'vi':
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -869,7 +869,7 @@ class ui(object):
+@@ -879,7 +879,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12331,8 +12331,8 @@ msgstr " (テンプレートのインス
+@@ -12461,8 +12461,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"
-@@ -19627,11 +19627,12 @@ msgstr ""
+@@ -19998,11 +19998,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20840,7 +20841,7 @@ msgid ""
+@@ -21221,7 +21222,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"
-@@ -20848,7 +20849,7 @@ msgstr ""
+@@ -21229,7 +21230,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12532,10 +12532,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12653,10 +12653,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 ""
-@@ -20025,10 +20025,12 @@ msgstr ""
+@@ -20393,10 +20393,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -21272,7 +21274,7 @@ msgid ""
+@@ -21647,7 +21649,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"
-@@ -21280,7 +21282,7 @@ msgstr ""
+@@ -21655,7 +21657,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"