Mercurial > hg-stable
comparison mercurial/shelve.py @ 42750:d684449eef67
unshelve: forget unknown files after a partial unshelve
This is a follow-up patch to 6957f7b93e03. This allows hg to forget
unknown files after a partial unshelve.
Differential Revision: https://phab.mercurial-scm.org/D6724
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Tue, 13 Aug 2019 22:48:05 +0530 |
parents | 6957f7b93e03 |
children | 5c285c8e4f98 |
comparison
equal
deleted
inserted
replaced
42749:6d61be152c55 | 42750:d684449eef67 |
---|---|
1003 with ui.configoverride(overrides, 'unshelve'): | 1003 with ui.configoverride(overrides, 'unshelve'): |
1004 mergefiles(ui, repo, pctx, shelvectx) | 1004 mergefiles(ui, repo, pctx, shelvectx) |
1005 restorebranch(ui, repo, branchtorestore) | 1005 restorebranch(ui, repo, branchtorestore) |
1006 shelvedstate.clear(repo) | 1006 shelvedstate.clear(repo) |
1007 _finishunshelve(repo, oldtiprev, tr, activebookmark) | 1007 _finishunshelve(repo, oldtiprev, tr, activebookmark) |
1008 _forgetunknownfiles(repo, shelvectx, addedbefore) | |
1008 if not ispartialunshelve: | 1009 if not ispartialunshelve: |
1009 _forgetunknownfiles(repo, shelvectx, addedbefore) | |
1010 unshelvecleanup(ui, repo, basename, opts) | 1010 unshelvecleanup(ui, repo, basename, opts) |
1011 finally: | 1011 finally: |
1012 if tr: | 1012 if tr: |
1013 tr.release() | 1013 tr.release() |
1014 lockmod.release(lock) | 1014 lockmod.release(lock) |