39 def authorfile(self): |
39 def authorfile(self): |
40 return os.path.join(self.path, ".hg", "authormap") |
40 return os.path.join(self.path, ".hg", "authormap") |
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) |
48 if f not in self.repo.dirstate: |
48 if f not in self.repo.dirstate: |
49 self.repo.dirstate.add(f) |
49 self.repo.dirstate.add(f) |
83 |
83 |
84 while parents: |
84 while parents: |
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()) |
92 |
92 |
93 return p2 |
93 return p2 |
114 f.write("".join(newlines)) |
114 f.write("".join(newlines)) |
115 f.close() |
115 f.close() |
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): |
124 converter_source.__init__(self, ui, path, rev) |
124 converter_source.__init__(self, ui, path, rev) |
125 self.repo = hg.repository(self.ui, path) |
125 self.repo = hg.repository(self.ui, path) |