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

annotate hgext/convert/init.py @ 4515:86a66cce9566

Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Wed, 06 Jun 2007 20:17:03 +0200
parents	ac2fe196ac9b
children	96d8a56d4ef9

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 #
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	3 # Copyright 2005, 2006 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
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	8 import sys, os, zlib, sha, time, re, locale, socket
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	9 from mercurial import hg, ui, util, commands
3825 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	10
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	11 commands.norepo += " convert"
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	12
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	13 class NoRepo(Exception): pass
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	14
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	15 class commit(object):
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	16 def __init__(self, **parts):
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	17 for x in "author date desc parents".split():
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	18 if not x in parts:
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	19 raise util.Abort("commit missing field %s\n" % x)
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	20 self.__dict__.update(parts)
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	21
3825 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	22 def recode(s):
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	23 try:
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	24 return s.decode("utf-8").encode("utf-8")
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	25 except:
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	26 try:
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	27 return s.decode("latin-1").encode("utf-8")
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	28 except:
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	29 return s.decode("utf-8", "replace").encode("utf-8")
158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	30
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	31 class converter_source(object):
4446 1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	32 """Conversion source interface"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	33
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	34 def __init__(self, ui, path):
4446 1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	35 """Initialize conversion source (or raise NoRepo("message")
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	36 exception if path is not a valid repository)"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	37 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	38
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	39 def getheads(self):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	40 """Return a list of this repository's heads"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	41 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	42
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	43 def getfile(self, name, rev):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	44 """Return file contents as a string"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	45 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	46
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	47 def getmode(self, name, rev):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	48 """Return file mode, eg. '', 'x', or 'l'"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	49 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	50
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	51 def getchanges(self, version):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	52 """Return sorted list of (filename, id) tuples for all files changed in rev.
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	53
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	54 id just tells us which revision to return in getfile(), e.g. in
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	55 git it's an object hash."""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	56 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	57
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	58 def getcommit(self, version):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	59 """Return the commit object for version"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	60 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	61
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	62 def gettags(self):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	63 """Return the tags as a dictionary of name: revision"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	64 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	65
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	66 class converter_sink(object):
4446 1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	67 """Conversion sink (target) interface"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	68
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	69 def __init__(self, ui, path):
4446 1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	70 """Initialize conversion sink (or raise NoRepo("message")
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	71 exception if path is not a valid repository)"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	72 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	73
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	74 def getheads(self):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	75 """Return a list of this repository's heads"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	76 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	77
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	78 def mapfile(self):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	79 """Path to a file that will contain lines
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	80 source_rev_id sink_rev_id
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	81 mapping equivalent revision identifiers for each system."""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	82 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	83
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	84 def putfile(self, f, e, data):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	85 """Put file for next putcommit().
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	86 f: path to file
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	87 e: '', 'x', or 'l' (regular file, executable, or symlink)
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	88 data: file contents"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	89 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	90
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	91 def delfile(self, f):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	92 """Delete file for next putcommit().
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	93 f: path to file"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	94 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	95
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	96 def putcommit(self, files, parents, commit):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	97 """Create a revision with all changed files listed in 'files'
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	98 and having listed parents. 'commit' is a commit object containing
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	99 at a minimum the author, date, and message for this changeset.
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	100 Called after putfile() and delfile() calls. Note that the sink
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	101 repository is not told to update itself to a particular revision
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	102 (or even what that revision would be) before it receives the
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	103 file data."""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	104 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	105
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	106 def puttags(self, tags):
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	107 """Put tags into sink.
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	108 tags: {tagname: sink_rev_id, ...}"""
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	109 raise NotImplementedError()
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	110
1b75e0eff532 document conversion interface Daniel Holth <dholth@fastmail.fm> parents: 4114 diff changeset	111
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	112 # CVS conversion code inspired by hg-cvs-import and git-cvsimport
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	113 class convert_cvs(converter_source):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	114 def __init__(self, ui, path):
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	115 self.path = path
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	116 self.ui = ui
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	117 cvs = os.path.join(path, "CVS")
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	118 if not os.path.exists(cvs):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	119 raise NoRepo("couldn't open CVS repo %s" % path)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	120
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	121 self.changeset = {}
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	122 self.files = {}
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	123 self.tags = {}
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	124 self.lastbranch = {}
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	125 self.parent = {}
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	126 self.socket = None
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	127 self.cvsroot = file(os.path.join(cvs, "Root")).read()[:-1]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	128 self.cvsrepo = file(os.path.join(cvs, "Repository")).read()[:-1]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	129 self.encoding = locale.getpreferredencoding()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	130 self._parse()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	131 self._connect()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	132
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	133 def _parse(self):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	134 if self.changeset:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	135 return
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	136
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	137 d = os.getcwd()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	138 try:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	139 os.chdir(self.path)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	140 id = None
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	141 state = 0
4109 59de487f43d7 Change a bit cvsps arguments Edouard Gomez <ed.gomez@free.fr> parents: 4082 diff changeset	142 for l in os.popen("cvsps -A -u --cvs-direct -q"):
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	143 if state == 0: # header
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	144 if l.startswith("PatchSet"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	145 id = l[9:-2]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	146 elif l.startswith("Date"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	147 date = util.parsedate(l[6:-1], ["%Y/%m/%d %H:%M:%S"])
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	148 date = util.datestr(date)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	149 elif l.startswith("Branch"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	150 branch = l[8:-1]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	151 self.parent[id] = self.lastbranch.get(branch,'bad')
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	152 self.lastbranch[branch] = id
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	153 elif l.startswith("Ancestor branch"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	154 ancestor = l[17:-1]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	155 self.parent[id] = self.lastbranch[ancestor]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	156 elif l.startswith("Author"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	157 author = self.recode(l[8:-1])
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	158 elif l.startswith("Tag: "):
4110 b53c6f7dbb1f Don't keep trailing white space in cvs tags Edouard Gomez <ed.gomez@free.fr> parents: 4109 diff changeset	159 t = l[5:-1].rstrip()
b53c6f7dbb1f Don't keep trailing white space in cvs tags Edouard Gomez <ed.gomez@free.fr> parents: 4109 diff changeset	160 if t != "(none)":
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	161 self.tags[t] = id
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	162 elif l.startswith("Log:"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	163 state = 1
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	164 log = ""
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	165 elif state == 1: # log
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	166 if l == "Members: \n":
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	167 files = {}
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	168 log = self.recode(log[:-1])
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	169 if log.isspace():
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	170 log = "* empty log message *\n"
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	171 state = 2
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	172 else:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	173 log += l
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	174 elif state == 2:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	175 if l == "\n": #
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	176 state = 0
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	177 p = [self.parent[id]]
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	178 if id == "1":
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	179 p = []
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	180 c = commit(author=author, date=date, parents=p,
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	181 desc=log, branch=branch)
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	182 self.changeset[id] = c
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	183 self.files[id] = files
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	184 else:
4515 86a66cce9566 Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension Thomas Arendsen Hein <thomas@intevation.de> parents: 4513 diff changeset	185 colon = l.rfind(':')
86a66cce9566 Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension Thomas Arendsen Hein <thomas@intevation.de> parents: 4513 diff changeset	186 file = l[1:colon]
86a66cce9566 Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension Thomas Arendsen Hein <thomas@intevation.de> parents: 4513 diff changeset	187 rev = l[colon+1:-2]
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	188 rev = rev.split("->")[1]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	189 files[file] = rev
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	190
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	191 self.heads = self.lastbranch.values()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	192 finally:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	193 os.chdir(d)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	194
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	195 def _connect(self):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	196 root = self.cvsroot
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	197 conntype = None
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	198 user, host = None, None
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	199 cmd = ['cvs', 'server']
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	200
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	201 self.ui.status("connecting to %s\n" % root)
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	202
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	203 if root.startswith(":pserver:"):
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	204 root = root[9:]
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	205 m = re.match(r'(?:(.?)(?::(.?))?@)?([^:\/])(?::(\d))?(.*)', root)
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	206 if m:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	207 conntype = "pserver"
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	208 user, passw, serv, port, root = m.groups()
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	209 if not user:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	210 user = "anonymous"
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	211 rr = ":pserver:" + user + "@" + serv + ":" + root
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	212 if port:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	213 rr2, port = "-", int(port)
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	214 else:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	215 rr2, port = rr, 2401
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	216 rr += str(port)
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	217
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	218 if not passw:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	219 passw = "A"
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	220 pf = open(os.path.join(os.environ["HOME"], ".cvspass"))
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	221 for l in pf:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	222 # :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	223 m = re.match(r'(/\d+\s+/)?(.*)', l)
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	224 l = m.group(2)
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	225 w, p = l.split(' ', 1)
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	226 if w in [rr, rr2]:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	227 passw = p
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	228 break
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	229 pf.close()
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	230
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	231 sck = socket.socket()
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	232 sck.connect((serv, port))
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	233 sck.send("\n".join(["BEGIN AUTH REQUEST", root, user, passw, "END AUTH REQUEST", ""]))
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	234 if sck.recv(128) != "I LOVE YOU\n":
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	235 raise NoRepo("CVS pserver authentication failed")
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	236
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	237 self.writep = self.readp = sck.makefile('r+')
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	238
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	239 if not conntype and root.startswith(":local:"):
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	240 conntype = "local"
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	241 root = root[7:]
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	242
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	243 if not conntype:
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	244 # :ext:user@host/home/user/path/to/cvsroot
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	245 if root.startswith(":ext:"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	246 root = root[5:]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	247 m = re.match(r'(?:([^@:/]+)@)?([^:/]+):?(.*)', root)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	248 if not m:
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	249 conntype = "local"
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	250 else:
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	251 conntype = "rsh"
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	252 user, host, root = m.group(1), m.group(2), m.group(3)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	253
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	254 if conntype != "pserver":
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	255 if conntype == "rsh":
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	256 rsh = os.environ.get("CVS_RSH" or "rsh")
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	257 if user:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	258 cmd = [rsh, '-l', user, host] + cmd
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	259 else:
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	260 cmd = [rsh, host] + cmd
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	261
4047 705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	262 self.writep, self.readp = os.popen2(cmd)
705d0792dbf2 add pserver support to convert_repo csaba.henk@creo.hu parents: 4006 diff changeset	263
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	264 self.realroot = root
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	265
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	266 self.writep.write("Root %s\n" % root)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	267 self.writep.write("Valid-responses ok error Valid-requests Mode"
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	268 " M Mbinary E Checked-in Created Updated"
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	269 " Merged Removed\n")
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	270 self.writep.write("valid-requests\n")
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	271 self.writep.flush()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	272 r = self.readp.readline()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	273 if not r.startswith("Valid-requests"):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	274 raise util.Abort("server sucks\n")
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	275 if "UseUnchanged" in r:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	276 self.writep.write("UseUnchanged\n")
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	277 self.writep.flush()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	278 r = self.readp.readline()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	279
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	280 def getheads(self):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	281 return self.heads
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	282
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	283 def _getfile(self, name, rev):
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	284 if rev.endswith("(DEAD)"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	285 raise IOError
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	286
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	287 args = ("-N -P -kk -r %s --" % rev).split()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	288 args.append(os.path.join(self.cvsrepo, name))
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	289 for x in args:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	290 self.writep.write("Argument %s\n" % x)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	291 self.writep.write("Directory .\n%s\nco\n" % self.realroot)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	292 self.writep.flush()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	293
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	294 data = ""
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	295 while 1:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	296 line = self.readp.readline()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	297 if line.startswith("Created ") or line.startswith("Updated "):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	298 self.readp.readline() # path
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	299 self.readp.readline() # entries
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	300 mode = self.readp.readline()[:-1]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	301 count = int(self.readp.readline()[:-1])
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	302 data = self.readp.read(count)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	303 elif line.startswith(" "):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	304 data += line[1:]
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	305 elif line.startswith("M "):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	306 pass
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	307 elif line.startswith("Mbinary "):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	308 count = int(self.readp.readline()[:-1])
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	309 data = self.readp.read(count)
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	310 else:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	311 if line == "ok\n":
4082 6b2909e84203 convert-repo converts symlinks from git Daniel Holth <dholth@fastmail.fm> parents: 4062 diff changeset	312 return (data, "x" in mode and "x" or "")
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	313 elif line.startswith("E "):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	314 self.ui.warn("cvs server: %s\n" % line[2:])
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	315 elif line.startswith("Remove"):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	316 l = self.readp.readline()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	317 l = self.readp.readline()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	318 if l != "ok\n":
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	319 raise util.Abort("unknown CVS response: %s\n" % l)
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	320 else:
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	321 raise util.Abort("unknown CVS response: %s\n" % line)
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	322
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	323 def getfile(self, file, rev):
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	324 data, mode = self._getfile(file, rev)
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	325 self.modecache[(file, rev)] = mode
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	326 return data
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	327
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	328 def getmode(self, file, rev):
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	329 return self.modecache[(file, rev)]
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	330
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	331 def getchanges(self, rev):
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	332 self.modecache = {}
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	333 files = self.files[rev]
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	334 cl = files.items()
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	335 cl.sort()
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	336 return cl
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	337
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	338 def recode(self, text):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	339 return text.decode(self.encoding, "replace").encode("utf-8")
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	340
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	341 def getcommit(self, rev):
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	342 return self.changeset[rev]
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	343
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	344 def gettags(self):
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	345 return self.tags
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	346
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	347 class convert_git(converter_source):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	348 def __init__(self, ui, path):
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	349 if os.path.isdir(path + "/.git"):
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	350 path += "/.git"
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	351 self.path = path
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	352 self.ui = ui
4111 06d65498f73b convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos Matt Mackall <mpm@selenic.com> parents: 4082 diff changeset	353 if not os.path.exists(path + "/objects"):
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	354 raise NoRepo("couldn't open GIT repo %s" % path)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	355
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	356 def getheads(self):
2649 e6a7a6a33a62 make convert-repo deal with git symbolic refs. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2093 diff changeset	357 fh = os.popen("GIT_DIR=%s git-rev-parse --verify HEAD" % self.path)
e6a7a6a33a62 make convert-repo deal with git symbolic refs. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2093 diff changeset	358 return [fh.read()[:-1]]
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	359
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	360 def catfile(self, rev, type):
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	361 if rev == "0" * 40: raise IOError()
1335 bea6356b8bca git -> hg conversion script Florian La Roche <laroche@redhat.com> parents: 1237 diff changeset	362 fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev))
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	363 return fh.read()
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	364
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	365 def getfile(self, name, rev):
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	366 return self.catfile(rev, "blob")
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	367
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	368 def getmode(self, name, rev):
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	369 return self.modecache[(name, rev)]
558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	370
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	371 def getchanges(self, version):
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	372 self.modecache = {}
1335 bea6356b8bca git -> hg conversion script Florian La Roche <laroche@redhat.com> parents: 1237 diff changeset	373 fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version))
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	374 changes = []
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	375 for l in fh:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	376 if "\t" not in l: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	377 m, f = l[:-1].split("\t")
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	378 m = m.split()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	379 h = m[3]
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	380 p = (m[1] == "100755")
4082 6b2909e84203 convert-repo converts symlinks from git Daniel Holth <dholth@fastmail.fm> parents: 4062 diff changeset	381 s = (m[1] == "120000")
6b2909e84203 convert-repo converts symlinks from git Daniel Holth <dholth@fastmail.fm> parents: 4062 diff changeset	382 self.modecache[(f, h)] = (p and "x") or (s and "l") or ""
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	383 changes.append((f, h))
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	384 return changes
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	385
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	386 def getcommit(self, version):
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	387 c = self.catfile(version, "commit") # read the commit hash
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	388 end = c.find("\n\n")
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	389 message = c[end+2:]
3825 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	390 message = recode(message)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	391 l = c[:end].splitlines()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	392 manifest = l[0].split()[1]
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	393 parents = []
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	394 for e in l[1:]:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	395 n,v = e.split(" ", 1)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	396 if n == "author":
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	397 p = v.split()
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	398 tm, tz = p[-2:]
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	399 author = " ".join(p[:-2])
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	400 if author[0] == "<": author = author[1:-1]
3825 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	401 author = recode(author)
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	402 if n == "committer":
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	403 p = v.split()
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	404 tm, tz = p[-2:]
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	405 committer = " ".join(p[:-2])
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	406 if committer[0] == "<": committer = committer[1:-1]
3825 158fce02dc40 Teach convert-repo to deal with mixed charsets in git Matt Mackall <mpm@selenic.com> parents: 2649 diff changeset	407 committer = recode(committer)
3910 4bc5a2405b12 convert-repo: fix recoding of committer Matt Mackall <mpm@selenic.com> parents: 3825 diff changeset	408 message += "\ncommitter: %s\n" % committer
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	409 if n == "parent": parents.append(v)
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	410
adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	411 tzs, tzh, tzm = tz[-5:-4] + "1", tz[-4:-2], tz[-2:]
2093 5cc414722587 convert-repo: fix reversed time zone offset Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1715 diff changeset	412 tz = -int(tzs) * (int(tzh) * 3600 + int(tzm))
1385 adb3de56635b convert-repo: Fix timezone handling Matt Mackall <mpm@selenic.com> parents: 1335 diff changeset	413 date = tm + " " + str(tz)
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	414
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	415 c = commit(parents=parents, date=date, author=author, desc=message)
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	416 return c
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	417
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	418 def gettags(self):
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	419 tags = {}
4062 516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	420 fh = os.popen('git-ls-remote --tags "%s" 2>/dev/null' % self.path)
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	421 prefix = 'refs/tags/'
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	422 for line in fh:
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	423 line = line.strip()
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	424 if not line.endswith("^{}"):
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	425 continue
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	426 node, tag = line.split(None, 1)
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	427 if not tag.startswith(prefix):
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	428 continue
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	429 tag = tag[len(prefix):-3]
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	430 tags[tag] = node
516f883e3d79 convert-repo: handle packed git tags Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4047 diff changeset	431
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	432 return tags
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	433
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	434 class convert_mercurial(converter_sink):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	435 def __init__(self, ui, path):
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	436 self.path = path
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	437 self.ui = ui
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	438 try:
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	439 self.repo = hg.repository(self.ui, path)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	440 except:
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	441 raise NoRepo("could open hg repo %s" % path)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	442
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	443 def mapfile(self):
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	444 return os.path.join(self.path, ".hg", "shamap")
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	445
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	446 def getheads(self):
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	447 h = self.repo.changelog.heads()
1335 bea6356b8bca git -> hg conversion script Florian La Roche <laroche@redhat.com> parents: 1237 diff changeset	448 return [ hg.hex(x) for x in h ]
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	449
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	450 def putfile(self, f, e, data):
4082 6b2909e84203 convert-repo converts symlinks from git Daniel Holth <dholth@fastmail.fm> parents: 4062 diff changeset	451 self.repo.wwrite(f, data, e)
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	452 if self.repo.dirstate.state(f) == '?':
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	453 self.repo.dirstate.update([f], "a")
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	454
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	455 def delfile(self, f):
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	456 try:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	457 os.unlink(self.repo.wjoin(f))
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	458 #self.repo.remove([f])
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	459 except:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	460 pass
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	461
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	462 def putcommit(self, files, parents, commit):
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	463 seen = {}
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	464 pl = []
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	465 for p in parents:
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	466 if p not in seen:
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	467 pl.append(p)
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	468 seen[p] = 1
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	469 parents = pl
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	470
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	471 if len(parents) < 2: parents.append("0" * 40)
695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	472 if len(parents) < 2: parents.append("0" * 40)
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	473 p2 = parents.pop(0)
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	474
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	475 text = commit.desc
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	476 extra = {}
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	477 try:
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	478 extra["branch"] = commit.branch
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	479 except AttributeError:
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	480 pass
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	481
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	482 while parents:
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	483 p1 = p2
dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	484 p2 = parents.pop(0)
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	485 a = self.repo.rawcommit(files, text, commit.author, commit.date,
9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	486 hg.bin(p1), hg.bin(p2), extra=extra)
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	487 text = "(octopus merge fixup)\n"
1389 9b3ef6f3cef5 convert-repo: fix up octopus merge conversion Matt Mackall <mpm@selenic.com> parents: 1388 diff changeset	488 p2 = hg.hex(self.repo.changelog.tip())
431 dfc44f3f587c convert-repo fixups mpm@selenic.com parents: 316 diff changeset	489
1389 9b3ef6f3cef5 convert-repo: fix up octopus merge conversion Matt Mackall <mpm@selenic.com> parents: 1388 diff changeset	490 return p2
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	491
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	492 def puttags(self, tags):
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	493 try:
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	494 old = self.repo.wfile(".hgtags").read()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	495 oldlines = old.splitlines(1)
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	496 oldlines.sort()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	497 except:
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	498 oldlines = []
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	499
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	500 k = tags.keys()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	501 k.sort()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	502 newlines = []
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	503 for tag in k:
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	504 newlines.append("%s %s\n" % (tags[tag], tag))
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	505
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	506 newlines.sort()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	507
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	508 if newlines != oldlines:
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	509 self.ui.status("updating tags\n")
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	510 f = self.repo.wfile(".hgtags", "w")
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	511 f.write("".join(newlines))
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	512 f.close()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	513 if not oldlines: self.repo.add([".hgtags"])
1335 bea6356b8bca git -> hg conversion script Florian La Roche <laroche@redhat.com> parents: 1237 diff changeset	514 date = "%s 0" % int(time.mktime(time.gmtime()))
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	515 self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	516 date, self.repo.changelog.tip(), hg.nullid)
1387 0c7e8d345564 convert-repo: linearize the tag commit Matt Mackall <mpm@selenic.com> parents: 1386 diff changeset	517 return hg.hex(self.repo.changelog.tip())
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	518
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	519 converters = [convert_cvs, convert_git, convert_mercurial]
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	520
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	521 def converter(ui, path):
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	522 if not os.path.isdir(path):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	523 raise util.Abort("%s: not a directory\n" % path)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	524 for c in converters:
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	525 try:
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	526 return c(ui, path)
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	527 except NoRepo:
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	528 pass
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	529 raise util.Abort("%s: unknown repository type\n" % path)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	530
4447 af013ae3ca10 use documented convert-repo interface Daniel Holth <dholth@fastmail.fm> parents: 4446 diff changeset	531 class convert(object):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	532 def __init__(self, ui, source, dest, mapfile, opts):
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	533
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	534 self.source = source
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	535 self.dest = dest
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	536 self.ui = ui
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	537 self.mapfile = mapfile
3958 2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	538 self.opts = opts
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	539 self.commitcache = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	540
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	541 self.map = {}
1655 7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	542 try:
7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	543 for l in file(self.mapfile):
7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	544 sv, dv = l[:-1].split()
7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	545 self.map[sv] = dv
7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	546 except IOError:
7bfd4724932a convert-repo: automatically create empty map file Matt Mackall <mpm@selenic.com> parents: 1389 diff changeset	547 pass
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	548
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	549 def walktree(self, heads):
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	550 visit = heads
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	551 known = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	552 parents = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	553 while visit:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	554 n = visit.pop(0)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	555 if n in known or n in self.map: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	556 known[n] = 1
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	557 self.commitcache[n] = self.source.getcommit(n)
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	558 cp = self.commitcache[n].parents
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	559 for p in cp:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	560 parents.setdefault(n, []).append(p)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	561 visit.append(p)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	562
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	563 return parents
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	564
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	565 def toposort(self, parents):
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	566 visit = parents.keys()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	567 seen = {}
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	568 children = {}
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	569
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	570 while visit:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	571 n = visit.pop(0)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	572 if n in seen: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	573 seen[n] = 1
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	574 pc = 0
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	575 if n in parents:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	576 for p in parents[n]:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	577 if p not in self.map: pc += 1
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	578 visit.append(p)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	579 children.setdefault(p, []).append(n)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	580 if not pc: root = n
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	581
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	582 s = []
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	583 removed = {}
692 695dd9a491da convert-repo: deal with packed git and other fixes mpm@selenic.com parents: 450 diff changeset	584 visit = children.keys()
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	585 while visit:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	586 n = visit.pop(0)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	587 if n in removed: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	588 dep = 0
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	589 if n in parents:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	590 for p in parents[n]:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	591 if p in self.map: continue
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	592 if p not in removed:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	593 # we're still dependent
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	594 visit.append(n)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	595 dep = 1
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	596 break
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	597
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	598 if not dep:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	599 # all n's parents are in the list
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	600 removed[n] = 1
3958 2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	601 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	602 s.append(n)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	603 if n in children:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	604 for c in children[n]:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	605 visit.insert(0, c)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	606
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	607 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	608 depth = {}
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	609 for n in s:
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	610 depth[n] = 0
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	611 pl = [p for p in self.commitcache[n].parents if p not in self.map]
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	612 if pl:
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	613 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	614
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	615 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	616 s.sort()
2b87d3c5ab8e convert-repo: add option to attempt to sort by date Matt Mackall <mpm@selenic.com> parents: 3957 diff changeset	617 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	618
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	619 return s
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	620
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	621 def copy(self, rev):
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	622 c = self.commitcache[rev]
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	623 files = self.source.getchanges(rev)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	624
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	625 for f,v in files:
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	626 try:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	627 data = self.source.getfile(f, v)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	628 except IOError, inst:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	629 self.dest.delfile(f)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	630 else:
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	631 e = self.source.getmode(f, v)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	632 self.dest.putfile(f, e, data)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	633
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	634 r = [self.map[v] for v in c.parents]
3957 558f52943cd2 convert-repo: add CVS exec bit support Matt Mackall <mpm@selenic.com> parents: 3955 diff changeset	635 f = [f for f,v in files]
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	636 self.map[rev] = self.dest.putcommit(f, r, c)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	637 file(self.mapfile, "a").write("%s %s\n" % (rev, self.map[rev]))
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	638
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	639 def convert(self):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	640 self.ui.status("scanning source...\n")
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	641 heads = self.source.getheads()
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	642 parents = self.walktree(heads)
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	643 self.ui.status("sorting...\n")
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	644 t = self.toposort(parents)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	645 num = len(t)
1715 40346aa66b0f Revert convert-repo changes Matt Mackall <mpm@selenic.com> parents: 1656 diff changeset	646 c = None
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	647
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	648 self.ui.status("converting...\n")
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	649 for c in t:
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	650 num -= 1
3955 9af4b853ed4d convert-repo: add CVS branch support Matt Mackall <mpm@selenic.com> parents: 3954 diff changeset	651 desc = self.commitcache[c].desc
3954 fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	652 if "\n" in desc:
fad134931327 convert-repo: add basic CVS import support Matt Mackall <mpm@selenic.com> parents: 3948 diff changeset	653 desc = desc.splitlines()[0]
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	654 self.ui.status("%d %s\n" % (num, desc))
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	655 self.copy(c)
c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	656
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	657 tags = self.source.gettags()
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	658 ctags = {}
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	659 for k in tags:
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	660 v = tags[k]
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	661 if v in self.map:
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	662 ctags[k] = self.map[v]
51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	663
1715 40346aa66b0f Revert convert-repo changes Matt Mackall <mpm@selenic.com> parents: 1656 diff changeset	664 if c and ctags:
1387 0c7e8d345564 convert-repo: linearize the tag commit Matt Mackall <mpm@selenic.com> parents: 1386 diff changeset	665 nrev = self.dest.puttags(ctags)
0c7e8d345564 convert-repo: linearize the tag commit Matt Mackall <mpm@selenic.com> parents: 1386 diff changeset	666 # write another hash correspondence to override the previous
0c7e8d345564 convert-repo: linearize the tag commit Matt Mackall <mpm@selenic.com> parents: 1386 diff changeset	667 # one so we don't end up with extra tag heads
3911 fe075ddf3272 convert-repo: avoid adding bogus value to shamap on tag update Matt Mackall <mpm@selenic.com> parents: 3910 diff changeset	668 if nrev:
fe075ddf3272 convert-repo: avoid adding bogus value to shamap on tag update Matt Mackall <mpm@selenic.com> parents: 3910 diff changeset	669 file(self.mapfile, "a").write("%s %s\n" % (c, nrev))
694 51eb248d3348 Teach convert-repo about tags mpm@selenic.com parents: 692 diff changeset	670
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	671 def _convert(ui, src, dest=None, mapfile=None, **opts):
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	672 '''Convert a foreign SCM repository to a Mercurial one.
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	673
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	674 Accepted source formats:
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	675 - GIT
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	676 - CVS
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	677
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	678 Accepted destination formats:
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	679 - Mercurial
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	680
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	681 If destination isn't given, a new Mercurial repo named <src>-hg will
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	682 be created. If <mapfile> isn't given, it will be put in a default
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	683 location (<dest>/.hg/shamap by default)
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	684
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	685 The <mapfile> is a simple text file that maps each source commit ID to
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	686 the destination ID for that revision, like so:
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	687
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	688 <source ID> <destination ID>
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	689
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	690 If the file doesn't exist, it's automatically created. It's updated
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	691 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	692 be run repeatedly to copy new commits.
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	693 '''
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	694
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	695 srcc = converter(ui, src)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	696 if not hasattr(srcc, "getcommit"):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	697 raise util.Abort("%s: can't read from this repo type\n" % src)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	698
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	699 if not dest:
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	700 dest = src + "-hg"
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	701 ui.status("assuming destination %s\n" % dest)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	702 if not os.path.isdir(dest):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	703 ui.status("creating repository %s\n" % dest)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	704 os.system("hg init " + dest)
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	705 destc = converter(ui, dest)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	706 if not hasattr(destc, "putcommit"):
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	707 raise util.Abort("%s: can't write to this repo type\n" % src)
316 c48d069163d6 Add new convert-repo script mpm@selenic.com parents: diff changeset	708
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	709 if not mapfile:
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	710 try:
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	711 mapfile = destc.mapfile()
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	712 except:
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	713 mapfile = os.path.join(destc, "map")
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	714
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	715 c = convert(ui, srcc, destc, mapfile, opts)
3947 0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	716 c.convert()
0fab73b3f453 convert-repo: add some smarts Matt Mackall <mpm@selenic.com> parents: 3916 diff changeset	717
4513 ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	718 cmdtable = {
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	719 "convert": (_convert,
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	720 [('', 'datesort', None, 'try to sort changesets by date')],
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	721 'hg convert [OPTIONS] <src> [dst [map]]'),
ac2fe196ac9b Turns convert.py into a real extension Edouard Gomez <ed.gomez@free.fr> parents: 4512 diff changeset	722 }

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/__init__.py @ 4515:86a66cce9566

annotate hgext/convert/init.py @ 4515:86a66cce9566