Page MenuHomePhabricator

unshelve: abort on using --keep and --interactive together
ClosedPublic

Authored by navaneeth.suresh on Sat, Jul 27, 12:11 AM.

Details

Summary

I am working on making interactive mode support --keep flag. Until
we support the usage of --interactive and --keep together, let
us abort on it.

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

pulkit added a subscriber: pulkit.Tue, Aug 6, 7:12 AM
pulkit added inline comments.
tests/test-shelve.t
1498

Can you show what the new shelve contains? Also add a test when there is partial unshelving going.

pulkit added a comment.Wed, Aug 7, 6:18 PM

You are already working on improving things with --keep and --interactive, so let's have this patch as a part of that patch.

navaneeth.suresh retitled this revision from tests: add test for unshelve --interactive --keep to unshelve: abort on using --keep and --interactive together.Fri, Aug 9, 2:42 PM
navaneeth.suresh edited the summary of this revision. (Show Details)
navaneeth.suresh updated this revision to Diff 16166.
pulkit added inline comments.Fri, Aug 9, 2:55 PM
mercurial/shelve.py
974

--keep on --interactive ...

navaneeth.suresh marked an inline comment as done.Fri, Aug 9, 3:16 PM
pulkit accepted this revision.Thu, Aug 15, 10:48 AM
pulkit added inline comments.
mercurial/shelve.py
973

Sorry for missing this earlier, let's move this check above. Maybe before line 944 on this side.

This revision is now accepted and ready to land.Thu, Aug 15, 10:48 AM