This is an archive of the discontinued Mercurial Phabricator instance.

Differential D428

fbamend: precnode -> prednode
ClosedPublic

Authored by ryanmce on Aug 17 2017, 1:22 PM.
Tags
None
Subscribers
simonfar

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGXf96a61080207: fbamend: precnode -> prednode
Summary

Upstream is changing names to be more consistent. Follow suit to eliminate
devel-warnings.

Diff Detail

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

Event Timeline

ryanmce created this revision.Aug 17 2017, 1:22 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 17 2017, 1:22 PM
simonfar accepted this revision.Aug 17 2017, 3:19 PM
simonfar added a subscriber: simonfar.
simonfar added inline comments.
hgext3rd/fbamend/unamend.py
54

Make this predctx for consistency?

This revision is now accepted and ready to land.Aug 17 2017, 3:19 PM
ryanmce marked an inline comment as done.Aug 18 2017, 5:29 AM
ryanmce updated this revision to Diff 1060.Aug 18 2017, 5:34 AM

per suggestion

ryanmce added a comment.Aug 18 2017, 5:35 AM

As suggested.

Closed by commit rFBHGXf96a61080207: fbamend: precnode -> prednode (authored by ryanmce). · Explain WhyAug 18 2017, 6:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/unamend.py (12 lines)

Diff 1064

hgext3rd/fbamend/unamend.py

curctx = repo['.'] curctx = repo['.']
# identify the commit to which to unamend # identify the commit to which to unamend
markers = list(precursormarkers(curctx)) markers = list(precursormarkers(curctx))
if len(markers) != 1: if len(markers) != 1:
e = _("changeset must have one precursor, found %i precursors") e = _("changeset must have one precursor, found %i precursors")
raise error.Abort(e % len(markers)) raise error.Abort(e % len(markers))
precnode = markers[0].precnode() prednode = markers[0].prednode()
precctx = unfi[precnode] predctx = unfi[prednode]
simonfarUnsubmitted
Done

Make this predctx for consistency?

simonfar: Make this predctx for consistency?
if curctx.children(): if curctx.children():
raise error.Abort(_("cannot unamend in the middle of a stack")) raise error.Abort(_("cannot unamend in the middle of a stack"))
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
ctxbookmarks = curctx.bookmarks() ctxbookmarks = curctx.bookmarks()
changedfiles = [] changedfiles = []
wctx = repo[None] wctx = repo[None]
wm = wctx.manifest() wm = wctx.manifest()
cm = precctx.manifest() cm = predctx.manifest()
dirstate = repo.dirstate dirstate = repo.dirstate
diff = cm.diff(wm) diff = cm.diff(wm)
changedfiles.extend(diff.iterkeys()) changedfiles.extend(diff.iterkeys())
tr = repo.transaction('unamend') tr = repo.transaction('unamend')
with dirstate.parentchange(): with dirstate.parentchange():
dirstate.rebuild(precnode, cm, changedfiles) dirstate.rebuild(prednode, cm, changedfiles)
# we want added and removed files to be shown # we want added and removed files to be shown
# properly, not with ? and ! prefixes # properly, not with ? and ! prefixes
for filename, data in diff.iteritems(): for filename, data in diff.iteritems():
if data[0][0] is None: if data[0][0] is None:
dirstate.add(filename) dirstate.add(filename)
if data[1][0] is None: if data[1][0] is None:
dirstate.remove(filename) dirstate.remove(filename)
changes = [] changes = []
for book in ctxbookmarks: for book in ctxbookmarks:
changes.append((book, precnode)) changes.append((book, prednode))
repo._bookmarks.applychanges(repo, tr, changes) repo._bookmarks.applychanges(repo, tr, changes)
obsolete.createmarkers(repo, [(curctx, (precctx,))]) obsolete.createmarkers(repo, [(curctx, (predctx,))])
tr.close() tr.close()