| pulkit |
| hg-reviewers |
Currently, the evolve extension's version of this command supports it.
| 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 (26 lines) | |||
| M | tests/test-uncommit.t (15 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| ) | ) | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| testedwith = 'ships-with-hg-core' | testedwith = 'ships-with-hg-core' | ||||
| def _commitfiltered(repo, ctx, match, keepcommit): | def _commitfiltered(repo, ctx, match, keepcommit, message=None, user=None, | ||||
| date=None): | |||||
| """Recommit ctx with changed files not in match. Return the new | """Recommit ctx with changed files not in match. Return the new | ||||
| node identifier, or None if nothing changed. | node identifier, or None if nothing changed. | ||||
| """ | """ | ||||
| base = ctx.p1() | base = ctx.p1() | ||||
| # ctx | # ctx | ||||
| initialfiles = set(ctx.files()) | initialfiles = set(ctx.files()) | ||||
| exclude = set(f for f in initialfiles if match(f)) | exclude = set(f for f in initialfiles if match(f)) | ||||
| fctx.islink(), | fctx.islink(), | ||||
| fctx.isexec(), | fctx.isexec(), | ||||
| copysource=copied.get(path)) | copysource=copied.get(path)) | ||||
| return mctx | return mctx | ||||
| if not files: | if not files: | ||||
| repo.ui.status(_("note: keeping empty commit\n")) | repo.ui.status(_("note: keeping empty commit\n")) | ||||
| if message is None: | |||||
| message = ctx.description() | |||||
| if not user: | |||||
| user = ctx.user() | |||||
| if not date: | |||||
| date = ctx.date() | |||||
| new = context.memctx(repo, | new = context.memctx(repo, | ||||
| parents=[base.node(), node.nullid], | parents=[base.node(), node.nullid], | ||||
| text=ctx.description(), | text=message, | ||||
| files=files, | files=files, | ||||
| filectxfn=filectxfn, | filectxfn=filectxfn, | ||||
| user=ctx.user(), | user=user, | ||||
| date=ctx.date(), | date=date, | ||||
| extra=ctx.extra()) | extra=ctx.extra()) | ||||
| return repo.commitctx(new) | return repo.commitctx(new) | ||||
| @command('uncommit', | @command('uncommit', | ||||
| [('', 'keep', None, _('allow an empty commit after uncommiting')), | [('', 'keep', None, _('allow an empty commit after uncommiting')), | ||||
| ('', 'allow-dirty-working-copy', False, | ('', 'allow-dirty-working-copy', False, | ||||
| _('allow uncommit with outstanding changes')) | _('allow uncommit with outstanding changes')) | ||||
| ] + commands.walkopts, | ] + commands.walkopts + commands.commitopts + commands.commitopts2, | ||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | ||||
| def uncommit(ui, repo, *pats, **opts): | def uncommit(ui, repo, *pats, **opts): | ||||
| """uncommit part or all of a local changeset | """uncommit part or all of a local changeset | ||||
| This command undoes the effect of a local commit, returning the affected | This command undoes the effect of a local commit, returning the affected | ||||
| 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 | ||||
| hint = _(b"file was untracked in working directory parent") | hint = _(b"file was untracked in working directory parent") | ||||
| else: | else: | ||||
| hint = _(b"file does not exist") | hint = _(b"file does not exist") | ||||
| raise error.Abort(_(b'cannot uncommit "%s"') | raise error.Abort(_(b'cannot uncommit "%s"') | ||||
| % scmutil.getuipathfn(repo)(f), hint=hint) | % scmutil.getuipathfn(repo)(f), hint=hint) | ||||
| with repo.transaction('uncommit'): | with repo.transaction('uncommit'): | ||||
| if not (opts[b'message'] or opts[b'logfile']): | |||||
| opts[b'message'] = old.description() | |||||
| message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts)) | |||||
| keepcommit = pats | keepcommit = pats | ||||
| if not keepcommit: | if not keepcommit: | ||||
| if opts.get('keep') is not None: | if opts.get('keep') is not None: | ||||
| keepcommit = opts.get('keep') | keepcommit = opts.get('keep') | ||||
| else: | else: | ||||
| keepcommit = ui.configbool('experimental', 'uncommit.keep') | keepcommit = ui.configbool('experimental', 'uncommit.keep') | ||||
| newid = _commitfiltered(repo, old, match, keepcommit) | newid = _commitfiltered(repo, old, match, keepcommit, | ||||
| message=message, user=opts.get(b'user'), | |||||
| date=opts.get(b'date')) | |||||
| if newid is None: | if newid is None: | ||||
| ui.status(_("nothing to uncommit\n")) | ui.status(_("nothing to uncommit\n")) | ||||
| return 1 | return 1 | ||||
| mapping = {} | mapping = {} | ||||
| if newid != old.p1().node(): | if newid != old.p1().node(): | ||||
| # Move local changes on filtered changeset | # Move local changes on filtered changeset | ||||
| mapping[old.node()] = (newid,) | mapping[old.node()] = (newid,) | ||||
| (use 'hg help -e uncommit' to show help for the uncommit extension) | (use 'hg help -e uncommit' to show help for the uncommit extension) | ||||
| options ([+] can be repeated): | options ([+] can be repeated): | ||||
| --keep allow an empty commit after uncommiting | --keep allow an empty commit after uncommiting | ||||
| --allow-dirty-working-copy allow uncommit with outstanding changes | --allow-dirty-working-copy allow uncommit with outstanding changes | ||||
| -I --include PATTERN [+] include names matching the given patterns | -I --include PATTERN [+] include names matching the given patterns | ||||
| -X --exclude PATTERN [+] exclude names matching the given patterns | -X --exclude PATTERN [+] exclude names matching the given patterns | ||||
| -m --message TEXT use text as commit message | |||||
| -l --logfile FILE read commit message from file | |||||
| -d --date DATE record the specified date as commit date | |||||
| -u --user USER record the specified user as committer | |||||
| (some details hidden, use --verbose to show complete help) | (some details hidden, use --verbose to show complete help) | ||||
| Uncommit with no commits should fail | Uncommit with no commits should fail | ||||
| $ hg uncommit | $ hg uncommit | ||||
| abort: cannot uncommit null changeset | abort: cannot uncommit null changeset | ||||
| (no changeset checked out) | (no changeset checked out) | ||||
| R b | R b | ||||
| Uncommitting a directory won't run afoul of the checks that an explicit file | Uncommitting a directory won't run afoul of the checks that an explicit file | ||||
| can be uncommitted. | can be uncommitted. | ||||
| $ mkdir dir | $ mkdir dir | ||||
| $ echo 1 > dir/file.txt | $ echo 1 > dir/file.txt | ||||
| $ hg ci -Aqm 'add file in directory' | $ hg ci -Aqm 'add file in directory' | ||||
| $ hg uncommit dir | $ hg uncommit dir -m 'uncommit with message' -u 'different user' \ | ||||
| > -d 'Jun 30 12:12:12 1980 +0000' | |||||
| $ hg status | $ hg status | ||||
| A dir/file.txt | A dir/file.txt | ||||
| $ hg log -r . | |||||
| changeset: 8:b4dd26dc42e0 | |||||
| tag: tip | |||||
| parent: 6:2278a4c24330 | |||||
| user: different user | |||||
| date: Mon Jun 30 12:12:12 1980 +0000 | |||||
| summary: uncommit with message | |||||
| `uncommit <dir>` and `cd <dir> && uncommit .` behave the same... | `uncommit <dir>` and `cd <dir> && uncommit .` behave the same... | ||||
| $ hg rollback -q --config ui.rollback=True | $ hg rollback -q --config ui.rollback=True | ||||
| $ echo 2 > dir/file2.txt | $ echo 2 > dir/file2.txt | ||||
| $ hg ci -Aqm 'add file2 in directory' | $ hg ci -Aqm 'add file2 in directory' | ||||
| $ hg uncommit dir | $ hg uncommit dir | ||||
| note: keeping empty commit | note: keeping empty commit | ||||