equal
deleted
inserted
replaced
677 files.extend(shelvectx.p1().files()) |
677 files.extend(shelvectx.p1().files()) |
678 |
678 |
679 # revert will overwrite unknown files, so move them out of the way |
679 # revert will overwrite unknown files, so move them out of the way |
680 for file in repo.status(unknown=True).unknown: |
680 for file in repo.status(unknown=True).unknown: |
681 if file in files: |
681 if file in files: |
682 util.rename(file, scmutil.origpath(ui, repo, file)) |
682 util.rename(repo.wjoin(file), |
|
683 scmutil.backuppath(ui, repo, file)) |
683 ui.pushbuffer(True) |
684 ui.pushbuffer(True) |
684 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
685 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
685 *pathtofiles(repo, files), |
686 *pathtofiles(repo, files), |
686 **{r'no_backup': True}) |
687 **{r'no_backup': True}) |
687 ui.popbuffer() |
688 ui.popbuffer() |