[GRASS-dev] C code indented

[Vaclav Petras]

I have resolved all indentation-related conflicts in the open PRs. The
procedure worked well on all PRs except one which had changes in
directories which were not indented yet.

The remaining issues are:

There are directories where indent reports an error, esp. due to
ambiguities in the current code formatting. These are not indented yet.
These would be best resolved by separate PRs, possibly separating the
ambiguity fixes from the overall formatting changes (esp. given that we
want to ignore purely formatting changes in git blame).

Formatting needs to be enforced in the CI. This can be done with something
like re-indent followed by git diff.

Best,
Vaclav

On Sat, 27 Aug 2022 at 14:06, Vaclav Petras <wenzeslaus at gmail.com> wrote:

> Dear all,
>
> Most of the C and C++ code was indented using our
> ./utils/grass_indent_ALL.sh script at the FOSS4G 2022 sprint. This will
> help to indent code for PRs and with the transition to clang-format.
>
> Directories with files which indent reports issues for were not updated,
> because more changes are needed in the code.
>
> This may create conflicts in some existing PR which modify C code. If you
> have a conflict related to this (old PR may have other conflicts too), you
> can follow this procedure:
>
> Indent your code:
>
> ./utils/grass_indent.sh db/drivers/mysql/create_table.c
>
> Commit the change:
>
> git commit -m "Indent PR code" db/drivers/mysql/create_table.c
>
> Update upstream/main branch:
>
> git fetch upstream
>
> Merge into your branch upstream/main:
>
> git merge --strategy=recursive --strategy-option=ours upstream/main
>
> Let me know if you have any questions,
> Vaclav
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20220913/b6606a40/attachment.htm>