Show More
@@ -1349,7 +1349,7 b' class changeset_printer(object):' | |||
|
1349 | 1349 | hexfunc = short |
|
1350 | 1350 | # as of now, wctx.node() and wctx.rev() return None, but we want to |
|
1351 | 1351 | # show the same values as {node} and {rev} templatekw |
|
1352 |
revnode = (scmutil.intrev( |
|
|
1352 | revnode = (scmutil.intrev(ctx), hexfunc(bin(ctx.hex()))) | |
|
1353 | 1353 | |
|
1354 | 1354 | if self.ui.quiet: |
|
1355 | 1355 | self.ui.write("%d:%s\n" % revnode, label='log.node') |
@@ -376,9 +376,10 b' def walkrepos(path, followsym=False, see' | |||
|
376 | 376 | newdirs.append(d) |
|
377 | 377 | dirs[:] = newdirs |
|
378 | 378 | |
|
379 |
def intrev( |
|
|
380 |
"""Return integer for a given |
|
|
379 | def intrev(ctx): | |
|
380 | """Return integer for a given basectx that can be used in comparison or | |
|
381 | 381 | arithmetic operation""" |
|
382 | rev = ctx.rev() | |
|
382 | 383 | if rev is None: |
|
383 | 384 | return wdirrev |
|
384 | 385 | return rev |
@@ -466,7 +467,7 b' def meaningfulparents(repo, ctx):' | |||
|
466 | 467 | return parents |
|
467 | 468 | if repo.ui.debugflag: |
|
468 | 469 | return [parents[0], repo['null']] |
|
469 |
if parents[0].rev() >= intrev(ctx |
|
|
470 | if parents[0].rev() >= intrev(ctx) - 1: | |
|
470 | 471 | return [] |
|
471 | 472 | return parents |
|
472 | 473 |
@@ -161,7 +161,7 b' def _formatrevnode(ctx):' | |||
|
161 | 161 | hexnode = ctx.hex() |
|
162 | 162 | else: |
|
163 | 163 | hexnode = ctx.hex()[:12] |
|
164 |
return '%d:%s' % (scmutil.intrev(ctx |
|
|
164 | return '%d:%s' % (scmutil.intrev(ctx), hexnode) | |
|
165 | 165 | |
|
166 | 166 | def getfiles(repo, ctx, revcache): |
|
167 | 167 | if 'files' not in revcache: |
@@ -611,7 +611,7 b' def showphaseidx(repo, ctx, templ, **arg' | |||
|
611 | 611 | @templatekeyword('rev') |
|
612 | 612 | def showrev(repo, ctx, templ, **args): |
|
613 | 613 | """Integer. The repository-local changeset revision number.""" |
|
614 |
return scmutil.intrev(ctx |
|
|
614 | return scmutil.intrev(ctx) | |
|
615 | 615 | |
|
616 | 616 | def showrevslist(name, revs, **args): |
|
617 | 617 | """helper to generate a list of revisions in which a mapped template will |
General Comments 0
You need to be logged in to leave comments.
Login now