D6679: unshelve: store information about interactive mode in shelvedstate
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Wed Jul 24 04:57:52 EDT 2019
pulkit added inline comments.
> + _shelvedinteractively = 'shelvedinteractively'
> + _notshelvedinteractively = 'notshelvedinteractively'
We are already in shelve code, so no need to prepend shelved to the name.
Also, we can only had `interactive` stored in the shelved state. If it's not present in the state file, we can assume we were not running interactive unshelve.
> # we'll be merging with, rebase it to be on top.
> - interactive = opts.get('interactive')
> + interactive = opts.get('interactive', False)
> if tmpwctx.node() == shelvectx.p1().node() and not interactive:
> - if abortf or continuef and not interactive:
> + if len(shelved) > 1:
> + raise error.Abort(_('can only unshelve one change at a time'))
This change is unrelated to storing info about interactive in shelvedstate. Can you decouple this into a separate patch?
CHANGES SINCE LAST ACTION
To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel