Mercurial > hg
comparison hgext/shelve.py @ 22184:fb8065de47b0
unshelve: silence internal revert
This prepares for upcoming revert changes.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 15 Aug 2014 10:54:15 -0500 |
parents | 445472225ccd |
children | b3e51675f98e |
comparison
equal
deleted
inserted
replaced
22183:4dd9f606d0a6 | 22184:fb8065de47b0 |
---|---|
411 # revert will overwrite unknown files, so move them out of the way | 411 # revert will overwrite unknown files, so move them out of the way |
412 m, a, r, d, u = repo.status(unknown=True)[:5] | 412 m, a, r, d, u = repo.status(unknown=True)[:5] |
413 for file in u: | 413 for file in u: |
414 if file in files: | 414 if file in files: |
415 util.rename(file, file + ".orig") | 415 util.rename(file, file + ".orig") |
416 ui.pushbuffer(True) | |
416 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), | 417 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), |
417 *pathtofiles(repo, files), | 418 *pathtofiles(repo, files), |
418 **{'no_backup': True}) | 419 **{'no_backup': True}) |
420 ui.popbuffer() | |
419 finally: | 421 finally: |
420 ui.quiet = oldquiet | 422 ui.quiet = oldquiet |
421 | 423 |
422 def unshelvecleanup(ui, repo, name, opts): | 424 def unshelvecleanup(ui, repo, name, opts): |
423 """remove related files after an unshelve""" | 425 """remove related files after an unshelve""" |