Purge IE #451

patricksnape · 2013-06-23T13:16:01Z

Purges the Debug and Release folders (#179, #448), in particular (sizes in kb):

    86331392    IE/BHO5.sdf
    1268264 IE/Debug/RESIE.ilk
    37224448    IE/Debug/RESIE.pch
    6269952 IE/Debug/RESIE.pdb
    1846272 IE/Debug/vc100.idb
    4091904 IE/Debug/vc100.pdb
    36831232    IE/Release/BHO5.pch
    5467136 IE/Release/BHO5.pdb
    4075520 IE/Release/vc100.pdb
    106496000   IE/ipch/bho5-a9477527/resie-abeb1384.ipch
    79777792    IE/RESIE.sdf

In order to merge this it apparently HAS to be rebased - and so does ever single branch everyone currently has taken out. This is to prevent the old history being merged back in. However, since it's only IE files which nobody works on (or I don't know of anyone working on it), it shouldn't cause any conflicts.

The new head then has to be FORCE pushed back up to change the history. May also need to contact Github to tell them to purge the cash of those large files.

…ods were styling it away completely, probably not realizing they were disabling RES functionality by doing so. This name should be a little more clear. also adding additional body class, .res-v420, in case mods want to style differently against newest version.

…ole until they open it.

…RES users won't use it, hopefully that changes over time!)

…"actions" in the RES console can be created.

…y in RES settings this is so yucky. the settings console needs an MVC-style refactor.

…and my fixups For more details see: skeeto/bitcointip-user-js@res-module-plus skeeto/bitcointip-user-js@4ae03fd skeeto/bitcointip-user-js@dcdfc4e

honestbleeps, is there a reason you chose value before? it seems inappropriate for the button text to be the option value

any reason why !important?

…for bitcoin wallet

update modules.bitcoinTip with skeeto's refactoring, my refactoring, and my fixups

…ing this via !important on .entry … :-\

Mistakenly passed two classes to classList which returns a DOM Exception error. Removing superfluous class.

…rom breaking it.

…RESUtils.addCsspostLoad

…r currently hover-info'd

instead of at the end, after [l+c]

blame skeeto for the whitespace changes 😁

…true after all modules .go()

…e that CSS

Handle flickr lightbox links

…tUser Add highlight to user via [highlight] button on user tagger hover info

honestbleeps · 2013-07-04T18:31:30Z

d'oh, this can't be automerged and it's gigantic... any chance you could rebase? I'm happy to get this in.. I won't pull any other requests before this one next time you submit it :-\

Remove IE files (should set the stage for #448 and #451 and fix #179)

aidanhs · 2013-09-01T17:06:08Z

Ping @patricksnape.
Keen to get this in, I appear to be literally unable to clone this repo at the moment.
Edit: finally managed to clone via ssh, seems https was choking.

honestbleeps · 2013-09-01T17:20:40Z

I just merged a different purge IE pr recently. On my phone so can't easily
look up. Not sure why you can't clone it. That's odd.
On Sep 1, 2013 12:06 PM, "aidanhs" notifications@github.com wrote:

Ping @patricksnape https://github.com/patricksnape.
Keen to get this in, I appear to be literally unable to clone this repo at
the moment.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23628755
.

aidanhs · 2013-09-01T17:32:39Z

I assume you mean 53564b3? Was that a purge (i.e. with force push) or just removing them from the head?

Given it's 98MB on disk I assume the latter, hence pinging this issue.

kevinji · 2013-09-01T17:42:07Z

I just removed them from the head; I thought that'd be an improvement over the original repo. We still do need to rebase though.

honestbleeps · 2013-09-02T16:59:27Z

okay I must confess my git-fu is what I'd consider "intermediate" here... I
do rebases with relative frequency to sync up branches so that merges will
work smoothly, etc and I know what a rebase actually does - but what rebase
action would I perform to purge all that IE stuff "properly" then? I'm
confused on that... although I haven't had a full cup of coffee yet...

On Sun, Sep 1, 2013 at 12:42 PM, Kevin Ji notifications@github.com wrote:

I just removed them from the head; I thought that'd be an improvement over
the original repo. We still do need to rebase though.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23629382
.

patricksnape · 2013-09-02T17:52:17Z

The commit rewrites history so that the IE commits never happened. Therefore, all the changes after I committed this need to be rebased on top of it and then master needs to be force pushed to the new HEAD. This HEAD represents the new history that never contained those IE commits. That latest push that deletes the IE code may cause an issue since it will try to delete items that never existed...

honestbleeps · 2013-09-02T17:54:23Z

Oh he was talking about rebasing your commit / pr. That makes more sense!

I was imagining some magic "Rebase that crap out of here" thing and got
confused. Need more coffee.
On Sep 2, 2013 12:52 PM, "Patrick Snape" notifications@github.com wrote:

The commit rewrite history so that the IE commits never happened.
Therefore, all the changes after I committed this need to be rebased on
top of it and then master needs to be force pushed to the new HEAD.
This HEAD represents the the new history that never contained those IE
commits. That latest push that deletes the IE code may be cause an issue
since it will try to delete items that never existed...

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23672359
.

kevinji · 2013-09-02T18:03:50Z

Running the following on your local machine should work (note: this will take some time to finish):

git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch -r IE/Release/'  --prune-empty --tag-name-filter cat -- --all
git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch -r IE/Debug/'  --prune-empty --tag-name-filter cat -- --all
git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch IE/ipch/bho5-a9477527/resie-abeb1384.ipch'  --prune-empty --tag-name-filter cat -- --all
git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch IE/*.sdf'  --prune-empty --tag-name-filter cat -- --all

should do the trick. Then, to force push (and rewrite the repo's history), run:

git push --force --tags origin master

AFTERWARDS, anyone else who had a repo before must force-rewrite their local and remote history (assuming that they're working with a fork). The easiest way is to delete your fork and re-fork the main project, then pull from your fork; however, if you do not wish to do that, follow the steps below:

git fetch --all --tags

If they have any branches, they must rebase them to the force-rewritten master first:

git rebase --onto upstream/master master [branch_name]

Then

git reset --hard upstream/master
git push --force --tags origin master

And cleaning up their repo afterwards is a nice idea:

git reflog expire --expire=now --all
git gc --prune=now
git gc --aggressive --prune=now

@patricksnape I don't think that my commit should be an issue; it's not empty at least (it contains a write to .gitignore) and the file removes should be purged from the history.

Remove IE files (should set the stage for #448 and #451 and fix #179)

honestbleeps · 2013-09-02T20:59:29Z

the voodoo has been performed... will add a note to the readme.md right now about people with existing forks, thank you loads, @mc10 and @patricksnape

kevinji · 2013-09-02T21:46:28Z

@honestbleeps I think you nuked some of the commits from today.... uh oh.

honestbleeps · 2013-09-02T21:48:45Z

oh no.. I just ran your stuff verbatim! :-\

how much was lost off the top of your head?

On Mon, Sep 2, 2013 at 4:46 PM, Kevin Ji notifications@github.com wrote:

@honestbleeps https://github.com/honestbleeps I think you nuked some of
the commits from today.... uh oh.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23679527
.

kevinji · 2013-09-02T21:50:34Z

That's weird, since my stuff shouldn't have affected it... are you sure you had an updated copy of the repo from the computer where you ran the commands?

Also, I should have an up-to-date copy of the master branch in my repo, so perhaps you could force update your master from my repo, and try again?

honestbleeps · 2013-09-02T21:50:35Z

ugh, yeah I see it... is there a way to reopen those pull requests and
reapply them?

or I could cherry pick the commits if need be...

On Mon, Sep 2, 2013 at 4:46 PM, Kevin Ji notifications@github.com wrote:

@honestbleeps https://github.com/honestbleeps I think you nuked some of
the commits from today.... uh oh.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23679527
.

patricksnape · 2013-09-02T21:54:23Z

Can't you just rease the range of commits that are missing back on top of the current HEAD?

On Mon, Sep 2, 2013 at 10:50 PM, honestbleeps notifications@github.com
wrote:

ugh, yeah I see it... is there a way to reopen those pull requests and
reapply them?
or I could cherry pick the commits if need be...
On Mon, Sep 2, 2013 at 4:46 PM, Kevin Ji notifications@github.com wrote:

@honestbleeps https://github.com/honestbleeps I think you nuked some of
the commits from today.... uh oh.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23679527
.

Reply to this email directly or view it on GitHub:
#451 (comment)

honestbleeps · 2013-09-02T21:54:38Z

I may have forgotten to do a git pull before running those commands. crap.
fortunately not much was lost, just those last couple of PRs.

I'll have to try pulling in your master later as I'm on my way out :-\

On Mon, Sep 2, 2013 at 4:50 PM, Kevin Ji notifications@github.com wrote:

That's weird, since my stuff shouldn't have affected it... are you sure
you had an updated copy of the repo from the computer where you ran the
commands?

Also, I should have an up-to-date copy of the master branch in my repohttps://github.com/mc10/Reddit-Enhancement-Suite,
so perhaps you could force update your master from my repo, and try again?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23679645
.

kevinji · 2013-09-02T21:57:47Z

@patricksnape I'm not quite sure how you do that exactly... it'd be nice if you could tell us how.
@honestbleeps If you can rebase the other commits back onto HEAD, that'd be great (though I'm not sure how to do so); otherwise, you can try the following (which is essentially going back to the previous state, and redoing the branch filtering) (I assume you're running this in master):

git remote add mc10 https://github.com/mc10/Reddit-Enhancement-Suite.git
git fetch mc10 master
git reset --hard mc10/master

Then, re-run the filter-branch commands.

honestbleeps · 2013-09-02T22:00:41Z

before I head out: the other 2 PRs that are lost would be really easy to
manually patch in. Only your JSHint stuff would be trickier.

What I could do is really just fetch the user.js file from your branch and
overwrite mine and commit it... that's probably easiest and won't require
re-running all the IE purge stuff.

On Mon, Sep 2, 2013 at 4:57 PM, Kevin Ji notifications@github.com wrote:

@patricksnape https://github.com/patricksnape I'm not quite sure how
you do that exactly... it'd be nice if you could tell us how.
@honestbleeps https://github.com/honestbleeps If you can rebase the
other commits back onto HEAD, that'd be great (though I'm not sure how to
do so); otherwise, you can try the following (which is essentially going
back to the previous state, and redoing the branch filtering) (I assume
you're running this in master):

git remote add mc10 https://github.com/mc10/Reddit-Enhancement-Suite.git
git fetch mc10 master
git reset --hard mc10/master

Then, re-run the filter-branch commands.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23679847
.

patricksnape · 2013-09-02T22:02:17Z

Maybe using rebase --onto?
Or cherry picking a range?
I'm on my phone so can't be a massive help at the moment. Maybe this stackoverflow helps: http://stackoverflow.com/questions/1994463/how-to-cherry-pick-a-range-of-commits-and-merge-into-another-branch

jewel-andraia · 2013-09-03T00:07:24Z

yeah, i just cherrypicked my #554 onto new master.

kevinji · 2013-09-03T00:15:16Z

Can you cherry pick the rest of the commits into master?

honestbleeps · 2013-09-03T07:19:58Z

I've cherry picked everything over, I believe we're good now!

On Mon, Sep 2, 2013 at 7:15 PM, Kevin Ji notifications@github.com wrote:

Can you cherry pick the rest of the commits into master?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/451#issuecomment-23683883
.

honestbleeps · 2013-09-03T07:32:27Z

So far as I can tell, this issue is now resolved. I just cloned the repo fresh and it took just a few seconds.

aidanhs · 2013-09-03T09:40:36Z

Amazing, thanks.

honestbleeps and others added 30 commits April 3, 2013 18:22

fixes honestbleeps#337

d78c7ef

added console nagger. once a day user will be shown the settings cons…

56e38aa

…ole until they open it.

bitcointip module is off by default (courtesy to their servers. most …

32358c4

…RES users won't use it, hopefully that changes over time!)

added new option type: button, which has a callback function so that …

c900e97

…"actions" in the RES console can be created.

Don't show "Search RES" boilerplate when switching to "About" categor…

71834c9

…y in RES settings this is so yucky. the settings console needs an MVC-style refactor.

update modules.bitcoinTip with skeeto's refactoring, my refactoring, …

9393fdf

…and my fixups For more details see: skeeto/bitcointip-user-js@res-module-plus skeeto/bitcointip-user-js@4ae03fd skeeto/bitcointip-user-js@dcdfc4e

Options button type - use name property instead of value for button text

ae2eb3d

honestbleeps, is there a reason you chose value before? it seems inappropriate for the button text to be the option value

show notifications above settings console

548499d

any reason why !important?

modules.bitcoinTip.options.fetchWalletAddress - button to search PMs …

918cede

…for bitcoin wallet

Merge pull request honestbleeps#341 from andytuba/btctip-cleanup

87eb9e4

update modules.bitcoinTip with skeeto's refactoring, my refactoring, and my fixups

add !important to keyboard nav highlight class due to some subs break…

7e4764b

…ing this via !important on .entry … :-\

classList bugfix

f77e6dd

Mistakenly passed two classes to classList which returns a DOM Exception error. Removing superfluous class.

further style fixes to keynav highlight to prevent subreddit styles f…

ee9082d

…rom breaking it.

RESUtils.addCSSpostLoad: for adding new chunks of CSS after go

d8457f4

userTagger.highlightUser-related options

bb2eb46

modules.userHighlighter.doHighlight can now run after pageload using …

d05bcd8

…RESUtils.addCsspostLoad

modules.userTagger.highlightUser: userHighlighter.doHighlight the use…

ac088f2

…r currently hover-info'd

added [highlight] button to userTagger hover info

27ffe86

show bitcoinTip button after share button for posts

864ff8f

instead of at the end, after [l+c]

bitcointip - correctly check that there is only post listings handy

c8ba2a9

RESUtils.isCommentPermalinkPage()

84d1992

bitcoinTip - up to date with skeeto/bitcointip-user-js@2e4a440

b0f9b2c

blame skeeto for the whitespace changes 😁

RESUtils.addCSSpostLoad refactored into .addCSS; RESUtils.postLoad = …

2f0cbda

…true after all modules .go()

when returning added CSS post load, also return an interface to remov…

9e081af

…e that CSS

refactor userTagger.highlightUser into userHighlighter

a3ef0d2

user tagger highlight button now toggles highlight on/off

bf4cf20

Handle flickr lightbox links

5084241

Merge pull request honestbleeps#346 from dshafik/master

40f371a

Handle flickr lightbox links

Merge pull request honestbleeps#344 from andytuba/userTagger-highligh…

71d34d9

…tUser Add highlight to user via [highlight] button on user tagger hover info

Ignore Debug and Release folders for IE

27823e7

honestbleeps added a commit that referenced this pull request Aug 28, 2013

Merge pull request #542 from mc10/purge-ie

53564b3

Remove IE files (should set the stage for #448 and #451 and fix #179)

honestbleeps pushed a commit that referenced this pull request Sep 2, 2013

Remove IE files (should set the stage for #448 and #451 and fix #179)

c14ff7e

honestbleeps added a commit that referenced this pull request Sep 2, 2013

Merge pull request #542 from mc10/purge-ie

00ce664

Remove IE files (should set the stage for #448 and #451 and fix #179)

honestbleeps closed this Sep 3, 2013

matheod mentioned this pull request May 15, 2014

v4.4.0 changelog #1022

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Purge IE #451

Purge IE #451

patricksnape commented Jun 23, 2013

honestbleeps commented Jul 4, 2013

aidanhs commented Sep 1, 2013

honestbleeps commented Sep 1, 2013

aidanhs commented Sep 1, 2013

kevinji commented Sep 1, 2013

honestbleeps commented Sep 2, 2013

patricksnape commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

patricksnape commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

patricksnape commented Sep 2, 2013

jewel-andraia commented Sep 3, 2013

kevinji commented Sep 3, 2013

honestbleeps commented Sep 3, 2013

honestbleeps commented Sep 3, 2013

aidanhs commented Sep 3, 2013

Purge IE #451

Purge IE #451

Conversation

patricksnape commented Jun 23, 2013

honestbleeps commented Jul 4, 2013

aidanhs commented Sep 1, 2013

honestbleeps commented Sep 1, 2013

aidanhs commented Sep 1, 2013

kevinji commented Sep 1, 2013

honestbleeps commented Sep 2, 2013

patricksnape commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

patricksnape commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

kevinji commented Sep 2, 2013

honestbleeps commented Sep 2, 2013

patricksnape commented Sep 2, 2013

jewel-andraia commented Sep 3, 2013

kevinji commented Sep 3, 2013

honestbleeps commented Sep 3, 2013

honestbleeps commented Sep 3, 2013

aidanhs commented Sep 3, 2013