This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6835

phabricator: don't abort if property writing fails during amending
ClosedPublic

Authored by Kwan on Sep 9 2019, 5:17 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe26c2440a030: phabricator: don't abort if property writing fails during amending
rHG0a7e60f50dd4: phabricator: don't abort if property writing fails during amending
Summary

Currently if one of the writediffproperty calls fails due to network issues
during the amending of commit messages to include the Diff. Rev. line, the
transaction is aborted and rolled back. This means that the associations
between the commits and the DREVs are lost for any already amended commits
because the removal of the local tags isn't covered by the rollback.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Kwan created this revision.Sep 9 2019, 5:17 PM
Kwan added a commit: rHG0a7e60f50dd4: phabricator: don't abort if property writing fails during amending.Sep 9 2019, 5:21 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0a7e60f50dd4: phabricator: don't abort if property writing fails during amending (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (7 lines)

Diff 16473

hgext/phabricator.py

new = context.metadataonlyctx( new = context.metadataonlyctx(
repo, old, parents=parents, text=newdesc, repo, old, parents=parents, text=newdesc,
user=old.user(), date=old.date(), extra=old.extra()) user=old.user(), date=old.date(), extra=old.extra())
newnode = new.commit() newnode = new.commit()
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
# associations will be lost
try:
writediffproperties(unfi[newnode], diffmap[old.node()]) writediffproperties(unfi[newnode], diffmap[old.node()])
except util.urlerr.urlerror:
ui.warn(b'Failed to update metadata for D%s\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(repo, tagname, nullid, message=None, user=None, tags.tag(repo, tagname, nullid, message=None, user=None,
date=None, local=True) date=None, local=True)
scmutil.cleanupnodes(repo, mapping, b'phabsend', fixphase=True) scmutil.cleanupnodes(repo, mapping, b'phabsend', fixphase=True)
if wnode in mapping: if wnode in mapping:
unfi.setparents(mapping[wnode][0]) unfi.setparents(mapping[wnode][0])