This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1905

strip: use in-place revset formatspec instead of %-formatting ourselves
ClosedPublic

Authored by durin42 on Jan 18 2018, 11:12 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG011ca2d795d6: strip: use in-place revset formatspec instead of %-formatting ourselves
rHG41f952d10905: strip: use in-place revset formatspec instead of %-formatting ourselves
Summary

Caught by Yuya during review of D1884.

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

durin42 created this revision.Jan 18 2018, 11:12 AM
pulkit accepted this revision.Jan 20 2018, 5:21 AM
indygreg accepted this revision.Feb 1 2018, 3:29 PM
This revision is now accepted and ready to land.Feb 1 2018, 3:29 PM
Closed by commit rHG41f952d10905: strip: use in-place revset formatspec instead of %-formatting ourselves (authored by durin42). · Explain WhyFeb 1 2018, 3:32 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Feb 1 2018, 4:22 PM
martinvonz added inline comments.
hgext/strip.py
218

I would expect "%d" with a revision number (such as uctx.rev()). I saw that that's also what Yuya suggested on D1884. Fixing in flight.

martinvonz added inline comments.Feb 1 2018, 4:24 PM
hgext/strip.py
218

Oh, that's done in the next patch :P

Revision Contents
Changeset List

PathPackages
Mhgext/strip.py (2 lines)

Diff 5053

hgext/strip.py

revs = sorted(rootnodes) revs = sorted(rootnodes)
if update and opts.get('keep'): if update and opts.get('keep'):
urev = _findupdatetarget(repo, revs) urev = _findupdatetarget(repo, revs)
uctx = repo[urev] uctx = repo[urev]
# only reset the dirstate for files that would actually change # only reset the dirstate for files that would actually change
# between the working context and uctx # between the working context and uctx
descendantrevs = repo.revs("%s::." % uctx.rev()) descendantrevs = repo.revs("%s::.", uctx.rev())
martinvonzUnsubmitted
Not Done

I would expect "%d" with a revision number (such as uctx.rev()). I saw that that's also what Yuya suggested on D1884. Fixing in flight.

martinvonz: I would expect "%d" with a revision number (such as uctx.rev()). I saw that that's also what…
martinvonzUnsubmitted
Not Done

Oh, that's done in the next patch :P

martinvonz: Oh, that's done in the next patch :P
changedfiles = [] changedfiles = []
for rev in descendantrevs: for rev in descendantrevs:
# blindly reset the files, regardless of what actually changed # blindly reset the files, regardless of what actually changed
changedfiles.extend(repo[rev].files()) changedfiles.extend(repo[rev].files())
# reset files that only changed in the dirstate too # reset files that only changed in the dirstate too
dirstate = repo.dirstate dirstate = repo.dirstate
dirchanges = [f for f in dirstate if dirstate[f] != 'n'] dirchanges = [f for f in dirstate if dirstate[f] != 'n']