1513055 - |mach clang-format| doesn't work with custom diff tool

Status: NEW

(Developer Infrastructure :: Lint and Formatting, enhancement, P3)

Description

[Botond Ballo [:botond]]

I use patdiff [1] to get nicer-looking "hg diff" output with mercurial.

To do this, I have the following entries in my .hgrc:

```
[alias]
diff = patdiff

[extdiff]
cmd.patdiff = 
```

However, this breaks |mach clang-format|:

$ ./mach clang-format
hg diff: option -U not recognized

It would be nice if I could both use |mach clang-format| and keep patdiff as my diff tool for "hg diff" output.

[1] https://github.com/janestreet/patdiff

Comment 1

[Sylvestre Ledru [:Sylvestre]]

In bug 1510458, I updated the -s option to use a diff instead of hg diff.
It should not happen anymore. Could you update and confirm? Thanks

Comment 2

[Botond Ballo [:botond]]

(In reply to Sylvestre Ledru [:sylvestre] from comment #1)
> In bug 1510458, I updated the -s option to use a diff instead of hg diff.
> It should not happen anymore. Could you update and confirm? Thanks

Assuming you mean update m-c? I'm using m-c from today, and the issue occurs.

Comment 3

[Sylvestre Ledru [:Sylvestre]]

OK, this is probably this line:
https://searchfox.org/mozilla-central/source/python/mozbuild/mozbuild/mach_commands.py#2676

Comment 4

[Jonathan Watt [:jwatt]]

Can you provide a permalink? That one rotted.

Comment 5

[Sylvestre Ledru [:Sylvestre]]

This is still
https://searchfox.org/mozilla-central/source/python/mozbuild/mozbuild/mach_commands.py#2677
I think
            args = ["hg", "diff", "-U0", "-r" ".^"]

Comment 6

[Jonathan Watt [:jwatt]]

Okay, thanks. Permalink for future reference in case that moves:

https://searchfox.org/mozilla-central/rev/7a922172a94cfe24c7a48e0a581577895e1da8c4/python/mozbuild/mozbuild/mach_commands.py#2677