Hi,
Here is a patch that seems to make tailor work for me with bzr.dev.
It addresses 2 issues:
1. api for adding files changed
2. bzr working tree is not nec in current dir ("subdir" conf option)
no guarantees but it seems to be happily cranking away at my cvs->bzr
conversion. already over 1000 revisions and no error. ...still: 10
more years of history to go ;-) I'm curious to see how that goes.
Cheers,
diff -rN -u old-tailor/vcpx/bzr.py new-tailor/vcpx/bzr.py
--- old-tailor/vcpx/bzr.py 2005-12-05 19:02:56.000000000 +0100
+++ new-tailor/vcpx/bzr.py 2005-12-05 19:02:56.000000000 +0100
@@ -135,8 +135,11 @@
if len(new_entries) == 0:
return
+
+ from bzrlib.add import smart_add_tree
+ import os.path
self.log.info('Adding %s...', ', '.join(new_entries))
- self._b.add(new_entries)
+ smart_add_tree(self._b.working_tree(),[os.path.join(self.basedir,e)
for e in new_entries],recurse=False)
def _addSubtree(self, subdir):
"""
@@ -147,10 +150,10 @@
"""
from os.path import join
- from bzrlib.add import smart_add_branch
+ from bzrlib.add import smart_add_tree
self.log.info('Recursively adding directory "%s"...', subdir)
- smart_add_branch(self._b, [join(self.basedir, subdir)], recurse=True)
+ smart_add_tree(self._b.working_tree(), [join(self.basedir, subdir)],
recurse=True)
def _commit(self, date, author, patchname, changelog=None, entries=None):
from time import mktime
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
