This is an archive of the discontinued Mercurial Phabricator instance.

rebase: change and standarize template for rebase's one-line summary
ClosedPublic

Authored by martinvonz on Oct 27 2020, 6:42 PM.

Details

Summary

This removes the default template in rebase and switches to a
centrally defined template. I've simplified it a bit to avoid the
conditional parenthesis. I've also added labels so the different parts
can be easily colored. The template is somewhat similar to what we've
used internally at Google for a few years.

I'm happy to change the template if others have opinions. Should we
reuse the color.log. names as I have?

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 27 2020, 6:42 PM
martinvonz edited the summary of this revision. (Show Details)Oct 27 2020, 6:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Oct 29 2020, 11:07 AM
mercurial/cmdutil.py
1229–1231

I left out branches and custom namespaces on purpose because I figured people like us (Google) who have custom namespaces can also have custom configs. However, I just realized that this makes everyone with the topic extension lose the topic they've had in rebase output for a long time (ever since someone was nice enough to add it in D741). I'll send a follow-up to include names from all non-branch namespaces. Sorry about the churn that that will incur.

martinvonz added inline comments.Oct 29 2020, 12:07 PM
mercurial/cmdutil.py
1229–1231

I sent D9262 to fix that.