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

annotate hgext/convert/init.py @ 5281:a176f9c8b26e

convert: rename a class and a function

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Sat, 01 Sep 2007 02:49:18 -0300
parents	0b0caffcf175
children	f0931c0240b4

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

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/__init__.py @ 5281:a176f9c8b26e

annotate hgext/convert/init.py @ 5281:a176f9c8b26e