Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/convert-repo @ 1335:bea6356b8bca
git -> hg conversion script
contrib/convert-repo changes:
- do not print verbose output so that error messages are seen more easily
- Output the date as integer and not as floating point number.
- Do not require a ".git" subdirectory to work on, but use the GIT_DIR
environment var to specify the git repository.
Change is otherwise compatible to the current version and I have tested it
by converting the kernel and several git respositories from kernel.org.
(Btw, the udev test dir contains a /sys dir with entries which should not
be normal dirs and not be normal files. ;-)
Thanks again for mercurial,
Florian La Roche
--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -28,26 +28,18 @@
self.path = path
def getheads(self):
- h = file(self.path + "/.git/HEAD").read()[:-1]
- return [h]
+ return [file(self.path + "/HEAD").read()[:-1]]
def catfile(self, rev, type):
if rev == "0" * 40: raise IOError()
- path = os.getcwd()
- os.chdir(self.path)
- fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev))
- os.chdir(path)
+ fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev))
return fh.read()
def getfile(self, name, rev):
return self.catfile(rev, "blob")
def getchanges(self, version):
- path = os.getcwd()
- os.chdir(self.path)
- fh = os.popen("git-diff-tree --root -m -r %s" % (version))
- os.chdir(path)
-
+ fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version))
changes = []
for l in fh:
if "\t" not in l: continue
@@ -83,9 +75,9 @@
def gettags(self):
tags = {}
- for f in os.listdir(self.path + "/.git/refs/tags"):
+ for f in os.listdir(self.path + "/refs/tags"):
try:
- h = file(self.path + "/.git/refs/tags/" + f).read().strip()
+ h = file(self.path + "/refs/tags/" + f).read().strip()
tags[f] = h
except:
pass
@@ -99,8 +91,7 @@
def getheads(self):
h = self.repo.changelog.heads()
- h = [ hg.hex(x) for x in h ]
- return h
+ return [ hg.hex(x) for x in h ]
def putfile(self, f, e, data):
self.repo.wfile(f, "w").write(data)
@@ -155,12 +146,12 @@
newlines.sort()
if newlines != oldlines:
- print "updating tags"
+ #print "updating tags"
f = self.repo.wfile(".hgtags", "w")
f.write("".join(newlines))
f.close()
if not oldlines: self.repo.add([".hgtags"])
- date = "%s 0" % time.mktime(time.gmtime())
+ date = "%s 0" % int(time.mktime(time.gmtime()))
self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
date, self.repo.changelog.tip(), hg.nullid)
@@ -262,7 +253,7 @@
num -= 1
if c in self.map: continue
desc = self.commitcache[c][3].splitlines()[0]
- print num, desc
+ #print num, desc
self.copy(c)
tags = self.source.gettags()
@@ -275,6 +266,8 @@
self.dest.puttags(ctags)
gitpath, hgpath, mapfile = sys.argv[1:]
+if os.path.isdir(gitpath + "/.git"):
+ gitpath += "/.git"
c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile)
c.convert()
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
author | Florian La Roche <laroche@redhat.com> |
---|---|
date | Fri, 23 Sep 2005 17:15:36 -0700 |
parents | 227cfbe34109 |
children | adb3de56635b |
rev | line source |
---|---|
316 | 1 #!/usr/bin/env python |
2 # | |
3 # This is a generalized framework for converting between SCM | |
4 # repository formats. | |
5 # | |
6 # In its current form, it's hardcoded to convert incrementally between | |
7 # git and Mercurial. | |
8 # | |
9 # To use, you must first import the first git version into Mercurial, | |
10 # and establish a mapping between the git commit hash and the hash in | |
11 # Mercurial for that version. This mapping is kept in a simple text | |
12 # file with lines like so: | |
13 # | |
14 # <git hash> <mercurial hash> | |
15 # | |
16 # To convert the rest of the repo, run: | |
17 # | |
18 # convert-repo <git-dir> <hg-dir> <mapfile> | |
19 # | |
20 # This updates the mapfile on each commit copied, so it can be | |
21 # interrupted and can be run repeatedly to copy new commits. | |
22 | |
694 | 23 import sys, os, zlib, sha, time |
450 | 24 from mercurial import hg, ui, util |
316 | 25 |
26 class convert_git: | |
27 def __init__(self, path): | |
28 self.path = path | |
29 | |
30 def getheads(self): | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
31 return [file(self.path + "/HEAD").read()[:-1]] |
316 | 32 |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
33 def catfile(self, rev, type): |
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
34 if rev == "0" * 40: raise IOError() |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
35 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
|
36 return fh.read() |
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
37 |
316 | 38 def getfile(self, name, rev): |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
39 return self.catfile(rev, "blob") |
316 | 40 |
41 def getchanges(self, version): | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
42 fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version)) |
316 | 43 changes = [] |
44 for l in fh: | |
45 if "\t" not in l: continue | |
46 m, f = l[:-1].split("\t") | |
47 m = m.split() | |
48 h = m[3] | |
49 p = (m[1] == "100755") | |
50 changes.append((f, h, p)) | |
51 return changes | |
52 | |
53 def getcommit(self, version): | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
54 c = self.catfile(version, "commit") # read the commit hash |
316 | 55 end = c.find("\n\n") |
56 message = c[end+2:] | |
57 l = c[:end].splitlines() | |
58 manifest = l[0].split()[1] | |
59 parents = [] | |
60 for e in l[1:]: | |
61 n,v = e.split(" ", 1) | |
62 if n == "author": | |
63 p = v.split() | |
64 date = " ".join(p[-2:]) | |
65 author = " ".join(p[:-2]) | |
66 if author[0] == "<": author = author[1:-1] | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
67 if n == "committer": |
431 | 68 p = v.split() |
69 date = " ".join(p[-2:]) | |
70 committer = " ".join(p[:-2]) | |
71 if committer[0] == "<": committer = committer[1:-1] | |
72 message += "\ncommitter: %s %s\n" % (committer, date) | |
316 | 73 if n == "parent": parents.append(v) |
74 return (parents, author, date, message) | |
75 | |
694 | 76 def gettags(self): |
77 tags = {} | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
78 for f in os.listdir(self.path + "/refs/tags"): |
694 | 79 try: |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
80 h = file(self.path + "/refs/tags/" + f).read().strip() |
1237 | 81 tags[f] = h |
694 | 82 except: |
83 pass | |
84 return tags | |
85 | |
316 | 86 class convert_mercurial: |
87 def __init__(self, path): | |
88 self.path = path | |
89 u = ui.ui() | |
90 self.repo = hg.repository(u, path) | |
91 | |
92 def getheads(self): | |
93 h = self.repo.changelog.heads() | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
94 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
|
95 |
316 | 96 def putfile(self, f, e, data): |
97 self.repo.wfile(f, "w").write(data) | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
98 if self.repo.dirstate.state(f) == '?': |
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
99 self.repo.dirstate.update([f], "a") |
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
100 |
450 | 101 util.set_exec(self.repo.wjoin(f), e) |
316 | 102 |
103 def delfile(self, f): | |
104 try: | |
105 os.unlink(self.repo.wjoin(f)) | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
106 #self.repo.remove([f]) |
316 | 107 except: |
108 pass | |
109 | |
110 def putcommit(self, files, parents, author, dest, text): | |
431 | 111 seen = {} |
112 pl = [] | |
113 for p in parents: | |
114 if p not in seen: | |
115 pl.append(p) | |
116 seen[p] = 1 | |
117 parents = pl | |
316 | 118 |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
119 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
|
120 if len(parents) < 2: parents.append("0" * 40) |
431 | 121 p2 = parents.pop(0) |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
122 |
431 | 123 while parents: |
124 p1 = p2 | |
125 p2 = parents.pop(0) | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
126 self.repo.rawcommit(files, text, author, dest, |
431 | 127 hg.bin(p1), hg.bin(p2)) |
128 text = "(octopus merge fixup)\n" | |
129 | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
130 return hg.hex(self.repo.changelog.tip()) |
316 | 131 |
694 | 132 def puttags(self, tags): |
133 try: | |
134 old = self.repo.wfile(".hgtags").read() | |
135 oldlines = old.splitlines(1) | |
136 oldlines.sort() | |
137 except: | |
138 oldlines = [] | |
139 | |
140 k = tags.keys() | |
141 k.sort() | |
142 newlines = [] | |
143 for tag in k: | |
144 newlines.append("%s %s\n" % (tags[tag], tag)) | |
145 | |
146 newlines.sort() | |
147 | |
148 if newlines != oldlines: | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
149 #print "updating tags" |
694 | 150 f = self.repo.wfile(".hgtags", "w") |
151 f.write("".join(newlines)) | |
152 f.close() | |
153 if not oldlines: self.repo.add([".hgtags"]) | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
154 date = "%s 0" % int(time.mktime(time.gmtime())) |
694 | 155 self.repo.rawcommit([".hgtags"], "update tags", "convert-repo", |
156 date, self.repo.changelog.tip(), hg.nullid) | |
157 | |
316 | 158 class convert: |
159 def __init__(self, source, dest, mapfile): | |
160 self.source = source | |
161 self.dest = dest | |
162 self.mapfile = mapfile | |
163 self.commitcache = {} | |
164 | |
165 self.map = {} | |
166 for l in file(self.mapfile): | |
167 sv, dv = l[:-1].split() | |
168 self.map[sv] = dv | |
169 | |
170 def walktree(self, heads): | |
171 visit = heads | |
172 known = {} | |
173 parents = {} | |
174 while visit: | |
175 n = visit.pop(0) | |
176 if n in known or n in self.map: continue | |
177 known[n] = 1 | |
178 self.commitcache[n] = self.source.getcommit(n) | |
179 cp = self.commitcache[n][0] | |
180 for p in cp: | |
181 parents.setdefault(n, []).append(p) | |
182 visit.append(p) | |
183 | |
184 return parents | |
185 | |
186 def toposort(self, parents): | |
187 visit = parents.keys() | |
188 seen = {} | |
189 children = {} | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
190 |
316 | 191 while visit: |
192 n = visit.pop(0) | |
193 if n in seen: continue | |
194 seen[n] = 1 | |
195 pc = 0 | |
196 if n in parents: | |
197 for p in parents[n]: | |
198 if p not in self.map: pc += 1 | |
199 visit.append(p) | |
200 children.setdefault(p, []).append(n) | |
201 if not pc: root = n | |
202 | |
203 s = [] | |
204 removed = {} | |
692
695dd9a491da
convert-repo: deal with packed git and other fixes
mpm@selenic.com
parents:
450
diff
changeset
|
205 visit = children.keys() |
316 | 206 while visit: |
207 n = visit.pop(0) | |
208 if n in removed: continue | |
209 dep = 0 | |
210 if n in parents: | |
211 for p in parents[n]: | |
212 if p in self.map: continue | |
213 if p not in removed: | |
214 # we're still dependent | |
215 visit.append(n) | |
216 dep = 1 | |
217 break | |
218 | |
219 if not dep: | |
220 # all n's parents are in the list | |
221 removed[n] = 1 | |
222 s.append(n) | |
223 if n in children: | |
224 for c in children[n]: | |
225 visit.insert(0, c) | |
226 | |
227 return s | |
228 | |
229 def copy(self, rev): | |
230 p, a, d, t = self.commitcache[rev] | |
231 files = self.source.getchanges(rev) | |
232 | |
233 for f,v,e in files: | |
234 try: | |
235 data = self.source.getfile(f, v) | |
236 except IOError, inst: | |
237 self.dest.delfile(f) | |
238 else: | |
239 self.dest.putfile(f, e, data) | |
240 | |
241 r = [self.map[v] for v in p] | |
242 f = [f for f,v,e in files] | |
243 self.map[rev] = self.dest.putcommit(f, r, a, d, t) | |
244 file(self.mapfile, "a").write("%s %s\n" % (rev, self.map[rev])) | |
245 | |
246 def convert(self): | |
247 heads = self.source.getheads() | |
248 parents = self.walktree(heads) | |
249 t = self.toposort(parents) | |
250 num = len(t) | |
251 | |
252 for c in t: | |
253 num -= 1 | |
254 if c in self.map: continue | |
255 desc = self.commitcache[c][3].splitlines()[0] | |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
256 #print num, desc |
316 | 257 self.copy(c) |
258 | |
694 | 259 tags = self.source.gettags() |
260 ctags = {} | |
261 for k in tags: | |
262 v = tags[k] | |
263 if v in self.map: | |
264 ctags[k] = self.map[v] | |
265 | |
266 self.dest.puttags(ctags) | |
267 | |
316 | 268 gitpath, hgpath, mapfile = sys.argv[1:] |
1335
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
269 if os.path.isdir(gitpath + "/.git"): |
bea6356b8bca
git -> hg conversion script
Florian La Roche <laroche@redhat.com>
parents:
1237
diff
changeset
|
270 gitpath += "/.git" |
316 | 271 |
272 c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile) | |
273 c.convert() |