This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6174

shelve: let cmdutil.revert() take care of backing up untracked files
ClosedPublic

Authored by martinvonz on Mar 29 2019, 2:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe08559769bc6: shelve: let cmdutil.revert() take care of backing up untracked files
Summary

cmdutil.revert() backs up untracked files, so I don't see a reason to
do it shelve.mergefiles(). We have tests for this and they still pass.

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

martinvonz created this revision.Mar 29 2019, 2:39 PM
Closed by commit rHGe08559769bc6: shelve: let cmdutil.revert() take care of backing up untracked files (authored by martinvonz). · Explain WhyMar 29 2019, 9:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (12 lines)

Diff 14608

hgext/shelve.py

shelvedstate.clear(repo) shelvedstate.clear(repo)
ui.warn(_("unshelve of '%s' aborted\n") % state.name) ui.warn(_("unshelve of '%s' aborted\n") % state.name)
def mergefiles(ui, repo, wctx, shelvectx): def mergefiles(ui, repo, wctx, shelvectx):
"""updates to wctx and merges the changes from shelvectx into the """updates to wctx and merges the changes from shelvectx into the
dirstate.""" dirstate."""
with ui.configoverride({('ui', 'quiet'): True}): with ui.configoverride({('ui', 'quiet'): True}):
hg.update(repo, wctx.node()) hg.update(repo, wctx.node())
files = []
files.extend(shelvectx.files())
files.extend(shelvectx.p1().files())
# revert will overwrite unknown files, so move them out of the way
for file in repo.status(unknown=True).unknown:
if file in files:
util.rename(repo.wjoin(file),
scmutil.backuppath(ui, repo, file))
ui.pushbuffer(True) ui.pushbuffer(True)
cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
**{r'no_backup': True})
ui.popbuffer() ui.popbuffer()
def restorebranch(ui, repo, branchtorestore): def restorebranch(ui, repo, branchtorestore):
if branchtorestore and branchtorestore != repo.dirstate.branch(): if branchtorestore and branchtorestore != repo.dirstate.branch():
repo.dirstate.setbranch(branchtorestore) repo.dirstate.setbranch(branchtorestore)
ui.status(_('marked working directory as branch %s\n') ui.status(_('marked working directory as branch %s\n')
% branchtorestore) % branchtorestore)