| durin42 |
| 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 (7 lines) | |||
| M | tests/test-histedit-commute.t (26 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def torule(self): | def torule(self): | ||||
| """build a histedit rule line for an action | """build a histedit rule line for an action | ||||
| by default lines are in the form: | by default lines are in the form: | ||||
| <hash> <rev> <summary> | <hash> <rev> <summary> | ||||
| """ | """ | ||||
| ctx = self.repo[self.node] | ctx = self.repo[self.node] | ||||
| ui = self.repo.ui | ui = self.repo.ui | ||||
| with ui.configoverride({}, b'histedit'): | |||||
| summary = cmdutil.rendertemplate( | summary = cmdutil.rendertemplate( | ||||
| ctx, ui.config(b'histedit', b'summary-template') | ctx, ui.config(b'histedit', b'summary-template') | ||||
| ) | ) | ||||
| summary = summary.splitlines()[0] | summary = summary.splitlines()[0] | ||||
| line = b'%s %s %s' % (self.verb, ctx, summary) | line = b'%s %s %s' % (self.verb, ctx, summary) | ||||
| # trim to 75 columns by default so it's not stupidly wide in my editor | # trim to 75 columns by default so it's not stupidly wide in my editor | ||||
| # (the 5 more are left for verb) | # (the 5 more are left for verb) | ||||
| maxlen = self.repo.ui.configint(b'histedit', b'linelen') | maxlen = self.repo.ui.configint(b'histedit', b'linelen') | ||||
| maxlen = max(maxlen, 22) # avoid truncating hash | maxlen = max(maxlen, 22) # avoid truncating hash | ||||
| return stringutil.ellipsis(line, maxlen) | return stringutil.ellipsis(line, maxlen) | ||||
| # 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 | ||||
| # | # | ||||
| colors in the custom template don't show up in the editor | |||||
| $ HGEDITOR=cat hg histedit 177f92b77385 --color=debug \ | |||||
| > --config histedit.summary-template='I am rev {label("rev", rev)}' | |||||
| pick 177f92b77385 I am rev [rev|2] | |||||
| pick 055a42cdd887 I am rev [rev|3] | |||||
| pick e860deea161a I am rev [rev|4] | |||||
| pick 652413bf663e I am rev [rev|5] | |||||
| # Edit history between 177f92b77385 and 652413bf663e | |||||
| # | |||||
| # Commits are listed from least to most recent | |||||
| # | |||||
| # You can reorder changesets by reordering the lines | |||||
| # | |||||
| # Commands: | |||||
| # | |||||
| # e, edit = use commit, but stop for amending | |||||
| # m, mess = edit commit message without changing commit content | |||||
| # p, pick = use commit | |||||
| # b, base = checkout changeset and apply further changesets from there | |||||
| # d, drop = remove commit from history | |||||
| # f, fold = use commit, but combine it with the one above | |||||
| # r, roll = like fold, but discard this commit's description and date | |||||
| # | |||||
| edit the history | edit the history | ||||
| (use a hacky editor to check histedit-last-edit.txt backup) | (use a hacky editor to check histedit-last-edit.txt backup) | ||||
| $ EDITED="$TESTTMP/editedhistory" | $ EDITED="$TESTTMP/editedhistory" | ||||
| $ cat > $EDITED <<EOF | $ cat > $EDITED <<EOF | ||||
| > edit 177f92b77385 c | > edit 177f92b77385 c | ||||
| > pick e860deea161a e | > pick e860deea161a e | ||||
| > pick 652413bf663e f | > pick 652413bf663e f | ||||