Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configuration for clang-format #406

Merged
merged 2 commits into from
Oct 11, 2019

Conversation

elliottslaughter
Copy link
Member

@elliottslaughter elliottslaughter commented Sep 29, 2019

Add clang-format configuration and run it. Contains only cosmetic changes (aside from .clang-format and format.sh).

@ErikMcClure
Copy link
Contributor

I don't know what the state of this PR is, but I would greatly appreciate having a clang-format file, because Visual Studio can detect these, which would make it easier to edit code files without having to fight my own default formatting options or try to reverse-engineer what the project is doing.

@elliottslaughter
Copy link
Member Author

I think my last push should have unbroken the build. The only issue at this point is that this commit needs to be done in coordination with the other outstanding branches so that we don't lose all our outstanding PRs when we do this. (I do not want to deal with the merge conflicts.)

Good news is I figured out how to do this with git filter-branch. Bad news is it's still has a fair number of manual steps and needs to be done with care or else we can lose the outstanding work.

@ErikMcClure
Copy link
Contributor

Given that I still have three or so more planned PRs, I would like to get this in sooner rather than later. Can you detail the manual steps needed to make this happen so I can either split the work with you or do it myself?

@elliottslaughter
Copy link
Member Author

elliottslaughter commented Oct 11, 2019

I'll try to get to this today, and if I can't finish I'll follow up with instructions on how to do it.

Making for myself the list of branches that need to be kept up to date:

If anyone else has outstanding branches that touch C/C++ files, let me know now or you will have substantial merge conflicts in the near future.

@ProfFan
Copy link
Contributor

ProfFan commented Oct 11, 2019

I took a look at this, looks fine for me, can rebase after this is merged

@elliottslaughter
Copy link
Member Author

I did it over again because apparently clang-format is not compatible between releases. I am declaring that clang-format 9.0 is the official version for Terra, at least for the time being. There will be a subsequent update that will enforce that.

@elliottslaughter elliottslaughter merged commit 7009c36 into terralang:master Oct 11, 2019
@elliottslaughter elliottslaughter deleted the clang-format branch October 11, 2019 18:26
@elliottslaughter
Copy link
Member Author

Ok, merged.

@elliottslaughter
Copy link
Member Author

I updated all the original branches except for aiverson:master, which I'm guessing really wants to be a separate branch anyway. @aiverson you may need to do to this yourself. Other than that we should be good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants