2029 hint="""/!\ You can try: |
2029 hint="""/!\ You can try: |
2030 /!\ * manual merge + resolve => new cset X |
2030 /!\ * manual merge + resolve => new cset X |
2031 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
2031 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
2032 /!\ * hg revert --all -r X |
2032 /!\ * hg revert --all -r X |
2033 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
2033 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
2034 /!\ * hg kill -n Y W Z |
2034 /!\ * hg prune -n Y W Z |
2035 """) |
2035 """) |
2036 if progresscb: progresscb() |
2036 if progresscb: progresscb() |
2037 emtpycommitallowed = repo.ui.backupconfig('ui', 'allowemptycommit') |
2037 emtpycommitallowed = repo.ui.backupconfig('ui', 'allowemptycommit') |
2038 tr = repo.currenttransaction() |
2038 tr = repo.currenttransaction() |
2039 assert tr is not None |
2039 assert tr is not None |
2297 if user: |
2297 if user: |
2298 metadata['user'] = user |
2298 metadata['user'] = user |
2299 return metadata |
2299 return metadata |
2300 |
2300 |
2301 |
2301 |
2302 @command('^prune|obsolete|kill', |
2302 @command('^prune|obsolete', |
2303 [('n', 'new', [], _("successor changeset (DEPRECATED)")), |
2303 [('n', 'new', [], _("successor changeset (DEPRECATED)")), |
2304 ('s', 'succ', [], _("successor changeset")), |
2304 ('s', 'succ', [], _("successor changeset")), |
2305 ('r', 'rev', [], _("revisions to prune")), |
2305 ('r', 'rev', [], _("revisions to prune")), |
2306 ('k', 'keep', None, _("does not modify working copy during prune")), |
2306 ('k', 'keep', None, _("does not modify working copy during prune")), |
2307 ('', 'biject', False, _("do a 1-1 map between rev and successor ranges")), |
2307 ('', 'biject', False, _("do a 1-1 map between rev and successor ranges")), |
3069 finally: |
3069 finally: |
3070 lockmod.release(lock, wlock) |
3070 lockmod.release(lock, wlock) |
3071 |
3071 |
3072 @eh.extsetup |
3072 @eh.extsetup |
3073 def oldevolveextsetup(ui): |
3073 def oldevolveextsetup(ui): |
3074 for cmd in ['kill', 'uncommit', 'touch', 'fold']: |
3074 for cmd in ['prune', 'uncommit', 'touch', 'fold']: |
3075 try: |
3075 try: |
3076 entry = extensions.wrapcommand(cmdtable, cmd, |
3076 entry = extensions.wrapcommand(cmdtable, cmd, |
3077 warnobserrors) |
3077 warnobserrors) |
3078 except error.UnknownCommand: |
3078 except error.UnknownCommand: |
3079 # Commands may be disabled |
3079 # Commands may be disabled |