1348982 - mach clang-format doesn't format the current revision

Status: RESOLVED FIXED

Description

[Chris Pearce (:cpearce)]

The `mach clang-format` command doesn't work well with history rewriting.

If I have three commits A, B, C, where C is the tip. If I `hg up A` and `./mach clang-format` (with the intention of following up with `hg amend ; hg evolve `) stuff changed in C gets formatted.

This is because clang-format's CommandProvider uses "-r tip^" to express the changes to be formatted. It should be using "-r .^" as that means "the current revision and any changes in the working dir", which is what we're trying to format.

Comment 1

[Chris Pearce (:cpearce)]

Created attachment 8849291 [details]
Bug 1348982 - Make 'mach clang-format' format the current revision instead of the tip.

Currently the mach clang-format command is formating '-r tip^', which is
everything in the tip revision, plus changes. Often this does what you want,
but if you're using changeset evolution or history rewriting this doesn't work
so well.  If you `hg up $rev` to some other revision with the intention of
clang-formating that revision, you don't get that revision formated when you
run clang-format. You get the lines touched by the changeset with the "tip"
bookmark formatted. We really want to have clang-format format '-r .^' which
means "the current revision in the working dir, plus any uncommited changes".

This results in the expected behaviour, and means clang-format can be used to
re-format commits which are work-in-progress and/or being evolved.

Review commit: https://reviewboard.mozilla.org/r/122110/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/122110/

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8849291 [details]
Bug 1348982 - Make 'mach clang-format' format the current revision instead of the tip.

https://reviewboard.mozilla.org/r/122110/#review124732

Good catch.

Strictly speaking `hg diff -c .` is probably semantically better. But I don't think it really matters in this case.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6270b8fc98ab
Make 'mach clang-format' format the current revision instead of the tip. r=gps

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/6270b8fc98ab