[Python-apps-commits] r2177 - in packages/mercurial/branches/1.1-vt/debian/patches (2 files)
vt-guest at users.alioth.debian.org
vt-guest at users.alioth.debian.org
Thu Jan 8 03:35:36 UTC 2009
Date: Thursday, January 8, 2009 @ 03:35:35
Author: vt-guest
Revision: 2177
Fix a forgotten import in deb_specific__optional-dependencies patch and remove dates from patches
Modified:
packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies
packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc
Modified: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies 2009-01-08 03:05:30 UTC (rev 2176)
+++ packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies 2009-01-08 03:35:35 UTC (rev 2177)
@@ -1,8 +1,8 @@
Suggest Debian packages for some optional dependencies.
-diff -r eadf8bc60966 hgext/bugzilla.py
---- a/hgext/bugzilla.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/bugzilla.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/bugzilla.py
+--- a/hgext/bugzilla.py
++++ b/hgext/bugzilla.py
@@ -308,7 +308,8 @@
global MySQLdb
MySQLdb = mysql
@@ -13,9 +13,9 @@
if node is None:
raise util.Abort(_('hook type %s does not pass a changeset id') %
-diff -r eadf8bc60966 hgext/convert/bzr.py
---- a/hgext/convert/bzr.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/bzr.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/convert/bzr.py
+--- a/hgext/convert/bzr.py
++++ b/hgext/convert/bzr.py
@@ -31,7 +31,8 @@
# access bzrlib stuff
branch
@@ -26,9 +26,9 @@
if not os.path.exists(os.path.join(path, '.bzr')):
raise NoRepo('%s does not look like a Bazaar repo' % path)
-diff -r eadf8bc60966 hgext/convert/common.py
---- a/hgext/convert/common.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/common.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/convert/common.py
+--- a/hgext/convert/common.py
++++ b/hgext/convert/common.py
@@ -20,11 +20,12 @@
class MissingTool(Exception): pass
@@ -44,9 +44,9 @@
class NoRepo(Exception): pass
-diff -r eadf8bc60966 hgext/convert/cvs.py
---- a/hgext/convert/cvs.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/cvs.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/convert/cvs.py
+--- a/hgext/convert/cvs.py
++++ b/hgext/convert/cvs.py
@@ -16,7 +16,7 @@
if not os.path.exists(cvs):
raise NoRepo("%s does not look like a CVS checkout" % path)
@@ -56,9 +56,9 @@
self.cmd = ui.config('convert', 'cvsps', 'builtin')
cvspsexe = self.cmd.split(None, 1)[0]
self.builtin = cvspsexe == 'builtin'
-diff -r eadf8bc60966 hgext/convert/darcs.py
---- a/hgext/convert/darcs.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/darcs.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/convert/darcs.py
+--- a/hgext/convert/darcs.py
++++ b/hgext/convert/darcs.py
@@ -30,7 +30,8 @@
checktool('darcs')
@@ -69,9 +69,9 @@
if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
raise NoRepo("%s does not look like a darcs repo" % path)
-diff -r eadf8bc60966 hgext/convert/git.py
---- a/hgext/convert/git.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/git.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/convert/git.py
+--- a/hgext/convert/git.py
++++ b/hgext/convert/git.py
@@ -32,7 +32,7 @@
if not os.path.exists(path + "/objects"):
raise NoRepo("%s does not look like a Git repo" % path)
@@ -81,9 +81,9 @@
self.path = path
-diff -r eadf8bc60966 hgext/convert/gnuarch.py
---- a/hgext/convert/gnuarch.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/gnuarch.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 hgext/convert/gnuarch.py
+--- a/hgext/convert/gnuarch.py
++++ b/hgext/convert/gnuarch.py
@@ -33,7 +33,8 @@
if util.find_exe('tla'):
self.execmd = 'tla'
@@ -94,9 +94,9 @@
commandline.__init__(self, ui, self.execmd)
-diff -r eadf8bc60966 hgext/convert/monotone.py
---- a/hgext/convert/monotone.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/monotone.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 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
@@ -106,10 +106,18 @@
# test if there are any revisions
self.rev = None
-diff -r eadf8bc60966 hgext/convert/subversion.py
---- a/hgext/convert/subversion.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/hgext/convert/subversion.py Thu Jan 08 09:14:25 2009 +0800
-@@ -155,16 +155,19 @@
+diff -r f371230d1cc1 hgext/convert/subversion.py
+--- a/hgext/convert/subversion.py
++++ b/hgext/convert/subversion.py
+@@ -34,6 +34,7 @@
+
+ from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
+ from common import commandline, converter_source, converter_sink, mapfile
++from common import checktool
+
+ try:
+ from svn.core import SubversionException, Pool
+@@ -155,16 +156,19 @@
try:
SubversionException
except NameError:
@@ -132,7 +140,7 @@
self.encoding = locale.getpreferredencoding()
self.lastrevs = {}
-@@ -960,6 +963,9 @@
+@@ -960,6 +964,9 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
@@ -142,9 +150,9 @@
converter_sink.__init__(self, ui, path)
commandline.__init__(self, ui, 'svn')
self.delete = []
-diff -r eadf8bc60966 mercurial/hgweb/server.py
---- a/mercurial/hgweb/server.py Thu Jan 08 07:45:45 2009 +0800
-+++ b/mercurial/hgweb/server.py Thu Jan 08 09:14:25 2009 +0800
+diff -r f371230d1cc1 mercurial/hgweb/server.py
+--- a/mercurial/hgweb/server.py
++++ b/mercurial/hgweb/server.py
@@ -259,7 +259,8 @@
from OpenSSL import SSL
ctx = SSL.Context(SSL.SSLv23_METHOD)
Modified: packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc 2009-01-08 03:05:30 UTC (rev 2176)
+++ packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc 2009-01-08 03:35:35 UTC (rev 2177)
@@ -1,8 +1,8 @@
Correct the documentation for the zeroconf extension.
-diff -r 487d967407ca hgext/zeroconf/__init__.py
---- a/hgext/zeroconf/__init__.py Mon Jan 05 20:48:48 2009 +0100
-+++ b/hgext/zeroconf/__init__.py Thu Jan 08 09:29:56 2009 +0800
+diff -r 15e292032969 hgext/zeroconf/__init__.py
+--- a/hgext/zeroconf/__init__.py
++++ b/hgext/zeroconf/__init__.py
@@ -6,11 +6,11 @@
# the GNU General Public License (version 2), incorporated herein by
# reference.
More information about the Python-apps-commits
mailing list