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

equal deleted inserted replaced

-:fad134931327
+:9af4b853ed4d
 os.environ["HGENCODING"] = "utf-8"
 from mercurial import hg, ui, util, fancyopts
 class Abort(Exception): pass
 class NoRepo(Exception): pass
+class commit:
+def __init__(self, **parts):
+for x in "author date desc parents".split():
+if not x in parts:
+abort("commit missing field %s\n" % x)
+self.__dict__.update(parts)
 quiet = 0
 def status(msg):
 if not quiet: sys.stdout.write(str(msg))
 cvs = os.path.join(path, "CVS")
 if not os.path.exists(cvs):
 raise NoRepo("couldn't open CVS repo %s" % path)
 self.changeset = {}
+self.files = {}
 self.tags = {}
 self.lastbranch = {}
 self.parent = {}
 self.socket = None
 self.cvsroot = file(os.path.join(cvs, "Root")).read()[:-1]
 else:
 log += l
 elif state == 2:
 if l == "\n": #
 state = 0
-self.changeset[id] = (date, author, log, files)
+p = [self.parent[id]]
+if id == "1":
+p = []
+c = commit(author=author, date=date, parents=p,
+desc=log, branch=branch)
+self.changeset[id] = c
+self.files[id] = files
 else:
 file,rev = l[1:-2].rsplit(':',1)
 rev = rev.split("->")[1]
 files[file] = rev
 abort("unknown CVS response: %s\n" % l)
 else:
 abort("unknown CVS response: %s\n" % line)
 def getchanges(self, rev):
-files = self.changeset[rev][3]
+files = self.files[rev]
 cl = [ (f, r, 0) for f,r in files.items() ]
 cl.sort()
 return cl
 def recode(self, text):
 return text.decode(self.encoding, "replace").encode("utf-8")
 def getcommit(self, rev):
-cs = self.changeset[rev]
+return self.changeset[rev]
-parents = [self.parent[rev]]
-if rev == "1":
-parents = []
-return (parents, cs[1], cs[0], cs[2])
 def gettags(self):
 return self.tags
 class convert_git:
 if n == "parent": parents.append(v)
 tzs, tzh, tzm = tz[-5:-4] + "1", tz[-4:-2], tz[-2:]
 tz = -int(tzs) * (int(tzh) * 3600 + int(tzm))
 date = tm + " " + str(tz)
-return (parents, author, date, message)
+c = commit(parents=parents, date=date, author=author, desc=message)
+return c
 def gettags(self):
 tags = {}
 for f in os.listdir(self.path + "/refs/tags"):
 try:
 os.unlink(self.repo.wjoin(f))
 #self.repo.remove([f])
 except:
 pass
-def putcommit(self, files, parents, author, dest, text):
+def putcommit(self, files, parents, commit):
 seen = {}
 pl = []
 for p in parents:
 if p not in seen:
 pl.append(p)
 if len(parents) < 2: parents.append("0" * 40)
 if len(parents) < 2: parents.append("0" * 40)
 p2 = parents.pop(0)
+text = commit.desc
+extra = {}
+try:
+extra["branch"] = commit.branch
+except AttributeError:
+pass
 while parents:
 p1 = p2
 p2 = parents.pop(0)
-a = self.repo.rawcommit(files, text, author, dest,
+a = self.repo.rawcommit(files, text, commit.author, commit.date,
-hg.bin(p1), hg.bin(p2))
+hg.bin(p1), hg.bin(p2), extra=extra)
 text = "(octopus merge fixup)\n"
 p2 = hg.hex(self.repo.changelog.tip())
 return p2
 while visit:
 n = visit.pop(0)
 if n in known or n in self.map: continue
 known[n] = 1
 self.commitcache[n] = self.source.getcommit(n)
-cp = self.commitcache[n][0]
+cp = self.commitcache[n].parents
 for p in cp:
 parents.setdefault(n, []).append(p)
 visit.append(p)
 return parents
 visit.insert(0, c)
 return s
 def copy(self, rev):
-p, a, d, t = self.commitcache[rev]
+c = self.commitcache[rev]
 files = self.source.getchanges(rev)
 for f,v,e in files:
 try:
 data = self.source.getfile(f, v)
 except IOError, inst:
 self.dest.delfile(f)
 else:
 self.dest.putfile(f, e, data)
-r = [self.map[v] for v in p]
+r = [self.map[v] for v in c.parents]
 f = [f for f,v,e in files]
-self.map[rev] = self.dest.putcommit(f, r, a, d, t)
+self.map[rev] = self.dest.putcommit(f, r, c)
 file(self.mapfile, "a").write("%s %s\n" % (rev, self.map[rev]))
 def convert(self):
 status("scanning source...\n")
 heads = self.source.getheads()
 c = None
 status("converting...\n")
 for c in t:
 num -= 1
-desc = self.commitcache[c][3]
+desc = self.commitcache[c].desc
 if "\n" in desc:
 desc = desc.splitlines()[0]
 status("%d %s\n" % (num, desc))
 self.copy(c)

changeset 3955	9af4b853ed4d
parent 3954	fad134931327
child 3957	558f52943cd2