Mercurial > hg
comparison hgext/histedit.py @ 43793:29adf0a087a1
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 05 Dec 2019 11:15:19 -0500 |
| parents | bde66eb4051d 40db695040eb |
| children | bde97bee321f |
comparison
equal
deleted
inserted
replaced
| 43790:765a9c299c44 | 43793:29adf0a087a1 |
|---|---|
| 2601 backup = not nobackup | 2601 backup = not nobackup |
| 2602 repair.strip(ui, repo, roots, backup=backup) | 2602 repair.strip(ui, repo, roots, backup=backup) |
| 2603 | 2603 |
| 2604 | 2604 |
| 2605 def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs): | 2605 def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs): |
| 2606 if isinstance(nodelist, str): | 2606 if isinstance(nodelist, bytes): |
| 2607 nodelist = [nodelist] | 2607 nodelist = [nodelist] |
| 2608 state = histeditstate(repo) | 2608 state = histeditstate(repo) |
| 2609 if state.inprogress(): | 2609 if state.inprogress(): |
| 2610 state.read() | 2610 state.read() |
| 2611 histedit_nodes = { | 2611 histedit_nodes = { |