The proposal to merge lp:~widelands-dev/widelands/clang-codecheck into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586
--
Your team Widelands Developers is subscribed to br
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/clang-codecheck.
___
Mailing list: https://launchpad.net/~widelands-
Bunnybot encountered an error while working on this merge proposal:
Running 'bzr merge ../_widelands_dev_widelands_clang_codecheck' failed. Output:
-D cmake/codecheck/rules/illegal_space_after_opening_brace
-D cmake/codecheck/rules/line_starting_with_space_followed_by_control_structure
-D cmak
Review: Approve
okay, let's remove the check then for now - it is way more complicated than it
needs to be imho anyways. We can also bring it back if the code starts to
degenerate again.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586
Your
Fixing the nit is beyond my abilities - it will fail on Type*&.
Both the types and the operators are correctly formatted by my clang-format, I
have tested this.
Diff comments:
>
> === removed file 'cmake/codecheck/rules/missing_padding'
> --- cmake/codecheck/rules/missing_padding 2014-07-1
Continuous integration builds have changed state:
Travis build 502. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/106279022.
Appveyor build 383. State: success. Details:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_clang_codec
Review: Approve
We could add a codecheck that runs clang-format and complains if the output is
different to what clang format produces. But that might be brittle as
clang-format is slightly changing between versions IMHO.
One nit, otherwise lgtm.
Diff comments:
>
> === removed file 'cmake/c
Thanks, Tibor! All fixed now :)
--
https://code.launchpad.net/~widelands-dev/widelands/clang-codecheck/+merge/284586
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/clang-codecheck into lp:widelands.
Hi, I am bunnybot (https://github.com/widelands/bunnybot).
I am keeping the source branch lp:~widelands-dev/widelands/clang-codecheck
mirrored to
https://github.com/widelands/widelands/tree/_widelands_dev_widelands_clang_codecheck
You can give me commands by starting a line with @bunnybot . I
My answer is in the diff
Diff comments:
>
> === modified file 'src/ai/defaultai.cc'
> --- src/ai/defaultai.cc 2016-01-24 17:01:59 +
> +++ src/ai/defaultai.cc 2016-02-01 11:17:20 +
> @@ -215,8 +215,8 @@
> }
> }
>
GunChleoc has proposed merging lp:~widelands-dev/widelands/clang-codecheck into
lp:widelands.
Commit message:
Prepared the codecheck rules and source code to be compatible with clang-format.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.
11 matches
Mail list logo
