Mercurial > hg
view tests/test-fix-clang-format.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | 2ecf5c24d0cd |
children |
line wrap: on
line source
#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:pattern=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 ..