FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Upgrade cpplint by bnoordhuis · Pull Request #7462 · nodejs/node · GitHub

/ node Public

Upgrade cpplint - #7462

Merged
bnoordhuis merged 22 commits into
nodejs:masterfrom
bnoordhuis:upgrade-cpplint
Jun 29, 2016
Merged

Upgrade cpplint#7462
bnoordhuis merged 22 commits into
nodejs:masterfrom
bnoordhuis:upgrade-cpplint

Conversation

bnoordhuis commented Jun 28, 2016
edited
Loading

Copy link
Copy Markdown
Member

Fixes #7444.

I dropped our custom whitespace/if-one-line rule because I don't think it's all that great and didn't feel like reimplementing it.

R=@trevnorris?

CI: https://ci.nodejs.org/job/node-test-pull-request/3109/

PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This commit disables the build/include, build/include_alpha,
build/include_order and legal/copyright warnings again.

PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This commit reimplements commit 7b45163 ("tools: add tap output to
cpplint") on top of the upgraded copy of cpplint.

PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
This reapplies commit a493dab ("cpplint: make it possible to run
outside git repo") from September 2015, this time with a proper
status line.

PR-URL: nodejs#7462
Refs: nodejs#2693
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Obsoleted by the recent cpplint upgrade.

PR-URL: nodejs#7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
bnoordhuis added c++ Issues and PRs that require attention from people who are familiar with C++. build Issues and PRs related to build files or the CI. tools Issues and PRs related to the tools directory. lib / src Issues and PRs related to general changes in the lib or src directory. labels Jun 28, 2016
nodejs-github-bot added the inspector Issues and PRs related to the V8 inspector protocol label Jun 28, 2016
mscdex removed the inspector Issues and PRs related to the V8 inspector protocol label Jun 28, 2016
Comment thread src/node_version.h Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

heh. this rule was the first thing I spent time fixing on my initial attempt. wish I had taken the time to see how many lines of code were affected first.

Copy link
Copy Markdown
Contributor

@bnoordhuis Looks like there might have been a merge problem here? https://github.com/nodejs/node/commits/9a6439aaccd7e712a5543acdae8af5909aa91c7c shows commits also ontop of it.

Also 9beef23...fba271b shows your commits alongside #6436

Fishrock123 mentioned this pull request Jun 29, 2016
3 tasks

Copy link
Copy Markdown
Member

The history should be fine, the commits from this PR just have weird-ish CommitDate: fields that weren’t updated during rebasing…?

Fishrock123 commented Jun 29, 2016
edited
Loading

Copy link
Copy Markdown
Contributor

Maybe the issue was the commits from #7016? They don't seem to be based on these commits yet come after these commits?

Copy link
Copy Markdown
Member Author

I did a git filter-branch --env-filter on them with a GIT_COMMITTER_DATE set in the past, that's probably why they show up like that.

Fishrock123 commented Jun 29, 2016
edited
Loading

Copy link
Copy Markdown
Contributor

@bnoordhuis May I ask why? (Why you did that lol)

Copy link
Copy Markdown
Member Author

I wanted to update the author date with GIT_AUTHOR_DATE but I also had GIT_COMMITTER_DATE set. Not normally an issue but I think GH sorts by timestamp rather than parent commit.

Copy link
Copy Markdown
Contributor

... strange. I guess it probably sorts like that because of regular merges.

Fishrock123 mentioned this pull request Jul 5, 2016

Copy link
Copy Markdown
Contributor

@bnoordhuis as you can imagine 9beef23...f8d3f6f is not landing cleanly on v4.x. Would you be willing to do a backport?

Copy link
Copy Markdown
Member Author

I'll do it when the current merge storm has died down a bit, I don't want to have to rebase it over and over.

Copy link
Copy Markdown
Contributor

totally reasonable. I'll likely finish up the merge storm by EOD today

Copy link
Copy Markdown
Member

Backport is in #7666

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Issues and PRs related to build files or the CI. c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. tools Issues and PRs related to the tools directory.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants


Back | FazBrowse Home | New Git URL