resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
Previously, with --config resolve.mark-check=abort, running `hg resolve -m foo`
would abort and emit a message saying to use --all. This command does not work,
though: `hg resolve -m foo --all`, and it's really weird for --all to be the
"--force" flag.
My original goal with the option was to make it so that `hg resolve -m` (no
filename arguments) was safer, which is why --all is used; in my mind, `hg
resolve -m foo` should always mark it as resolved, and `--all` is how you
specify "all the files", so that's why I chose `hg resolve -m --all` as the way
out of `hg resolve -m` aborting. This commit makes all of this work the way it
was meant to in my head :)
Differential Revision: https://phab.mercurial-scm.org/D5218
#require clang-format
Test that a simple "hg fix" configuration for clang-format works.
$ cat >> $HGRCPATH <<EOF
> [extensions]
> fix =
> [experimental]
> evolution.createmarkers=True
> evolution.allowunstable=True
> [fix]
> clang-format:command=clang-format --style=Google --assume-filename={rootpath}
> clang-format:linerange=--lines={first}:{last}
> clang-format:fileset=set:**.cpp or **.hpp
> EOF
$ hg init repo
$ cd repo
$ printf "void foo(){int x=2;}\n" > foo.cpp
$ printf "void\nfoo();\n" > foo.hpp
$ hg commit -Am "foo commit"
adding foo.cpp
adding foo.hpp
$ hg cat -r tip *
void foo(){int x=2;}
void
foo();
$ hg fix -r tip
$ hg cat -r tip *
void foo() { int x = 2; }
void foo();
$ cd ..