This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7153

py3: use %d instead of %s when formatting an int into a bytestring
ClosedPublic

Authored by Kwan on Oct 23 2019, 6:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa2ff3aff81d2: py3: use %d instead of %s when formatting an int into a bytestring
Summary

The latter wasn't noticed before since no tests exercise --confirm at all, let
alone on an existing DREV.
The second is only hit during an intermittent network issue during amending at
the end of a phabsend, so doesn't seem testable.
The first is also untested and is hit when a user creates fake D1234 tags that
get removed.

Diff Detail

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

Event Timeline

Kwan created this revision.Oct 23 2019, 6:10 PM
Kwan edited the summary of this revision. (Show Details)Oct 24 2019, 5:57 AM
Kwan updated this revision to Diff 17395.
Kwan added a commit: rHGa2ff3aff81d2: py3: use %d instead of %s when formatting an int into a bytestring.Oct 24 2019, 12:32 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa2ff3aff81d2: py3: use %d instead of %s when formatting an int into a bytestring (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Kwan edited the summary of this revision. (Show Details)Oct 24 2019, 12:44 PM
Kwan updated this revision to Diff 17397.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (6 lines)

Diff 17397

hgext/phabricator.py

nullid, nullid,
message=None, message=None,
user=None, user=None,
date=None, date=None,
local=True, local=True,
) )
unfi.ui.warn( unfi.ui.warn(
_( _(
b'D%s: local tag removed - does not match ' b'D%d: local tag removed - does not match '
b'Differential history\n' b'Differential history\n'
) )
% drev % drev
) )
continue continue
# Find the last node using Phabricator metadata, and make sure it # Find the last node using Phabricator metadata, and make sure it
# exists in the repo # exists in the repo
mapping[old.node()] = [newnode] mapping[old.node()] = [newnode]
# Update diff property # Update diff property
# If it fails just warn and keep going, otherwise the DREV # If it fails just warn and keep going, otherwise the DREV
# associations will be lost # associations will be lost
try: try:
writediffproperties(unfi[newnode], diffmap[old.node()]) writediffproperties(unfi[newnode], diffmap[old.node()])
except util.urlerr.urlerror: except util.urlerr.urlerror:
ui.warnnoi18n( ui.warnnoi18n(
b'Failed to update metadata for D%s\n' % drevid b'Failed to update metadata for D%d\n' % drevid
) )
# Remove local tags since it's no longer necessary # Remove local tags since it's no longer necessary
tagname = b'D%d' % drevid tagname = b'D%d' % drevid
if tagname in repo.tags(): if tagname in repo.tags():
tags.tag( tags.tag(
repo, repo,
tagname, tagname,
nullid, nullid,
def _confirmbeforesend(repo, revs, oldmap): def _confirmbeforesend(repo, revs, oldmap):
url, token = readurltoken(repo.ui) url, token = readurltoken(repo.ui)
ui = repo.ui ui = repo.ui
for rev in revs: for rev in revs:
ctx = repo[rev] ctx = repo[rev]
desc = ctx.description().splitlines()[0] desc = ctx.description().splitlines()[0]
oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None)) oldnode, olddiff, drevid = oldmap.get(ctx.node(), (None, None, None))
if drevid: if drevid:
drevdesc = ui.label(b'D%s' % drevid, b'phabricator.drev') drevdesc = ui.label(b'D%d' % drevid, b'phabricator.drev')
else: else:
drevdesc = ui.label(_(b'NEW'), b'phabricator.drev') drevdesc = ui.label(_(b'NEW'), b'phabricator.drev')
ui.write( ui.write(
_(b'%s - %s: %s\n') _(b'%s - %s: %s\n')
% ( % (
drevdesc, drevdesc,
ui.label(bytes(ctx), b'phabricator.node'), ui.label(bytes(ctx), b'phabricator.node'),