##// END OF EJS Templates
convert: get rid of "hg." prefix where not needed
Bryan O'Sullivan -
r5017:06329efa default
parent child Browse files
Show More
@@ -41,7 +41,7 b' class mercurial_sink(converter_sink):'
41
41
42 def getheads(self):
42 def getheads(self):
43 h = self.repo.changelog.heads()
43 h = self.repo.changelog.heads()
44 return [ hg.hex(x) for x in h ]
44 return [ hex(x) for x in h ]
45
45
46 def putfile(self, f, e, data):
46 def putfile(self, f, e, data):
47 self.repo.wwrite(f, data, e)
47 self.repo.wwrite(f, data, e)
@@ -85,7 +85,7 b' class mercurial_sink(converter_sink):'
85 p1 = p2
85 p1 = p2
86 p2 = parents.pop(0)
86 p2 = parents.pop(0)
87 a = self.repo.rawcommit(files, text, commit.author, commit.date,
87 a = self.repo.rawcommit(files, text, commit.author, commit.date,
88 hg.bin(p1), hg.bin(p2), extra=extra)
88 bin(p1), bin(p2), extra=extra)
89 self.repo.dirstate.invalidate()
89 self.repo.dirstate.invalidate()
90 text = "(octopus merge fixup)\n"
90 text = "(octopus merge fixup)\n"
91 p2 = hg.hex(self.repo.changelog.tip())
91 p2 = hg.hex(self.repo.changelog.tip())
@@ -116,8 +116,8 b' class mercurial_sink(converter_sink):'
116 if not oldlines: self.repo.add([".hgtags"])
116 if not oldlines: self.repo.add([".hgtags"])
117 date = "%s 0" % int(time.mktime(time.gmtime()))
117 date = "%s 0" % int(time.mktime(time.gmtime()))
118 self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
118 self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
119 date, self.repo.changelog.tip(), hg.nullid)
119 date, self.repo.changelog.tip(), nullid)
120 return hg.hex(self.repo.changelog.tip())
120 return hex(self.repo.changelog.tip())
121
121
122 class mercurial_source(converter_source):
122 class mercurial_source(converter_source):
123 def __init__(self, ui, path, rev=None):
123 def __init__(self, ui, path, rev=None):
General Comments 0
You need to be logged in to leave comments. Login now