convert: display source revision id with --verbose

hgext/convert/convcmd.py

@@ -1,317 +1,321 b''
 # convcmd - convert extension commands definition
 #
 # Copyright 2005-2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from common import NoRepo, SKIPREV, converter_source, converter_sink, mapfile
 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 debugsvnlog, svn_source, svn_sink
 import filemap
 
 import os, shutil
 from mercurial import hg, util
 from mercurial.i18n import _
 
 source_converters = [
     ('cvs', convert_cvs),
     ('git', convert_git),
     ('svn', svn_source),
     ('hg', mercurial_source),
     ('darcs', darcs_source),
     ]
 
 sink_converters = [
     ('hg', mercurial_sink),
     ('svn', svn_sink),
     ]
 
 def convertsource(ui, path, type, rev):
     exceptions = []
     for name, source in source_converters:
         try:
             if not type or name == type:
                 return source(ui, path, rev)
         except NoRepo, inst:
             exceptions.append(inst)
     if not ui.quiet:
         for inst in exceptions:
             ui.write(_("%s\n") % inst)
     raise util.Abort('%s: unknown repository type' % path)
 
 def convertsink(ui, path, type):
     for name, sink in sink_converters:
         try:
             if not type or name == type:
                 return sink(ui, path)
         except NoRepo, inst:
             ui.note(_("convert: %s\n") % inst)
     raise util.Abort('%s: unknown repository type' % path)
 
 class converter(object):
     def __init__(self, ui, source, dest, revmapfile, opts):
 
         self.source = source
         self.dest = dest
         self.ui = ui
         self.opts = opts
         self.commitcache = {}
         self.authors = {}
         self.authorfile = None
 
         self.map = mapfile(ui, revmapfile)
 
         # Read first the dst author map if any
         authorfile = self.dest.authorfile()
         if authorfile and os.path.exists(authorfile):
             self.readauthormap(authorfile)
         # Extend/Override with new author map if necessary
         if opts.get('authors'):
             self.readauthormap(opts.get('authors'))
             self.authorfile = self.dest.authorfile()
 
     def walktree(self, heads):
         '''Return a mapping that identifies the uncommitted parents of every
         uncommitted changeset.'''
         visit = heads
         known = {}
         parents = {}
         while visit:
             n = visit.pop(0)
             if n in known or n in self.map: continue
             known[n] = 1
             commit = self.cachecommit(n)
             parents[n] = []
             for p in commit.parents:
                 parents[n].append(p)
                 visit.append(p)
 
         return parents
 
     def toposort(self, parents):
         '''Return an ordering such that every uncommitted changeset is
         preceeded by all its uncommitted ancestors.'''
         visit = parents.keys()
         seen = {}
         children = {}
 
         while visit:
             n = visit.pop(0)
             if n in seen: continue
             seen[n] = 1
             # Ensure that nodes without parents are present in the 'children'
             # mapping.
             children.setdefault(n, [])
             for p in parents[n]:
                 if not p in self.map:
                     visit.append(p)
                 children.setdefault(p, []).append(n)
 
         s = []
         removed = {}
         visit = children.keys()
         while visit:
             n = visit.pop(0)
             if n in removed: continue
             dep = 0
             if n in parents:
                 for p in parents[n]:
                     if p in self.map: continue
                     if p not in removed:
                         # we're still dependent
                         visit.append(n)
                         dep = 1
                         break
 
             if not dep:
                 # all n's parents are in the list
                 removed[n] = 1
                 if n not in self.map:
                     s.append(n)
                 if n in children:
                     for c in children[n]:
                         visit.insert(0, c)
 
         if self.opts.get('datesort'):
             depth = {}
             for n in s:
                 depth[n] = 0
                 pl = [p for p in self.commitcache[n].parents
                       if p not in self.map]
                 if pl:
                     depth[n] = max([depth[p] for p in pl]) + 1
 
             s = [(depth[n], util.parsedate(self.commitcache[n].date), n)
                  for n in s]
             s.sort()
             s = [e[2] for e in s]
 
         return s
 
     def writeauthormap(self):
         authorfile = self.authorfile
         if authorfile:
            self.ui.status('Writing author map file %s\n' % authorfile)
            ofile = open(authorfile, 'w+')
            for author in self.authors:
                ofile.write("%s=%s\n" % (author, self.authors[author]))
            ofile.close()
 
     def readauthormap(self, authorfile):
         afile = open(authorfile, 'r')
         for line in afile:
             try:
                 srcauthor = line.split('=')[0].strip()
                 dstauthor = line.split('=')[1].strip()
                 if srcauthor in self.authors and dstauthor != self.authors[srcauthor]:
                     self.ui.status(
                         'Overriding mapping for author %s, was %s, will be %s\n'
                         % (srcauthor, self.authors[srcauthor], dstauthor))
                 else:
                     self.ui.debug('Mapping author %s to %s\n'
                                   % (srcauthor, dstauthor))
                     self.authors[srcauthor] = dstauthor
             except IndexError:
                 self.ui.warn(
                     'Ignoring bad line in author file map %s: %s\n'
                     % (authorfile, line))
         afile.close()
 
     def cachecommit(self, rev):
         commit = self.source.getcommit(rev)
         commit.author = self.authors.get(commit.author, commit.author)
         self.commitcache[rev] = commit
         return commit
 
     def copy(self, rev):
         commit = self.commitcache[rev]
         do_copies = hasattr(self.dest, 'copyfile')
         filenames = []
 
         changes = self.source.getchanges(rev)
         if isinstance(changes, basestring):
             if changes == SKIPREV:
                 dest = SKIPREV
             else:
                 dest = self.map[changes]
             self.map[rev] = dest
             return
         files, copies = changes
         parents = [self.map[r] for r in commit.parents]
         if commit.parents:
             prev = commit.parents[0]
             if prev not in self.commitcache:
                 self.cachecommit(prev)
             pbranch = self.commitcache[prev].branch
         else:
             pbranch = None
         self.dest.setbranch(commit.branch, pbranch, parents)
         for f, v in files:
             filenames.append(f)
             try:
                 data = self.source.getfile(f, v)
             except IOError, inst:
                 self.dest.delfile(f)
             else:
                 e = self.source.getmode(f, v)
                 self.dest.putfile(f, e, data)
                 if do_copies:
                     if f in copies:
                         copyf = copies[f]
                         # Merely marks that a copy happened.
                         self.dest.copyfile(copyf, f)
 
         newnode = self.dest.putcommit(filenames, parents, commit)
         self.source.converted(rev, newnode)
         self.map[rev] = newnode
 
     def convert(self):
+
+        def recode(s):
+            return s.decode('utf-8').encode(orig_encoding, 'replace')
+
         try:
             self.source.before()
             self.dest.before()
             self.source.setrevmap(self.map)
             self.ui.status("scanning source...\n")
             heads = self.source.getheads()
             parents = self.walktree(heads)
             self.ui.status("sorting...\n")
             t = self.toposort(parents)
             num = len(t)
             c = None
 
             self.ui.status("converting...\n")
             for c in t:
                 num -= 1
                 desc = self.commitcache[c].desc
                 if "\n" in desc:
                     desc = desc.splitlines()[0]
                 # convert log message to local encoding without using
                 # tolocal() because util._encoding conver() use it as
                 # 'utf-8'
-                desc = desc.decode('utf-8').encode(orig_encoding, 'replace')
-                self.ui.status("%d %s\n" % (num, desc))
+                self.ui.status("%d %s\n" % (num, recode(desc)))
+                self.ui.note(_("source: %s\n" % recode(c)))
                 self.copy(c)
 
             tags = self.source.gettags()
             ctags = {}
             for k in tags:
                 v = tags[k]
                 if self.map.get(v, SKIPREV) != SKIPREV:
                     ctags[k] = self.map[v]
 
             if c and ctags:
                 nrev = self.dest.puttags(ctags)
                 # write another hash correspondence to override the previous
                 # one so we don't end up with extra tag heads
                 if nrev:
                     self.map[c] = nrev
 
             self.writeauthormap()
         finally:
             self.cleanup()
 
     def cleanup(self):
         try:
             self.dest.after()
         finally:
             self.source.after()
         self.map.close()
 
 orig_encoding = 'ascii'
 
 def convert(ui, src, dest=None, revmapfile=None, **opts):
     global orig_encoding
     orig_encoding = util._encoding
     util._encoding = 'UTF-8'
 
     if not dest:
         dest = hg.defaultdest(src) + "-hg"
         ui.status("assuming destination %s\n" % dest)
 
     destc = convertsink(ui, dest, opts.get('dest_type'))
 
     try:
         srcc = convertsource(ui, src, opts.get('source_type'),
                              opts.get('rev'))
     except Exception:
         for path in destc.created:
             shutil.rmtree(path, True)
         raise
 
     fmap = opts.get('filemap')
     if fmap:
         srcc = filemap.filemap_source(ui, srcc, fmap)
         destc.setfilemapmode(True)
 
     if not revmapfile:
         try:
             revmapfile = destc.revmapfile()
         except:
             revmapfile = os.path.join(destc, "map")
 
     c = converter(ui, srcc, destc, revmapfile, opts)
     c.convert()
 

tests/test-convert-svn-source

@@ -1,180 +1,180 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
 svnadmin create svn-repo
 
 echo % initial svn import
 mkdir t
 cd t
 echo a > a
 cd ..
 
 svnpath=`pwd | fix_path`
 # SVN wants all paths to start with a slash. Unfortunately,
 # Windows ones don't. Handle that.
 expr $svnpath : "\/" > /dev/null
 if [ $? -ne 0 ]; then
     svnpath='/'$svnpath
 fi
 
 svnurl=file://$svnpath/svn-repo/trunk/test
 svn import -m init t $svnurl | fix_path
 
 echo % update svn repository
 svn co $svnurl t2 | fix_path
 cd t2
 echo b >> a
 echo b > b
 svn add b
 svn ci -m changea
 cd ..
 
 echo % convert to hg once
 hg convert $svnurl
 
 echo % update svn repository again
 cd t2
 echo c >> a
 echo c >> b
 svn ci -m changeb
 cd ..
 
 echo % test incremental conversion
-hg convert $svnurl
+hg convert -v $svnurl | sed 's/source:.*/source:/'
 
 echo % test filemap
 echo 'include b' > filemap
 hg convert --filemap filemap $svnurl fmap
 echo '[extensions]' >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 hg glog -R fmap --template '#rev# #desc|firstline# files: #files#\n'
 
 echo % test stop revision
 hg convert --rev 1 $svnurl stoprev
 # Check convert_revision extra-records.
 # This is also the only place testing more than one extra field
 # in a revision.
 hg --cwd stoprev tip --debug | grep extra | sed 's/=.*/=/'
 
 ########################################
 
 echo "# now tests that it works with trunk/branches/tags layout"
 echo
 echo % initial svn import
 mkdir projA
 cd projA
 mkdir trunk
 mkdir branches
 mkdir tags
 cd ..
 
 svnurl=file://$svnpath/svn-repo/projA
 svn import -m "init projA" projA $svnurl | fix_path
 
 
 echo % update svn repository
 svn co $svnurl/trunk A | fix_path
 cd A
 echo hello > letter.txt
 svn add letter.txt
 svn ci -m hello
 
 echo world >> letter.txt
 svn ci -m world
 
 svn copy -m "tag v0.1" $svnurl/trunk $svnurl/tags/v0.1
 
 echo 'nice day today!' >> letter.txt
 svn ci -m "nice day"
 cd ..
 
 echo % convert to hg once
 hg convert $svnurl A-hg
 
 echo % update svn repository again
 cd A
 echo "see second letter" >> letter.txt
 # Put it in a subdirectory to test duplicate file records
 # from svn source (issue 714)
 mkdir todo
 echo "nice to meet you" > todo/letter2.txt
 svn add todo
 svn ci -m "second letter"
 
 svn copy -m "tag v0.2" $svnurl/trunk $svnurl/tags/v0.2
 
 echo "blah-blah-blah" >> todo/letter2.txt
 svn ci -m "work in progress"
 cd ..
 
 echo % test incremental conversion
 hg convert $svnurl A-hg
 
 cd A-hg
 hg glog --template '#rev# #desc|firstline# files: #files#\n'
 hg tags -q
 cd ..
 
 ########################################
 
 echo "# now tests that it works with trunk/tags layout, but no branches yet"
 echo
 echo % initial svn import
 mkdir projB
 cd projB
 mkdir trunk
 mkdir tags
 cd ..
 
 svnurl=file://$svnpath/svn-repo/projB
 svn import -m "init projB" projB $svnurl | fix_path
 
 
 echo % update svn repository
 svn co $svnurl/trunk B | fix_path
 cd B
 echo hello > letter.txt
 svn add letter.txt
 svn ci -m hello
 
 echo world >> letter.txt
 svn ci -m world
 
 svn copy -m "tag v0.1" $svnurl/trunk $svnurl/tags/v0.1
 
 echo 'nice day today!' >> letter.txt
 svn ci -m "nice day"
 cd ..
 
 echo % convert to hg once
 hg convert $svnurl B-hg
 
 echo % update svn repository again
 cd B
 echo "see second letter" >> letter.txt
 echo "nice to meet you" > letter2.txt
 svn add letter2.txt
 svn ci -m "second letter"
 
 svn copy -m "tag v0.2" $svnurl/trunk $svnurl/tags/v0.2
 
 echo "blah-blah-blah" >> letter2.txt
 svn ci -m "work in progress"
 cd ..
 
 echo % test incremental conversion
 hg convert $svnurl B-hg
 
 cd B-hg
 hg glog --template '#rev# #desc|firstline# files: #files#\n'
 hg tags -q
 cd ..

tests/test-convert-svn-source.out

@@ -1,190 +1,195 b''
 % initial svn import
 Adding         t/a
 
 Committed revision 1.
 % update svn repository
 A    t2/a
 Checked out revision 1.
 A         b
 Sending        a
 Adding         b
 Transmitting file data ..
 Committed revision 2.
 % convert to hg once
 assuming destination test-hg
 initializing destination test-hg repository
 scanning source...
 sorting...
 converting...
 1 init
 0 changea
 % update svn repository again
 Sending        a
 Sending        b
 Transmitting file data ..
 Committed revision 3.
 % test incremental conversion
 assuming destination test-hg
 scanning source...
+fetching revision log for "/trunk/test" from 3 to 2
 sorting...
 converting...
 0 changeb
+source:
+a
+b
+no tags found at revision 3
 % test filemap
 initializing destination fmap repository
 scanning source...
 sorting...
 converting...
 2 init
 1 changea
 0 changeb
 o  1 changeb files: b
 |
 o  0 changea files: b
 
 % test stop revision
 initializing destination stoprev repository
 scanning source...
 sorting...
 converting...
 0 init
 extra:       branch=
 extra:       convert_revision=
 # now tests that it works with trunk/branches/tags layout
 
 % initial svn import
 Adding         projA/trunk
 Adding         projA/branches
 Adding         projA/tags
 
 Committed revision 4.
 % update svn repository
 Checked out revision 4.
 A         letter.txt
 Adding         letter.txt
 Transmitting file data .
 Committed revision 5.
 Sending        letter.txt
 Transmitting file data .
 Committed revision 6.
 
 Committed revision 7.
 Sending        letter.txt
 Transmitting file data .
 Committed revision 8.
 % convert to hg once
 initializing destination A-hg repository
 scanning source...
 sorting...
 converting...
 3 init projA
 2 hello
 1 world
 0 nice day
 updating tags
 % update svn repository again
 A         todo
 A         todo/letter2.txt
 Sending        letter.txt
 Adding         todo
 Adding         todo/letter2.txt
 Transmitting file data ..
 Committed revision 9.
 
 Committed revision 10.
 Sending        todo/letter2.txt
 Transmitting file data .
 Committed revision 11.
 % test incremental conversion
 scanning source...
 sorting...
 converting...
 1 second letter
 0 work in progress
 updating tags
 o  7 update tags files: .hgtags
 |
 o  6 work in progress files: todo/letter2.txt
 |
 o  5 second letter files: letter.txt todo/letter2.txt
 |
 o  4 update tags files: .hgtags
 |
 o  3 nice day files: letter.txt
 |
 o  2 world files: letter.txt
 |
 o  1 hello files: letter.txt
 |
 o  0 init projA files:
 
 tip
 v0.2
 v0.1
 # now tests that it works with trunk/tags layout, but no branches yet
 
 % initial svn import
 Adding         projB/trunk
 Adding         projB/tags
 
 Committed revision 12.
 % update svn repository
 Checked out revision 12.
 A         letter.txt
 Adding         letter.txt
 Transmitting file data .
 Committed revision 13.
 Sending        letter.txt
 Transmitting file data .
 Committed revision 14.
 
 Committed revision 15.
 Sending        letter.txt
 Transmitting file data .
 Committed revision 16.
 % convert to hg once
 initializing destination B-hg repository
 scanning source...
 sorting...
 converting...
 3 init projB
 2 hello
 1 world
 0 nice day
 updating tags
 % update svn repository again
 A         letter2.txt
 Sending        letter.txt
 Adding         letter2.txt
 Transmitting file data ..
 Committed revision 17.
 
 Committed revision 18.
 Sending        letter2.txt
 Transmitting file data .
 Committed revision 19.
 % test incremental conversion
 scanning source...
 sorting...
 converting...
 1 second letter
 0 work in progress
 updating tags
 o  7 update tags files: .hgtags
 |
 o  6 work in progress files: letter2.txt
 |
 o  5 second letter files: letter.txt letter2.txt
 |
 o  4 update tags files: .hgtags
 |
 o  3 nice day files: letter.txt
 |
 o  2 world files: letter.txt
 |
 o  1 hello files: letter.txt
 |
 o  0 init projB files:
 
 tip
 v0.2
 v0.1