mercurial-crew-with-dirclash: hgext/convert/__init_

annotate hgext/convert/init.py @ 5374:e710874247d1

convert: allow the converter_source to say "skip this revision" If getchanges returns a string, it's assumed to be the id of an already converted revision. We map the current revision to the same revision this converted revision was mapped to. To allow skipping a root revision, getchanges can return the special string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which hopefully won't clash with any real id. The converter_source is responsible for rewriting the parents of the commit objects to make sure the revision graph makes sense.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Thu, 04 Oct 2007 23:21:37 -0300
parents	6aba1835a7b3
children	dae323e453aa

rev	line source
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	1 # convert.py Foreign SCM converter
3916 645e1dd4b8ae convert-repo: update usage information Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3911 diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4591 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	4 #
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	5 # This software may be used and distributed according to the terms
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	7
5374 e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	8 from common import NoRepo, SKIPREV, converter_source, converter_sink
4534 cc9b79216a76 Split convert extension into common and repository type modules Brendan Cully <brendan@kublai.com> parents: 4532 diff changeset	9 from cvs import convert_cvs
5355 6b6104430964 convert: support darcs as a source repo Bryan O'Sullivan <bos@serpentine.com> parents: 5352 diff changeset	10 from darcs import darcs_source
4534 cc9b79216a76 Split convert extension into common and repository type modules Brendan Cully <brendan@kublai.com> parents: 4532 diff changeset	11 from git import convert_git
5013 6c1029aacc9a convert: Support Mercurial as a source, as well as a sink Bryan O'Sullivan <bos@serpentine.com> parents: 5012 diff changeset	12 from hg import mercurial_source, mercurial_sink
5112 18abf13064cb Move debugsvnlog to subversion module. Thomas Arendsen Hein <thomas@intevation.de> parents: 5111 diff changeset	13 from subversion import convert_svn, debugsvnlog
4534 cc9b79216a76 Split convert extension into common and repository type modules Brendan Cully <brendan@kublai.com> parents: 4532 diff changeset	14
5112 18abf13064cb Move debugsvnlog to subversion module. Thomas Arendsen Hein <thomas@intevation.de> parents: 5111 diff changeset	15 import os, shlex, shutil
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	16 from mercurial import hg, ui, util, commands
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	17 from mercurial.i18n import _
3825 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	18
5111 9cda2315c7a9 convert: Use debugsvnlog instead of git-like debug-svn-log. Thomas Arendsen Hein <thomas@intevation.de> parents: 5107 diff changeset	19 commands.norepo += " convert debugsvnlog"
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	20
5013 6c1029aacc9a convert: Support Mercurial as a source, as well as a sink Bryan O'Sullivan <bos@serpentine.com> parents: 5012 diff changeset	21 converters = [convert_cvs, convert_git, convert_svn, mercurial_source,
5355 6b6104430964 convert: support darcs as a source repo Bryan O'Sullivan <bos@serpentine.com> parents: 5352 diff changeset	22 mercurial_sink, darcs_source]
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	23
4773 169fe1e6104c convert: make convertsource option handling transparent Brendan Cully <brendan@kublai.com> parents: 4759 diff changeset	24 def convertsource(ui, path, **opts):
4756 8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	25 for c in converters:
8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	26 try:
5018 c7623d2b2a66 convert: get rid of ugly use of hasattr Bryan O'Sullivan <bos@serpentine.com> parents: 5016 diff changeset	27 return c.getcommit and c(ui, path, **opts)
c7623d2b2a66 convert: get rid of ugly use of hasattr Bryan O'Sullivan <bos@serpentine.com> parents: 5016 diff changeset	28 except (AttributeError, NoRepo):
4756 8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	29 pass
8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	30 raise util.Abort('%s: unknown repository type' % path)
8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	31
8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	32 def convertsink(ui, path):
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	33 if not os.path.isdir(path):
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	34 raise util.Abort("%s: not a directory" % path)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	35 for c in converters:
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	36 try:
5018 c7623d2b2a66 convert: get rid of ugly use of hasattr Bryan O'Sullivan <bos@serpentine.com> parents: 5016 diff changeset	37 return c.putcommit and c(ui, path)
c7623d2b2a66 convert: get rid of ugly use of hasattr Bryan O'Sullivan <bos@serpentine.com> parents: 5016 diff changeset	38 except (AttributeError, NoRepo):
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	39 pass
4756 8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	40 raise util.Abort('%s: unknown repository type' % path)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	41
5281 a176f9c8b26e convert: rename a class and a function Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5252 diff changeset	42 class converter(object):
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	43 def __init__(self, ui, source, dest, revmapfile, filemapper, opts):
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	44
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	45 self.source = source
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	46 self.dest = dest
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	47 self.ui = ui
3958 2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	48 self.opts = opts
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	49 self.commitcache = {}
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	50 self.revmapfile = revmapfile
89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	51 self.revmapfilefd = None
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	52 self.authors = {}
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	53 self.authorfile = None
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	54 self.mapfile = filemapper
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	55
5373 6aba1835a7b3 convert: pass the order of the revmapfile to the converter_source Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5355 diff changeset	56 self.maporder = []
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	57 self.map = {}
1655 7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	58 try:
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	59 origrevmapfile = open(self.revmapfile, 'r')
89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	60 for l in origrevmapfile:
1655 7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	61 sv, dv = l[:-1].split()
5373 6aba1835a7b3 convert: pass the order of the revmapfile to the converter_source Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5355 diff changeset	62 if sv not in self.map:
6aba1835a7b3 convert: pass the order of the revmapfile to the converter_source Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5355 diff changeset	63 self.maporder.append(sv)
1655 7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	64 self.map[sv] = dv
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	65 origrevmapfile.close()
1655 7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	66 except IOError:
7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	67 pass
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	68
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	69 # Read first the dst author map if any
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	70 authorfile = self.dest.authorfile()
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	71 if authorfile and os.path.exists(authorfile):
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	72 self.readauthormap(authorfile)
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	73 # Extend/Override with new author map if necessary
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	74 if opts.get('authors'):
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	75 self.readauthormap(opts.get('authors'))
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	76 self.authorfile = self.dest.authorfile()
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	77
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	78 def walktree(self, heads):
4719 1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	79 '''Return a mapping that identifies the uncommitted parents of every
1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	80 uncommitted changeset.'''
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	81 visit = heads
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	82 known = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	83 parents = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	84 while visit:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	85 n = visit.pop(0)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	86 if n in known or n in self.map: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	87 known[n] = 1
5201 653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	88 commit = self.cachecommit(n)
4719 1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	89 parents[n] = []
5201 653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	90 for p in commit.parents:
4719 1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	91 parents[n].append(p)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	92 visit.append(p)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	93
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	94 return parents
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	95
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	96 def toposort(self, parents):
4719 1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	97 '''Return an ordering such that every uncommitted changeset is
1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	98 preceeded by all its uncommitted ancestors.'''
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	99 visit = parents.keys()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	100 seen = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	101 children = {}
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	102
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	103 while visit:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	104 n = visit.pop(0)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	105 if n in seen: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	106 seen[n] = 1
4719 1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	107 # Ensure that nodes without parents are present in the 'children'
1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	108 # mapping.
1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	109 children.setdefault(n, [])
1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	110 for p in parents[n]:
1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	111 if not p in self.map:
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	112 visit.append(p)
4719 1069205a8894 fix 'convert' with single commit repositories Hollis Blanchard <hollisb@us.ibm.com> parents: 4635 diff changeset	113 children.setdefault(p, []).append(n)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	114
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	115 s = []
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	116 removed = {}
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	117 visit = children.keys()
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	118 while visit:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	119 n = visit.pop(0)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	120 if n in removed: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	121 dep = 0
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	122 if n in parents:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	123 for p in parents[n]:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	124 if p in self.map: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	125 if p not in removed:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	126 # we're still dependent
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	127 visit.append(n)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	128 dep = 1
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	129 break
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	130
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	131 if not dep:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	132 # all n's parents are in the list
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	133 removed[n] = 1
3958 2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	134 if n not in self.map:
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	135 s.append(n)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	136 if n in children:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	137 for c in children[n]:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	138 visit.insert(0, c)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	139
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	140 if self.opts.get('datesort'):
3958 2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	141 depth = {}
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	142 for n in s:
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	143 depth[n] = 0
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	144 pl = [p for p in self.commitcache[n].parents
c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	145 if p not in self.map]
3958 2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	146 if pl:
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	147 depth[n] = max([depth[p] for p in pl]) + 1
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	148
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	149 s = [(depth[n], self.commitcache[n].date, n) for n in s]
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	150 s.sort()
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	151 s = [e[2] for e in s]
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	152
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	153 return s
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	154
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	155 def mapentry(self, src, dst):
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	156 if self.revmapfilefd is None:
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	157 try:
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	158 self.revmapfilefd = open(self.revmapfile, "a")
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	159 except IOError, (errno, strerror):
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	160 raise util.Abort("Could not open map file %s: %s, %s\n" % (self.revmapfile, errno, strerror))
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	161 self.map[src] = dst
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	162 self.revmapfilefd.write("%s %s\n" % (src, dst))
89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	163 self.revmapfilefd.flush()
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	164
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	165 def writeauthormap(self):
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	166 authorfile = self.authorfile
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	167 if authorfile:
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	168 self.ui.status('Writing author map file %s\n' % authorfile)
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	169 ofile = open(authorfile, 'w+')
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	170 for author in self.authors:
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	171 ofile.write("%s=%s\n" % (author, self.authors[author]))
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	172 ofile.close()
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	173
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	174 def readauthormap(self, authorfile):
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	175 afile = open(authorfile, 'r')
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	176 for line in afile:
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	177 try:
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	178 srcauthor = line.split('=')[0].strip()
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	179 dstauthor = line.split('=')[1].strip()
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	180 if srcauthor in self.authors and dstauthor != self.authors[srcauthor]:
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	181 self.ui.status(
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	182 'Overriding mapping for author %s, was %s, will be %s\n'
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	183 % (srcauthor, self.authors[srcauthor], dstauthor))
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	184 else:
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	185 self.ui.debug('Mapping author %s to %s\n'
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	186 % (srcauthor, dstauthor))
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	187 self.authors[srcauthor] = dstauthor
4590 80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	188 except IndexError:
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	189 self.ui.warn(
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	190 'Ignoring bad line in author file map %s: %s\n'
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	191 % (authorfile, line))
80fb4ec512b5 convert: fix various authormap handling bugs Brendan Cully <brendan@kublai.com> parents: 4589 diff changeset	192 afile.close()
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	193
5201 653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	194 def cachecommit(self, rev):
653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	195 commit = self.source.getcommit(rev)
653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	196 commit.author = self.authors.get(commit.author, commit.author)
653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	197 self.commitcache[rev] = commit
653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	198 return commit
653790c2fa52 convert: wrap cached commits author remapping Patrick Mezard <pmezard@gmail.com> parents: 5192 diff changeset	199
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	200 def copy(self, rev):
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	201 commit = self.commitcache[rev]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	202 do_copies = hasattr(self.dest, 'copyfile')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	203 filenames = []
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4905 diff changeset	204
5374 e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	205 changes = self.source.getchanges(rev)
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	206 if isinstance(changes, basestring):
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	207 if changes == SKIPREV:
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	208 dest = SKIPREV
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	209 else:
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	210 dest = self.map[changes]
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	211 self.mapentry(rev, dest)
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	212 return
e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	213 files, copies = changes
5172 6b4c332f241b convert: hg: optionally create branches as clones Brendan Cully <brendan@kublai.com> parents: 5117 diff changeset	214 parents = [self.map[r] for r in commit.parents]
6b4c332f241b convert: hg: optionally create branches as clones Brendan Cully <brendan@kublai.com> parents: 5117 diff changeset	215 if commit.parents:
5202 6f636d13f6b8 convert: load parent commits on-demand Patrick Mezard <pmezard@gmail.com> parents: 5201 diff changeset	216 prev = commit.parents[0]
6f636d13f6b8 convert: load parent commits on-demand Patrick Mezard <pmezard@gmail.com> parents: 5201 diff changeset	217 if prev not in self.commitcache:
6f636d13f6b8 convert: load parent commits on-demand Patrick Mezard <pmezard@gmail.com> parents: 5201 diff changeset	218 self.cachecommit(prev)
6f636d13f6b8 convert: load parent commits on-demand Patrick Mezard <pmezard@gmail.com> parents: 5201 diff changeset	219 pbranch = self.commitcache[prev].branch
5172 6b4c332f241b convert: hg: optionally create branches as clones Brendan Cully <brendan@kublai.com> parents: 5117 diff changeset	220 else:
6b4c332f241b convert: hg: optionally create branches as clones Brendan Cully <brendan@kublai.com> parents: 5117 diff changeset	221 pbranch = None
6b4c332f241b convert: hg: optionally create branches as clones Brendan Cully <brendan@kublai.com> parents: 5117 diff changeset	222 self.dest.setbranch(commit.branch, pbranch, parents)
5076 ef338e34a906 convert: look up copies in getchanges instead of getcommit Brendan Cully <brendan@kublai.com> parents: 5018 diff changeset	223 for f, v in files:
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	224 newf = self.mapfile(f)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	225 if not newf:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	226 continue
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	227 filenames.append(newf)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	228 try:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	229 data = self.source.getfile(f, v)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	230 except IOError, inst:
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	231 self.dest.delfile(newf)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	232 else:
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	233 e = self.source.getmode(f, v)
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	234 self.dest.putfile(newf, e, data)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: 4756 diff changeset	235 if do_copies:
5076 ef338e34a906 convert: look up copies in getchanges instead of getcommit Brendan Cully <brendan@kublai.com> parents: 5018 diff changeset	236 if f in copies:
ef338e34a906 convert: look up copies in getchanges instead of getcommit Brendan Cully <brendan@kublai.com> parents: 5018 diff changeset	237 copyf = self.mapfile(copies[f])
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	238 if copyf:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	239 # Merely marks that a copy happened.
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	240 self.dest.copyfile(copyf, newf)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: 4756 diff changeset	241
5192 33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	242 if not filenames and self.mapfile.active():
33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	243 newnode = parents[0]
33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	244 else:
33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	245 newnode = self.dest.putcommit(filenames, parents, commit)
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	246 self.mapentry(rev, newnode)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	247
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	248 def convert(self):
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	249 try:
5352 f0931c0240b4 convert: add before/after hooks for converter sources Bryan O'Sullivan <bos@serpentine.com> parents: 5281 diff changeset	250 self.source.before()
5014 914054ca532e convert: acquire/release locks periodically Bryan O'Sullivan <bos@serpentine.com> parents: 5013 diff changeset	251 self.dest.before()
5373 6aba1835a7b3 convert: pass the order of the revmapfile to the converter_source Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5355 diff changeset	252 self.source.setrevmap(self.map, self.maporder)
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	253 self.ui.status("scanning source...\n")
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	254 heads = self.source.getheads()
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	255 parents = self.walktree(heads)
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	256 self.ui.status("sorting...\n")
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	257 t = self.toposort(parents)
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	258 num = len(t)
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	259 c = None
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	260
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	261 self.ui.status("converting...\n")
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	262 for c in t:
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	263 num -= 1
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	264 desc = self.commitcache[c].desc
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	265 if "\n" in desc:
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	266 desc = desc.splitlines()[0]
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	267 self.ui.status("%d %s\n" % (num, desc))
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	268 self.copy(c)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	269
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	270 tags = self.source.gettags()
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	271 ctags = {}
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	272 for k in tags:
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	273 v = tags[k]
5374 e710874247d1 convert: allow the converter_source to say "skip this revision" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5373 diff changeset	274 if self.map.get(v, SKIPREV) != SKIPREV:
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	275 ctags[k] = self.map[v]
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	276
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	277 if c and ctags:
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	278 nrev = self.dest.puttags(ctags)
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	279 # write another hash correspondence to override the previous
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	280 # one so we don't end up with extra tag heads
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	281 if nrev:
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	282 self.mapentry(c, nrev)
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	283
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	284 self.writeauthormap()
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	285 finally:
9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	286 self.cleanup()
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	287
4588 9855939d0c82 convert extension: Save a few opens on the map file Edouard Gomez <ed.gomez@free.fr> parents: 4534 diff changeset	288 def cleanup(self):
5352 f0931c0240b4 convert: add before/after hooks for converter sources Bryan O'Sullivan <bos@serpentine.com> parents: 5281 diff changeset	289 try:
f0931c0240b4 convert: add before/after hooks for converter sources Bryan O'Sullivan <bos@serpentine.com> parents: 5281 diff changeset	290 self.dest.after()
f0931c0240b4 convert: add before/after hooks for converter sources Bryan O'Sullivan <bos@serpentine.com> parents: 5281 diff changeset	291 finally:
f0931c0240b4 convert: add before/after hooks for converter sources Bryan O'Sullivan <bos@serpentine.com> parents: 5281 diff changeset	292 self.source.after()
5014 914054ca532e convert: acquire/release locks periodically Bryan O'Sullivan <bos@serpentine.com> parents: 5013 diff changeset	293 if self.revmapfilefd:
914054ca532e convert: acquire/release locks periodically Bryan O'Sullivan <bos@serpentine.com> parents: 5013 diff changeset	294 self.revmapfilefd.close()
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	295
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	296 def rpairs(name):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	297 e = len(name)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	298 while e != -1:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	299 yield name[:e], name[e+1:]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	300 e = name.rfind('/', 0, e)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	301
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	302 class filemapper(object):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	303 '''Map and filter filenames when importing.
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	304 A name can be mapped to itself, a new name, or None (omit from new
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	305 repository).'''
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	306
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	307 def __init__(self, ui, path=None):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	308 self.ui = ui
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	309 self.include = {}
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	310 self.exclude = {}
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	311 self.rename = {}
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	312 if path:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	313 if self.parse(path):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	314 raise util.Abort(_('errors in filemap'))
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	315
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	316 def parse(self, path):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	317 errs = 0
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	318 def check(name, mapping, listname):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	319 if name in mapping:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	320 self.ui.warn(_('%s:%d: %r already in %s list\n') %
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	321 (lex.infile, lex.lineno, name, listname))
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	322 return 1
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	323 return 0
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	324 lex = shlex.shlex(open(path), path, True)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	325 lex.wordchars += '!@#$%^&*()-=+[]{}\|;:,./<>?'
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	326 cmd = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	327 while cmd:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	328 if cmd == 'include':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	329 name = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	330 errs += check(name, self.exclude, 'exclude')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	331 self.include[name] = name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	332 elif cmd == 'exclude':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	333 name = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	334 errs += check(name, self.include, 'include')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	335 errs += check(name, self.rename, 'rename')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	336 self.exclude[name] = name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	337 elif cmd == 'rename':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	338 src = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	339 dest = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	340 errs += check(src, self.exclude, 'exclude')
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	341 self.rename[src] = dest
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	342 elif cmd == 'source':
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	343 errs += self.parse(lex.get_token())
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	344 else:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	345 self.ui.warn(_('%s:%d: unknown directive %r\n') %
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	346 (lex.infile, lex.lineno, cmd))
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	347 errs += 1
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	348 cmd = lex.get_token()
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	349 return errs
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	350
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	351 def lookup(self, name, mapping):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	352 for pre, suf in rpairs(name):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	353 try:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	354 return mapping[pre], pre, suf
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	355 except KeyError, err:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	356 pass
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	357 return '', name, ''
5117 d4fa6bafc43a Remove trailing spaces, fix indentation Thomas Arendsen Hein <thomas@intevation.de> parents: 5112 diff changeset	358
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	359 def __call__(self, name):
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	360 if self.include:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	361 inc = self.lookup(name, self.include)[0]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	362 else:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	363 inc = name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	364 if self.exclude:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	365 exc = self.lookup(name, self.exclude)[0]
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	366 else:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	367 exc = ''
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	368 if not inc or exc:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	369 return None
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	370 newpre, pre, suf = self.lookup(name, self.rename)
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	371 if newpre:
5106 745cffe59ca8 convert: use '.' as destination name if renaming subdir into root Bryan O'Sullivan <bos@serpentine.com> parents: 5100 diff changeset	372 if newpre == '.':
745cffe59ca8 convert: use '.' as destination name if renaming subdir into root Bryan O'Sullivan <bos@serpentine.com> parents: 5100 diff changeset	373 return suf
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	374 if suf:
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	375 return newpre + '/' + suf
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	376 return newpre
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	377 return name
4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	378
5192 33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	379 def active(self):
33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	380 return bool(self.include or self.exclude or self.rename)
33015dac5df5 convert: fix mercurial_sink.putcommit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5172 diff changeset	381
5281 a176f9c8b26e convert: rename a class and a function Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5252 diff changeset	382 def convert(ui, src, dest=None, revmapfile=None, **opts):
4940 71fed370b7a7 Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. Thomas Arendsen Hein <thomas@intevation.de> parents: 4939 diff changeset	383 """Convert a foreign SCM repository to a Mercurial one.
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	384
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	385 Accepted source formats:
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	386 - CVS
5355 6b6104430964 convert: support darcs as a source repo Bryan O'Sullivan <bos@serpentine.com> parents: 5352 diff changeset	387 - Darcs
6b6104430964 convert: support darcs as a source repo Bryan O'Sullivan <bos@serpentine.com> parents: 5352 diff changeset	388 - git
6b6104430964 convert: support darcs as a source repo Bryan O'Sullivan <bos@serpentine.com> parents: 5352 diff changeset	389 - Subversion
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	390
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	391 Accepted destination formats:
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	392 - Mercurial
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	393
4753 07efcce17d28 convert: add -r argument specifying latest revision to convert Brendan Cully <brendan@kublai.com> parents: 4719 diff changeset	394 If no revision is given, all revisions will be converted. Otherwise,
07efcce17d28 convert: add -r argument specifying latest revision to convert Brendan Cully <brendan@kublai.com> parents: 4719 diff changeset	395 convert will only import up to the named revision (given in a format
07efcce17d28 convert: add -r argument specifying latest revision to convert Brendan Cully <brendan@kublai.com> parents: 4719 diff changeset	396 understood by the source).
07efcce17d28 convert: add -r argument specifying latest revision to convert Brendan Cully <brendan@kublai.com> parents: 4719 diff changeset	397
4884 72ac66e88c43 convert: Use clone's behaviour for the default destionation name. Thomas Arendsen Hein <thomas@intevation.de> parents: 4719 diff changeset	398 If no destination directory name is specified, it defaults to the
4940 71fed370b7a7 Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. Thomas Arendsen Hein <thomas@intevation.de> parents: 4939 diff changeset	399 basename of the source with '-hg' appended. If the destination
71fed370b7a7 Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. Thomas Arendsen Hein <thomas@intevation.de> parents: 4939 diff changeset	400 repository doesn't exist, it will be created.
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	401
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	402 If <revmapfile> isn't given, it will be put in a default location
89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	403 (<dest>/.hg/shamap by default). The <revmapfile> is a simple text
4884 72ac66e88c43 convert: Use clone's behaviour for the default destionation name. Thomas Arendsen Hein <thomas@intevation.de> parents: 4719 diff changeset	404 file that maps each source commit ID to the destination ID for
72ac66e88c43 convert: Use clone's behaviour for the default destionation name. Thomas Arendsen Hein <thomas@intevation.de> parents: 4719 diff changeset	405 that revision, like so:
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	406 <source ID> <destination ID>
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	407
4940 71fed370b7a7 Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. Thomas Arendsen Hein <thomas@intevation.de> parents: 4939 diff changeset	408 If the file doesn't exist, it's automatically created. It's updated
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	409 on each commit copied, so convert-repo can be interrupted and can
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	410 be run repeatedly to copy new commits.
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	411
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	412 The [username mapping] file is a simple text file that maps each source
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	413 commit author to a destination commit author. It is handy for source SCMs
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	414 that use unix logins to identify authors (eg: CVS). One line per author
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	415 mapping and the line format is:
451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	416 srcauthor=whatever string you want
5252 0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	417
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	418 The filemap is a file that allows filtering and remapping of files
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	419 and directories. Comment lines start with '#'. Each line can
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	420 contain one of the following directives:
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	421
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	422 include path/to/file
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	423
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	424 exclude path/to/file
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	425
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	426 rename from/file to/file
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	427
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	428 The 'include' directive causes a file, or all files under a
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	429 directory, to be included in the destination repository. The
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	430 'exclude' directive causes files or directories to be omitted.
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	431 The 'rename' directive renames a file or directory. To rename
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	432 from a subdirectory into the root of the repository, use '.' as
0b0caffcf175 convert: document filemap. Bryan O'Sullivan <bos@serpentine.com> parents: 5202 diff changeset	433 the path to rename to.
4940 71fed370b7a7 Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. Thomas Arendsen Hein <thomas@intevation.de> parents: 4939 diff changeset	434 """
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	435
4895 fa6c9381d053 convert: manually set encoding to UTF-8 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4884 diff changeset	436 util._encoding = 'UTF-8'
fa6c9381d053 convert: manually set encoding to UTF-8 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4884 diff changeset	437
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	438 if not dest:
4884 72ac66e88c43 convert: Use clone's behaviour for the default destionation name. Thomas Arendsen Hein <thomas@intevation.de> parents: 4719 diff changeset	439 dest = hg.defaultdest(src) + "-hg"
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	440 ui.status("assuming destination %s\n" % dest)
4521 d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	441
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	442 # Try to be smart and initalize things when required
4754 7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	443 created = False
4521 d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	444 if os.path.isdir(dest):
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	445 if len(os.listdir(dest)) > 0:
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	446 try:
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	447 hg.repository(ui, dest)
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	448 ui.status("destination %s is a Mercurial repository\n" % dest)
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	449 except hg.RepoError:
4521 d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	450 raise util.Abort(
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	451 "destination directory %s is not empty.\n"
c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	452 "Please specify an empty directory to be initialized\n"
c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	453 "or an already initialized mercurial repository"
c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	454 % dest)
4521 d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	455 else:
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	456 ui.status("initializing destination %s repository\n" % dest)
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	457 hg.repository(ui, dest, create=True)
4754 7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	458 created = True
4521 d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	459 elif os.path.exists(dest):
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	460 raise util.Abort("destination %s exists and is not a directory" % dest)
4521 d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	461 else:
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	462 ui.status("initializing destination %s repository\n" % dest)
d634b61e9cec Add some more smart when initializing destination repository Edouard Gomez <ed.gomez@free.fr> parents: 4520 diff changeset	463 hg.repository(ui, dest, create=True)
4754 7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	464 created = True
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	465
4756 8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	466 destc = convertsink(ui, dest)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	467
4754 7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	468 try:
4756 8e9d3faec270 convert: split converter into convertsource and convertsink Brendan Cully <brendan@kublai.com> parents: 4754 diff changeset	469 srcc = convertsource(ui, src, rev=opts.get('rev'))
4754 7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	470 except Exception:
7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	471 if created:
7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	472 shutil.rmtree(dest, True)
7c8cd400e86a convert: initialize source after destination, cleaning up if source is unusable Brendan Cully <brendan@kublai.com> parents: 4753 diff changeset	473 raise
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	474
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	475 if not revmapfile:
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	476 try:
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	477 revmapfile = destc.revmapfile()
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	478 except:
5011 89fbb0a5e8e3 convert: rename mapfile to revmapfile, so we can map more than just revs Bryan O'Sullivan <bos@serpentine.com> parents: 4940 diff changeset	479 revmapfile = os.path.join(destc, "map")
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	480
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	481
5281 a176f9c8b26e convert: rename a class and a function Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5252 diff changeset	482 c = converter(ui, srcc, destc, revmapfile, filemapper(ui, opts['filemap']),
a176f9c8b26e convert: rename a class and a function Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5252 diff changeset	483 opts)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	484 c.convert()
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	485
5100 39b6eaee6fd7 convert: replace fork with subprocess call. Patrick Mezard <pmezard@gmail.com> parents: 5076 diff changeset	486
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	487 cmdtable = {
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	488 "convert":
5281 a176f9c8b26e convert: rename a class and a function Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5252 diff changeset	489 (convert,
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	490 [('A', 'authors', '', 'username mapping filename'),
5016 4ebc8693ce72 convert: add filename filtering and renaming support Bryan O'Sullivan <bos@serpentine.com> parents: 5014 diff changeset	491 ('', 'filemap', '', 'remap file names using contents of file'),
4753 07efcce17d28 convert: add -r argument specifying latest revision to convert Brendan Cully <brendan@kublai.com> parents: 4719 diff changeset	492 ('r', 'rev', '', 'import up to target revision REV'),
4589 451e91ed535e convert extension: Add support for username mapping Edouard Gomez <ed.gomez@free.fr> parents: 4588 diff changeset	493 ('', 'datesort', None, 'try to sort changesets by date')],
4532 c3a78a49d7f0 Some small cleanups for convert extension: Thomas Arendsen Hein <thomas@intevation.de> parents: 4521 diff changeset	494 'hg convert [OPTION]... SOURCE [DEST [MAPFILE]]'),
5111 9cda2315c7a9 convert: Use debugsvnlog instead of git-like debug-svn-log. Thomas Arendsen Hein <thomas@intevation.de> parents: 5107 diff changeset	495 "debugsvnlog":
5100 39b6eaee6fd7 convert: replace fork with subprocess call. Patrick Mezard <pmezard@gmail.com> parents: 5076 diff changeset	496 (debugsvnlog,
39b6eaee6fd7 convert: replace fork with subprocess call. Patrick Mezard <pmezard@gmail.com> parents: 5076 diff changeset	497 [],
5111 9cda2315c7a9 convert: Use debugsvnlog instead of git-like debug-svn-log. Thomas Arendsen Hein <thomas@intevation.de> parents: 5107 diff changeset	498 'hg debugsvnlog'),
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	499 }
5100 39b6eaee6fd7 convert: replace fork with subprocess call. Patrick Mezard <pmezard@gmail.com> parents: 5076 diff changeset	500

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/__init__.py @ 5374:e710874247d1

annotate hgext/convert/init.py @ 5374:e710874247d1