Mercurial > hg
comparison hgext/shelve.py @ 27651:07fc2f2134ba
origpath: move from cmdutil to scmutil
This is a lower-level function so it doesn't need to be in cmdutil, and putting
it here avoids a bunch of potential import cycle issues.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sat, 02 Jan 2016 03:02:57 -0800 |
parents | c14af2d4b08c |
children | 2dc363274702 |
comparison
equal
deleted
inserted
replaced
27650:e7222d326ea2 | 27651:07fc2f2134ba |
---|---|
510 files.extend(shelvectx.parents()[0].files()) | 510 files.extend(shelvectx.parents()[0].files()) |
511 | 511 |
512 # revert will overwrite unknown files, so move them out of the way | 512 # revert will overwrite unknown files, so move them out of the way |
513 for file in repo.status(unknown=True).unknown: | 513 for file in repo.status(unknown=True).unknown: |
514 if file in files: | 514 if file in files: |
515 util.rename(file, cmdutil.origpath(ui, repo, file)) | 515 util.rename(file, scmutil.origpath(ui, repo, file)) |
516 ui.pushbuffer(True) | 516 ui.pushbuffer(True) |
517 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), | 517 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
518 *pathtofiles(repo, files), | 518 *pathtofiles(repo, files), |
519 **{'no_backup': True}) | 519 **{'no_backup': True}) |
520 ui.popbuffer() | 520 ui.popbuffer() |