rpms/tailor/F-10 tailor-0.9.35-mercurial-1.1-compat.patch, NONE, 1.1 tailor.spec, 1.10, 1.11

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/tailor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30365

Modified Files:
	tailor.spec 
Added Files:
	tailor-0.9.35-mercurial-1.1-compat.patch 
Log Message:
* Fri Dec 19 2008 Dan Horák <dan[at]danny.cz> 0.9.35-3
- add patch for compatibility with mercurial 1.1 by Daniel P. Berrange (Resolves: #477148)


tailor-0.9.35-mercurial-1.1-compat.patch:

--- NEW FILE tailor-0.9.35-mercurial-1.1-compat.patch ---
diff -rup tailor-0.9.35.old/vcpx/repository/hg.py tailor-0.9.35.new/vcpx/repository/hg.py
--- tailor-0.9.35.old/vcpx/repository/hg.py	2008-06-02 13:14:41.000000000 +0100
+++ tailor-0.9.35.new/vcpx/repository/hg.py	2008-12-19 11:58:51.000000000 +0000
@@ -343,9 +343,12 @@ class HgWorkingDir(UpdatableSourceWorkin
             if cmdutil.findcmd.func_code.co_argcount == 2:     # 0.9.4
                 def findcmd(cmd):
                     return cmdutil.findcmd(self._getUI(), cmd)
-            elif cmdutil.findcmd.func_code.co_argcount == 3:   # 0.9.5
+            elif cmdutil.findcmd.func_code.co_argcount == 3: #  >= 0.9.5
                 def findcmd(cmd):
-                    return cmdutil.findcmd(self._getUI(), cmd, commands.table)
+                    if cmdutil.findcmd.func_code.co_varnames[0] == "ui": # < 1.1.0
+                        return cmdutil.findcmd(self._getUI(), cmd, commands.table)
+                    else: # >= 1.1.0
+                        return cmdutil.findcmd(cmd, commands.table)
         elif hasattr(commands, 'findcmd'):         # < 0.9.4
             if commands.findcmd.func_code.co_argcount == 1:
                 findcmd = commands.findcmd
Only in tailor-0.9.35.new/vcpx/repository: hg.py~


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-10/tailor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tailor.spec	6 Sep 2008 10:10:54 -0000	1.10
+++ tailor.spec	19 Dec 2008 12:40:02 -0000	1.11
@@ -3,7 +3,7 @@
 Summary:	A tool to migrate changesets between several version control systems
 Name:		tailor
 Version:	0.9.35
-Release:	1%{?dist}
+Release:	3%{?dist}
 Source0:	http://darcs.arstecnica.it/%{name}-%{version}.tar.gz
 License:	GPLv3+
 Group:		Development/Tools
@@ -13,6 +13,8 @@
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
 Patch0:		tailor-test.patch
+# http://progetti.arstecnica.it/tailor/ticket/172
+Patch1:		tailor-0.9.35-mercurial-1.1-compat.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,
@@ -36,6 +38,7 @@
 %prep
 %setup -q 
 %patch0
+%patch1 -p1 -b .hg-1.1
 
 # remove the shebang line
 sed -i -e '1d' vcpx/repository/p4/p4lib.py
@@ -64,6 +67,12 @@
 
 
 %changelog
+* Fri Dec 19 2008 Dan Horák <dan[at]danny.cz> 0.9.35-3
+- add patch for compatibility with mercurial 1.1 by Daniel P. Berrange (Resolves: #477148)
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9.35-2
+- Rebuild for Python 2.6
+
 * Sat Jun  7 2008 Dan Horák <dan[at]danny.cz> 0.9.35-1
 - update to upstream version 0.9.35