[00:02:28] <grrrit-wm>	 (PS1) Ejegg: Quit setting default email in form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215245
[00:02:51] <grrrit-wm>	 (CR) jenkins-bot: [V: -1] Quit setting default email in form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215245 (owner: Ejegg)
[00:12:05] <atgo>	 yaaaay astropay!!
[00:12:07] <atgo>	 woo!!!!!
[00:12:15] * atgo does a celebratory dance
[00:14:49] <ejegg>	 yeah, now we find all the bugs!
[00:18:14] <atgo>	 yay!!
[00:18:27] <atgo>	 ejegg: did you shoot something to the AP guys, too? they were asking :)
[00:19:16] <ejegg>	 Yep, I included 'em on the email along with fr-online
[00:25:04] <grrrit-wm>	 (PS1) Ejegg: Remove debit cards from Brazil form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215251
[00:26:02] <grrrit-wm>	 (CR) Awight: [C: 2] Remove debit cards from Brazil form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215251 (owner: Ejegg)
[00:26:22] <grrrit-wm>	 (Merged) jenkins-bot: Remove debit cards from Brazil form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215251 (owner: Ejegg)
[00:26:33] <ejegg>	 awight: thanks!  those definitely belong in settings, not code...
[00:28:34] <grrrit-wm>	 (PS1) Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/215254
[00:28:59] <grrrit-wm>	 (CR) Ejegg: [C: 2] "Minor settings change" [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/215254 (owner: Ejegg)
[00:30:02] <grrrit-wm>	 (PS1) Ejegg: Update DI for deploy [core] (fundraising/REL1_23) - https://gerrit.wikimedia.org/r/215256
[00:30:32] <grrrit-wm>	 (CR) Ejegg: [C: 2 V: 2] "deploying settings change" [core] (fundraising/REL1_23) - https://gerrit.wikimedia.org/r/215256 (owner: Ejegg)
[00:31:36] <awight>	 ejegg: to deploy faster?
[00:31:50] <ejegg>	 the V2?
[00:32:09] <awight>	 hehe no I was asking about your settings comment above
[00:32:21] <awight>	 V+2 is to trout-slap Jenkins :)
[00:32:34] <ejegg>	 heh, yep, go-faster stripes
[00:32:57] <awight>	 cold!
[00:33:07] <ejegg>	 !log updated payments-wiki from a4fef65ec1dd3db1fb1d7ceb797b2c7485c722d2 to d22e44e3fab2b937707c2776384cb93a49b4cfd3
[00:33:11] <morebots>	 Logged the message, Master
[00:34:23] <awight>	 ejegg: re. the default email address, we've heard a few times that we should be using labels rather than placeholders.  Grr I wish we could do that now.
[00:36:07] <ejegg>	 yeah... but the difference here is that RapidHTML has a special exception for the @email token: https://github.com/wikimedia/mediawiki-extensions-DonationInterface/blob/master/gateway_forms/RapidHtml.php#L205
[00:38:49] <wikibugs>	 Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Patch-For-Review: Create an Civi import function for hand keyed (including DAF) donations - https://phabricator.wikimedia.org/T88836#1327778 (awight) We should talk about Contribution Type...
[00:40:16] <awight>	 ejegg: haha, don't grep for nobody@wikimedia.org in the crm repo unless you want nightmares.  We special-case that all over the place.
[00:40:33] <ejegg>	 blecch
[00:45:58] <awight>	 We definitely sent a bunch of email there, a few times.  And probably called some donors "nobody"
[00:49:32] <wikibugs>	 Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Patch-For-Review: Create an Civi import function for hand keyed (including DAF) donations - https://phabricator.wikimedia.org/T88836#1327834 (RLewis) @awight   I think we care about Contri...
[00:53:17] <AndyRussG>	 nobody donates?
[00:57:08] <grrrit-wm>	 (PS2) Ejegg: Quit setting default email in form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215245
[01:00:23] <ejegg>	 nobody /loves/ donating!
[01:01:20] <ejegg>	 http://www.online-literature.com/dickinson/448/
[01:02:29] <ejegg>	 ok folks, I'mma jet.  Will play with that redis queue patch more tomorrow morning
[01:07:11] <awight>	 AndyRussG: who's on first?
[01:07:35] <AndyRussG>	 awight: heheheh
[01:07:36] <awight>	 ejegg|away: She was so weird!
[01:08:41] <AndyRussG>	 In all seriousness, since we've been in Montreal, the number of people we've met who have donated is pretty astounding
[01:16:57] <awight>	 Wow!  Yeah, I'm surprised too... I never donated before this job, and when people tell me they sent a few bucks I'm always impressed.
[01:25:33] <wikibugs>	 Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Patch-For-Review: Create an Civi import function for hand keyed (including DAF) donations - https://phabricator.wikimedia.org/T88836#1327933 (awight) Hi @RLewis, thanks for taking a look a...
[03:29:33] <wikibugs>	 Fundraising Sprint Kraftwerk, Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Analytics-Cluster, operations: Verify kafkatee use for fundraising logs on erbium - https://phabricator.wikimedia.org/T97676#1328015 (Ottomata) In those cases, there are more requests in kafkatee than in udp2log...
[07:36:01] <grrrit-wm>	 (CR) Awight: [C: 2] "This is a safe step... but looking around, I'm not sure why we bother stuffing with default garbage. The only thing I can imagine is that" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215245 (owner: Ejegg)
[07:36:26] <grrrit-wm>	 (Merged) jenkins-bot: Quit setting default email in form [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215245 (owner: Ejegg)
[08:42:12] <wikibugs>	 fundraising-tech-ops, Wikimania-Hackathon-2015: overhaul fundraising cluster monitoring - https://phabricator.wikimedia.org/T91508#1328384 (Qgil) Did anyone work on this task during #Wikimedia-Hackathon-2015? If so, please post an update with the results. Otherwise remove the label.
[12:38:33] <wikibugs>	 fundraising-tech-ops, Wikimania-Hackathon-2015: overhaul fundraising cluster monitoring - https://phabricator.wikimedia.org/T91508#1328676 (Jgreen) Looked into why ganglia has stopped reporting for most of the fundraising cluster, determined pfw config is likely blocking multicast, opened T100150.  Spent...
[15:59:22] <wikibugs>	 Fundraising Sprint Lou Reed, Astropay Integration: Astropay form is autofilling email to "nobody@wikimedia.org" - https://phabricator.wikimedia.org/T101114#1329977 (atgo) NEW a:Ejegg
[16:04:38] <grrrit-wm>	 (PS1) Ejegg: Finish removing hardcoded nobody@wikimedia.org [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215341 (https://phabricator.wikimedia.org/T101114)
[16:05:15] <grrrit-wm>	 (CR) jenkins-bot: [V: -1] Finish removing hardcoded nobody@wikimedia.org [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215341 (https://phabricator.wikimedia.org/T101114) (owner: Ejegg)
[16:06:32] <wikibugs>	 Fundraising Sprint Lou Reed, Astropay Integration, Patch-For-Review: Astropay form is autofilling email to "nobody@wikimedia.org" - https://phabricator.wikimedia.org/T101114#1330058 (Ejegg) Yep, there was an odd quirk where we set a default value for email right at the start of the process.  The old fo...
[16:11:06] <wikibugs>	 Fundraising-Backlog: Pass name/email data from Silverpop to LP2 fields through URL - https://phabricator.wikimedia.org/T101019#1330091 (Pcoombe) My understanding is that we could simply add some javascript to the forms, which populates the fields from the URL parameters
[16:11:54] <grrrit-wm>	 (PS2) Ejegg: Finish removing hardcoded nobody@wikimedia.org [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215341 (https://phabricator.wikimedia.org/T101114)
[16:12:39] <wikibugs>	 Fundraising Sprint M, Fundraising-Backlog: Spike: Use WMF-hosted unsubscribe page for Fundraising emails, make conditional opt-out options - https://phabricator.wikimedia.org/T99821#1330095 (atgo)
[16:16:02] <atgo>	 hey ejegg did you see that none of ppena's testers were able to get to LP2?
[16:16:29] <atgo>	 and they didn't get any requests in their logs
[16:16:31] <ejegg>	 Oops!
[16:16:38] <ejegg>	 Let me see what we have in our logs.
[16:18:19] <ejegg>	 oho, communication failures!  I bet I need to ask Jeff_Green for a firewall hole
[16:18:33] <Jeff_Green>	 hey
[16:18:59] <Jeff_Green>	 from whence to wither?
[16:19:15] <ejegg>	 just looking up the ip now...
[16:19:44] <atgo>	 oh :)
[16:22:00] <awight>	 ejegg: you need anythiing
[16:22:08] <awight>	 CR'd before I go into full heads-down parenting mode?
[16:22:20] <ejegg>	 awight: think I'm good.  enjoy daddy day!
[16:22:53] <awight>	 great, thx!  Feel free to call if there are any questions about the limbo sketchiness
[16:31:58] <AndyRussG>	 awight: ejegg: anyone else interested in education stuff: https://wikimania2015.wikimedia.org/wiki/Programme/Education_Pre_Conference
[16:32:46] <ejegg>	 AndyRussG: might be interesting - I'll take a look!
[16:33:01] <AndyRussG>	 :)
[16:33:27] <awight>	 have fun today!
[16:33:56] <K4-713>	 Oh man. awight installed a Boss Key or something.
[16:34:22] <K4-713>	 What are we having fun with today?
[16:37:37] <K4-713>	 ...nothing. Okay.
[16:37:39] <K4-713>	 :p
[16:39:41] <AndyRussG>	 I'm having fun CRing this: https://github.com/adamwight/php-queue/pull/3/files?diff=unified
[16:39:56] <AndyRussG>	 What's your poison?
[16:39:57] <K4-713>	 heh
[16:40:16] <K4-713>	 I'm getting a power washer and hosing out my inbox.
[16:40:31] <cwdent>	 i'm trying to generate data for that pgehres.bannerimpressions table
[16:40:38] <AndyRussG>	 Ooooh
[16:40:38] <K4-713>	 There are hundreds of emails marked TODO from 2014 and earlier.
[16:41:01] <AndyRussG>	 K4-713: ouch just thinking about those must be....
[16:41:02] <K4-713>	 And... over 250 labeled "document".
[16:41:09] <AndyRussG>	 pfff ;p
[16:41:24] <K4-713>	 Hey... it's evidence that I was thinking about trying.
[16:41:52] <K4-713>	 Or, maybe trying to try.
[16:42:03] <K4-713>	 Too much abstraction, anyway.
[16:42:11] <AndyRussG>	 Translated expression from Spanish: there's no worse attempt (or struggle, "lucha") than the one you never made
[16:42:28] <AndyRussG>	 cwdent: what are u doing that for? I just re-installed on my laptop the thing that fills that up
[16:42:46] <AndyRussG>	 I could get u some test data pretty easy I think
[16:42:59] <K4-713>	 So... Lucha Libre means "awesome mask wrestling"?
[16:43:02] <cwdent>	 oh that would be awesome
[16:43:21] <cwdent>	 that table is pushing 200M rows
[16:43:25] <cwdent>	 pretty awesome
[16:43:33] <K4-713>	 "Awesome mask wrestling with half the physics turned off"
[16:43:39] <wikibugs>	 Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Patch-For-Review: Create an Civi import function for hand keyed (including DAF) donations - https://phabricator.wikimedia.org/T88836#1330254 (RLewis) @awight  The Engage thing raises some...
[16:43:39] <AndyRussG>	 K4-713: heheh
[16:44:02] <cwdent>	 so i'm trying to figure out how to get a good enough sample over time to xref with the contributions tables
[16:44:19] <AndyRussG>	 cwdent: hmm I was wondering how big it was...
[16:44:19] <cwdent>	 and i think i'll have basic a/b data that i can then plug into wmf_ab by ellery
[16:44:35] <AndyRussG>	 cwdent: hmmm...
[16:45:18] <cwdent>	 well i'll be mocking up all that data too
[16:45:33] <cwdent>	 so i guess it doesn't matter what it looks like
[16:45:34] <AndyRussG>	 cwdent: ah OK I see... I think I can't actually pull data from the real table (requesting permissions for that box is on my to-do list in fact)
[16:46:00] <cwdent>	 the hardest thing is actually inserting the data because all the foreign keys
[16:46:01] <AndyRussG>	 I can download a bunch of the files used to fill up the table and send you the results
[16:46:24] <cwdent>	 well i've just been looking at it on lutetium
[16:46:32] <cwdent>	 i can select stuff from there
[16:46:38] <AndyRussG>	 But if you need a substantial amount of the real data... Yeah that might be best
[16:46:53] <AndyRussG>	 Huh I thought it was barium.. Maybe barium is where the script runs
[16:47:00] <cwdent>	 and since the banner impressions are sampled i guess it's not really sensitive data?
[16:47:53] <AndyRussG>	 Hmm no I can't get onto lutetium
[16:48:19] <AndyRussG>	 cwdent: the input data may be, since it's culled from weblogs, includes referer (the page people were browsing) as well as UA
[16:48:32] <cwdent>	 huh, it's got some RO slave dbs
[16:48:56] <cwdent>	 but yeah the recorded data is just big chunks of hits
[16:49:09] <K4-713>	 Haaargh. 492 conversations tagged "New Documentation".
[16:49:30] * K4-713 looks for 'export to wiki' button
[16:49:49] <AndyRussG>	 K4-713: Maybe just mark it all "Read" or untag and move on?
[16:50:15] <K4-713>	 The thing is, I made that tag to tell myself to write something where we can all see it.
[16:50:17] <AndyRussG>	 If it was important it'll eventually return to bite you
[16:50:43] <K4-713>	 It's probably... insanely useful for describing why things work the way they do (or not).
[16:50:56] <K4-713>	 And, like, I can find it already. But it's not for me.
[16:51:00] <ejegg>	 print it out and send it to the state department?
[16:51:05] <K4-713>	 Word.
[16:51:06] <AndyRussG>	 K4-713: hmmmm
[16:51:13] * K4-713 looks for 'export to state department' button
[16:51:31] <AndyRussG>	 cwdent: Yeah looks like the actual contents of the table aren't sensitive
[16:51:46] <K4-713>	 I even have a TODO: FUN label that is all blown up with all the fun stuff I never did.
[16:51:53] <cwdent>	 that will be nice and easy then
[16:52:00] <K4-713>	 In fact, those emails are more stale.
[16:52:03] <cwdent>	 the contribution stuff is a lot more gnarly
[16:52:04] <K4-713>	 I feel better now.
[17:40:07] <AndyRussG>	 ejegg: I commented on some superficial stuff WRT https://github.com/adamwight/php-queue/pull/3 , didn't get to smoke test or study in detail how it twiddles the reddis backend
[17:40:17] <AndyRussG>	 twiddledee twiddleredis
[17:40:51] <AndyRussG>	 dunno if I should delve deeper
[17:44:10] <ejegg>	 awesome! i'm about to try to use it in the donation interface context
[18:05:39] <atgo>	 i like how ccogdill's IRC always says she quit for lunch any time she signs off
[18:05:43] <atgo>	 lunch all the time!
[18:05:53] <K4-713>	 So. Much. Lunching.
[18:06:29] <K4-713>	 Ugh. I've been on the verge of a nasty headache for days.
[18:07:22] <ccogdill>	 haha it does that?
[18:07:25] <ccogdill>	 I didn’t even know...
[18:07:34] <ccogdill>	 hmm
[18:07:38] <K4-713>	 Yeah, I mean, I guess you don't get to see yourself leave.
[18:07:54] <ccogdill>	 kind of funny that way. I don’t eat that many lunches, I swear!
[18:11:17] <atgo>	 hey Jeff_Green! did you have a time in mind for that maintenance window to get the giant rabbit stuff in? i can help find a good time if you'd like
[18:11:17] <atgo>	 ?
[18:12:08] <Jeff_Green>	 nah, I don't have much preference
[18:12:15] <Jeff_Green>	 well except tomorrow is bad
[18:12:53] <atgo>	 ok. want me to send something to fr-all?
[18:12:58] <Jeff_Green>	 sure
[18:13:24] <atgo>	 how much time do you need? and what will be down?
[18:13:39] <Jeff_Green>	 well...
[18:13:52] <Jeff_Green>	 it depends on how ugly we want the rollback to be I guess
[18:14:23] <atgo>	 ha
[18:14:25] <Jeff_Green>	 cleanest would be to stop everything that writes to the civi/drupal database, dump the databases, do the queries, and start everythign back up
[18:14:41] <atgo>	 would we need to take down campaigns or could we let donations queue?
[18:14:52] <Jeff_Green>	 they have to come down
[18:15:08] <atgo>	 for... 30 min? 1 hour?
[18:15:09] <Jeff_Green>	 each donation writes to one of the tables
[18:15:13] <atgo>	 gotcha
[18:15:38] <Jeff_Green>	 an hour total should be reasonable if things go smoothly
[18:15:49] <atgo>	 cool. i'll put it out there and we should be able to find a time
[18:15:55] <atgo>	 does thursday look ok for you?
[18:15:55] <Jeff_Green>	 kthx
[18:15:59] <atgo>	 i know they want to run tests wed & fri
[18:16:09] <Jeff_Green>	 thursday is ok
[18:16:13] <atgo>	 cool.
[18:17:16] <atgo>	 would people be able to get into civi during this?
[18:18:05] <atgo>	 Jeff_Green: ^
[18:18:20] <K4-713>	 I really should send that outage matrix out again.
[18:19:51] <Jeff_Green>	 atgo: no, civi has to be shut down for the duration of the outage
[18:19:58] <atgo>	 cool, thanks
[18:20:53] <K4-713>	 Hey, look! Documentation!
[18:20:53] <K4-713>	 https://collab.wikimedia.org/wiki/Fundraising/Engineering/Outages
[18:21:13] <K4-713>	 It's just that I'm feeling terrible for usually not having any.
[18:21:42] <K4-713>	 But this one thing, we have covered pretty well.
[18:21:59] <Jeff_Green>	 whoa
[18:22:04] <K4-713>	 Right?
[18:22:22] <Jeff_Green>	 totally
[18:22:49] <atgo>	 woo
[18:23:48] <atgo>	 alright. logging off for dindin
[18:23:51] <atgo>	 be back for standup!
[18:24:05] <atgo>	 also in London they call Iams cat food "I-ams"
[18:24:13] <atgo>	 ... the more you know...
[18:24:28] <ccogdill>	 isn’t that how they say it on the commercials?
[18:24:35] <ccogdill>	 maybe Iams is British?
[18:24:35] <atgo>	 is that how they do it in the US?!
[18:24:50] <atgo>	 i've been wrong all this time!
[18:24:50] <K4-713>	 Yeah... now I want to know what you call ie.
[18:24:50] <ccogdill>	 I don’t know! :D
[18:24:58] <atgo>	 iam's
[18:25:08] <K4-713>	 See, my brain agrees with the brits.
[18:25:09] <atgo>	 kind of like... ein
[18:25:13] <atgo>	 but with an M
[18:25:27] <ccogdill>	 your way makes sense
[18:25:36] <K4-713>	 ions.
[18:25:45] <atgo>	 it's like... 1 syllable in my mind
[18:25:56] <XenoRyet>	 Heh, that's my brand, and now I can't figure out how I normally say it.
[18:26:00] <ccogdill>	 i guess they went the ‘iambic” route
[18:26:02] <ccogdill>	 as in pentameter
[18:26:12] <K4-713>	 ...ions, guys. :p
[18:26:12] <ccogdill>	 :
[18:26:30] <ccogdill>	 we just have to work it out ourselves :p
[18:26:34] <atgo>	 ZING ccogdill
[18:26:36] <atgo>	 iAMbic
[18:26:41] <atgo>	 i see what you did there
[18:26:44] <XenoRyet>	 I think I say it "eyem's"
[18:26:44] <K4-713>	 EYE-ons.
[18:27:01] <XenoRyet>	 Definitely one syllable for me.
[18:27:16] <atgo>	 this act of distraction brought to you by anne's low blood sugar
[18:27:39] <atgo-dinner>	 hasta standup :)
[18:27:43] <K4-713>	 hehe
[18:27:51] <K4-713>	 That was fun.
[18:27:58] <K4-713>	 Let's do whatever that was again sometime.
[18:27:58] <ccogdill>	 +1 !
[18:28:09] <XenoRyet>	 Indeed
[18:28:38] <K4-713>	 In other news, I discovered today that it was possible to kill gmail by trying to delete too many things at once.
[18:28:52] <XenoRyet>	 Awesome, I wouldn't have expected that.
[18:29:01] <K4-713>	 Yeah. I was getting 500s.
[18:29:05] <K4-713>	 I can make that happen.
[18:29:17] <K4-713>	 ...by trying to delete two months of cronspam at once.
[18:29:21] <K4-713>	 Totally repeatable.
[18:29:25] <K4-713>	 They should fix that.
[18:29:39] <XenoRyet>	 Yea, totally.
[18:29:40] <K4-713>	 I swear I'm not trying to DoS anybody.
[18:29:47] <XenoRyet>	 lol
[18:30:18] <XenoRyet>	 Hey, while I've got you here...
[18:30:25] <K4-713>	 Yeeeees?
[18:30:48] <XenoRyet>	 Git is telling me my branch is ahead of origin/master by 2 commits
[18:30:50] <XenoRyet>	 What do?
[18:30:54] <K4-713>	 Ah!
[18:30:58] <K4-713>	 The thing you want to commit.
[18:31:07] <K4-713>	 Does it actually depend on the last work you did?
[18:31:24] <K4-713>	 Or, to put it another way: If you git log -3
[18:31:41] <K4-713>	 Does the freshest one actually depend on the second freshest?
[18:32:56] <cwdent>	 doesn't that just mean you have two commits on that branch?
[18:33:03] <K4-713>	 Yes.
[18:33:05] <K4-713>	 If they're essentially independent, I'd do the branch dance, clean up master, and cherry-pick the fresh one back over.
[18:33:23] <K4-713>	 Otherwise, the second patch won't be mergeable into master until the first one passes review.
[18:33:29] * K4-713 shrugs
[18:33:38] <XenoRyet>	 I think they're independent
[18:33:58] <K4-713>	 Okay. Next question: Was this before or after you git fetch --all?
[18:33:58] <cwdent>	 oh i gotcha.  i've been doing the rebase/squash thing which i dig
[18:34:09] <XenoRyet>	 I don't have any new work of my own since I sent that one yesterday into review
[18:34:18] <K4-713>	 If the lower one was already in git review and somebody merged it, the problem might just go away.
[18:34:27] <K4-713>	 ...once your local copy gets the news.
[18:35:35] <XenoRyet>	 I did git pull --ff, and it asked me to write a merge comment, but I wasn't sure that's what I wanted to do so I tried to abort it with the empty comment.
[18:35:58] <XenoRyet>	 Not sure that actually worked,  git log -3 is showing a merge from me and two commits from Elliott
[18:36:21] <K4-713>	 Yeah, sounds like it's gone and done something interesting.
[18:36:26] <XenoRyet>	 should I just try git fetch --all and see what happens?
[18:36:46] <K4-713>	 yeah, though in theory it does that as part of the git pull.
[18:37:05] <K4-713>	 It won't hurt, anyway.
[18:37:24] <K4-713>	 All fetching does, is get all the news from the remote repo.
[18:37:30] <K4-713>	 It doesn't actually do anything with it.
[18:38:09] <K4-713>	 But, ah, I fetch and status obsessively.
[18:38:11] <XenoRyet>	 Yea, that didn't do anything.   Still getting on branch master, your branch is ahead by 3 commits, working directory clean
[18:39:13] <ejegg>	 so you probably just want to get back to the same state as origin
[18:39:21] <ejegg>	 if those 3 commits don't include any new work
[18:39:28] <XenoRyet>	 Yea, I think that's what I'm looking to do.
[18:39:37] <K4-713>	 okay, so to get rid of the merge commit the long way, git branch [somename] and clean up master by rewinding to before the problem, and fast-forwarding to the present.
[18:39:40] <ejegg>	 try git reset --hard HEAD^3
[18:39:49] <K4-713>	 Tilde-three.
[18:39:53] <K4-713>	 Right?
[18:39:58] <ejegg>	 oh, tilde?
[18:40:00] <K4-713>	 Yep
[18:40:15] <K4-713>	 git reset --hard HEAD~3
[18:40:45] <K4-713>	 And then the status should say you're just behind master a ways, so a git pull -ff will get you to the present.
[18:40:56] <XenoRyet>	 OK, that jives with what I'm seeing
[18:41:15] <K4-713>	 But, yeah... we probably should have said don't do that until you have your good patch on a saved branch.
[18:41:19] <K4-713>	 :/
[18:41:30] <K4-713>	 Please tell me you did that first.
[18:41:40] <XenoRyet>	 I didn't have anything that needed saving
[18:41:45] <K4-713>	 oh.
[18:41:47] <K4-713>	 well, nvm.
[18:42:03] <XenoRyet>	 I was just trying to get my clean slate to start doing some new stuff.
[18:42:06] <K4-713>	 yep
[18:42:12] <ejegg>	 if you /did/ need to retrieve something after a reset, there's git reflog to help with that
[18:42:14] <K4-713>	 It's totally like back to the future 2.
[18:42:18] <cwdent>	 XenoRyet: if you haven't tried it yet, git stash is very handy
[18:42:26] <XenoRyet>	 Yea, looked a bit at that.
[18:42:55] <grrrit-wm>	 (PS1) Krinkle: resourceloader: Remove redundant getModifiedTime implementation [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/215382
[18:43:02] <ejegg>	 also, local branches are cheap, so go ahead and make a new one for each commit if you want
[18:43:07] <K4-713>	 I have never been able to use git stash without ruining my life for many hours at a time.
[18:43:43] <K4-713>	 Some people seem to love it.
[18:43:52] <K4-713>	 But, I don't know why you wouldn't just make a branch.
[18:43:59] <K4-713>	 And git commit --amend later.
[18:44:25] <XenoRyet>	 Ok, after git pull -ff.   Now git status is giving me this: fatal: Unable to read current working directory: No such file or directory
[18:44:33] <ejegg>	 whoa!
[18:44:33] <XenoRyet>	 That seems bad
[18:44:33] <K4-713>	 uhh
[18:44:47] <K4-713>	 git status said that?
[18:44:54] <XenoRyet>	 yep
[18:44:56] <K4-713>	 Posessed.
[18:45:29] <AndyRussG>	 stash is good for when you have uncommitted changes in the working directory, and you want to rebase or do other fancy stuff with other branches for a little while and then get back to them
[18:45:56] <K4-713>	 Yeah, again, I don't see how that's better than committing and saving that branch.
[18:46:34] <K4-713>	 But... XenoRyet: At this point of weirdness, I'd typically blow up the dir from orbit and start over.
[18:47:01] <XenoRyet>	 Yea, that's what I did last time.  Nuke the site from orbit, it's the only way to be sure.
[18:47:10] <K4-713>	 Exactly.
[18:47:22] <cwdent>	 well i use it for a variety of things, sometimes i have dev config i'm never going to want to push so i'll save it to a stash and apply it as needed
[18:47:33] <AndyRussG>	 K4-713: sometimes you have in the working tree changes that you plan to put in different commits
[18:47:46] <K4-713>	 huh
[18:47:50] <cwdent>	 or i just need to switch branches like right now
[18:47:53] <AndyRussG>	 Yah also huh
[18:48:22] <cwdent>	 but like inbox zero, a stash zero policy is good
[18:48:51] <AndyRussG>	 XenoRyet: I agree w/ K4-713's suggestion :)
[18:49:04] <cwdent>	 i have ended up losing changes in a long git stash list
[18:49:32] <K4-713>	 I'm now thinking, though, that there are ways to abuse stash that would make developing more interesting.
[18:49:40] <K4-713>	 So, thanks for that. :)
[18:50:04] <AndyRussG>	 I think it helps to psychologically separate stuff that's pretty temporary from stuff that's stable enough to have a named place to put it (aka a "branch")
[18:50:07] <XenoRyet>	 Wait, hold the nukes, it was something silly.
[18:50:19] * K4-713 pauses over key
[18:50:20] <cwdent>	 protip: use pop instead of apply for ephemeral changes, it removes the stash after application
[18:50:32] <K4-713>	 oho
[18:50:34] <XenoRyet>	 I was just in a directory that got deleted, so my command line didn't know where it was.
[18:50:40] <K4-713>	 hah!
[18:50:41] <K4-713>	 Cool
[18:50:55] <XenoRyet>	 Yea, one of those.
[18:51:01] <K4-713>	 I was sort of wondering how you would manage that error at all.
[18:51:42] <XenoRyet>	 Yea, that was a weird error to come from what we were doing.
[18:51:52] <XenoRyet>	 All good now though.
[18:51:56] <K4-713>	 woot
[18:53:26] <XenoRyet>	 So if I'm going to use a branch,  does it go like this:  Make the branch, do some stuff, commit, merge back to local master, then send to review?
[18:53:46] <XenoRyet>	 or do I send to review from the branch?
[18:54:12] <ejegg>	 yep, straight from the branch
[18:54:19] <K4-713>	 If you review from a branch, that branch name will show up in gerrit.
[18:54:28] <XenoRyet>	 So make it something useful
[18:54:41] <ejegg>	 heh.  or at least not obscene
[18:54:42] <K4-713>	 Or, at least: Only cuss on purpose.
[18:54:56] <XenoRyet>	 Right ;-)
[18:55:37] <ejegg>	 it keeps things simple to let your local master stay right on track with origin/master
[18:55:47] <XenoRyet>	 Yea, I'm sensing that.
[18:56:54] <K4-713>	 Sometimes, though, you can develop on a branch that exists in gerrit.
[18:57:10] <K4-713>	 That's a whole other deal.
[18:57:21] <K4-713>	 It's a good idea, sometimes.
[18:57:43] <K4-713>	 I mean, outside of our production branches.
[18:58:24] <cwdent>	 like for multiple collaborators?
[18:59:12] <K4-713>	 Yeah... it seems to be the right thing to do for multiple collaborators on a feature we know we don't want in prod for a while.
[18:59:34] <cwdent>	 yeah totally
[18:59:42] <cwdent>	 so it's ok to push a local branch to remote?
[18:59:53] <K4-713>	 I think you have to do something weird to set it up.
[19:00:00] <K4-713>	 But, yes.
[19:00:07] <K4-713>	 As long as you clean up after yourself eventually.
[19:00:21] <K4-713>	 Also, I have no idea how the rest of this place feels about that kind of thing.
[19:00:26] <K4-713>	 Local rules.
[19:00:48] <ejegg>	 when you review from a local branch, the name just shows up as a 'topic' in gerrit
[19:01:05] <K4-713>	 Yeah, but you can create a branch in gerrit and track that.
[19:01:18] <cwdent>	 will it get pushed over to github?
[19:01:31] <K4-713>	 Buh.
[19:01:39] <K4-713>	 ...no?
[19:01:48] <K4-713>	 Then again, I don't really github.
[19:02:15] <K4-713>	 (something about "get off my lawn")
[19:02:36] <ejegg>	 oh hey, they do get a bunch of branches from gerrit: https://github.com/wikimedia/mediawiki-extensions-DonationInterface/
[19:03:05] <cwdent>	 https://blog.benjojo.co.uk/post/auditing-github-users-keys
[19:03:11] <K4-713>	 Why is that even there?
[19:03:14] <cwdent>	 ^ K4-713 you're probably better off
[19:03:37] <cwdent>	 but yeah i could see unreviewed code hitting github as something to be careful about
[19:04:25] <K4-713>	 I think it still has to get reviewed.
[19:04:42] <K4-713>	 I mean, I'm not seeing any gerrit internal stuff.
[19:04:53] <K4-713>	 So, merging to a branch works the same way as merging to master.
[19:05:31] <K4-713>	 If anything, you over-review if you work in branches.
[19:06:40] <cwdent>	 yeah, well better to err on the side of caution
[19:06:44] <K4-713>	 yep
[19:07:01] <cwdent>	 the open development process is awesome
[19:07:04] <cwdent>	 unless it's not
[19:07:07] <K4-713>	 haha
[19:07:36] <K4-713>	 And, like, how many people think this is a good idea to do with payments systems, strongly enough to actually go there?
[19:07:57] * K4-713 blinks
[19:08:03] <K4-713>	 I'm going to get a Food.
[19:11:19] <cwdent>	 lunch in longmont is tough.  there is basically nothing in between the $2.50 burrito and the $12 artisan sandwich
[19:12:56] <cwdent>	 anyway imma go get a $2.50 burrito
[20:01:09] <cwdent>	 git diff -p -R | grep -E "^(diff|(old|new) mode)" | git apply
[20:01:18] <cwdent>	 ^ reset repo perms to what git thinks they are
[20:01:50] * cwdent just copied a repo via fat32 usb drive
[20:04:28] <cwdent>	 something is wrong with my hangouts
[20:21:20] <atgo>	 K4-713:  i'm in ze hangout
[20:21:32] <K4-713>	 yep, getting there
[20:39:25] <cwdent>	 awesome, my good friend just got hired at digital ocean
[20:48:20] <XenoRyet>	 Awesome, good for them.
[21:03:45] <atgo>	 yo Jeff_Green - everyone is good with thursday. what time? i'm going to put it on the calendar and invite errybody
[21:07:33] <Jeff_Green>	 ok great
[21:07:54] <K4-713>	 BAH. I knew there was something in my inbox that I had to do.
[21:08:03] <K4-713>	 Anti-harassment training!
[21:08:08] <Jeff_Green>	 atgo: we should have giantrabbit around for that
[21:45:37] <wikibugs>	 Wikimedia-Fundraising-CiviCRM: Amend rule for Engage team members - https://phabricator.wikimedia.org/T101179#1331962 (RLewis) NEW a:atgo
[21:58:00] <grrrit-wm>	 (PS1) Ejegg: Mustache l10n - use additional parameters [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215521
[21:58:57] <grrrit-wm>	 (PS3) Ejegg: Finish removing hardcoded nobody@wikimedia.org [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215341 (https://phabricator.wikimedia.org/T101114)
[22:07:06] <grrrit-wm>	 (PS1) Ejegg: Annotate some more vars and methods [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215527
[22:38:27] <grrrit-wm>	 (PS1) Ejegg: Get rid of special test functions [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/215534
[22:43:17] <wikibugs>	 Wikimedia-Fundraising-CiviCRM: Amend rule for Engage team members - https://phabricator.wikimedia.org/T101179#1332180 (awight) I don't quite understand, "Community Gift" is a type of Gift Source, so that's simple, but "Unrestricted - General" is in Restrictions, and we currently don't enforce any rules about...
[22:44:12] <grrrit-wm>	 (PS1) Awight: Allow Engage to enter "Community Gift" donations [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/215535 (https://phabricator.wikimedia.org/T101179)
[22:51:16] <wikibugs>	 Fundraising-Backlog: Set up import Major Gifts events payment/invitation tool - https://phabricator.wikimedia.org/T101191#1332238 (CCogdill_WMF) NEW
[22:51:50] <wikibugs>	 Fundraising-Backlog: Set up import for Major Gifts events payment/invitation tool - https://phabricator.wikimedia.org/T101191#1332247 (CCogdill_WMF)
[22:52:33] <wikibugs>	 Wikimedia-Fundraising-CiviCRM, Patch-For-Review: Amend rule for Engage team members - https://phabricator.wikimedia.org/T101179#1332264 (RLewis) @awight yeah, I think we're good to keep the Restrictions as they are but just change the rule for Engage to have the option to enter Community Gifts.
[22:54:35] <grrrit-wm>	 (PS2) Ejegg: Redirect to failure page when the gateway is disabled [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/214272 (https://phabricator.wikimedia.org/T100584) (owner: Awight)
[22:55:18] <grrrit-wm>	 (CR) Ejegg: [C: 2] "Much more polite" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/214272 (https://phabricator.wikimedia.org/T100584) (owner: Awight)
[22:55:40] <grrrit-wm>	 (Merged) jenkins-bot: Redirect to failure page when the gateway is disabled [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/214272 (https://phabricator.wikimedia.org/T100584) (owner: Awight)
[23:28:38] <atgo>	 do you guys need anything else from me today?
[23:52:17] <K4-713>	 atgo: Sounds like no?