[Python-apps-commits] r10305 - in packages/mercurial/trunk/debian/patches (3 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Thu Jan 2 15:18:02 UTC 2014
Date: Thursday, January 2, 2014 @ 15:18:01
Author: vicho
Revision: 10305
Refresh patches
Modified:
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
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2014-01-02 15:17:59 UTC (rev 10304)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2014-01-02 15:18:01 UTC (rev 10305)
@@ -116,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -236,16 +237,19 @@ class svn_source(converter_source):
+@@ -237,16 +238,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 = {}
-@@ -1024,6 +1028,8 @@ class svn_sink(converter_sink, commandli
+@@ -1025,6 +1029,8 @@ class svn_sink(converter_sink, commandli
return self.join('hg-authormap')
def __init__(self, ui, 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-01-02 15:17:59 UTC (rev 10304)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch 2014-01-02 15:18:01 UTC (rev 10305)
@@ -4,7 +4,7 @@
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
-@@ -373,7 +373,7 @@ funcs = {
+@@ -375,7 +375,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-01-02 15:17:59 UTC (rev 10304)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2014-01-02 15:18:01 UTC (rev 10305)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -2091,8 +2091,8 @@ def debuginstall(ui):
+@@ -2095,8 +2095,8 @@ def debuginstall(ui):
editor = ui.geteditor()
cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
if not cmdpath:
@@ -170,7 +170,7 @@
msgid ""
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -11950,8 +11950,8 @@ msgstr " (ãã³ãã¬ã¼ãã®ã¤ã³ã¹
+@@ -11954,8 +11954,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"
-@@ -18513,11 +18513,12 @@ msgstr ""
+@@ -18499,11 +18499,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -196,7 +196,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -19675,7 +19676,7 @@ msgid ""
+@@ -19662,7 +19663,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"
-@@ -19683,7 +19684,7 @@ msgstr ""
+@@ -19670,7 +19671,7 @@ msgstr ""
" ããã§ä½¿ç¨ãããã¨ãã£ã¿ã¯ã HGEDITORã VISUAL\n"
" ããã㯠EDITOR ç°å¢å¤æ°ã«è¨å®ããããã®ã(ãã®é åºã§)使ç¨ãã¾ãã\n"
" æåã®ç©ºã§ç¡ãå¤ã«è¨å®ãããç°å¢å¤æ°ã®å¤ã使ç¨ãã¾ãã\n"
@@ -216,7 +216,7 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -12119,10 +12119,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12122,10 +12122,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 ""
-@@ -18854,10 +18854,12 @@ msgstr ""
+@@ -18837,10 +18837,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -244,7 +244,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -20047,7 +20049,7 @@ msgid ""
+@@ -20030,7 +20032,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"
-@@ -20055,7 +20057,7 @@ msgstr ""
+@@ -20038,7 +20040,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"
More information about the Python-apps-commits
mailing list