##// END OF EJS Templates
py3: use '%d' for integers instead of '%s'...
Pulkit Goyal -
r37597:ce566e0f default
parent child Browse files
Show More
@@ -435,7 +435,7 b' class convert_git(common.converter_sourc'
435 else:
435 else:
436 output, status = self.gitrunlines('diff-tree', '--name-only',
436 output, status = self.gitrunlines('diff-tree', '--name-only',
437 '--root', '-r', version,
437 '--root', '-r', version,
438 '%s^%s' % (version, i + 1), '--')
438 '%s^%d' % (version, i + 1), '--')
439 if status:
439 if status:
440 raise error.Abort(_('cannot read changes in %s') % version)
440 raise error.Abort(_('cannot read changes in %s') % version)
441 changes = [f.rstrip('\n') for f in output]
441 changes = [f.rstrip('\n') for f in output]
@@ -401,7 +401,7 b' class mercurial_sink(common.converter_si'
401 return context.memfilectx(repo, memctx, f, data, False, False, None)
401 return context.memfilectx(repo, memctx, f, data, False, False, None)
402
402
403 self.ui.status(_("updating tags\n"))
403 self.ui.status(_("updating tags\n"))
404 date = "%s 0" % int(time.mktime(time.gmtime()))
404 date = "%d 0" % int(time.mktime(time.gmtime()))
405 extra = {'branch': self.tagsbranch}
405 extra = {'branch': self.tagsbranch}
406 ctx = context.memctx(self.repo, (tagparent, None), "update tags",
406 ctx = context.memctx(self.repo, (tagparent, None), "update tags",
407 [".hgtags"], getfilectx, "convert-repo", date,
407 [".hgtags"], getfilectx, "convert-repo", date,
@@ -1042,7 +1042,7 b' def storebundle(op, params, bundlefile):'
1042
1042
1043 # Notify the user of what is being pushed
1043 # Notify the user of what is being pushed
1044 plural = 's' if len(revs) > 1 else ''
1044 plural = 's' if len(revs) > 1 else ''
1045 op.repo.ui.warn(_("pushing %s commit%s:\n") % (len(revs), plural))
1045 op.repo.ui.warn(_("pushing %d commit%s:\n") % (len(revs), plural))
1046 maxoutput = 10
1046 maxoutput = 10
1047 for i in range(0, min(len(revs), maxoutput)):
1047 for i in range(0, min(len(revs), maxoutput)):
1048 firstline = bundle[revs[i]].description().split('\n')[0][:50]
1048 firstline = bundle[revs[i]].description().split('\n')[0][:50]
@@ -1021,7 +1021,7 b' def verify(repo):'
1021 ret = (ctx.sub(subpath, allowcreate=False).verify()
1021 ret = (ctx.sub(subpath, allowcreate=False).verify()
1022 or ret)
1022 or ret)
1023 except error.RepoError as e:
1023 except error.RepoError as e:
1024 repo.ui.warn(('%s: %s\n') % (rev, e))
1024 repo.ui.warn(('%d: %s\n') % (rev, e))
1025 except Exception:
1025 except Exception:
1026 repo.ui.warn(_('.hgsubstate is corrupt in revision %s\n') %
1026 repo.ui.warn(_('.hgsubstate is corrupt in revision %s\n') %
1027 node.short(ctx.node()))
1027 node.short(ctx.node()))
General Comments 0
You need to be logged in to leave comments. Login now