How to reset code formatting with Uncrustify

Question

I am using Uncrustify to formatting my C++ code and I am making some experiments with infinite list of settings.

Because of some bad settings my code now has a lot of new line that split statement in more lines (mostly due to a short line width).

I would like to reformat the code in order to have one statement per line and reformat it in another way.

How can I do it?

I suppose `git checkout -- .` (or however your SCM spells "throw away all changes") is going to help? — Martin Bonner supports Monica, Mar 06 '17 at 20:41
Sadly I made some commits (on SVN) after uncrustify execution. — Kill KRT, Mar 06 '17 at 20:49
Ah! You do *have* an SCM then. I'd a) get a listing of the diffs that you made after the uncrustify checkin; b) revert back to before you started; c) reapply the diffs (probably by hand). — Martin Bonner supports Monica, Mar 06 '17 at 20:51
Unfortunately we made a lot of commits and now we realized that our uncrustify configuration is not ok, reverting to a _stable_ situation would mean to merge manually a lot of diffs. — Kill KRT, Mar 06 '17 at 20:55

score 2 · Answer 1 · answered Mar 07 '17 at 21:17

There is no undo function in Uncrustify and if your SCM can not help you, you are unfortunately out of luck.

Regarding to the newlines, which seem to cause the most problems for you, you could try to remove and reapply them with the 'nl_remove_extra_newlines' option (see a short discussion about it in the uncrustify issue #994) in combination with other options that are influencing newlines.

How to reset code formatting with Uncrustify

1 Answers1