[Python-apps-commits] r4102 - in packages/mercurial/trunk/debian (7 files)
vt-guest at users.alioth.debian.org
vt-guest at users.alioth.debian.org
Wed Nov 11 03:23:19 UTC 2009
Date: Wednesday, November 11, 2009 @ 03:23:18
Author: vt-guest
Revision: 4102
mercurial: rebase our patches against mercurial dec177286deb
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.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
packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/changelog 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,9 +1,10 @@
-mercurial (1.3.1-2) UNRELEASED; urgency=low
+mercurial (1.4-1~hg) UNRELEASED; urgency=low
+ * New upstream release.
* adjust quilt dependency so that it works with backports
(ie quilt >> 0.46-6 instead of quilt >= 0.46-7)
- -- Vincent Danjean <vdanjean at debian.org> Tue, 18 Aug 2009 12:44:51 +0200
+ -- Vernon Tang <vt at foilhead.net> Wed, 11 Nov 2009 14:18:36 +1100
mercurial (1.3.1-1) unstable; urgency=low
Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,15 +1,14 @@
Set default hgk path for hgk outside bin.
-Index: mercurial-1.1.2/hgext/hgk.py
-===================================================================
---- mercurial-1.1.2.orig/hgext/hgk.py
-+++ mercurial-1.1.2/hgext/hgk.py
-@@ -318,7 +318,7 @@
+diff -r 5d6bd2f5ea7e hgext/hgk.py
+--- a/hgext/hgk.py
++++ b/hgext/hgk.py
+@@ -307,7 +307,7 @@
"start interactive history viewer"
os.chdir(repo.root)
optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
- cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
+ cmd = ui.config("hgk", "path", "/usr/share/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
- ui.debug(_("running %s\n") % cmd)
+ ui.debug("running %s\n" % cmd)
util.system(cmd)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,6 +1,6 @@
Support installation of templates handled by mercurial-common.install.
-diff -r b042642c1393 mercurial/templater.py
+diff -r 55fb3b7436b4 mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -9,7 +9,7 @@
@@ -12,15 +12,15 @@
stringify = templatefilters.stringify
def parsestring(s, quoted=True):
-diff -r b042642c1393 setup.py
+diff -r 55fb3b7436b4 setup.py
--- a/setup.py
+++ b/setup.py
-@@ -246,7 +246,7 @@
+@@ -254,7 +254,7 @@
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
datafiles = []
--for root in ('templates',):
-+for root in ():
+-for root in ('templates', 'help'):
++for root in ('help'):
for dir, dirs, files in os.walk(root):
- datafiles.append((os.path.join('mercurial', dir),
- [os.path.join(dir, file_) for file_ in files]))
+ dirs[:] = [x for x in dirs if not x.startswith('.')]
+ files = [x for x in files if not x.startswith('.')]
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,9 +1,9 @@
Suggest Debian packages for some optional dependencies.
-diff -r 06d10c5c850e hgext/bugzilla.py
+diff -r d29c8b10d01f hgext/bugzilla.py
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
-@@ -308,7 +308,8 @@
+@@ -421,7 +421,8 @@
global MySQLdb
MySQLdb = mysql
except ImportError, err:
@@ -13,10 +13,10 @@
if node is None:
raise util.Abort(_('hook type %s does not pass a changeset id') %
-diff -r 06d10c5c850e hgext/convert/bzr.py
+diff -r d29c8b10d01f hgext/convert/bzr.py
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
-@@ -31,7 +31,8 @@
+@@ -42,7 +42,8 @@
# access bzrlib stuff
branch
except NameError:
@@ -24,12 +24,12 @@
+ raise NoRepo('Bazaar modules could not be loaded' +
+ _(' (try installing the %s package)') % 'bzr')
- if not os.path.exists(os.path.join(path, '.bzr')):
- raise NoRepo('%s does not look like a Bazaar repo' % path)
-diff -r 06d10c5c850e hgext/convert/common.py
+ path = os.path.abspath(path)
+ self._checkrepotype(path)
+diff -r d29c8b10d01f hgext/convert/common.py
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
-@@ -20,11 +20,12 @@
+@@ -26,11 +26,12 @@
class MissingTool(Exception): pass
@@ -44,39 +44,43 @@
class NoRepo(Exception): pass
-diff -r 06d10c5c850e hgext/convert/cvs.py
+diff -r d29c8b10d01f hgext/convert/cvs.py
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
-@@ -16,7 +16,7 @@
+@@ -21,7 +21,7 @@
if not os.path.exists(cvs):
raise NoRepo("%s does not look like a CVS checkout" % path)
- checktool('cvs')
+ checktool('cvs', debname='cvs')
- self.cmd = ui.config('convert', 'cvsps', 'builtin')
- cvspsexe = self.cmd.split(None, 1)[0]
- self.builtin = cvspsexe == 'builtin'
-diff -r 06d10c5c850e hgext/convert/darcs.py
+
+ self.changeset = None
+ self.files = {}
+diff -r d29c8b10d01f hgext/convert/darcs.py
--- a/hgext/convert/darcs.py
+++ b/hgext/convert/darcs.py
-@@ -27,10 +27,11 @@
+@@ -35,14 +35,15 @@
if not os.path.exists(os.path.join(path, '_darcs')):
raise NoRepo("%s does not look like a darcs repo" % path)
- checktool('darcs')
+ checktool('darcs', debname='darcs')
+ version = self.run0('--version').splitlines()[0].strip()
+ if version < '2.1':
+ raise util.Abort(_('darcs version 2.1 or newer needed (found %r)') %
+ version)
if ElementTree is None:
- raise util.Abort(_("Python ElementTree module is not available"))
+ raise util.Abort(_("Python ElementTree module is not available") +
+ _(" (try installing the %s package)") % 'python-celementtree')
- if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
- raise NoRepo("%s does not look like a darcs repo" % path)
-diff -r 06d10c5c850e hgext/convert/git.py
+ self.path = os.path.realpath(path)
+
+diff -r d29c8b10d01f hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
-@@ -32,7 +32,7 @@
+@@ -37,7 +37,7 @@
if not os.path.exists(path + "/objects"):
raise NoRepo("%s does not look like a Git repo" % path)
@@ -85,10 +89,10 @@
self.path = path
-diff -r 06d10c5c850e hgext/convert/gnuarch.py
+diff -r d29c8b10d01f hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
-@@ -33,7 +33,8 @@
+@@ -41,7 +41,8 @@
if util.find_exe('tla'):
self.execmd = 'tla'
else:
@@ -98,22 +102,22 @@
commandline.__init__(self, ui, self.execmd)
-diff -r 06d10c5c850e hgext/convert/monotone.py
+diff -r d29c8b10d01f hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
-@@ -43,7 +43,7 @@
- if not os.path.exists(path):
- raise norepo
+@@ -55,7 +55,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
-diff -r 06d10c5c850e hgext/convert/subversion.py
+diff -r d29c8b10d01f hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
-@@ -34,6 +34,7 @@
+@@ -20,6 +20,7 @@
from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
from common import commandline, converter_source, converter_sink, mapfile
@@ -121,7 +125,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -155,16 +156,19 @@
+@@ -197,16 +198,19 @@
try:
SubversionException
except NameError:
@@ -142,9 +146,9 @@
+ 'or later required') +
+ _(' (try upgrading the %s package)') % 'python-subversion')
- self.encoding = locale.getpreferredencoding()
self.lastrevs = {}
-@@ -960,6 +964,9 @@
+
+@@ -937,6 +941,9 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
@@ -154,10 +158,10 @@
converter_sink.__init__(self, ui, path)
commandline.__init__(self, ui, 'svn')
self.delete = []
-diff -r 06d10c5c850e mercurial/hgweb/server.py
+diff -r d29c8b10d01f mercurial/hgweb/server.py
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
-@@ -259,7 +259,8 @@
+@@ -260,7 +260,8 @@
from OpenSSL import SSL
ctx = SSL.Context(SSL.SSLv23_METHOD)
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 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,19 +1,19 @@
Use sensible-editor as default instead of vi.
-diff -r 84488c99c405 doc/hgrc.5.txt
+diff -r 88b335331ee3 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
-@@ -715,7 +715,8 @@
- debug;;
+@@ -745,7 +745,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;;
+ ``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.
-diff -r 84488c99c405 doc/ja/hg.1.ja.txt
+diff -r 88b335331ee3 doc/ja/hg.1.ja.txt
--- a/doc/ja/hg.1.ja.txt
+++ b/doc/ja/hg.1.ja.txt
@@ -813,7 +813,7 @@
@@ -25,7 +25,7 @@
PYTHONPATH::
ã“ã‚Œã¯ã‚¤ãƒ³ãƒãƒ¼ãƒˆã•ã‚Œã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’見ã¤ã‘ã‚‹ãŸã‚ã« Python ã«ã‚ˆã£
-diff -r 84488c99c405 doc/ja/hgrc.5.ja.txt
+diff -r 88b335331ee3 doc/ja/hgrc.5.ja.txt
--- a/doc/ja/hgrc.5.ja.txt
+++ b/doc/ja/hgrc.5.ja.txt
@@ -119,7 +119,7 @@
@@ -37,7 +37,19 @@
interactive;;
ユーザã«å¯¾ã—ã¦ãƒ—ãƒãƒ³ãƒ—トを出ã™ã‚ˆã†ã«ã—ã¾ã™ã€‚True ã‹ False ã‚’å–
ã‚Šã¾ã™ã€‚デフォルトã§ã¯ True ã§ã™ã€‚
-diff -r 84488c99c405 hgeditor
+diff -r 88b335331ee3 help/environment.txt
+--- a/help/environment.txt
++++ b/help/environment.txt
+@@ -69,7 +69,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'.
++ defaults to 'sensible-editor'.
+
+ PYTHONPATH
+ This is used by Python to find imported modules and may need to be
+diff -r 88b335331ee3 hgeditor
--- a/hgeditor
+++ b/hgeditor
@@ -7,7 +7,7 @@
@@ -49,10 +61,10 @@
;;
emacs)
EDITOR="$EDITOR -nw"
-diff -r 84488c99c405 mercurial/commands.py
+diff -r 88b335331ee3 mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -1005,8 +1005,8 @@
+@@ -1019,8 +1019,8 @@
editor = ui.geteditor()
cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
if not cmdpath:
@@ -63,24 +75,15 @@
ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
else:
ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
-diff -r 84488c99c405 mercurial/help.py
---- a/mercurial/help.py
-+++ b/mercurial/help.py
-@@ -252,7 +252,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'.
-+ defaults to 'sensible-editor'.
-
- PYTHONPATH::
- This is used by Python to find imported modules and may need to be
-diff -r 84488c99c405 mercurial/ui.py
+diff -r 88b335331ee3 mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -343,4 +343,4 @@
+@@ -350,7 +350,7 @@
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
- os.environ.get("EDITOR", "vi"))
+ os.environ.get("EDITOR", "sensible-editor"))
+
+ def progress(self, topic, pos, item="", unit="", total=None):
+ '''show a progress message
Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,6 +1,6 @@
Correct the documentation for the zeroconf extension.
-diff -r 151f1e65ad7b hgext/zeroconf/__init__.py
+diff -r eeca030c4639 hgext/zeroconf/__init__.py
--- a/hgext/zeroconf/__init__.py
+++ b/hgext/zeroconf/__init__.py
@@ -7,9 +7,9 @@
@@ -15,13 +15,13 @@
+the server's address.
To allow other people to discover your repository using run "hg serve"
- in your repository.
+ in your repository::
@@ -17,7 +17,7 @@
- $ cd test
- $ hg serve
+ $ cd test
+ $ hg serve
--You can discover zeroconf enabled repositories by running "hg paths".
-+You can discover Zeroconf-enabled repositories by running "hg paths".
+-You can discover zeroconf enabled repositories by running "hg paths"::
++You can discover Zeroconf-enabled repositories by running "hg paths"::
- $ hg paths
- zc-test = http://example.com:8000/test
+ $ hg paths
+ zc-test = http://example.com:8000/test
Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n 2009-11-10 22:32:16 UTC (rev 4101)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n 2009-11-11 03:23:18 UTC (rev 4102)
@@ -1,15 +1,15 @@
Don't install the i18n folder; it's pointless to do so since the compiled
translations are in the locale folder.
-diff -r 8c9d9d659637 setup.py
+diff -r 1390cfdeffab setup.py
--- a/setup.py
+++ b/setup.py
-@@ -222,7 +222,7 @@
- pass
+@@ -254,7 +254,7 @@
+ packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
datafiles = []
--for root in ('templates', 'i18n'):
-+for root in ('templates',):
+-for root in ('templates', 'i18n', 'help'):
++for root in ('templates', 'help'):
for dir, dirs, files in os.walk(root):
- datafiles.append((os.path.join('mercurial', dir),
- [os.path.join(dir, file_) for file_ in files]))
+ dirs[:] = [x for x in dirs if not x.startswith('.')]
+ files = [x for x in files if not x.startswith('.')]
More information about the Python-apps-commits
mailing list