Merge with crew.
--- a/contrib/darcs2hg.py Tue Oct 02 20:25:35 2007 +0200
+++ b/contrib/darcs2hg.py Tue Oct 02 13:49:36 2007 -0700
@@ -3,12 +3,15 @@
# vim: tw=80 ts=4 sw=4 noet
# -----------------------------------------------------------------------------
# Project : Basic Darcs to Mercurial conversion script
+#
+# *** DEPRECATED. Use the convert extension instead. This script will
+# *** be removed soon.
+#
# -----------------------------------------------------------------------------
# Authors : Sebastien Pierre <sebastien@xprima.com>
# TK Soh <teekaysoh@gmail.com>
# -----------------------------------------------------------------------------
# Creation : 24-May-2006
-# Last mod : 05-Jun-2006
# -----------------------------------------------------------------------------
import os, sys
@@ -217,6 +220,7 @@
else:
print USAGE
sys.exit(-1)
+ print 'This command is deprecated. Use the convert extension instead.'
# Initializes the target repo
if not os.path.isdir(darcs_repo + "/_darcs"):
print "No darcs directory found at: " + darcs_repo
--- a/hgext/convert/__init__.py Tue Oct 02 20:25:35 2007 +0200
+++ b/hgext/convert/__init__.py Tue Oct 02 13:49:36 2007 -0700
@@ -7,6 +7,7 @@
from common import NoRepo, converter_source, converter_sink
from cvs import convert_cvs
+from darcs import darcs_source
from git import convert_git
from hg import mercurial_source, mercurial_sink
from subversion import convert_svn, debugsvnlog
@@ -18,7 +19,7 @@
commands.norepo += " convert debugsvnlog"
converters = [convert_cvs, convert_git, convert_svn, mercurial_source,
- mercurial_sink]
+ mercurial_sink, darcs_source]
def convertsource(ui, path, **opts):
for c in converters:
@@ -235,6 +236,7 @@
def convert(self):
try:
+ self.source.before()
self.dest.before()
self.source.setrevmap(self.map)
self.ui.status("scanning source...\n")
@@ -273,7 +275,10 @@
self.cleanup()
def cleanup(self):
- self.dest.after()
+ try:
+ self.dest.after()
+ finally:
+ self.source.after()
if self.revmapfilefd:
self.revmapfilefd.close()
@@ -367,9 +372,10 @@
"""Convert a foreign SCM repository to a Mercurial one.
Accepted source formats:
- - GIT
- CVS
- - SVN
+ - Darcs
+ - git
+ - Subversion
Accepted destination formats:
- Mercurial
--- a/hgext/convert/common.py Tue Oct 02 20:25:35 2007 +0200
+++ b/hgext/convert/common.py Tue Oct 02 13:49:36 2007 -0700
@@ -38,6 +38,12 @@
self.encoding = 'utf-8'
+ def before(self):
+ pass
+
+ def after(self):
+ pass
+
def setrevmap(self, revmap):
"""set the map of already-converted revisions"""
pass
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/convert/darcs.py Tue Oct 02 13:49:36 2007 -0700
@@ -0,0 +1,137 @@
+# 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)
+
+ 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)
+ 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
--- a/hgext/convert/hg.py Tue Oct 02 20:25:35 2007 +0200
+++ b/hgext/convert/hg.py Tue Oct 02 13:49:36 2007 -0700
@@ -156,7 +156,10 @@
class mercurial_source(converter_source):
def __init__(self, ui, path, rev=None):
converter_source.__init__(self, ui, path, rev)
- self.repo = hg.repository(self.ui, path)
+ try:
+ self.repo = hg.repository(self.ui, path)
+ except:
+ raise NoRepo("could not open hg repo %s as source" % path)
self.lastrev = None
self.lastctx = None
--- a/mercurial/util.py Tue Oct 02 20:25:35 2007 +0200
+++ b/mercurial/util.py Tue Oct 02 13:49:36 2007 -0700
@@ -1468,7 +1468,7 @@
s += timezone_format % (-tz / 3600, ((-tz % 3600) / 60))
return s
-def strdate(string, format, defaults):
+def strdate(string, format, defaults=[]):
"""parse a localized time string and return a (unixtime, offset) tuple.
if the string cannot be parsed, ValueError is raised."""
def timezone(string):