Show More
@@ -541,7 +541,7 b' class rebaseruntime(object):' | |||||
541 | 'to commit\n') % (rev, ctx)) |
|
541 | 'to commit\n') % (rev, ctx)) | |
542 | self.skipped.add(rev) |
|
542 | self.skipped.add(rev) | |
543 | self.state[rev] = p1 |
|
543 | self.state[rev] = p1 | |
544 |
ui.debug('next revision set to % |
|
544 | ui.debug('next revision set to %d\n' % p1) | |
545 | else: |
|
545 | else: | |
546 | ui.status(_('already rebased %s as %s\n') % |
|
546 | ui.status(_('already rebased %s as %s\n') % | |
547 | (desc, repo[self.state[rev]])) |
|
547 | (desc, repo[self.state[rev]])) |
@@ -271,7 +271,7 b' class shelvedstate(object):' | |||||
271 | "activebook": activebook or cls._noactivebook |
|
271 | "activebook": activebook or cls._noactivebook | |
272 | } |
|
272 | } | |
273 | scmutil.simplekeyvaluefile(repo.vfs, cls._filename)\ |
|
273 | scmutil.simplekeyvaluefile(repo.vfs, cls._filename)\ | |
274 |
.write(info, firstline= |
|
274 | .write(info, firstline=("%d" % cls._version)) | |
275 |
|
275 | |||
276 | @classmethod |
|
276 | @classmethod | |
277 | def clear(cls, repo): |
|
277 | def clear(cls, repo): |
@@ -60,6 +60,7 b' class verifier(object):' | |||||
60 | def err(self, linkrev, msg, filename=None): |
|
60 | def err(self, linkrev, msg, filename=None): | |
61 | if linkrev is not None: |
|
61 | if linkrev is not None: | |
62 | self.badrevs.add(linkrev) |
|
62 | self.badrevs.add(linkrev) | |
|
63 | linkrev = "%d" % linkrev | |||
63 | else: |
|
64 | else: | |
64 | linkrev = '?' |
|
65 | linkrev = '?' | |
65 | msg = "%s: %s" % (linkrev, msg) |
|
66 | msg = "%s: %s" % (linkrev, msg) |
General Comments 0
You need to be logged in to leave comments.
Login now