This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11021

mq: use `set_untracked` in `qrename`
ClosedPublic

Authored by marmoute on Jul 8 2021, 3:33 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG4dca29b00405: mq: use `set_untracked` in `qrename`
Summary

This is the new shiny API.

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

marmoute created this revision.Jul 8 2021, 3:33 AM
Alphare accepted this revision.Jul 9 2021, 12:01 PM
This revision is now accepted and ready to land.Jul 9 2021, 12:01 PM
marmoute edited the summary of this revision. (Show Details)Jul 10 2021, 5:02 PM
marmoute updated this revision to Diff 29152.
baymax updated this revision to Diff 29166.Jul 11 2021, 7:17 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29257.Jul 15 2021, 12:04 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG4dca29b00405: mq: use `set_untracked` in `qrename`.Jul 15 2021, 12:55 PM
Closed by commit rHG4dca29b00405: mq: use `set_untracked` in `qrename` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (2 lines)

Diff 29279

hgext/mq.py

if not os.path.isdir(destdir): if not os.path.isdir(destdir):
os.makedirs(destdir) os.makedirs(destdir)
util.rename(q.join(patch), absdest) util.rename(q.join(patch), absdest)
r = q.qrepo() r = q.qrepo()
if r and patch in r.dirstate: if r and patch in r.dirstate:
wctx = r[None] wctx = r[None]
with r.wlock(): with r.wlock():
if r.dirstate[patch] == b'a': if r.dirstate[patch] == b'a':
r.dirstate.drop(patch) r.dirstate.set_untracked(patch)
r.dirstate.set_tracked(name) r.dirstate.set_tracked(name)
else: else:
wctx.copy(patch, name) wctx.copy(patch, name)
wctx.forget([patch]) wctx.forget([patch])
q.savedirty() q.savedirty()