This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5056

closehead: use correct format string for rev numbers
AbandonedPublic

Authored by mbthomas on Oct 13 2018, 4:38 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Summary

Python 3 requires %d for numbers.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mbthomas created this revision.Oct 13 2018, 4:38 AM
mbthomas updated this revision to Diff 12013.Oct 13 2018, 4:41 AM

Add whitelist for test this fixes.

mbthomas abandoned this revision.Oct 13 2018, 5:08 AM
In D5056#75750, @pulkit wrote:

I took care of this in https://phab.mercurial-scm.org/D5040 ;)

D'oh!

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mhgext/closehead.py (2 lines)

Diff 12013

contrib/python3-whitelist

test-check-shbang.t test-check-shbang.t
test-children.t test-children.t
test-clone-cgi.t test-clone-cgi.t
test-clone-pull-corruption.t test-clone-pull-corruption.t
test-clone-r.t test-clone-r.t
test-clone-uncompressed.t test-clone-uncompressed.t
test-clone-update-order.t test-clone-update-order.t
test-clonebundles.t test-clonebundles.t
test-close-head.t
test-commit-amend.t test-commit-amend.t
test-commit-interactive.t test-commit-interactive.t
test-commit-multiple.t test-commit-multiple.t
test-commit-unresolved.t test-commit-unresolved.t
test-commit.t test-commit.t
test-committer.t test-committer.t
test-completion.t test-completion.t
test-config-env.py test-config-env.py

hgext/closehead.py

raise error.Abort(_('no revisions specified')) raise error.Abort(_('no revisions specified'))
heads = [] heads = []
for branch in repo.branchmap(): for branch in repo.branchmap():
heads.extend(repo.branchheads(branch)) heads.extend(repo.branchheads(branch))
heads = set(repo[h].rev() for h in heads) heads = set(repo[h].rev() for h in heads)
for rev in revs: for rev in revs:
if rev not in heads: if rev not in heads:
raise error.Abort(_('revision is not an open head: %s') % rev) raise error.Abort(_('revision is not an open head: %d') % rev)
message = cmdutil.logmessage(ui, opts) message = cmdutil.logmessage(ui, opts)
if not message: if not message:
raise error.Abort(_("no commit message specified with -l or -m")) raise error.Abort(_("no commit message specified with -l or -m"))
extra = { 'close': '1' } extra = { 'close': '1' }
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
for rev in revs: for rev in revs:
r = repo[rev] r = repo[rev]
branch = r.branch() branch = r.branch()
extra['branch'] = branch extra['branch'] = branch
docommit(r) docommit(r)
return 0 return 0