| durin42 | |
| Alphare |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/histedit.py (42 lines) | |||
| M | tests/test-histedit-arguments.t (4 lines) | |||
| M | tests/test-histedit-edit.t (2 lines) | |||
| M | tests/test-histedit-non-commute-abort.t (2 lines) | |||
| M | tests/test-histedit-obsolete.t (2 lines) | |||
| M | tests/test-histedit-outgoing.t (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz |
| return repo.commitctx(new) | return repo.commitctx(new) | ||||
| def _isdirtywc(repo): | def _isdirtywc(repo): | ||||
| return repo[None].dirty(missing=True) | return repo[None].dirty(missing=True) | ||||
| def abortdirty(): | def abortdirty(): | ||||
| raise error.Abort( | raise error.StateError( | ||||
| _(b'working copy has pending changes'), | _(b'working copy has pending changes'), | ||||
| hint=_( | hint=_( | ||||
| b'amend, commit, or revert them and run histedit ' | b'amend, commit, or revert them and run histedit ' | ||||
| b'--continue, or abort with histedit --abort' | b'--continue, or abort with histedit --abort' | ||||
| ), | ), | ||||
| ) | ) | ||||
| revs, checkout = hg.addbranchrevs(repo, repo, (path.branch, []), None) | revs, checkout = hg.addbranchrevs(repo, repo, (path.branch, []), None) | ||||
| other = hg.peer(repo, opts, dest) | other = hg.peer(repo, opts, dest) | ||||
| if revs: | if revs: | ||||
| revs = [repo.lookup(rev) for rev in revs] | revs = [repo.lookup(rev) for rev in revs] | ||||
| outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) | outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) | ||||
| if not outgoing.missing: | if not outgoing.missing: | ||||
| raise error.Abort(_(b'no outgoing ancestors')) | raise error.StateError(_(b'no outgoing ancestors')) | ||||
| roots = list(repo.revs(b"roots(%ln)", outgoing.missing)) | roots = list(repo.revs(b"roots(%ln)", outgoing.missing)) | ||||
| if len(roots) > 1: | if len(roots) > 1: | ||||
| msg = _(b'there are ambiguous outgoing revisions') | msg = _(b'there are ambiguous outgoing revisions') | ||||
| hint = _(b"see 'hg help histedit' for more detail") | hint = _(b"see 'hg help histedit' for more detail") | ||||
| raise error.Abort(msg, hint=hint) | raise error.StateError(msg, hint=hint) | ||||
| return repo[roots[0]].node() | return repo[roots[0]].node() | ||||
| # Curses Support | # Curses Support | ||||
| try: | try: | ||||
| import curses | import curses | ||||
| except ImportError: | except ImportError: | ||||
| curses = None | curses = None | ||||
| cmdutil.bailifchanged(repo) | cmdutil.bailifchanged(repo) | ||||
| revs.extend(freeargs) | revs.extend(freeargs) | ||||
| if not revs: | if not revs: | ||||
| defaultrev = destutil.desthistedit(ui, repo) | defaultrev = destutil.desthistedit(ui, repo) | ||||
| if defaultrev is not None: | if defaultrev is not None: | ||||
| revs.append(defaultrev) | revs.append(defaultrev) | ||||
| if len(revs) != 1: | if len(revs) != 1: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b'histedit requires exactly one ancestor revision') | _(b'histedit requires exactly one ancestor revision') | ||||
| ) | ) | ||||
| rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs))) | rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs))) | ||||
| if len(rr) != 1: | if len(rr) != 1: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _( | _( | ||||
| b'The specified revisions must have ' | b'The specified revisions must have ' | ||||
| b'exactly one common root' | b'exactly one common root' | ||||
| ) | ) | ||||
| ) | ) | ||||
| root = rr[0].node() | root = rr[0].node() | ||||
| topmost = repo.dirstate.p1() | topmost = repo.dirstate.p1() | ||||
| revs = between(repo, root, topmost, keep) | revs = between(repo, root, topmost, keep) | ||||
| if not revs: | if not revs: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b'%s is not an ancestor of working directory') % short(root) | _(b'%s is not an ancestor of working directory') % short(root) | ||||
| ) | ) | ||||
| ctxs = [] | ctxs = [] | ||||
| for i, r in enumerate(revs): | for i, r in enumerate(revs): | ||||
| ctxs.append(histeditrule(ui, repo[r], i)) | ctxs.append(histeditrule(ui, repo[r], i)) | ||||
| with util.with_lc_ctype(): | with util.with_lc_ctype(): | ||||
| rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs)) | rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs)) | ||||
| return f.read() | return f.read() | ||||
| def _validateargs(ui, repo, freeargs, opts, goal, rules, revs): | def _validateargs(ui, repo, freeargs, opts, goal, rules, revs): | ||||
| # TODO only abort if we try to histedit mq patches, not just | # TODO only abort if we try to histedit mq patches, not just | ||||
| # blanket if mq patches are applied somewhere | # blanket if mq patches are applied somewhere | ||||
| mq = getattr(repo, 'mq', None) | mq = getattr(repo, 'mq', None) | ||||
| if mq and mq.applied: | if mq and mq.applied: | ||||
| raise error.Abort(_(b'source has mq patches applied')) | raise error.StateError(_(b'source has mq patches applied')) | ||||
| # basic argument incompatibility processing | # basic argument incompatibility processing | ||||
| outg = opts.get(b'outgoing') | outg = opts.get(b'outgoing') | ||||
| editplan = opts.get(b'edit_plan') | editplan = opts.get(b'edit_plan') | ||||
| abort = opts.get(b'abort') | abort = opts.get(b'abort') | ||||
| force = opts.get(b'force') | force = opts.get(b'force') | ||||
| if force and not outg: | if force and not outg: | ||||
| raise error.Abort(_(b'--force only allowed with --outgoing')) | raise error.InputError(_(b'--force only allowed with --outgoing')) | ||||
| if goal == b'continue': | if goal == b'continue': | ||||
| if any((outg, abort, revs, freeargs, rules, editplan)): | if any((outg, abort, revs, freeargs, rules, editplan)): | ||||
| raise error.Abort(_(b'no arguments allowed with --continue')) | raise error.InputError(_(b'no arguments allowed with --continue')) | ||||
| elif goal == b'abort': | elif goal == b'abort': | ||||
| if any((outg, revs, freeargs, rules, editplan)): | if any((outg, revs, freeargs, rules, editplan)): | ||||
| raise error.Abort(_(b'no arguments allowed with --abort')) | raise error.InputError(_(b'no arguments allowed with --abort')) | ||||
| elif goal == b'edit-plan': | elif goal == b'edit-plan': | ||||
| if any((outg, revs, freeargs)): | if any((outg, revs, freeargs)): | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b'only --commands argument allowed with --edit-plan') | _(b'only --commands argument allowed with --edit-plan') | ||||
| ) | ) | ||||
| else: | else: | ||||
| if outg: | if outg: | ||||
| if revs: | if revs: | ||||
| raise error.Abort(_(b'no revisions allowed with --outgoing')) | raise error.InputError( | ||||
| _(b'no revisions allowed with --outgoing') | |||||
| ) | |||||
| if len(freeargs) > 1: | if len(freeargs) > 1: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b'only one repo argument allowed with --outgoing') | _(b'only one repo argument allowed with --outgoing') | ||||
| ) | ) | ||||
| else: | else: | ||||
| revs.extend(freeargs) | revs.extend(freeargs) | ||||
| if len(revs) == 0: | if len(revs) == 0: | ||||
| defaultrev = destutil.desthistedit(ui, repo) | defaultrev = destutil.desthistedit(ui, repo) | ||||
| if defaultrev is not None: | if defaultrev is not None: | ||||
| revs.append(defaultrev) | revs.append(defaultrev) | ||||
| if len(revs) != 1: | if len(revs) != 1: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b'histedit requires exactly one ancestor revision') | _(b'histedit requires exactly one ancestor revision') | ||||
| ) | ) | ||||
| def _histedit(ui, repo, state, freeargs, opts): | def _histedit(ui, repo, state, freeargs, opts): | ||||
| fm = ui.formatter(b'histedit', opts) | fm = ui.formatter(b'histedit', opts) | ||||
| fm.startitem() | fm.startitem() | ||||
| goal = _getgoal(opts) | goal = _getgoal(opts) | ||||
| if ui.promptchoice( | if ui.promptchoice( | ||||
| _( | _( | ||||
| b'warning: tags associated with the given' | b'warning: tags associated with the given' | ||||
| b' changeset will be lost after histedit.\n' | b' changeset will be lost after histedit.\n' | ||||
| b'do you want to continue (yN)? $$ &Yes $$ &No' | b'do you want to continue (yN)? $$ &Yes $$ &No' | ||||
| ), | ), | ||||
| default=1, | default=1, | ||||
| ): | ): | ||||
| raise error.Abort(_(b'histedit cancelled\n')) | raise error.CanceledError(_(b'histedit cancelled\n')) | ||||
| # rebuild state | # rebuild state | ||||
| if goal == goalcontinue: | if goal == goalcontinue: | ||||
| state.read() | state.read() | ||||
| state = bootstrapcontinue(ui, state, opts) | state = bootstrapcontinue(ui, state, opts) | ||||
| elif goal == goaleditplan: | elif goal == goaleditplan: | ||||
| _edithisteditplan(ui, repo, state, rules) | _edithisteditplan(ui, repo, state, rules) | ||||
| return | return | ||||
| elif goal == goalabort: | elif goal == goalabort: | ||||
| if freeargs: | if freeargs: | ||||
| remote = freeargs[0] | remote = freeargs[0] | ||||
| else: | else: | ||||
| remote = None | remote = None | ||||
| root = findoutgoing(ui, repo, remote, force, opts) | root = findoutgoing(ui, repo, remote, force, opts) | ||||
| else: | else: | ||||
| rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs))) | rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs))) | ||||
| if len(rr) != 1: | if len(rr) != 1: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _( | _( | ||||
| b'The specified revisions must have ' | b'The specified revisions must have ' | ||||
| b'exactly one common root' | b'exactly one common root' | ||||
| ) | ) | ||||
| ) | ) | ||||
| root = rr[0].node() | root = rr[0].node() | ||||
| revs = between(repo, root, topmost, state.keep) | revs = between(repo, root, topmost, state.keep) | ||||
| if not revs: | if not revs: | ||||
| raise error.Abort( | raise error.InputError( | ||||
| _(b'%s is not an ancestor of working directory') % short(root) | _(b'%s is not an ancestor of working directory') % short(root) | ||||
| ) | ) | ||||
| ctxs = [repo[r] for r in revs] | ctxs = [repo[r] for r in revs] | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| # Please don't ask me why `ancestors` is this value. I figured it | # Please don't ask me why `ancestors` is this value. I figured it | ||||
| # out with print-debugging, not by actually understanding what the | # out with print-debugging, not by actually understanding what the | ||||
| # These parameters were determined by print-debugging | # These parameters were determined by print-debugging | ||||
| # what happens later on inside histedit. | # what happens later on inside histedit. | ||||
| branchmerge=False, | branchmerge=False, | ||||
| force=False, | force=False, | ||||
| acceptremote=False, | acceptremote=False, | ||||
| followcopies=False, | followcopies=False, | ||||
| ) | ) | ||||
| except error.Abort: | except error.Abort: | ||||
| raise error.Abort( | raise error.StateError( | ||||
| _( | _( | ||||
| b"untracked files in working directory conflict with files in %s" | b"untracked files in working directory conflict with files in %s" | ||||
| ) | ) | ||||
| % c | % c | ||||
| ) | ) | ||||
| if not rules: | if not rules: | ||||
| comment = geteditcomment(ui, short(root), short(topmost)) | comment = geteditcomment(ui, short(root), short(topmost)) | ||||
| def between(repo, old, new, keep): | def between(repo, old, new, keep): | ||||
| """select and validate the set of revision to edit | """select and validate the set of revision to edit | ||||
| When keep is false, the specified set can't have children.""" | When keep is false, the specified set can't have children.""" | ||||
| revs = repo.revs(b'%n::%n', old, new) | revs = repo.revs(b'%n::%n', old, new) | ||||
| if revs and not keep: | if revs and not keep: | ||||
| rewriteutil.precheck(repo, revs, b'edit') | rewriteutil.precheck(repo, revs, b'edit') | ||||
| if repo.revs(b'(%ld) and merge()', revs): | if repo.revs(b'(%ld) and merge()', revs): | ||||
| raise error.Abort(_(b'cannot edit history that contains merges')) | raise error.StateError( | ||||
| _(b'cannot edit history that contains merges') | |||||
| ) | |||||
| return pycompat.maplist(repo.changelog.node, revs) | return pycompat.maplist(repo.changelog.node, revs) | ||||
| def ruleeditor(repo, ui, actions, editcomment=b""): | def ruleeditor(repo, ui, actions, editcomment=b""): | ||||
| """open an editor to edit rules | """open an editor to edit rules | ||||
| rules are in the format [ [act, ctx], ...] like in state.rules | rules are in the format [ [act, ctx], ...] like in state.rules | ||||
| """ | """ | ||||
| Run on a revision not ancestors of the current working directory. | Run on a revision not ancestors of the current working directory. | ||||
| -------------------------------------------------------------------- | -------------------------------------------------------------------- | ||||
| $ hg up 2 | $ hg up 2 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg histedit -r 4 | $ hg histedit -r 4 | ||||
| abort: 08d98a8350f3 is not an ancestor of working directory | abort: 08d98a8350f3 is not an ancestor of working directory | ||||
| [255] | [10] | ||||
| $ hg up --quiet | $ hg up --quiet | ||||
| Test that we pick the minimum of a revrange | Test that we pick the minimum of a revrange | ||||
| --------------------------------------- | --------------------------------------- | ||||
| $ HGEDITOR=cat hg histedit '2::' --commands - << EOF | $ HGEDITOR=cat hg histedit '2::' --commands - << EOF | ||||
| > pick eb57da33312f 2 three | > pick eb57da33312f 2 three | ||||
| $ hg update -q 2 | $ hg update -q 2 | ||||
| $ echo x > x | $ echo x > x | ||||
| $ hg add x | $ hg add x | ||||
| $ hg commit -m'x' x | $ hg commit -m'x' x | ||||
| created new head | created new head | ||||
| $ hg histedit -r 'heads(all())' | $ hg histedit -r 'heads(all())' | ||||
| abort: The specified revisions must have exactly one common root | abort: The specified revisions must have exactly one common root | ||||
| [255] | [10] | ||||
| Test that trimming description using multi-byte characters | Test that trimming description using multi-byte characters | ||||
| -------------------------------------------------------------------- | -------------------------------------------------------------------- | ||||
| $ "$PYTHON" <<EOF | $ "$PYTHON" <<EOF | ||||
| > fp = open('logfile', 'wb') | > fp = open('logfile', 'wb') | ||||
| > fp.write(b'12345678901234567890123456789012345678901234567890' + | > fp.write(b'12345678901234567890123456789012345678901234567890' + | ||||
| > b'12345') # there are 5 more columns for 80 columns | > b'12345') # there are 5 more columns for 80 columns | ||||
| $ hg tags | $ hg tags | ||||
| tip 1:bd7ee4f3939b | tip 1:bd7ee4f3939b | ||||
| a 0:a8a82d372bb3 | a 0:a8a82d372bb3 | ||||
| $ hg histedit | $ hg histedit | ||||
| warning: tags associated with the given changeset will be lost after histedit. | warning: tags associated with the given changeset will be lost after histedit. | ||||
| do you want to continue (yN)? n | do you want to continue (yN)? n | ||||
| abort: histedit cancelled | abort: histedit cancelled | ||||
| [255] | [250] | ||||
| $ cd .. | $ cd .. | ||||
| $ hg rm c | $ hg rm c | ||||
| $ hg ci -m 'remove c' | $ hg ci -m 'remove c' | ||||
| $ echo collision > c | $ echo collision > c | ||||
| $ hg histedit e860deea161a | $ hg histedit e860deea161a | ||||
| c: untracked file differs | c: untracked file differs | ||||
| abort: untracked files in working directory conflict with files in 055a42cdd887 | abort: untracked files in working directory conflict with files in 055a42cdd887 | ||||
| [255] | [20] | ||||
| We should have detected the collision early enough we're not in a | We should have detected the collision early enough we're not in a | ||||
| histedit state, and p1 is unchanged. | histedit state, and p1 is unchanged. | ||||
| $ hg log -r 'p1()' -T'{node}\n' | $ hg log -r 'p1()' -T'{node}\n' | ||||
| 1b0954ff00fccb15a37b679e4a35e9b01dfe685e | 1b0954ff00fccb15a37b679e4a35e9b01dfe685e | ||||
| $ hg status --config ui.tweakdefaults=yes | $ hg status --config ui.tweakdefaults=yes | ||||
| ? c | ? c | ||||
| ? e.orig | ? e.orig | ||||
| $ cd .. | $ cd .. | ||||
| $ hg merge f9daec13fb98 | $ hg merge f9daec13fb98 | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg ci -m 'merge' | $ hg ci -m 'merge' | ||||
| $ echo not wat > wat | $ echo not wat > wat | ||||
| $ hg ci -m 'modify wat' | $ hg ci -m 'modify wat' | ||||
| $ hg histedit 050280826e04 | $ hg histedit 050280826e04 | ||||
| abort: cannot edit history that contains merges | abort: cannot edit history that contains merges | ||||
| [255] | [20] | ||||
| $ cd .. | $ cd .. | ||||
| Check abort behavior | Check abort behavior | ||||
| ------------------------------------------- | ------------------------------------------- | ||||
| We checks that abort properly clean the repository so the same histedit can be | We checks that abort properly clean the repository so the same histedit can be | ||||
| attempted later. | attempted later. | ||||
| | | | | ||||
| o e860deea161a(default) | o e860deea161a(default) | ||||
| | | | | ||||
| o 055a42cdd887(default) | o 055a42cdd887(default) | ||||
| $ HGEDITOR=cat hg -q histedit --outgoing '../r' | $ HGEDITOR=cat hg -q histedit --outgoing '../r' | ||||
| abort: there are ambiguous outgoing revisions | abort: there are ambiguous outgoing revisions | ||||
| (see 'hg help histedit' for more detail) | (see 'hg help histedit' for more detail) | ||||
| [255] | [20] | ||||
| $ hg -q update -C 2 | $ hg -q update -C 2 | ||||
| $ echo aa >> a | $ echo aa >> a | ||||
| $ hg -q commit -m 'another head on default' | $ hg -q commit -m 'another head on default' | ||||
| $ hg -q outgoing -G --template '{node|short}({branch})' '../r#default' | $ hg -q outgoing -G --template '{node|short}({branch})' '../r#default' | ||||
| @ 3879dc049647(default) | @ 3879dc049647(default) | ||||
| o 652413bf663e(default) | o 652413bf663e(default) | ||||
| | | | | ||||
| o e860deea161a(default) | o e860deea161a(default) | ||||
| | | | | ||||
| o 055a42cdd887(default) | o 055a42cdd887(default) | ||||
| $ HGEDITOR=cat hg -q histedit --outgoing '../r#default' | $ HGEDITOR=cat hg -q histedit --outgoing '../r#default' | ||||
| abort: there are ambiguous outgoing revisions | abort: there are ambiguous outgoing revisions | ||||
| (see 'hg help histedit' for more detail) | (see 'hg help histedit' for more detail) | ||||
| [255] | [20] | ||||
| $ cd .. | $ cd .. | ||||