Mercurial > hg
comparison mercurial/cmdutil.py @ 41206:6acbe86c6490
repair: move ui.history-editing-backup to [rewrite] section
Since we have the "rewrite" section for general history-editing options, the
backup option should be there.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 12 Jan 2019 17:43:36 +0900 |
| parents | 4145fd3569c3 |
| children | 876494fd967d 4ea21df312ec |
comparison
equal
deleted
inserted
replaced
| 41205:3f807237dc94 | 41206:6acbe86c6490 |
|---|---|
| 2586 repo.setparents(newid, nullid) | 2586 repo.setparents(newid, nullid) |
| 2587 mapping = {old.node(): (newid,)} | 2587 mapping = {old.node(): (newid,)} |
| 2588 obsmetadata = None | 2588 obsmetadata = None |
| 2589 if opts.get('note'): | 2589 if opts.get('note'): |
| 2590 obsmetadata = {'note': encoding.fromlocal(opts['note'])} | 2590 obsmetadata = {'note': encoding.fromlocal(opts['note'])} |
| 2591 backup = ui.configbool('ui', 'history-editing-backup') | 2591 backup = ui.configbool('rewrite', 'backup-bundle') |
| 2592 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata, | 2592 scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata, |
| 2593 fixphase=True, targetphase=commitphase, | 2593 fixphase=True, targetphase=commitphase, |
| 2594 backup=backup) | 2594 backup=backup) |
| 2595 | 2595 |
| 2596 # Fixing the dirstate because localrepo.commitctx does not update | 2596 # Fixing the dirstate because localrepo.commitctx does not update |