This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6697

cmdutil: add allowunfinished to prevent checkunfinished() on docommit()
Needs RevisionPublic

Authored by navaneeth.suresh on Jul 26 2019, 8:51 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Summary

cmdutil.dorecord() has a checkunfinished() function call. We might not
want to do that on certain occasions. For example, unshelve --continue
on interactive mode is trying to create a commit during an existing
unfinished state.

We are now allowing that case using an option interactive-unshelve.
However, there should be a general way to do that. This patch adds
a allowunfinished optional argument to the cmdutil.dorecord()
function and make unshelve to migrate to this argument by removing
the interactive-unshelve option.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 26 2019, 9:00 AM
pulkit added inline comments.
mercurial/cmdutil.py
274

Why not get rid of interactive-shelve passed by unshelve and make that pass allowunfinished=True to dorecord?

navaneeth.suresh added inline comments.Jul 26 2019, 9:02 AM
mercurial/cmdutil.py
274

I thought of splitting into two patches. Will be amending the changes soon in this patch itself.

navaneeth.suresh edited the summary of this revision. (Show Details)Jul 26 2019, 9:05 AM
navaneeth.suresh updated this revision to Diff 16073.
navaneeth.suresh marked an inline comment as done.Jul 26 2019, 9:06 AM
pulkit accepted this revision.Jul 29 2019, 5:41 AM

cmdutil: add allowunfinished to prevent checkunfinished() on docommit()

s/docommit/dorecord/ in flight

This revision is now accepted and ready to land.Jul 29 2019, 5:41 AM
pulkit added a comment.Jul 29 2019, 6:04 AM

test-commit-interactive.t and some other tests fail for me with this, can you have a look?

navaneeth.suresh added a comment.Jul 29 2019, 11:30 AM
In D6697#98061, @pulkit wrote:

test-commit-interactive.t and some other tests fail for me with this, can you have a look?

Doing that right away!

pulkit requested changes to this revision.Aug 7 2019, 6:20 PM

The test still fails.

This revision now requires changes to proceed.Aug 7 2019, 6:20 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (9 lines)
Mmercurial/shelve.py (3 lines)

Diff 16110

mercurial/cmdutil.py

try: try:
newchunks, newopts = filterchunks(ui, originalhunks, usecurses, newchunks, newopts = filterchunks(ui, originalhunks, usecurses,
testfile, match, operation) testfile, match, operation)
finally: finally:
ui.write = oldwrite ui.write = oldwrite
return newchunks, newopts return newchunks, newopts
def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
filterfn, *pats, **opts): filterfn, allowunfinished=False, *pats, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if not ui.interactive(): if not ui.interactive():
if cmdsuggest: if cmdsuggest:
msg = _('running non-interactively, use %s instead') % cmdsuggest msg = _('running non-interactively, use %s instead') % cmdsuggest
else: else:
msg = _('running non-interactively') msg = _('running non-interactively')
raise error.Abort(msg) raise error.Abort(msg)
job can be delegated to a non-interactive commit command such as job can be delegated to a non-interactive commit command such as
'commit' or 'qrefresh'. 'commit' or 'qrefresh'.
After the actual job is done by non-interactive command, the After the actual job is done by non-interactive command, the
working directory is restored to its original state. working directory is restored to its original state.
In the end we'll record interesting changes, and everything else In the end we'll record interesting changes, and everything else
will be left in place, so the user can continue working. will be left in place, so the user can continue working.
We will prevent committing changesets on unfinished states if and only
if `allowunfinished` is not set `True`. For example, `unshelve` on
interactive mode does a commit during an unfinished state and we don't
want to prevent that.
""" """
if not opts.get('interactive-unshelve'): if not allowunfinished:
pulkitUnsubmitted
Done

Why not get rid of interactive-shelve passed by unshelve and make that pass allowunfinished=True to dorecord?

pulkit: Why not get rid of `interactive-shelve` passed by unshelve and make that pass…
navaneeth.sureshAuthorUnsubmitted
Done

I thought of splitting into two patches. Will be amending the changes soon in this patch itself.

navaneeth.suresh: I thought of splitting into two patches. Will be amending the changes soon in this patch itself.
checkunfinished(repo, commit=True) checkunfinished(repo, commit=True)
wctx = repo[None] wctx = repo[None]
merge = len(wctx.parents()) > 1 merge = len(wctx.parents()) > 1
if merge: if merge:
raise error.Abort(_('cannot partially commit a merge ' raise error.Abort(_('cannot partially commit a merge '
'(use "hg commit" instead)')) '(use "hg commit" instead)'))
def fail(f, msg): def fail(f, msg):

mercurial/shelve.py

The user might want to unshelve certain changes only from the stored The user might want to unshelve certain changes only from the stored
shelve in interactive. So, we would create two commits. One with requested shelve in interactive. So, we would create two commits. One with requested
changes to unshelve at that time and the latter is shelved for future. changes to unshelve at that time and the latter is shelved for future.
Here, we return both the newnode which is created interactively and a Here, we return both the newnode which is created interactively and a
bool to know whether the shelve is partly done or completely done. bool to know whether the shelve is partly done or completely done.
""" """
opts['message'] = shelvectx.description() opts['message'] = shelvectx.description()
opts['interactive-unshelve'] = True
pats = [] pats = []
if not interactive: if not interactive:
newnode = repo.commit(text=shelvectx.description(), newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(), extra=shelvectx.extra(),
user=shelvectx.user(), user=shelvectx.user(),
date=shelvectx.date()) date=shelvectx.date())
return newnode, False return newnode, False
commitfunc = getcommitfunc(shelvectx.extra(), interactive=True, commitfunc = getcommitfunc(shelvectx.extra(), interactive=True,
editor=True) editor=True)
newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False, newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False,
cmdutil.recordfilter, *pats, cmdutil.recordfilter, True, *pats,
**pycompat.strkwargs(opts)) **pycompat.strkwargs(opts))
snode = repo.commit(text=shelvectx.description(), snode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(), extra=shelvectx.extra(),
user=shelvectx.user()) user=shelvectx.user())
if snode: if snode:
m = scmutil.matchfiles(repo, repo[snode].files()) m = scmutil.matchfiles(repo, repo[snode].files())
_shelvecreatedcommit(repo, snode, basename, m) _shelvecreatedcommit(repo, snode, basename, m)