equal
deleted
inserted
replaced
212 for d, v in self.state.iteritems(): |
212 for d, v in self.state.iteritems(): |
213 oldrev = repo[d].hex() |
213 oldrev = repo[d].hex() |
214 if v >= 0: |
214 if v >= 0: |
215 newrev = repo[v].hex() |
215 newrev = repo[v].hex() |
216 else: |
216 else: |
217 newrev = v |
217 newrev = "%d" % v |
218 destnode = repo[destmap[d]].hex() |
218 destnode = repo[destmap[d]].hex() |
219 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) |
219 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) |
220 repo.ui.debug('rebase status stored\n') |
220 repo.ui.debug('rebase status stored\n') |
221 |
221 |
222 def restorestatus(self): |
222 def restorestatus(self): |