merge with stable

hgext/convert/darcs.py

@@ -1,188 +1,200
 # darcs.py - darcs support for the convert extension
 #
 #  Copyright 2007-2009 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from common import NoRepo, checktool, commandline, commit, converter_source
 from mercurial.i18n import _
-from mercurial import util
+from mercurial import encoding, util
 import os, shutil, tempfile, re
 
 # The naming drift of ElementTree is fun!
 
 try:
-    from xml.etree.cElementTree import ElementTree
+    from xml.etree.cElementTree import ElementTree, XMLParser
 except ImportError:
     try:
-        from xml.etree.ElementTree import ElementTree
+        from xml.etree.ElementTree import ElementTree, XMLParser
     except ImportError:
         try:
-            from elementtree.cElementTree import ElementTree
+            from elementtree.cElementTree import ElementTree, XMLParser
         except ImportError:
             try:
-                from elementtree.ElementTree import ElementTree
+                from elementtree.ElementTree import ElementTree, XMLParser
             except ImportError:
                 ElementTree = None
 
 class darcs_source(converter_source, commandline):
     def __init__(self, ui, path, rev=None):
         converter_source.__init__(self, ui, path, rev=rev)
         commandline.__init__(self, ui, 'darcs')
 
         # check for _darcs, ElementTree so that we can easily skip
         # test-convert-darcs if ElementTree is not around
         if not os.path.exists(os.path.join(path, '_darcs')):
             raise NoRepo(_("%s does not look like a darcs repository") % path)
 
         checktool('darcs')
         version = self.run0('--version').splitlines()[0].strip()
         if version < '2.1':
             raise util.Abort(_('darcs version 2.1 or newer needed (found %r)') %
                              version)
 
         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 = {}
 
         # Check darcs repository format
         format = self.format()
         if format:
             if format in ('darcs-1.0', 'hashed'):
                 raise NoRepo(_("%s repository format is unsupported, "
                                "please upgrade") % format)
         else:
             self.ui.warn(_('failed to detect repository format!'))
 
     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=True, summary=True,
                         repodir=self.path)
         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 recode(self, s, encoding=None):
+        if isinstance(s, unicode):
+            # XMLParser returns unicode objects for anything it can't
+            # encode into ASCII. We convert them back to str to get
+            # recode's normal conversion behavior.
+            s = s.encode('latin-1')
+        return super(darcs_source, self).recode(s, encoding)
+
     def xml(self, cmd, **kwargs):
         # NOTE: darcs is currently encoding agnostic and will print
         # patch metadata byte-for-byte, even in the XML changelog.
         etree = ElementTree()
+        # While we are decoding the XML as latin-1 to be as liberal as
+        # possible, etree will still raise an exception if any
+        # non-printable characters are in the XML changelog.
+        parser = XMLParser(encoding='latin-1')
         fp = self._run(cmd, **kwargs)
-        etree.parse(fp)
+        etree.parse(fp, parser=parser)
         self.checkexit(fp.close())
         return etree.getroot()
 
     def format(self):
         output, status = self.run('show', 'repo', no_files=True,
                                   repodir=self.path)
         self.checkexit(status)
         m = re.search(r'^\s*Format:\s*(.*)$', output, re.MULTILINE)
         if not m:
             return None
         return ','.join(sorted(f.strip() for f in m.group(1).split(',')))
 
     def manifest(self):
         man = []
         output, status = self.run('show', 'files', no_directories=True,
                                   repodir=self.tmppath)
         self.checkexit(status)
         for line in output.split('\n'):
             path = line[2:]
             if path:
                 man.append(path)
         return man
 
     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', '')
         # etree can return unicode objects for name, comment, and author,
         # so recode() is used to ensure str objects are emitted.
         return commit(author=self.recode(elt.get('author')),
                       date=util.datestr(date),
                       desc=self.recode(desc).strip(),
                       parents=self.parents[rev])
 
     def pull(self, rev):
         output, status = self.run('pull', self.path, all=True,
                                   match='hash %s' % rev,
                                   no_test=True, no_posthook=True,
                                   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=True, repodir=self.tmppath)
             self.checkexit(status, output)
 
     def getchanges(self, rev):
         copies = {}
         changes = []
         man = None
         for elt in self.changes[rev].find('summary').getchildren():
             if elt.tag in ('add_directory', 'remove_directory'):
                 continue
             if elt.tag == 'move':
                 if man is None:
                     man = self.manifest()
                 source, dest = elt.get('from'), elt.get('to')
                 if source in man:
                     # File move
                     changes.append((source, rev))
                     changes.append((dest, rev))
                     copies[dest] = source
                 else:
                     # Directory move, deduce file moves from manifest
                     source = source + '/'
                     for f in man:
                         if not f.startswith(source):
                             continue
                         fdest = dest + '/' + f[len(source):]
                         changes.append((f, rev))
                         changes.append((fdest, rev))
                         copies[fdest] = f
             else:
                 changes.append((elt.text.strip(), rev))
         self.pull(rev)
         self.lastrev = rev
         return sorted(changes), copies
 
     def getfile(self, name, rev):
         if rev != self.lastrev:
             raise util.Abort(_('internal calling inconsistency'))
         path = os.path.join(self.tmppath, name)
         data = open(path, 'rb').read()
         mode = os.lstat(path).st_mode
         mode = (mode & 0111) and 'x' or ''
         return data, mode
 
     def gettags(self):
         return self.tags

tests/test-convert-darcs.t

@@ -1,131 +1,144
 
   $ "$TESTDIR/hghave" darcs || exit 80
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert=" >> $HGRCPATH
   $ echo 'graphlog =' >> $HGRCPATH
   $ DARCS_EMAIL='[e-mail]'; export DARCS_EMAIL
   $ HOME=`pwd`/do_not_use_HOME_darcs; export HOME
 
 skip if we can't import elementtree
 
   $ mkdir dummy
   $ mkdir dummy/_darcs
   $ if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
   >     echo 'skipped: missing feature: elementtree module'
   >     exit 80
   > fi
 
 try converting darcs1 repository
 
   $ hg clone -q "$TESTDIR/darcs1.hg" darcs
   $ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0
   darcs-1.0 repository format is unsupported, please upgrade
 
 initialize darcs repo
 
   $ mkdir darcs-repo
   $ cd darcs-repo
   $ darcs init
   $ echo a > a
   $ darcs record -a -l -m p0
   Finished recording patch 'p0'
   $ cd ..
 
 branch and update
 
   $ darcs get darcs-repo darcs-clone >/dev/null
   $ cd darcs-clone
   $ echo c >> a
   $ echo c > c
   $ darcs record -a -l -m p1.1
   Finished recording patch 'p1.1'
   $ cd ..
 
 update source
 
   $ cd darcs-repo
   $ echo b >> a
   $ echo b > b
   $ darcs record -a -l -m p1.2
   Finished recording patch 'p1.2'
 
-merge branch
-
   $ darcs pull -a ../darcs-clone
   Backing up ./a(-darcs-backup0)
   We have conflicts in the following files:
   ./a
   Finished pulling and applying.
   $ sleep 1
   $ echo e > a
   $ echo f > f
   $ mkdir dir
   $ echo d > dir/d
   $ echo d > dir/d2
   $ darcs record -a -l -m p2
   Finished recording patch 'p2'
 
 test file and directory move
 
   $ darcs mv f ff
 
 Test remove + move
 
   $ darcs remove dir/d2
   $ rm dir/d2
   $ darcs mv dir dir2
   $ darcs record -a -l -m p3
   Finished recording patch 'p3'
 
 test utf-8 commit message and author
 
   $ echo g > g
 
 darcs is encoding agnostic, so it takes whatever bytes it's given
 
   $ darcs record -a -l -m 'p4: desc ñ' -A 'author ñ'
   Finished recording patch 'p4: desc ñ'
+
+Test latin-1 commit message
+
+  $ echo h > h
+  $ printf "p5: desc " > ../p5
+  $ python -c 'print "".join([chr(i) for i in range(128, 256)])' >> ../p5
+  $ darcs record -a -l --logfile ../p5
+  Finished recording patch 'p5: desc ��������������������������������������������������������������������������������������������������������������������������������'
+ 
   $ glog()
   > {
   >     HGENCODING=utf-8 hg glog --template '{rev} "{desc|firstline}" ({author}) files: {files}\n' "$@"
   > }
   $ cd ..
   $ hg convert darcs-repo darcs-repo-hg
   initializing destination darcs-repo-hg repository
   scanning source...
   sorting...
   converting...
-  5 p0
-  4 p1.2
-  3 p1.1
-  2 p2
-  1 p3
-  0 p4: desc ?
+  6 p0
+  5 p1.2
+  4 p1.1
+  3 p2
+  2 p3
+  1 p4: desc ?
+  0 p5: desc ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
 
 The converter does not currently handle patch conflicts very well.
 When they occur, it reverts *all* changes and moves forward,
 letting the conflict resolving patch fix collisions.
 Unfortunately, non-conflicting changes, like the addition of the
 "c" file in p1.1 patch are reverted too.
 Just to say that manifest not listing "c" here is a bug.
 
-  $ glog -R darcs-repo-hg
-  o  5 "p4: desc ñ" (author ñ) files: g
+  $ HGENCODING=latin-1 glog -R darcs-repo-hg -r 6 | "$TESTDIR"/printrepr.py
+  o  6 "p5: desc \xc2\x80\xc2\x81\xc2\x82\xc2\x83\xc2\x84\xc2\x85\xc2\x86\xc2\x87\xc2\x88\xc2\x89\xc2\x8a\xc2\x8b\xc2\x8c\xc2\x8d\xc2\x8e\xc2\x8f\xc2\x90\xc2\x91\xc2\x92\xc2\x93\xc2\x94\xc2\x95\xc2\x96\xc2\x97\xc2\x98\xc2\x99\xc2\x9a\xc2\x9b\xc2\x9c\xc2\x9d\xc2\x9e\xc2\x9f\xc2\xa0\xc2\xa1\xc2\xa2\xc2\xa3\xc2\xa4\xc2\xa5\xc2\xa6\xc2\xa7\xc2\xa8\xc2\xa9\xc2\xaa\xc2\xab\xc2\xac\xc2\xad\xc2\xae\xc2\xaf\xc2\xb0\xc2\xb1\xc2\xb2\xc2\xb3\xc2\xb4\xc2\xb5\xc2\xb6\xc2\xb7\xc2\xb8\xc2\xb9\xc2\xba\xc2\xbb\xc2\xbc\xc2\xbd\xc2\xbe\xc2\xbf\xc3\x80\xc3\x81\xc3\x82\xc3\x83\xc3\x84\xc3\x85\xc3\x86\xc3\x87\xc3\x88\xc3\x89\xc3\x8a\xc3\x8b\xc3\x8c\xc3\x8d\xc3\x8e\xc3\x8f\xc3\x90\xc3\x91\xc3\x92\xc3\x93\xc3\x94\xc3\x95\xc3\x96\xc3\x97\xc3\x98\xc3\x99\xc3\x9a\xc3\x9b\xc3\x9c\xc3\x9d\xc3\x9e\xc3\x9f\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4\xc3\xa5\xc3\xa6\xc3\xa7\xc3\xa8\xc3\xa9\xc3\xaa\xc3\xab\xc3\xac\xc3\xad\xc3\xae\xc3\xaf\xc3\xb0\xc3\xb1\xc3\xb2\xc3\xb3\xc3\xb4\xc3\xb5\xc3\xb6\xc3\xb7\xc3\xb8\xc3\xb9\xc3\xba\xc3\xbb\xc3\xbc\xc3\xbd\xc3\xbe\xc3\xbf" ([e-mail]) files: h
+  |
+  $ HGENCODING=utf-8 glog -R darcs-repo-hg -r 0:5 | "$TESTDIR"/printrepr.py
+  o  5 "p4: desc \xc3\xb1" (author \xc3\xb1) files: g
   |
   o  4 "p3" ([e-mail]) files: dir/d dir/d2 dir2/d f ff
   |
   o  3 "p2" ([e-mail]) files: a dir/d dir/d2 f
   |
   o  2 "p1.1" ([e-mail]) files:
   |
   o  1 "p1.2" ([e-mail]) files: a b
   |
   o  0 "p0" ([e-mail]) files: a
   
+
   $ hg up -q -R darcs-repo-hg
   $ hg -R darcs-repo-hg manifest --debug
   7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
   1e88685f5ddec574a34c70af492f95b6debc8741 644   b
   37406831adc447ec2385014019599dfec953c806 644   dir2/d
   b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff
   0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644   g
+  fe6f8b4f507fe3eb524c527192a84920a4288dac 644   h