From d1512abf140a98f982dbcfa771ff13477ef653ef Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Tue, 11 Jul 2017 16:12:57 -0600 Subject: [PATCH 1/2] Update indent config for uncrustify 0.65 compat. It applies the struct new line rule slightly differently than before, and changing it to 1 from 3 results in no changes in our existing base whether using uncrustify 0.64 or 0.65. Additionally, 0.65 seems to want to change indentation on some usages of 'break' outside of bracketed regions, so I'm adding a line that will force breaks to be put within brackets, which avoids the problem and makes the codebase more consistent at the same time. --- uncrustify/citus-style.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uncrustify/citus-style.cfg b/uncrustify/citus-style.cfg index 6279323b..0507e788 100644 --- a/uncrustify/citus-style.cfg +++ b/uncrustify/citus-style.cfg @@ -1392,7 +1392,7 @@ nl_before_cpp_comment = 0 # number nl_after_multiline_comment = false # false/true # The number of newlines after '}' or ';' of a struct/enum/union definition -nl_after_struct = 3 # number +nl_after_struct = 1 # number # The number of newlines after '}' or ';' of a class definition nl_after_class = 0 # number @@ -1522,7 +1522,7 @@ mod_sort_using = false # false/true mod_sort_include = false # false/true # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace. -mod_move_case_break = false # false/true +mod_move_case_break = true # false/true # Will add or remove the braces around a fully braced case statement. # Will only remove the braces if there are no variable declarations in the block. From 57e6ffa30ce9c5dbd47d198b0466cbe20827c70e Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Tue, 11 Jul 2017 16:19:59 -0600 Subject: [PATCH 2/2] Bump CHANGELOG for release --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa5419c2..4d4921b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### citustools v0.6.3 (July 11, 2017) ### + +* Addresses citus-style compatibility issues with uncrustify 0.65 + ### citustools v0.6.2 (June 19, 2017) ### * Fixes bug causing early exit during first release of new package