[Python-apps-commits] r7353 - in packages/mercurial/trunk/debian/patches (6 files)
vicho-guest at users.alioth.debian.org
vicho-guest at users.alioth.debian.org
Sun Jul 24 08:18:20 UTC 2011
Date: Sunday, July 24, 2011 @ 08:18:19
Author: vicho-guest
Revision: 7353
Refresh patches
Modified:
packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
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__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2011-07-24 08:18:04 UTC (rev 7352)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2011-07-24 08:18:19 UTC (rev 7353)
@@ -12,12 +12,13 @@
--- a/setup.py
+++ b/setup.py
-@@ -315,7 +315,7 @@
+@@ -337,8 +337,7 @@
cmdclass = {'build_mo': hgbuildmo,
'build_ext': hgbuildext,
'build_py': hgbuildpy,
+- 'build_hgextindex': buildhgextindex,
- 'install_scripts': hginstallscripts}
-+ }
++ 'build_hgextindex': buildhgextindex}
- packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert',
- 'hgext.highlight', 'hgext.zeroconf']
+ packages = ['mercurial', 'mercurial.hgweb',
+ 'mercurial.httpclient', 'mercurial.httpclient.tests',
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2011-07-24 08:18:04 UTC (rev 7352)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2011-07-24 08:18:19 UTC (rev 7353)
@@ -2,7 +2,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -349,8 +349,7 @@
+@@ -379,8 +379,7 @@
extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
@@ -14,7 +14,7 @@
return p and p[0] != '.' and p[-1] != '~'
--- a/mercurial/help.py
+++ b/mercurial/help.py
-@@ -73,9 +73,11 @@
+@@ -37,9 +37,11 @@
module = __file__
base = os.path.dirname(module)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2011-07-24 08:18:04 UTC (rev 7352)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2011-07-24 08:18:19 UTC (rev 7353)
@@ -12,7 +12,7 @@
break
--- a/setup.py
+++ b/setup.py
-@@ -349,7 +349,7 @@
+@@ -379,7 +379,7 @@
extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2011-07-24 08:18:04 UTC (rev 7352)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2011-07-24 08:18:19 UTC (rev 7353)
@@ -2,7 +2,7 @@
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
-@@ -194,7 +194,7 @@
+@@ -193,7 +193,7 @@
# template engine
@@ -13,7 +13,7 @@
def _flatten(thing):
--- a/setup.py
+++ b/setup.py
-@@ -355,14 +355,6 @@
+@@ -385,14 +385,6 @@
def ordinarypath(p):
return p and p[0] != '.' and p[-1] != '~'
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2011-07-24 08:18:04 UTC (rev 7352)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2011-07-24 08:18:19 UTC (rev 7353)
@@ -2,16 +2,16 @@
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
-@@ -423,7 +423,8 @@
- global MySQLdb
- MySQLdb = mysql
- except ImportError, err:
-- raise util.Abort(_('python mysql support not available: %s') % err)
-+ raise util.Abort(_('python mysql support not available: %s') % err +
-+ _(' (try installing the %s package)') % 'python-mysqldb')
+@@ -316,7 +316,8 @@
+ import MySQLdb as mysql
+ bzmysql._MySQLdb = mysql
+ except ImportError, err:
+- raise util.Abort(_('python mysql support not available: %s') % err)
++ raise util.Abort(_('python mysql support not available: %s') % err +
++ _(' (try installing the %s package)') % 'python-mysqldb')
- if node is None:
- raise util.Abort(_('hook type %s does not pass a changeset id') %
+ bzaccess.__init__(self, ui)
+
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -44,7 +44,8 @@
@@ -33,7 +33,7 @@
-def checktool(exe, name=None, abort=True):
+def checktool(exe, name=None, abort=True, debname=None):
name = name or exe
- if not util.find_exe(exe):
+ if not util.findexe(exe):
exc = abort and util.Abort or MissingTool
- raise exc(_('cannot find required "%s" tool') % name)
+ raise exc(_('cannot find required "%s" tool') % name +
@@ -74,7 +74,7 @@
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
-@@ -44,7 +44,7 @@
+@@ -52,7 +52,7 @@
if not os.path.exists(path + "/objects"):
raise NoRepo(_("%s does not look like a Git repository") % path)
@@ -86,7 +86,7 @@
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
@@ -42,7 +42,8 @@
- if util.find_exe('tla'):
+ if util.findexe('tla'):
self.execmd = 'tla'
else:
- raise util.Abort(_('cannot find a GNU Arch tool'))
@@ -97,15 +97,15 @@
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
-@@ -62,7 +62,7 @@
+@@ -66,7 +66,7 @@
self.files = None
self.dirs = None
- checktool('mtn', abort=False)
+ checktool('mtn', abort=False, debname='monotone')
- # test if there are any revisions
- self.rev = None
+ def mtnrun(self, *args, **kwargs):
+ if self.automatestdio:
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -21,6 +21,7 @@
@@ -116,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -210,16 +211,19 @@
+@@ -219,16 +220,19 @@
raise NoRepo(_("%s does not look like a Subversion repository")
% url)
if svn is None:
@@ -139,18 +139,18 @@
self.lastrevs = {}
-@@ -963,6 +967,8 @@
+@@ -966,6 +970,8 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
+ checktool('svn', debname='subversion')
+ checktool('svnadmin', debname='subversion')
- if svn is None:
- raise MissingTool(_('Could not load Subversion python bindings'))
+ converter_sink.__init__(self, ui, path)
+ commandline.__init__(self, ui, 'svn')
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
-@@ -184,7 +184,8 @@
+@@ -194,7 +194,8 @@
import OpenSSL
OpenSSL.SSL.Context
except ImportError:
@@ -160,7 +160,7 @@
ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
ctx.use_privatekey_file(ssl_cert)
ctx.use_certificate_file(ssl_cert)
-@@ -225,7 +226,8 @@
+@@ -235,7 +236,8 @@
import ssl
ssl.wrap_socket
except ImportError:
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2011-07-24 08:18:04 UTC (rev 7352)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2011-07-24 08:18:19 UTC (rev 7353)
@@ -1,17 +1,5 @@
Use sensible-editor as default instead of vi.
---- a/doc/hgrc.5.txt
-+++ b/doc/hgrc.5.txt
-@@ -891,7 +891,8 @@
- ``debug``
- Print debugging information. True or False. Default is False.
- ``editor``
-- The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
-+ The editor to use during a commit. Default is ``$EDITOR`` or
-+ ``sensible-editor``.
- ``fallbackencoding``
- Encoding to try if it's not possible to decode the changelog using
- UTF-8. Default is ISO-8859-1.
--- a/hgeditor
+++ b/hgeditor
@@ -7,7 +7,7 @@
@@ -25,9 +13,9 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -1501,8 +1501,8 @@
+@@ -1776,8 +1776,8 @@
editor = ui.geteditor()
- cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
+ cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
if not cmdpath:
- if editor == 'vi':
- ui.write(_(" No commit editor set and can't find vi in PATH\n"))
@@ -38,7 +26,7 @@
else:
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -580,7 +580,7 @@
+@@ -656,7 +656,7 @@
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
@@ -49,7 +37,7 @@
'''show a progress message
--- a/i18n/da.po
+++ b/i18n/da.po
-@@ -7437,7 +7437,7 @@
+@@ -7706,7 +7706,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -58,7 +46,7 @@
msgstr ""
msgid " (specify a commit editor in your configuration file)\n"
-@@ -10749,7 +10749,7 @@
+@@ -11058,7 +11058,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"
@@ -162,7 +150,7 @@
msgid ""
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -7698,8 +7698,8 @@
+@@ -8354,8 +8354,8 @@
msgid "Checking commit editor...\n"
msgstr "メッセージ入力用エディタã®æ¤œè¨¼ä¸...\n"
@@ -173,7 +161,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (コミットメッセージ用エディタをè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -11339,7 +11339,7 @@
+@@ -13783,7 +13783,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"
@@ -182,7 +170,7 @@
msgstr ""
"EDITOR\n"
" コミット時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ エディタã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€\n"
-@@ -11347,7 +11347,7 @@
+@@ -13791,7 +13791,7 @@
" ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€ HGEDITOR〠VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚\n"
@@ -193,7 +181,7 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -8490,8 +8490,8 @@
+@@ -9254,8 +9254,8 @@
msgid "Checking commit editor...\n"
msgstr "Verificando editor para consolidação...\n"
@@ -204,7 +192,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"
-@@ -12177,7 +12177,7 @@
+@@ -15758,7 +15758,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"
@@ -213,7 +201,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -12185,7 +12185,7 @@
+@@ -15766,7 +15766,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"
@@ -224,7 +212,7 @@
"PYTHONPATH\n"
--- a/i18n/sv.po
+++ b/i18n/sv.po
-@@ -7188,7 +7188,7 @@
+@@ -7868,7 +7868,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -233,7 +221,7 @@
msgstr ""
msgid " (specify a commit editor in your configuration file)\n"
-@@ -10683,7 +10683,7 @@
+@@ -13095,7 +13095,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"
@@ -286,7 +274,7 @@
msgid ""
--- a/mercurial/help/environment.txt
+++ b/mercurial/help/environment.txt
-@@ -86,7 +86,7 @@
+@@ -94,7 +94,7 @@
editor it uses is determined by looking at the environment
variables HGEDITOR, VISUAL and EDITOR, in that order. The first
non-empty one is chosen. If all of them are empty, the editor
@@ -295,3 +283,48 @@
PYTHONPATH
This is used by Python to find imported modules and may need to be
+--- a/doc/hg.1
++++ b/doc/hg.1
+@@ -3278,7 +3278,7 @@
+ editor it uses is determined by looking at the environment
+ variables HGEDITOR, VISUAL and EDITOR, in that order. The first
+ non\-empty one is chosen. If all of them are empty, the editor
+-defaults to \(aqvi\(aq.
++defaults to \(aqsensible-editor\(aq.
+ .TP
+ .B PYTHONPATH
+ .
+--- a/doc/hg.1.html
++++ b/doc/hg.1.html
+@@ -2697,7 +2697,7 @@
+ editor it uses is determined by looking at the environment
+ variables HGEDITOR, VISUAL and EDITOR, in that order. The first
+ non-empty one is chosen. If all of them are empty, the editor
+-defaults to 'vi'.</dd>
++defaults to 'sensible-editor'.</dd>
+ <dt>PYTHONPATH</dt>
+ <dd>This is used by Python to find imported modules and may need to be
+ set appropriately if this Mercurial is not installed system-wide.</dd>
+--- a/doc/hgrc.5
++++ b/doc/hgrc.5
+@@ -1252,7 +1252,8 @@
+ .TP
+ .B \fBeditor\fP
+ .sp
+-The editor to use during a commit. Default is \fB$EDITOR\fP or \fBvi\fP.
++The editor to use during a commit. Default is \fB$EDITOR\fP or
++\fBsensible-editor\fP.
+ .TP
+ .B \fBfallbackencoding\fP
+ .sp
+--- a/doc/hgrc.5.html
++++ b/doc/hgrc.5.html
+@@ -975,7 +975,7 @@
+ <dt><tt class="docutils literal">debug</tt></dt>
+ <dd>Print debugging information. True or False. Default is False.</dd>
+ <dt><tt class="docutils literal">editor</tt></dt>
+-<dd>The editor to use during a commit. Default is <tt class="docutils literal">$EDITOR</tt> or <tt class="docutils literal">vi</tt>.</dd>
++<dd>The editor to use during a commit. Default is <tt class="docutils literal">$EDITOR</tt> or <tt class="docutils literal">sensible-editor</tt>.</dd>
+ <dt><tt class="docutils literal">fallbackencoding</tt></dt>
+ <dd>Encoding to try if it's not possible to decode the changelog using
+ UTF-8. Default is ISO-8859-1.</dd>
More information about the Python-apps-commits
mailing list