D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:961 > Can you explain why we are not processing this if files are present? okay. on unshelving with `--files` flag, we don't want to clear the shelvedstate

D6596: unshelve: make unshelve accept files (issue6162)

pulkit added a comment. It will be nice to add information to commit message about how thing unshelving of a subset works. INLINE COMMENTS > shelve.py:961 > restorebranch(ui, repo, branchtorestore) > -_forgetunknownfiles(repo, shelvectx, addedbefore) > +if not

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh updated this revision to Diff 15888. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15757=15888 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6596: unshelve: make unshelve accept files (issue6162)

pulkit added inline comments. INLINE COMMENTS > shelve.py:842 > repo.setparents(tmpwctx.node(), nodemod.nullid) > newnode = repo.commit(text=shelvectx.description(), >extra=shelvectx.extra(), We can do filtering of files to unshelve

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: add interactive mode (issue6162)" to "unshelve: make unshelve accept files (issue6162)". navaneeth.suresh updated this revision to Diff 15757. REPOSITORY rHG Mercurial CHANGES SINCE

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:990 > To have this patch in a good state to be reviewed, it will be nice you take > out the addition of interactive flag to the patch where you add that >

D6596: unshelve: make unshelve accept files (issue6162)

pulkit added inline comments. INLINE COMMENTS > navaneeth.suresh wrote in shelve.py:990 > will fix this in the next-to-next revision. To have this patch in a good state to be reviewed, it will be nice you take out the addition of interactive flag to the patch where you add that functionality.

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15739. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15738=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. navaneeth.suresh updated this revision to Diff 15738. pulkit added a comment. navaneeth.suresh updated this revision to Diff 15739. navaneeth.suresh marked an inline comment

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh updated this revision to Diff 15738. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15737=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6596

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:990 > The interactive flag should work the same way as it work for revert, commit > and shelve commands. That's either ask hunk by hunk or pop up a curses UI. > > As you suggested before, maybe we can have `-f`

D6596: unshelve: make unshelve accept files (issue6162)

pulkit added a comment. Didn't look at the actual implementation yet. INLINE COMMENTS > shelve.py:990 > +filesinclude = [] > +if interactive: > +for file in files: The interactive flag should work the same way as it work for revert, commit and shelve commands.