mercurial-crew-with-dirclash: contrib/convert-repo annotate

annotate contrib/convert-repo @ 4111:06d65498f73b

convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos

author	Matt Mackall <mpm@selenic.com>
date	Wed, 21 Feb 2007 11:02:37 -0600
parents	6b2909e84203
children	d5011e347476

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

Mercurial > hg > mercurial-crew-with-dirclash

annotate contrib/convert-repo @ 4111:06d65498f73b