rpms/tailor/F-9 tailor-0.9.35-mercurial-1.1.2-delete.patch, NONE, 1.1 tailor.spec, 1.11, 1.12

[Dan Horák]

Author: sharkcz

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

Modified Files:
	tailor.spec 
Added Files:
	tailor-0.9.35-mercurial-1.1.2-delete.patch 
Log Message:
* Tue Jan  6 2009 Dan Horák <dan[at]danny.cz> 0.9.35-4
- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)


tailor-0.9.35-mercurial-1.1.2-delete.patch:

--- NEW FILE tailor-0.9.35-mercurial-1.1.2-delete.patch ---
--- tailor-0.9.35/vcpx/repository/hg.py.hg-1.1.2-delete	2009-01-06 09:14:38.000000000 +0100
+++ tailor-0.9.35/vcpx/repository/hg.py	2009-01-06 09:14:48.000000000 +0100
@@ -13,7 +13,7 @@ instead of thru the command line.
 
 __docformat__ = 'reStructuredText'
 
-from mercurial import ui, hg, cmdutil, commands
+from mercurial import ui, hg, cmdutil, commands, match
 
 from vcpx.repository import Repository
 from vcpx.source import UpdatableSourceWorkingDir
@@ -479,8 +479,11 @@ class HgWorkingDir(UpdatableSourceWorkin
         """
         from os.path import join, split
 
+        m = match.exact(self.repository.basedir,
+                        self.repository.basedir,
+                        [subdir])
         files = []
-        for src, path in self._getRepo().dirstate.walk([subdir]):
+        for path in self._getRepo().dirstate.walk(m, unknown=True, ignored=False):
             # If subdir is a plain file, just return
             if path == subdir:
                 return None


Index: tailor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tailor/F-9/tailor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tailor.spec	19 Dec 2008 12:41:52 -0000	1.11
+++ tailor.spec	6 Jan 2009 09:16:07 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	A tool to migrate changesets between several version control systems
 Name:		tailor
 Version:	0.9.35
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	http://darcs.arstecnica.it/%{name}-%{version}.tar.gz
 License:	GPLv3+
 Group:		Development/Tools
@@ -13,8 +13,11 @@
 Requires:	python-vcpx = %{version}-%{release}
 BuildArch:	noarch
 Patch0:		tailor-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=477148
 # http://progetti.arstecnica.it/tailor/ticket/172
 Patch1:		tailor-0.9.35-mercurial-1.1-compat.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=478841
+Patch2:		tailor-0.9.35-mercurial-1.1.2-delete.patch
 
 %description
 Tailor is a tool to migrate changesets between CVS, Subversion, git,
@@ -27,7 +30,8 @@
 %package -n python-vcpx
 Summary:	Version Control Patch eXchanger
 Group:		Development/Libraries
-Requires:	cvs, subversion, mercurial, cogito, tla, bazaar, monotone, git-core
+Requires:	cvs, subversion, cogito, tla, bazaar, monotone, git-core
+Requires:	mercurial >= 1.1.2
 
 %description -n python-vcpx
 This is the package `vcpx` (pronounced "veeseepex").  It encapsulates
@@ -38,7 +42,8 @@
 %prep
 %setup -q 
 %patch0
-%patch1 -p1 -b .hg-1.1
+%patch1 -p1 -b .hg-1.1-compat
+%patch2 -p1 -b .hg-1.1.2-delete
 
 # remove the shebang line
 sed -i -e '1d' vcpx/repository/p4/p4lib.py
@@ -67,6 +72,9 @@
 
 
 %changelog
+* Tue Jan  6 2009 Dan Horák <dan[at]danny.cz> 0.9.35-4
+- add patch for compatibility with mercurial 1.1.2 by Daniel P. Berrange (Resolves: #478841)
+
 * 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)