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

[vicho-guest at users.alioth.debian.org]

    Date: Monday, October 4, 2010 @ 12:36:43
  Author: vicho-guest
Revision: 6163

refreshed patches

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

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-10-04 12:36:29 UTC (rev 6162)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-10-04 12:36:43 UTC (rev 6163)
@@ -54,7 +54,7 @@
          self.files = {}
 --- a/hgext/convert/darcs.py
 +++ b/hgext/convert/darcs.py
-@@ -39,14 +39,15 @@
+@@ -36,14 +36,15 @@
          if not os.path.exists(os.path.join(path, '_darcs')):
              raise NoRepo(_("%s does not look like a darcs repository") % path)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-10-04 12:36:29 UTC (rev 6162)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-10-04 12:36:43 UTC (rev 6163)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -832,7 +832,8 @@
+@@ -831,7 +831,8 @@
  ``debug``
      Print debugging information. True or False. Default is False.
  ``editor``
@@ -25,7 +25,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1355,8 +1355,8 @@
+@@ -1356,8 +1356,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -33,9 +33,9 @@
 -            ui.write(_(" No commit editor set and can't find vi in PATH\n"))
 +        if editor == 'sensible-editor':
 +            ui.write(_(" No commit editor set and can't find sensible-editor in PATH\n"))
-             ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
+             ui.write(_(" (specify a commit editor in your configuration"
+                        " file)\n"))
          else:
-             ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
 @@ -559,7 +559,7 @@
@@ -131,16 +131,7 @@
  msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/it.po
 +++ b/i18n/it.po
-@@ -217,7 +217,7 @@
- "    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"
--"    defaults to 'vi'."
-+"    defaults to 'sensible-editor'."
- msgstr ""
- 
- msgid ""
-@@ -6210,8 +6210,8 @@
+@@ -6842,8 +6842,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Sto controllando l'editor per il commit...\n"
  
@@ -151,9 +142,18 @@
  
  msgid " (specify a commit editor in your .hgrc file)\n"
  msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n"
+@@ -10271,7 +10271,7 @@
+ "    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"
+-"    defaults to 'vi'."
++"    defaults to 'sensible-editor'."
+ msgstr ""
+ 
+ msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -7364,8 +7364,8 @@
+@@ -7414,8 +7414,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -162,9 +162,9 @@
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n"
  
- msgid " (specify a commit editor in your .hgrc file)\n"
+ msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -10735,14 +10735,14 @@
+@@ -10847,14 +10847,14 @@
  "    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"
@@ -183,7 +183,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -8196,8 +8196,8 @@
+@@ -8236,8 +8236,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -192,9 +192,9 @@
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " Nenhum editor para consolidação configurado, e não foi possível encontrar 'sensible-editor' no PATH\n"
  
- msgid " (specify a commit editor in your .hgrc file)\n"
- msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n"
-@@ -11652,7 +11652,7 @@
+ msgid " (specify a commit editor in your configuration file)\n"
+ msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n"
+@@ -11716,7 +11716,7 @@
  "    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"
@@ -203,7 +203,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -11660,7 +11660,7 @@
+@@ -11724,7 +11724,7 @@
  "    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"