Package: tailor
Version: 0.9.35-2
Severity: important
Tags: patch
Problem with mercurial current:
19:53:30 [C] Cannot prepare working directory!
Traceback (most recent call last):
[...]
File "/var/lib/python-support/python2.5/vcpx/repository/hg.py", line 348, in
findcmd
return cmdutil.findcmd(self._getUI(), cmd, commands.table)
File "/var/lib/python-support/python2.5/mercurial/cmdutil.py", line 52, in
findcmd
choice = findpossible(cmd, table, strict)
File "/var/lib/python-support/python2.5/mercurial/cmdutil.py", line 29, in
findpossible
for e in table.keys():
AttributeError: 'str' object has no attribute 'keys'
And it's been fixed in
http://progetti.arstecnica.it/tailor/changeset/1660
which is basically:
===================================================================
--- a/vcpx/repository/hg.py
+++ b/vcpx/repository/hg.py
@@ -503,7 +503,10 @@
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:
And it is possible that this patch is also needed:
https://bugzilla.redhat.com/attachment.cgi?id=328401
which say:
--- 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
I installed both and now it works flawlessly.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (2000, 'unstable'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.29.1-narya2 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=C, LC_CTYPE=hu_HU (charmap=ISO-8859-2)
Shell: /bin/sh linked to /bin/bash
Versions of packages tailor depends on:
ii python 2.5.4-2 An interactive high-level object-o
ii python-support 1.0.0 automated rebuilding support for P
Versions of packages tailor recommends:
ii rsync 3.0.5-1 fast remote file copy program (lik
Versions of packages tailor suggests:
ii bazaar 1.4.2-5.4 arch-based distributed revision co
pn bzr <none> (no description available)
pn codeville <none> (no description available)
ii cvs 1:1.12.13-12 Concurrent Versions System
pn darcs <none> (no description available)
ii git-core 1:1.6.2.1-1 fast, scalable, distributed revisi
ii mercurial 1.2.1-3 scalable distributed version contr
ii monotone 0.40-7 A distributed version (revision) c
ii subversion 1.5.6dfsg-1 Advanced version control system
pn tla <none> (no description available)
-- no debconf information
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
