| pulkit |
| hg-reviewers |
This is how amend and graft work (but not MQ). I'm not sure why this didn't
work for me when I first tried it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (11 lines) | |||
| M | tests/test-uncommit.t (10 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| # 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 | ||||
| """ | """ | ||||
| if opts.get('date') and opts.get('currentdate'): | |||||
| raise error.Abort(_('--date and --currentdate are mutually ' | |||||
| 'exclusive')) | |||||
| if opts.get(b'user') and opts.get(b'currentuser'): | |||||
| raise error.Abort(_('--user and --currentuser are mutually ' | |||||
| 'exclusive')) | |||||
| # N.B. this is extremely similar to setupheaderopts() in mq.py | # N.B. this is extremely similar to setupheaderopts() in mq.py | ||||
| if not opts.get(b'date') and 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() | ||||
| if not opts.get(b'user') and opts.get(b'currentuser'): | if opts.get(b'currentuser'): | ||||
| opts[b'user'] = ui.username() | opts[b'user'] = ui.username() | ||||
| 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() | ||||
| $ hg log -r . | $ hg log -r . | ||||
| changeset: 8:b4dd26dc42e0 | changeset: 8:b4dd26dc42e0 | ||||
| tag: tip | tag: tip | ||||
| parent: 6:2278a4c24330 | parent: 6:2278a4c24330 | ||||
| user: different user | user: different user | ||||
| date: Mon Jun 30 12:12:12 1980 +0000 | date: Mon Jun 30 12:12:12 1980 +0000 | ||||
| summary: uncommit with message | summary: uncommit with message | ||||
| Bad option combinations | |||||
| $ hg rollback -q --config ui.rollback=True | |||||
| $ hg uncommit -U --user 'user' | |||||
| abort: --user and --currentuser are mutually exclusive | |||||
| [255] | |||||
| $ hg uncommit -D --date today | |||||
| abort: --date and --currentdate are mutually exclusive | |||||
| [255] | |||||
| `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 | |||||
| $ 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 | ||||
| $ hg status | $ hg status | ||||
| A dir/file2.txt | A dir/file2.txt | ||||
| $ hg rollback -q --config ui.rollback=True | $ hg rollback -q --config ui.rollback=True | ||||