Merge with crew

hgext/convert/darcs.py

@@ -1,137 +1,137 b''
 # darcs support for the convert extension
 
 from common import NoRepo, commit, converter_source
 from mercurial.i18n import _
 from mercurial import util
 import os, shutil, tempfile
 
 # The naming drift of ElementTree is fun!
 
 try: from xml.etree.cElementTree import ElementTree
 except ImportError:
     try: from xml.etree.ElementTree import ElementTree
     except ImportError:
         try: from elementtree.cElementTree import ElementTree
         except ImportError:
             try: from elementtree.ElementTree import ElementTree
             except ImportError: ElementTree = None
 
 
 class darcs_source(converter_source):
     def __init__(self, ui, path, rev=None):
         super(darcs_source, self).__init__(ui, path, rev=rev)
 
         if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
             raise NoRepo("couldn't open darcs repo %s" % path)
 
         if ElementTree is None:
             raise util.Abort(_("Python ElementTree module is not available"))
 
         self.path = os.path.realpath(path)
 
         self.lastrev = None
         self.changes = {}
         self.parents = {}
         self.tags = {}
 
     def before(self):
         self.tmppath = tempfile.mkdtemp(
             prefix='convert-' + os.path.basename(self.path) + '-')
         output, status = self.run('init', repodir=self.tmppath)
         self.checkexit(status)
 
         tree = self.xml('changes', '--xml-output', '--summary')
         tagname = None
         child = None
         for elt in tree.findall('patch'):
             node = elt.get('hash')
             name = elt.findtext('name', '')
             if name.startswith('TAG '):
                 tagname = name[4:].strip()
             elif tagname is not None:
                 self.tags[tagname] = node
                 tagname = None
             self.changes[node] = elt
             self.parents[child] = [node]
             child = node
         self.parents[child] = []
 
     def after(self):
         self.ui.debug('cleaning up %s\n' % self.tmppath)
-        #shutil.rmtree(self.tmppath, ignore_errors=True)
+        shutil.rmtree(self.tmppath, ignore_errors=True)
 
     def _run(self, cmd, *args, **kwargs):
         cmdline = 'darcs %s --repodir=%r %s </dev/null' % (
             cmd, kwargs.get('repodir', self.path), ' '.join(args))
         self.ui.debug(cmdline, '\n')
         return os.popen(cmdline, 'r')
 
     def run(self, cmd, *args, **kwargs):
         fp = self._run(cmd, *args, **kwargs)
         output = fp.read()
         return output, fp.close()
 
     def checkexit(self, status, output=''):
         if status:
             if output:
-                ui.warn(_('darcs error:\n'))
-                ui.warn(output)
+                self.ui.warn(_('darcs error:\n'))
+                self.ui.warn(output)
             msg = util.explain_exit(status)[0]
             raise util.Abort(_('darcs %s') % msg)
         
     def xml(self, cmd, *opts):
         etree = ElementTree()
         fp = self._run(cmd, *opts)
         etree.parse(fp)
         self.checkexit(fp.close())
         return etree.getroot()
 
     def getheads(self):
         return self.parents[None]
 
     def getcommit(self, rev):
         elt = self.changes[rev]
         date = util.strdate(elt.get('local_date'), '%a %b %d %H:%M:%S %Z %Y')
         desc = elt.findtext('name') + '\n' + elt.findtext('comment', '')
         return commit(author=elt.get('author'), date=util.datestr(date),
                       desc=desc.strip(), parents=self.parents[rev])
 
     def pull(self, rev):
         output, status = self.run('pull %r --all --match="hash %s"' %
                                   (self.path, rev),
                                   '--no-test', '--no-posthook',
                                   '--external-merge=/bin/false',
                                   repodir=self.tmppath)
         if status:
             if output.find('We have conflicts in') == -1:
                 self.checkexit(status, output)
             output, status = self.run('revert --all', repodir=self.tmppath)
             self.checkexit(status, output)
 
     def getchanges(self, rev):
         self.pull(rev)
         copies = {}
         changes = []
         for elt in self.changes[rev].find('summary').getchildren():
             if elt.tag in ('add_directory', 'remove_directory'):
                 continue
             if elt.tag == 'move':
                 changes.append((elt.get('from'), rev))
                 copies[elt.get('from')] = elt.get('to')
             else:
                 changes.append((elt.text.strip(), rev))
         changes.sort()
         self.lastrev = rev
         return changes, copies
 
     def getfile(self, name, rev):
         if rev != self.lastrev:
             raise util.Abort(_('internal calling inconsistency'))
         return open(os.path.join(self.tmppath, name), 'rb').read()
 
     def getmode(self, name, rev):
         mode = os.lstat(os.path.join(self.tmppath, name)).st_mode
         return (mode & 0111) and 'x' or ''
 
     def gettags(self):
         return self.tags

tests/test-convert-cvs

@@ -1,50 +1,51 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs cvsps || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
 export CVSROOT=`pwd`
 cd ..
 
 cvs -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
 cd src-temp
 echo a > a
 mkdir b
 cd b
 echo c > c
 cd ..
 
 echo % import source directory
 cvs -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
 cvs -q checkout src
 
 echo % convert fresh repo
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 cat src-hg/a
 cat src-hg/b/c
 
 echo % commit new file revisions
 cd src
 echo a >> a
 echo c >> b/c
-cvs -q commit -mci1 . | sed -e 's:.*src/\(.*\),v:src/\1,v:g'
+cvs -q commit -mci1 . | grep '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 cat src-hg/a
 cat src-hg/b/c
 
 
 

tests/test-convert-cvs.out

@@ -1,39 +1,37 b''
 % create cvs repository
 % create source directory
 % import source directory
 N src/a
 N src/b/c
 
 No conflicts created by this import
 
 % checkout source directory
 U src/a
 U src/b/c
 % convert fresh repo
 initializing destination src-hg repository
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 1 Initial revision
 0 import
 updating tags
 a
 c
 % commit new file revisions
-src/a,v  <--  a
-new revision: 1.2; previous revision: 1.1
-src/b/c,v  <--  b/c
-new revision: 1.2; previous revision: 1.1
+checking in src/a,v
+checking in src/b/c,v
 % convert again
 destination src-hg is a Mercurial repository
 connecting to cvsrepo
 scanning source...
 sorting...
 converting...
 0 ci1
 updating tags
 a
 a
 c
 c