Mercurial > hg
comparison hgext/shelve.py @ 38508:39db5a01cd53
cleanup: pass in overwrite flag to hg.updaterepo() as named argument
For clarity.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 01 Jul 2018 21:40:55 +0900 |
| parents | f4776f8b98e0 |
| children | c829749e7639 |
comparison
equal
deleted
inserted
replaced
| 38507:03e7ec8180f0 | 38508:39db5a01cd53 |
|---|---|
| 707 else: | 707 else: |
| 708 # only strip the shelvectx if we produced one | 708 # only strip the shelvectx if we produced one |
| 709 state.nodestoremove.append(newnode) | 709 state.nodestoremove.append(newnode) |
| 710 shelvectx = repo[newnode] | 710 shelvectx = repo[newnode] |
| 711 | 711 |
| 712 hg.updaterepo(repo, pendingctx.node(), False) | 712 hg.updaterepo(repo, pendingctx.node(), overwrite=False) |
| 713 | 713 |
| 714 if repo.vfs.exists('unshelverebasestate'): | 714 if repo.vfs.exists('unshelverebasestate'): |
| 715 repo.vfs.rename('unshelverebasestate', 'rebasestate') | 715 repo.vfs.rename('unshelverebasestate', 'rebasestate') |
| 716 rebase.clearstatus(repo) | 716 rebase.clearstatus(repo) |
| 717 | 717 |