Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

io.js to Node.js #50

Closed
wants to merge 2 commits into from

Conversation

andrewdeandrade
Copy link

This is a first pass at trying to replace (almost) all references to io.js (and it's permutations) with Node.js (and its equivalent permutations).

Things that were untouched:

  • URIs to things like issues, pull requests, commits and the continuous integration URIs
  • Notes with historical references.
  • tc-meeting notes
  • Changelog

Things that I touched that I am uncertain about

Beyond that I tried to do my best to make judgement calls on things to change, add or remove.

These two diffs are large, but they only deal with changes that have to do with changing the name back to Node.js from io.js. This needs several pairs of eyes to catch anything I changed that I shouldn't have or should have treated differently.

It would also help if people pull this locally and check if there are any additional references to io.js that I should have changed but may have missed.

FWIW, this is the silver searcher query I was running by the end of this endeavor to ignore things that I shouldn't change:

ag '(?!jenkins-)io\.?js(?!-[a-z][a-z])(?!(\/io.js)?\/(issues|pull|commit)\/([0-9]|[a-f]))' --ignore-dir node_modules --ignore-dir doc/tc-meetings --ignore-case --ignore README.md  --ignore CHANGELOG.md --ignore-dir deps/

@andrewdeandrade
Copy link
Author

I'm encountering a non-fast-forward error after I rebase this onto the current master of nodejs/node and try to push back to the iojs-to-nodejs branch on my fork. I've done stuff like this a million times, but can't figure out where I'm derping here.

I just git pushed origin with --force since github knows how to deal with it and no one was working of my work yet.

@Fishrock123
Copy link
Contributor

This might change between now and once we've got all joyent/node patches and we are done rebasing, I'm not going to review until then, and it may be outdated by then. :S

Thanks for trying to help though, this would be great once we're there!

@andrewdeandrade
Copy link
Author

@Fishrock123 I don't mind rebasing periodically to keep this updated if you think that's a worthwhile endeavor. Since most of the patches we're pulling in are coming from node, I figure it's better to switch over sooner than later.

Also, I'm new to contributing to node/io.js so if there are certain patches that you know need pulling in and are low hanging fruit, let me know. I have a vested interest in helping this convergence happen sooner, because we've been waiting for the dust to settle to upgrade from node 0.10.x.

@Fishrock123
Copy link
Contributor

Since most of the patches we're pulling in are coming from node, I figure it's better to switch over sooner than later.

Right, but we will be rebasing ontop of io.js until we have all the patches, so there are no guarantees. :)

@jasnell
Copy link
Member

jasnell commented Jun 4, 2015

👍 @malandrew ... this is very much appreciated. As @Fishrock123 mentions, we may need to hold off on landing this just until we're a bit further along on the convergence. (We're still in the process of cataloging everything that may need to land here). If you're willing to be patient and rebase this every now and then, then we'll land as soon as we're able!

@andrewdeandrade
Copy link
Author

@Fishrock123 Totally understand. I understand if the timing was not right, but a little encouragement and suggestions on what I can do besides rebase wouldn't hurt. This is my first PR and low-hanging fruit that helps with digging into the code base and orienting myself with what's in the repo.

@jasnell perfectly happy to rebase every couple of days to once per week. Given the current pace of the migration, how long do you reckon until we're ready to merge this? Ballpark figure is fine here.

Also, QQ for both of you, what of the other open issues for the merge that are low-hanging fruit and suitable for those who are not new to NodeJS but only new to contributing to NodeJS?

@brendanashworth
Copy link
Contributor

Hi @malandrew! Unfortunately it looks like a separate PR went ahead and fixed this in the other repo: nodejs/node#2367 (comment). Thanks for taking the time to put this together, but since it isn't applicable anymore I'll close this. Sorry for the annoyance.

Also, QQ for both of you, what of the other open issues for the merge that are low-hanging fruit and suitable for those who are not new to NodeJS but only new to contributing to NodeJS?

Sometimes you can find good issues with the "good first contribution" label, especially for those with mentors available. Right now these issues block for the 4.0 converged release, though most of them already have people actively working on them, there's a few outliers. Here are some known issues with the software that we all want to fix. And of course, theres others scattered around the issue tracker - mentorships are also available (link idk?) from some collaborators, and most if not all are probably open to help anyone that asks. We're always open to help :)

Edit: and test issues, these are great.

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

Successfully merging this pull request may close these issues.

4 participants