| 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 (6 lines) | |||
| M | tests/test-histedit-commute.t (8 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'): | # We don't want color codes in the commit message template, so | ||||
| # disable the label() template function while we render it. | |||||
| with ui.configoverride( | |||||
| {(b'templatealias', b'label(l,x)'): b"x"}, 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') | ||||
| # 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 | colors in the custom template don't show up in the editor | ||||
| $ HGEDITOR=cat hg histedit 177f92b77385 --color=debug \ | $ HGEDITOR=cat hg histedit 177f92b77385 --color=debug \ | ||||
| > --config histedit.summary-template='I am rev {label("rev", rev)}' | > --config histedit.summary-template='I am rev {label("rev", rev)}' | ||||
| pick 177f92b77385 I am rev [rev|2] | pick 177f92b77385 I am rev 2 | ||||
| pick 055a42cdd887 I am rev [rev|3] | pick 055a42cdd887 I am rev 3 | ||||
| pick e860deea161a I am rev [rev|4] | pick e860deea161a I am rev 4 | ||||
| pick 652413bf663e I am rev [rev|5] | pick 652413bf663e I am rev 5 | ||||
| # 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: | ||||