| pulkit |
| hg-reviewers |
As with checknotesize(), I also changed to snake_case while at it,
to help extensions a little.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/uncommit.py (2 lines) | |||
| M | mercurial/cmdutil.py (24 lines) | |||
| M | mercurial/commands.py (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| files to their uncommitted state. This means that files modified or | files to their uncommitted state. This means that files modified or | ||||
| deleted in the changeset will be left unchanged, and so will remain | deleted in the changeset will be left unchanged, and so will remain | ||||
| modified in the working directory. | modified in the working directory. | ||||
| If no files are specified, the commit will be pruned, unless --keep is | If no files are specified, the commit will be pruned, unless --keep is | ||||
| given. | given. | ||||
| """ | """ | ||||
| cmdutil.check_note_size(opts) | cmdutil.check_note_size(opts) | ||||
| cmdutil.resolve_commit_options(ui, opts) | |||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| cmdutil.resolvecommitoptions(ui, opts) | |||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| st = repo.status() | st = repo.status() | ||||
| m, a, r, d = st.modified, st.added, st.removed, st.deleted | m, a, r, d = st.modified, st.added, st.removed, st.deleted | ||||
| isdirtypath = any(set(m + a + r + d) & set(pats)) | isdirtypath = any(set(m + a + r + d) & set(pats)) | ||||
| allowdirtywcopy = opts[ | allowdirtywcopy = opts[ | ||||
| b'allow_dirty_working_copy' | b'allow_dirty_working_copy' | ||||
| Unlike check_at_most_one_arg(), `others` are not mutually exclusive | Unlike check_at_most_one_arg(), `others` are not mutually exclusive | ||||
| among themselves, and they're passed as a single collection. | among themselves, and they're passed as a single collection. | ||||
| """ | """ | ||||
| for other in others: | for other in others: | ||||
| check_at_most_one_arg(opts, first, other) | check_at_most_one_arg(opts, first, other) | ||||
| def resolvecommitoptions(ui, opts): | def resolve_commit_options(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 return value indicates that ``rewrite.update-timestamp`` is the reason | ||||
| the ``date`` option is set. | the ``date`` option is set. | ||||
| """ | """ | ||||
| check_at_most_one_arg(opts, b'date', b'currentdate') | check_at_most_one_arg(opts, 'date', 'currentdate') | ||||
| check_at_most_one_arg(opts, b'user', b'currentuser') | check_at_most_one_arg(opts, 'user', 'currentuser') | ||||
| datemaydiffer = False # date-only change should be ignored? | datemaydiffer = False # date-only change should be ignored? | ||||
| if opts.get(b'currentdate'): | if opts.get('currentdate'): | ||||
| opts[b'date'] = b'%d %d' % dateutil.makedate() | opts['date'] = b'%d %d' % dateutil.makedate() | ||||
| elif ( | elif ( | ||||
| not opts.get(b'date') | not opts.get('date') | ||||
| and ui.configbool(b'rewrite', b'update-timestamp') | and ui.configbool(b'rewrite', b'update-timestamp') | ||||
| and opts.get(b'currentdate') is None | and opts.get('currentdate') is None | ||||
| ): | ): | ||||
| opts[b'date'] = b'%d %d' % dateutil.makedate() | opts['date'] = b'%d %d' % dateutil.makedate() | ||||
| datemaydiffer = True | datemaydiffer = True | ||||
| if opts.get(b'currentuser'): | if opts.get('currentuser'): | ||||
| opts[b'user'] = ui.username() | opts['user'] = ui.username() | ||||
| return datemaydiffer | return datemaydiffer | ||||
| def check_note_size(opts): | def check_note_size(opts): | ||||
| """make sure note is of valid format""" | """make sure note is of valid format""" | ||||
| note = opts.get('note') | note = opts.get('note') | ||||
| return not a.cmp(b) and a.flags() == b.flags() | return not a.cmp(b) and a.flags() == b.flags() | ||||
| else: | else: | ||||
| return False | return False | ||||
| else: | else: | ||||
| return f not in ctx2.manifest() | return f not in ctx2.manifest() | ||||
| def amend(ui, repo, old, extra, pats, opts): | def amend(ui, repo, old, extra, pats, opts): | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| # avoid cycle context -> subrepo -> cmdutil | # avoid cycle context -> subrepo -> cmdutil | ||||
| from . import context | from . import context | ||||
| # amend will reuse the existing user if not specified, but the obsolete | # amend will reuse the existing user if not specified, but the obsolete | ||||
| # marker creation requires that the current user's name is specified. | # marker creation requires that the current user's name is specified. | ||||
| if obsolete.isenabled(repo, obsolete.createmarkersopt): | if obsolete.isenabled(repo, obsolete.createmarkersopt): | ||||
| ui.username() # raise exception if username not set | ui.username() # raise exception if username not set | ||||
| # 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()) | ||||
| # date-only change should be ignored? | # date-only change should be ignored? | ||||
| datemaydiffer = resolvecommitoptions(ui, opts) | datemaydiffer = resolve_commit_options(ui, opts) | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| date = old.date() | date = old.date() | ||||
| if opts.get(b'date'): | if opts.get(b'date'): | ||||
| date = dateutil.parsedate(opts.get(b'date')) | date = dateutil.parsedate(opts.get(b'date')) | ||||
| user = opts.get(b'user') or old.user() | user = opts.get(b'user') or old.user() | ||||
| 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 | ||||
| revs = list(revs) | revs = list(revs) | ||||
| revs.extend(opts.get('rev')) | revs.extend(opts.get('rev')) | ||||
| # a dict of data to be stored in state file | # a dict of data to be stored in state file | ||||
| statedata = {} | statedata = {} | ||||
| # list of new nodes created by ongoing graft | # list of new nodes created by ongoing graft | ||||
| statedata[b'newnodes'] = [] | statedata[b'newnodes'] = [] | ||||
| cmdutil.resolve_commit_options(ui, opts) | |||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| cmdutil.resolvecommitoptions(ui, opts) | |||||
| editor = cmdutil.getcommiteditor( | editor = cmdutil.getcommiteditor( | ||||
| editform=b'graft', **pycompat.strkwargs(opts) | editform=b'graft', **pycompat.strkwargs(opts) | ||||
| ) | ) | ||||
| cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') | cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') | ||||
| cont = False | cont = False | ||||