| martinvonz |
| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/histedit.py (6 lines) | |||
| M | tests/test-histedit-arguments.t (6 lines) | |||
| M | tests/test-histedit-bookmark-motion.t (4 lines) | |||
| M | tests/test-histedit-commute.t (8 lines) | |||
| M | tests/test-histedit-edit.t (2 lines) | |||
| M | tests/test-histedit-obsolete.t (2 lines) | |||
| M | tests/test-histedit-outgoing.t (6 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 4de3363622d0 | 41616143a67c | Augie Fackler | Dec 10 2020, 1:15 PM |
| pick 7c2fd3b9020c Add delta | pick 7c2fd3b9020c Add delta | ||||
| # Edit history between c561b4e977df and 7c2fd3b9020c | # Edit history between c561b4e977df and 7c2fd3b9020c | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # | # | ||||
| In this file, lines beginning with ``#`` are ignored. You must specify a rule | In this file, lines beginning with ``#`` are ignored. You must specify a rule | ||||
| for each revision in your history. For example, if you had meant to add gamma | for each revision in your history. For example, if you had meant to add gamma | ||||
| before beta, and then wanted to add delta in the same revision as beta, you | before beta, and then wanted to add delta in the same revision as beta, you | ||||
| would reorganize the file to look like this:: | would reorganize the file to look like this:: | ||||
| pick 030b686bedc4 Add gamma | pick 030b686bedc4 Add gamma | ||||
| pick c561b4e977df Add beta | pick c561b4e977df Add beta | ||||
| fold 7c2fd3b9020c Add delta | fold 7c2fd3b9020c Add delta | ||||
| # Edit history between c561b4e977df and 7c2fd3b9020c | # Edit history between c561b4e977df and 7c2fd3b9020c | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # | # | ||||
| At which point you close the editor and ``histedit`` starts working. When you | At which point you close the editor and ``histedit`` starts working. When you | ||||
| rulectx = self.repo[self.node] | rulectx = self.repo[self.node] | ||||
| if rulectx.p1().node() == self.state.parentctxnode: | if rulectx.p1().node() == self.state.parentctxnode: | ||||
| self.repo.ui.debug(b'node %s unchanged\n' % node.short(self.node)) | self.repo.ui.debug(b'node %s unchanged\n' % node.short(self.node)) | ||||
| return rulectx, [] | return rulectx, [] | ||||
| return super(pick, self).run() | return super(pick, self).run() | ||||
| @action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True) | @action([b'edit', b'e'], _(b'use commit, but allow edits before making new commit'), priority=True) | ||||
| class edit(histeditaction): | class edit(histeditaction): | ||||
| def run(self): | def run(self): | ||||
| repo = self.repo | repo = self.repo | ||||
| rulectx = repo[self.node] | rulectx = repo[self.node] | ||||
| hg.update(repo, self.state.parentctxnode, quietempty=True) | hg.update(repo, self.state.parentctxnode, quietempty=True) | ||||
| applychanges(repo.ui, repo, rulectx, {}) | applychanges(repo.ui, repo, rulectx, {}) | ||||
| hint = _(b'to amend %s, `hg histedit --continue` after making changes') | hint = _(b'to amend %s, `hg histedit --continue` after making changes') | ||||
| raise error.InterventionRequired( | raise error.InterventionRequired( | ||||
| # Edit history between eb57da33312f and 08d98a8350f3 | # Edit history between eb57da33312f and 08d98a8350f3 | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b | # Edit history between 3d3ea1f3a10b and 3d3ea1f3a10b | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between 6058cbb6cfd7 and 4f34d0f8b5fa | # Edit history between 6058cbb6cfd7 and 4f34d0f8b5fa | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between d2ae7f538514 and 652413bf663e | # Edit history between d2ae7f538514 and 652413bf663e | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| $ hg histedit 1 --commands - --verbose << EOF | grep histedit | $ hg histedit 1 --commands - --verbose << EOF | grep histedit | ||||
| # Edit history between b346ab9a313d and cacdfd884a93 | # Edit history between b346ab9a313d and cacdfd884a93 | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| $ hg histedit 1 --commands - --verbose << EOF | grep histedit | $ hg histedit 1 --commands - --verbose << EOF | grep histedit | ||||
| # Edit history between 177f92b77385 and 652413bf663e | # Edit history between 177f92b77385 and 652413bf663e | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between 177f92b77385 and 652413bf663e | # Edit history between 177f92b77385 and 652413bf663e | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between 177f92b77385 and 652413bf663e | # Edit history between 177f92b77385 and 652413bf663e | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between ece0b8d93dda and 9c863c565126 | # Edit history between ece0b8d93dda and 9c863c565126 | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between 0012be4a27ea and 0012be4a27ea | # Edit history between 0012be4a27ea and 0012be4a27ea | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, fold = use commit | # p, fold = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| # Edit history between d2ae7f538514 and 652413bf663e | # Edit history between d2ae7f538514 and 652413bf663e | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| $ hg histedit 1 --commands - --verbose <<EOF | grep histedit | $ hg histedit 1 --commands - --verbose <<EOF | grep histedit | ||||
| # Edit history between 055a42cdd887 and 652413bf663e | # Edit history between 055a42cdd887 and 652413bf663e | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| $ cd .. | $ cd .. | ||||
| # Edit history between 2a4042b45417 and 51281e65ba79 | # Edit history between 2a4042b45417 and 51281e65ba79 | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||
| $ cd .. | $ cd .. | ||||
| # Edit history between f26599ee3441 and f26599ee3441 | # Edit history between f26599ee3441 and f26599ee3441 | ||||
| # | # | ||||
| # Commits are listed from least to most recent | # Commits are listed from least to most recent | ||||
| # | # | ||||
| # You can reorder changesets by reordering the lines | # You can reorder changesets by reordering the lines | ||||
| # | # | ||||
| # Commands: | # Commands: | ||||
| # | # | ||||
| # e, edit = use commit, but stop for amending | # e, edit = use commit, but allow edits before making new commit | ||||
| # m, mess = edit commit message without changing commit content | # m, mess = edit commit message without changing commit content | ||||
| # p, pick = use commit | # p, pick = use commit | ||||
| # b, base = checkout changeset and apply further changesets from there | # b, base = checkout changeset and apply further changesets from there | ||||
| # d, drop = remove commit from history | # d, drop = remove commit from history | ||||
| # f, fold = use commit, but combine it with the one above | # f, fold = use commit, but combine it with the one above | ||||
| # r, roll = like fold, but discard this commit's description and date | # r, roll = like fold, but discard this commit's description and date | ||||
| # | # | ||||