| pulkit |
| hg-reviewers |
This is also from the evolve extension's version of amend. A side effect of
this refactoring is for uncommit to support rewrite.update-timestamp.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/amend.py (5 lines) | |||
| M | mercurial/cmdutil.py (33 lines) | |||
| M | mercurial/help/config.txt (3 lines) | |||
| M | relnotes/next (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| command = registrar.command(cmdtable) | command = registrar.command(cmdtable) | ||||
| @command('amend', | @command('amend', | ||||
| [('A', 'addremove', None, | [('A', 'addremove', None, | ||||
| _('mark new/missing files as added/removed before committing')), | _('mark new/missing files as added/removed before committing')), | ||||
| ('e', 'edit', None, _('invoke editor on commit messages')), | ('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('i', 'interactive', None, _('use interactive mode')), | ('i', 'interactive', None, _('use interactive mode')), | ||||
| ('n', 'note', '', _('store a note on the amend')), | ('n', 'note', '', _('store a note on the amend')), | ||||
| ('D', 'currentdate', None, | ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2 | ||||
| _('record the current date as commit date')), | + cmdutil.commitopts3, | ||||
| ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2, | |||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING, | helpcategory=command.CATEGORY_COMMITTING, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def amend(ui, repo, *pats, **opts): | def amend(ui, repo, *pats, **opts): | ||||
| """amend the working copy parent with all or specified outstanding changes | """amend the working copy parent with all or specified outstanding changes | ||||
| Similar to :hg:`commit --amend`, but reuse the commit message without | Similar to :hg:`commit --amend`, but reuse the commit message without | ||||
| invoking editor, unless ``--edit`` was set. | invoking editor, unless ``--edit`` was set. | ||||
| ] | ] | ||||
| # special string such that everything below this line will be ingored in the | # special string such that everything below this line will be ingored in the | ||||
| # editor text | # editor text | ||||
| _linebelow = "^HG: ------------------------ >8 ------------------------$" | _linebelow = "^HG: ------------------------ >8 ------------------------$" | ||||
| def resolvecommitoptions(ui, opts): | def resolvecommitoptions(ui, opts): | ||||
| """modify commit options dict to handle related options | """modify commit options dict to handle related options | ||||
| The return value indicates that ``rewrite.update-timestamp`` is the reason | |||||
| the ``date`` option is set. | |||||
| """ | """ | ||||
| if opts.get('date') and opts.get('currentdate'): | if opts.get('date') and opts.get('currentdate'): | ||||
| raise error.Abort(_('--date and --currentdate are mutually ' | raise error.Abort(_('--date and --currentdate are mutually ' | ||||
| 'exclusive')) | 'exclusive')) | ||||
| if opts.get(b'user') and opts.get(b'currentuser'): | if opts.get(b'user') and opts.get(b'currentuser'): | ||||
| raise error.Abort(_('--user and --currentuser are mutually ' | raise error.Abort(_('--user and --currentuser are mutually ' | ||||
| 'exclusive')) | 'exclusive')) | ||||
| # N.B. this is extremely similar to setupheaderopts() in mq.py | datemaydiffer = False # date-only change should be ignored? | ||||
| if opts.get(b'currentdate'): | if opts.get(b'currentdate'): | ||||
| opts[b'date'] = b'%d %d' % dateutil.makedate() | opts[b'date'] = b'%d %d' % dateutil.makedate() | ||||
| elif (not opts.get('date') | |||||
| and ui.configbool('rewrite', 'update-timestamp') | |||||
| and opts.get('currentdate') is None): | |||||
| opts[b'date'] = b'%d %d' % dateutil.makedate() | |||||
| datemaydiffer = True | |||||
| if opts.get(b'currentuser'): | if opts.get(b'currentuser'): | ||||
| opts[b'user'] = ui.username() | opts[b'user'] = ui.username() | ||||
| return datemaydiffer | |||||
| def ishunk(x): | def ishunk(x): | ||||
| hunkclasses = (crecordmod.uihunk, patch.recordhunk) | hunkclasses = (crecordmod.uihunk, patch.recordhunk) | ||||
| return isinstance(x, hunkclasses) | return isinstance(x, hunkclasses) | ||||
| def newandmodified(chunks, originalchunks): | def newandmodified(chunks, originalchunks): | ||||
| newlyaddedandmodifiedfiles = set() | newlyaddedandmodifiedfiles = set() | ||||
| alsorestore = set() | alsorestore = set() | ||||
| for chunk in chunks: | for chunk in chunks: | ||||
| extra = extra.copy() | extra = extra.copy() | ||||
| # Update extra dict from amended commit (e.g. to preserve graft | # Update extra dict from amended commit (e.g. to preserve graft | ||||
| # source) | # source) | ||||
| extra.update(old.extra()) | extra.update(old.extra()) | ||||
| # Also update it from the from the wctx | # Also update it from the from the wctx | ||||
| extra.update(wctx.extra()) | extra.update(wctx.extra()) | ||||
| user = opts.get('user') or old.user() | # date-only change should be ignored? | ||||
| datemaydiffer = resolvecommitoptions(ui, opts) | |||||
| datemaydiffer = False # date-only change should be ignored? | date = old.date() | ||||
| if opts.get('date') and opts.get('currentdate'): | |||||
| raise error.Abort(_('--date and --currentdate are mutually ' | |||||
| 'exclusive')) | |||||
| if opts.get('date'): | if opts.get('date'): | ||||
| date = dateutil.parsedate(opts.get('date')) | date = dateutil.parsedate(opts.get('date')) | ||||
| elif opts.get('currentdate'): | user = opts.get('user') or old.user() | ||||
| date = dateutil.makedate() | |||||
| elif (ui.configbool('rewrite', 'update-timestamp') | |||||
| and opts.get('currentdate') is None): | |||||
| date = dateutil.makedate() | |||||
| datemaydiffer = True | |||||
| else: | |||||
| date = old.date() | |||||
| if len(old.parents()) > 1: | if len(old.parents()) > 1: | ||||
| # ctx.files() isn't reliable for merges, so fall back to the | # ctx.files() isn't reliable for merges, so fall back to the | ||||
| # slower repo.status() method | # slower repo.status() method | ||||
| files = {fn for st in base.status(old)[:3] for fn in st} | files = {fn for st in base.status(old)[:3] for fn in st} | ||||
| else: | else: | ||||
| files = set(old.files()) | files = set(old.files()) | ||||
| ``rewrite`` | ``rewrite`` | ||||
| ----------- | ----------- | ||||
| ``backup-bundle`` | ``backup-bundle`` | ||||
| Whether to save stripped changesets to a bundle file. (default: True) | Whether to save stripped changesets to a bundle file. (default: True) | ||||
| ``update-timestamp`` | ``update-timestamp`` | ||||
| If true, updates the date and time of the changeset to current. It is only | If true, updates the date and time of the changeset to current. It is only | ||||
| applicable for hg amend in current version. | applicable for `hg amend`, `hg commit --amend` and `hg uncommit` in the | ||||
| current version. | |||||
| ``storage`` | ``storage`` | ||||
| ----------- | ----------- | ||||
| Control the strategy Mercurial uses internally to store history. Options in this | Control the strategy Mercurial uses internally to store history. Options in this | ||||
| category impact performance and repository size. | category impact performance and repository size. | ||||
| ``revlog.optimize-delta-parent-choice`` | ``revlog.optimize-delta-parent-choice`` | ||||
| == New Features == | == New Features == | ||||
| * The amend extension supports the `--currentuser` argument. | |||||
| * The uncommit extension supports the `rewrite.update-timestamp` config option. | |||||
| == New Experimental Features == | == New Experimental Features == | ||||
| == Bug Fixes == | == Bug Fixes == | ||||
| == Backwards Compatibility Changes == | == Backwards Compatibility Changes == | ||||