Definitelytyped: Need to revert a commit

Created on 24 Mar 2017 · 25Comments · Source: DefinitelyTyped/DefinitelyTyped

@horiuchi @vvakame

The latest commit to master (#15365) destroyed all history. Doing a normal git revert wouldn't fix history. Could you do git pull; git reset HEAD~; git push -f? The last commit should be core-js: Declare globals with 'var' to avoid conflicts (#15362).

Source

andy-ms

Most helpful comment

@andy-ms In WebStorm there is a very helpful feature where you can load typescript definitions from DefinitelyTyped for IntelliSense (autocomplete, etc).

Here is a link to the docs about it: https://blog.jetbrains.com/webstorm/2014/07/how-webstorm-works-completion-for-javascript-libraries/

Until this PR: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/15365 you would see a list of all the packages from the repo inside the WebStorm UI and you could choose and search whichever you want.

But now all you see is the "types" folder.
You can't go inside folders so it means that you can't load any definitions any more.

shaharmor on 25 Mar 2017

👍8

All 25 comments

wait a moment... I'll try it.

vvakame on 24 Mar 2017

Actually, not sure this is necessary any more.
We don't get good history on GitHub, but using the command line with git log --follow everything seems to be working.
Also, I do want those files moved. Although I accidentally did "Squash and Merge" rather than just "Merge", so that may have had a bad effect.

andy-ms on 24 Mar 2017

I think we do the git co -b master f8493b7b8; git push -f?

horiuchi on 24 Mar 2017

done.

vvakame on 24 Mar 2017

👍2

OK, what should we do differently the second time?

andy-ms on 24 Mar 2017

Unprotect master branch at https://github.com/DefinitelyTyped/DefinitelyTyped/settings/branches/master

$ git pull --rebase
$ git reset --hard HEAD^
$ git push -f

Protect master branch again.

vvakame on 24 Mar 2017

🎉1

Hm, I don't have access to settings on this repo currently.

andy-ms on 24 Mar 2017

other owners ( @basarat @blakeembrey @borisyankov @Diullei @johnnyreilly )
I'm suggesting add owner grant to @andy-ms .
We are active on TypeScript still, but inactive in DefinitelyTyped org. (isn't it?)
There is a possibility that we will become active again in future. 😉
What do you think about this issue?

vvakame on 24 Mar 2017

I agree to add owner.
I think it is better for at least one person to have an currently active member in the owners.

horiuchi on 24 Mar 2017

It looks like there's no way to preserve history in the github view. See http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames .

So, I will re-do that commit, and push (not force) directly to master.

History will not be viewable on github, but we can add a notice to the README to always use git log --follow.

OK?

andy-ms on 24 Mar 2017

👍3

@vvakame I am okay with whatever you choose :heart: :rose:

basarat on 24 Mar 2017

😄1

@andy-ms this change also breaks all IntelliJ integration

shaharmor on 24 Mar 2017

👍4

@shaharmor Could you be more specific? What are you trying to do?

andy-ms on 25 Mar 2017

@andy-ms In WebStorm there is a very helpful feature where you can load typescript definitions from DefinitelyTyped for IntelliSense (autocomplete, etc).

Here is a link to the docs about it: https://blog.jetbrains.com/webstorm/2014/07/how-webstorm-works-completion-for-javascript-libraries/

But now all you see is the "types" folder.
You can't go inside folders so it means that you can't load any definitions any more.

shaharmor on 25 Mar 2017

👍8

This has also broken indexing from the Typings registry. A heads up would have been really useful, I'm sure, to the many people using DefinitelyTyped from programmatic tools. I'll need to look into the logs, but I haven't been able to index anything since this commit. Even if I did, however, I'm sure it would have broken all the registry names and required manual undoing to fix the paths.

Edit: Looks like the sheer amount of changes causes the crash and thank goodness, as a result of being unable to parse this change, it hasn't been indexed. I'll try to support this new path style ASAP for Typings.