Mercurial > hg
comparison hgext/rebase.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 | 53800d6eed26 |
| children | 19076e2d62e7 |
comparison
equal
deleted
inserted
replaced
| 38507:03e7ec8180f0 | 38508:39db5a01cd53 |
|---|---|
| 621 if newwd < 0: | 621 if newwd < 0: |
| 622 # original directory is a parent of rebase set root or ignored | 622 # original directory is a parent of rebase set root or ignored |
| 623 newwd = self.originalwd | 623 newwd = self.originalwd |
| 624 if newwd not in [c.rev() for c in repo[None].parents()]: | 624 if newwd not in [c.rev() for c in repo[None].parents()]: |
| 625 ui.note(_("update back to initial working directory parent\n")) | 625 ui.note(_("update back to initial working directory parent\n")) |
| 626 hg.updaterepo(repo, newwd, False) | 626 hg.updaterepo(repo, newwd, overwrite=False) |
| 627 | 627 |
| 628 collapsedas = None | 628 collapsedas = None |
| 629 if self.collapsef and not self.keepf: | 629 if self.collapsef and not self.keepf: |
| 630 collapsedas = newnode | 630 collapsedas = newnode |
| 631 clearrebased(ui, repo, self.destmap, self.state, self.skipped, | 631 clearrebased(ui, repo, self.destmap, self.state, self.skipped, |