[14:22:36] multichill: hey, how long do you think it will be before there's a date for the WMNL GLAM meetup in Dec? [14:23:04] There is a date, just no commitment yet [14:23:08] Dec 3, right? [14:23:36] multichill: "no commitment yet" from WMNL? [14:26:27] sumanah: Re your earlier comment about coworking spaces: Timo and I will be coming into the WMNL office tomorrow to work on our joint project (RL2) [14:26:35] oh how nice, RoanKattouw [14:26:58] It's a bit of a trip but we should be able to get a good working day out of it [14:26:59] RL2 -- a sequel that will improve on the original? :D [14:27:02] And it means I get to leave the house [14:27:26] The flagship feature is sharing of Gadgets across wikis, much like Commons for images/files [14:27:50] yes! yay [14:27:58] (And making Gadgets use RL for performance benefits and such, supporting Gadget i18n, and a few other things) [14:28:41] Reminds me, I should write a presentation proposal today; Timo and I plan to present about this at WCN in November [14:28:46] (Wikimedia Conferentie Nederland) [14:29:22] neat, RoanKattouw - any English-language info about WCN or is it all in Dutch? [14:29:35] *sumanah searches [14:29:36] *RoanKattouw looks [14:29:38] RoanKattouw: I will be at the office the day after tomorrow :S [14:29:46] aha, meta [14:29:47] Took a day off to do last WLM stuuf [14:29:49] https://secure.wikimedia.org/wikipedia/meta/wiki/Wikimedia_Conference_Netherlands [14:30:21] http://www.wikimediaconferentie.nl/over-de-conferentie/ [14:30:29] I swear there was an English translation there, but I might be wrong [14:31:04] Anyway, it's on Saturday November 5th in Utrecht [14:31:10] sumanah: Anyway, what is your role in Glamcamp nl? [14:31:26] multichill: volunteer coordinator? ;-) [14:31:38] multichill: nope! AFAIK I'm not coming. But I want to spread the word about it [14:32:17] sumanah: I don't think the problem is to get a lot of people, but to get the right people. [14:32:27] multichill: ah, exclusivity, ok [14:32:34] *sumanah backs off [14:32:34] o_O [14:32:48] sumanah: No no, I'm not trying to scare you away [14:33:05] To be honest: I'm not sure we'll actually do it. [14:33:12] *Danny_B|backup wonders about the criteria fo being the right person [14:33:34] multichill: how come? [14:33:34] Danny_B|backup: Activty in the GLAM field [14:33:48] I misunderstood and thought it was a standard "if you're interested, come by" sort of meetup, hence me pushing Danny_B|backup into making https://secure.wikimedia.org/wikipedia/meta/wiki/GLAMcamp_NL [14:33:56] multichill: do you need any help with that? [14:34:14] We need some people to organize it. I'm only going to commit if we have enough people to do that. [14:34:27] sumanah: Our conference is :-) [14:34:56] sumanah: And the four Wiki Takes ... we're organizing in September as part of WIki Loves Monuments [14:35:20] do we know if liam will participate on glam related stuff after his period is over? [14:35:35] Dunno, he probably will [14:37:07] sumanah: How was the storm? Or are you in SF now? [14:37:25] I'm fine multichill - am in nyc [14:37:39] Did you take some good pictures? :P [14:37:39] multichill: My household had no hurricane-related problems. Electricity, natural gas, water, mobile phone, and internet service continued without interruption. We're very lucky that Hurricane Irene did not substantially affect us. (And that we're well-off enough to have a two-bedroom apartment, to reduce cabin fever.) [14:38:01] multichill: no photos at all; the view from my windows was quite boring! [14:38:05] "now it is raining" [14:38:08] "now it is windy" [14:38:22] Did any windows break in high-rise buildings in the city? [14:38:30] Did you enjoy the storm? A storm can be quite fun if not a lot of stuff is breaking :P [14:38:58] RoanKattouw: I don't know! [14:39:08] Cause I know they were afraid of that [14:39:11] RoanKattouw: No according to my morning paper [14:39:18] We've been watching the Weather Channel on line for most of the weekend [14:39:39] I should probably repair my fema bot to get the pretty pictures to the commons [14:40:01] multichill: I disliked the anticipation/uncertainty, but it was nice to have a quiet Sunday with my husband, a book, the internet, good food, and "Breaking Bad" and "The Dick Van Dyke Show" [14:41:13] multichill: I hereby encourage you to repair that bot, but only as part of a healthy and well-balanced set of work priorities [14:43:27] multichill: so, do you think in a few weeks you'll be more certain about whether the GLAM NL meetup will happen? I don't mean to spam the world to tell them about it. If you only want people who are already involved in GLAM stuff then of course your existing publicity channels will be sufficient; if you want hackers who are only potentially interested in coming and helping, I can help with that [14:43:58] activating them & getting them excited about GLAM [14:44:23] sumanah: My priority is with Wiki Loves Monuments at the moment. Very busy for about 10 more days and than riding out the wave [14:44:27] ok [14:45:13] I'm currently waiting for Liam en MaartenB to respond to my email asking for commitment. [14:45:31] nod. will wait to hear from you about it, then, multichill - and good luck with WLM [14:45:45] ty [14:46:50] if it won't happen in nl, it should definitely happen in europe anyway. france, uk, spain/catalan, germany? [15:06:15] neilk_: Good morning. I'm gonna eat my microwave pizza now and when I come back I'd like to start this deploy whenever possible and convenient for you. Earlier is better for both of us (you have to go later today and I have to get in the car early tomorrow morning) [15:06:41] RoanKattouw_away: ok [15:14:22] Danny_B|backup: i agree, it's a good weekend [15:14:45] RoanKattouw: Deploy upload wizard! Deploy upload wizard! Deploy upload wizard! Deploy upload wizard! :P [15:40:53] *RoanKattouw returns from dinner [15:41:11] neilk_: I see a massive commit to 1.17wmf1, does that mean the rev is ready to go? [15:41:37] RoanKattouw: I'm going to revert that because the mergeinfo was dirty, forgot to clean it out. Unless you don't care about mergeinfo? [15:41:43] Oh, wait, that's mostly property noise [15:41:49] I care about unreviewability [15:41:53] I'll fix it [15:43:54] RoanKattouw: what do you do when the svn copy command complains that such-and-such already exists? [15:44:11] I was trying to copy the state of extensions/UploadWizard@95551 to extensions/UploadWizard [15:44:19] Delete it first and commit [15:44:47] RoanKattouw: oh yeah, forgot. [15:45:04] You'll have to redo your merge too, of course [15:45:21] what merge [15:47:11] The one you reverted because of mergeinfo noise [15:47:13] Or was that in trunk? [15:49:08] Ah, indeed it was [15:53:19] hey Roan, could you review http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95551 so I could get that in? [15:54:55] I'm assuming we'll need to add 'missingCategoriesWikiText' => '{{subst:unc}}' to the config? [15:56:12] yes! [15:56:54] Marking OK [15:57:02] This is not ideal, ideally it'd be an i18n message [15:57:15] But I recognize that in our specific use case, we don't need that flexibility [15:58:55] RoanKattouw: I get confused about when to use those and when not. It seems weird to rely on database state as config [15:59:00] but anyway, thanks [15:59:31] Someone like Nikerabbit would be able to judge that better [15:59:50] My first instinct was it's wikitext -> it's text -> it's in a certain language -> needs i18n [16:01:00] RoanKattouw: {{uncategorized}} is i18ned [16:01:16] I know [16:01:30] Like I said, in this specific case the text is some template that has its own i18n, so it's fine [16:03:04] I'm here [16:04:48] neilk_: Status? [16:05:11] testing locally -- need mediawiki.uri.js (apparently that was reverted too) [16:05:20] found the change to bring it back [16:05:31] OK [16:08:15] this merge isn't working [16:08:19] I don't understand [16:08:32] RoanKattouw: so here's the change: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95266 [16:08:49] and it seems, all I should do is reapply that change to the same location [16:08:52] but nothing happens [16:08:53] ??? [16:08:57] It's too smart, probably [16:09:02] maybe I should revert the revert... [16:09:22] That'll take other things with it to [16:09:24] o [16:09:30] Which you may or may not want, I can't tell [16:10:06] Though you could revert that rev just on Resources.php, then copy the JS file [16:10:08] grrr [16:10:16] ok the log says this was never reverted [16:10:18] and yet I don't have it [16:11:02] What do you maen [16:11:09] https://secure.wikimedia.org/wikipedia/mediawiki/wiki/Special:Code/MediaWiki/95285 [16:11:20] Reverts that and a few other things [16:11:40] So if you do svn merge -c -95285 resources resources , that should do it [16:11:52] (2x resources is not a typo) [16:12:02] I know i do the same thing [16:12:52] ok that worked, although I don't know why. [16:13:08] also, apparently negative numbers work to revert? [16:13:15] Yes [16:13:24] -c 12345 is an alias for -r 12344:12345 [16:13:31] And -c -12345 means -r 12345:12344 [16:13:36] I do it the long way when reverse-merging [16:13:40] good to know [16:22:28] RoanKattouw: almost there one more merge [16:24:55] OK [16:28:27] RoanKattouw: ready [16:28:30] OK [16:28:35] You said you'd gotten deploy access? [16:28:39] yes [16:28:46] Alright [16:28:55] Then you can do the whole thing and I'll walk you through it [16:29:21] cd to /h/w/c/php, run svn up, and get a cup of coffee [16:29:55] k [16:31:34] RoanKattouw: so just to clarify, you meant cd /home/wikipedia/common/php ? [16:31:40] Yes [16:31:50] ok, updating... [16:32:40] In the meantime, add your config thingy in /h/w/c/wmf-config/CommonSettings.php near line 2176 [16:34:21] When both are done, your code will instantly be live on testwiki, where you should test it [16:36:59] RoanKattouw: ok. I don't quite understand how we config things for one site and not others [16:37:22] Oh, you want this to only apply to Commons? [16:37:25] RoanKattouw: that new setting would only make sense on Commons, where there is a subst:unc [16:37:28] OK [16:37:30] {{subst:unc}} rather [16:37:40] but we should test it on testwiki too... [16:37:43] Yes [16:37:55] Put it in unconditionally first, that'll be harmless [16:38:05] Then later you can clean it up by wrapping it in if ( $wgDBname == 'commons' ) [16:38:06] k [16:38:26] The nice way to do site-specific settings is in InitialiseSettings.php, but because this is an element of an array that doesn't work all too well [16:38:58] In fact you'll notice we're already doing that very same thing on line 2188-2195 [16:39:48] I was about to say. :) [16:43:57] neilk_, RoanKattouw - so where do I look for this checklist/HOWTO on wikitech.wikimedia.org ? http://wikitech.wikimedia.org/view/Deployment_checklist_features ? [16:44:56] How_to_deploy_code [16:45:25] RoanKattouw: okay, config is in, testing testwiki [16:45:36] OK [16:45:50] 2 PHP Parse error: syntax error, unexpected '}' in /home/wikipedia/common/wmf-config/CommonSettings.php on line 2197 [16:46:07] aha. didn't search hard enough, thought the autosuggestions would include "deploy" as a string anywhere in the page title [16:46:10] Never midn [16:46:18] That syntax error is already fixed [16:51:06] hey multichill are you here or not? I think my client is broken. Anyway if you are, UploadCampaigns etc. are on test.wikipedia.org [16:51:11] please help us test [16:52:55] neilk_: Yeah, I'm here. Just a crappy connection with freenode [16:53:06] multichill: k [16:54:09] neilk_: I'm actually at work right now so I can't spend too much time on it right now ;-) [16:54:17] multichill: np [16:56:16] hey [16:57:00] RoanKattouw: ok I did a few tests. I think there are some remaining issues with the WLM functionality when uploading multiple files -- I will take this up with Jeroen [16:57:15] otherwise it is what we expected [16:57:19] OK [16:57:31] But if the bugs are in WLM-specific stuff, we can deploy, right? [16:57:32] the problems are edge cases, if someone tries to use multiple different licenses for files. [16:57:49] the vast majority (maybe even 100%) are covered by the usual case [16:59:18] I get a fatal when having SpecialUpload retrieve a file from the stash: PHP fatal error in /home/wikipedia/common/php-1.17/includes/upload/UploadBase.php line 636: [16:59:18] Call to undefined method UploadFromStash::getSourceType() [16:59:25] investigating now... [16:59:59] On testwiki? [17:00:07] D'oh, of course [17:00:13] The error message contains /home , so yes, it's testwiki [17:00:33] yeah, for some reason the deployed version of UploadBase is missing the getSourceType() method. [17:01:00] line 152 of trunk's include/upload/UploadBase.php [17:01:28] also missing from depoyed UploadFromStash.php [17:01:41] (line 94 in trunk's copy) [17:02:10] ok [17:02:55] raindrift: did you add this? [17:03:09] I don't believe I did. lemme check. [17:03:49] ok bryan did it in... r79749 [17:04:55] yep [17:05:13] should we commit that too? [17:05:17] RoanKattouw: ? [17:05:34] raindrift: maybe you can tell me your test for this, so I can do it locally [17:05:36] neilk_: Looks ok on first sight. [17:05:38] If it fixes a fatal, yes [17:06:15] 79749 is okayed, and it doesn't look obviously harmful. It adds a few methods like sourceType. [17:06:18] Oh, sure. Go to Special:Upload, upload a file, go back to Special:Upload, upload the exact same file under the same name, observe that there is a conflict, change the description, click "Submit modified file description" [17:06:33] raindrift: okay [17:07:01] I didn't realize 79749 wasn't already deployed... [17:07:08] *raindrift lacks sufficient historical perspective. [17:08:02] but really, any action that triggers UploadBase::stashFile will do it. [17:08:04] raindrift: https://secure.wikimedia.org/wikipedia/mediawiki/wiki/Branch_points [17:08:16] ooh! handy! [17:08:58] RoanKattouw: huh. I've never seen that either [17:10:01] ok conflict http://pastebin.mozilla.org/1314849 -- I assume stashFile() is the new and correct way [17:11:03] ^ raindrift [17:11:06] you are correct, sir. [17:13:06] raindrift: basically we just keep the impl from trunk and it should all work -- $data is no longer used IIRC. [17:13:58] that sounds right. though, of course, it's possible that trunk's implementation relies on something not present in 1.17. [17:14:12] i think it should be okay. [17:15:47] oh, and if you mean the getSourceType implementation, that should be fine as it does very little. Note, however, that it's in UploadFromFile, UploadFromUrl as well. [17:16:06] all the different UploadBase subclasses need to implement it. [17:18:28] raindrift: yes [17:18:38] raindrift: I have to un-commons-ify my local setup [17:18:44] raindrift: in order to trigger the warning... [17:19:59] raindrift: ok so the expected behaviour is what -- to try uploading, and then get a page modified w/Javascript which asks me if I want to replace? That was the old behavior [17:21:25] raindrift: ping?? [17:21:31] http://minus.com/mkSdYQzkM <--- I get this now [17:21:37] which is the thing I expect to see [17:21:43] I mean, the expected behavior is that I don't get a fatal error. I believe it should let you replace the image description. The UI in this part of SpecialUpload is kinda poor. [17:22:03] that looks better. [17:22:09] when does the error occur, if it occurs [17:22:16] at the ajax call or upon submission [17:22:23] lemme look. [17:22:57] on submission, but the page I get is different. lemme screenshot it. [17:24:25] http://minus.com/mIZP7zk0K [17:24:42] so, when I click "submit modified file description", I get the error. [17:25:01] right, I have a few hacks still applied to my system that do this ajaxy thing. [17:25:06] you have super-vanilla uploading [17:25:13] this is on testwiki, actually. [17:25:26] wait... that was testwiki [17:25:29] yes. [17:25:38] I don't understand what you are showing me. Is that a bad thing or a good thing. [17:25:54] You had a problem with testwiki, so I assume that anything with testwiki on it is the wrong thing. [17:25:59] it's fine that I get this page. you are seeing expected behavior. it fails when I submit that form. [17:26:12] ok I haven't duplicated the failure then [17:26:18] you can try it on testwiki. [17:26:26] but only by committing code. [17:26:29] oh I see [17:26:30] nm [17:26:33] http://test.wikipedia.org/wiki/Special:Upload [17:27:47] raindrift: I don't get any errors [17:28:11] raindrift: even on testwik [17:28:14] testwiki. [17:28:18] You're talking about this one 1 PHP Fatal error: Call to undefined method UploadFromStash::getSourceType() in /home/wikipedia/common/php-1.17/includes/upload/UploadBase.php on line 636 right? [17:28:23] yes. [17:28:37] OK that's the only one I see for test ATM [17:28:45] should I be seeing a page of errors or is the error only appearing in the log? [17:28:57] page [17:29:01] I don't even understand what we are fixing any more since the page seems fine to me [17:29:29] unless, my user status is affecting this (it might, people who have more privileges can add a new version of a file) ? [17:30:01] when I do it, it silently creates a new version of the file [17:30:04] no errors [17:30:24] although it gives me an ajax warning this is about to happen [17:30:28] yeah. that's what it's doing for me now, too. [17:30:34] hm. [17:31:04] let me trying being another user [17:32:19] except I can't upload as a new user [17:32:26] wah wah wah wah wah waaaaaaaah. [17:33:07] raindrift: you were just made staff [17:33:13] I bet that's the reason why :) [17:33:13] Did you guys commit new code? It's weird that I can't duplicate this anymore. [17:33:18] Certainly possible. [17:33:37] good that didn't happen 5 minutes earlier? ;) [17:33:39] I didn't do anything [17:33:43] guillaume did it [17:34:22] ok well now we need to get someone ELSE to test this or make a new acct and confirm it [17:35:23] test what? [17:35:32] I am in the office, if testing could be done from there [17:35:41] apergos: we were testing whether a certain kind of upload would fail [17:35:44] (as long as I'm in this channel I mgiht was well do something useful) [17:35:47] apergos: but you're staff [17:36:02] apergos: you have to have a non-staff confirmed test acct on testwiki. [17:36:08] heh [17:36:09] I am making one now [17:36:10] d;oh [17:36:12] ok [17:36:19] neilk_: Would you like me to demote you temporarily? [17:36:33] I made a test account. What's involved in confirming it? [17:36:38] I just made an account -- I'll just log in as me and make it confirmed [17:36:47] Is it just confirming email, or does it require an admin to do something? [17:37:46] raindrift: no -- I'll show you later, but check out Special:UserRights [17:39:23] Nope. still replaces it outright, even with a new account. [17:39:29] raindrift... yes same here [17:39:34] hm [17:39:47] well let's get back to basics [17:39:51] oh. [17:39:53] i see. [17:39:55] what is the actual error in the code [17:40:01] upload a duplicate file, but under a *different* name. [17:40:06] aaaaaaaaaaaaaa [17:40:09] ok then [17:40:50] somebody, with your non-staff acct, upload a file and call it "Poultryman_lambsuccory.jpg" [17:41:50] okay. done. [17:42:01] but??? that's a different user acount, not a different filename. [17:42:37] I thought you said the problem was the same file name, different user accounts. [17:42:55] no. same file contents, different file names. [17:43:05] ok finally [17:43:16] sorry??? was ambiguous i now realize. [17:44:52] does it have to be different users? I assume not [17:45:13] no [17:46:07] raindrift: ok I got a warning when I tried to upload the same content under a different name. [17:46:13] is that expected? [17:46:38] yes. [17:46:42] raindrift: hang on, can you just skype or call me? [17:46:55] now, if you click "submit modified file description" it should break [17:47:05] err, don't have your number, but I'm x6778 [17:47:06] FINALLY [17:47:07] yes [17:47:14] ok at least I can test it [17:50:51] except I can't quite, because my system is a bit too customized -- I have some of michael dale's fancy JS involved here [17:51:27] hm. [17:54:03] raindrift: I just patched fenari directly. [17:54:08] without committin [17:54:15] committing [17:54:18] so let's try test now [17:54:22] committin'. pardner. [17:54:35] I will soon need committing [17:54:37] testing [17:55:27] okay. works. [17:55:32] OK. [17:55:44] let's commit it, I guess [17:59:06] Roan: there seem to be locally modified files on fenari, BTW. Is that normal? [17:59:20] It shouldn't be, but yes, it is [17:59:49] probably people doing the same thing I just did - patch directly. [17:59:51] RobLa wants that cleaned up, and Sam's been committing some live hacks recently [17:59:55] Yes, and then they forget about it [18:00:09] allrighty then [18:00:15] I think we are go for deploy [18:00:25] after r95681 [18:00:26] OK [18:00:35] Are things looking good on testwiki now? [18:00:46] let's do one last test of everything [18:00:49] everything I've tested works so far. [18:00:54] but yeah, lemme look a little more. [18:00:55] because i just reverted patch and updated from trunk [18:01:06] in theory they should be identical. [18:01:09] but you never know. [18:01:32] Neil, do you know how to trigger UploadFromFile or UploadFromUrl? [18:01:48] UploadFromFile is what happens when you upload a file. [18:01:57] UploadFromUrl is this thing that isn't even enabled [18:02:04] check. [18:02:06] where you pass in a url for it to go fetch [18:03:07] I see you got the "remove" buttons working again. awesome. [18:03:30] I think WLM is still working [18:03:49] this all looks good to me. [18:03:49] I think this is okay to go [18:04:15] RoanKattouw: I think we can now finally start deploy [18:04:21] neilk_: You need only type the magic word scap [18:04:29] That'll push out the code and the config [18:04:46] I'm reading this great documentation on how to deploy code... [18:05:18] heh [18:05:20] link? (or was that sarcasm?) [18:05:48] raindrift: no, Roan wrote the docs [18:05:54] and they are more complex than "just type scap" [18:05:55] http://wikitech.wikimedia.org/view/How_to_deploy_code [18:06:04] awesome, thanks! [18:06:18] I feel jealous [18:06:28] In this case it is that simple, though: http://wikitech.wikimedia.org/view/How_to_deploy_code#More_complex_changes:_sync_everything [18:06:30] it took me 1.5 years to get here and raindrift is learning all this stuff already [18:06:45] I demand fewer docs and less communication [18:06:50] hehe [18:07:15] also, more hazing [18:07:28] RoanKattouw: go ahead and set that option [18:07:31] RoanKattouw: step 5, bumping JS, is obsolete? [18:07:36] Yes [18:07:39] I should remove that [18:07:39] RoanKattouw: just ensure you disable it when you aren't using it [18:07:46] I'll fix it [18:08:18] Ryan_Lane: OK. Yeah I really just need one segfault to happen. Might take 1 or 2 hours, they're infrequent and I'm only getting 1% of reqs on that box of course [18:08:30] *Ryan_Lane nods [18:08:42] RoanKattouw: IIRC it will take up to 5 min for ResourceLoader to push out new JS? [18:08:45] If nothing is seriously broken in the next 5 minutes, I'm gonna step out for 5 [18:08:47] Yes [18:08:51] Actually [18:09:06] Krinkle: what's your skype id? [18:09:18] I'm just gonna step out now and Neil can fight the fires, he knows how to fix bugs and how to deploy code is documented :D [18:09:27] 'krinklemail' , just gave it to disokawa [18:09:28] Then after that I'll deploy the Narayam bug fixes and enable that segfault thing [18:09:30] :) [18:09:43] Alright, back in 5 [18:10:52] Krinkle: dialing you [18:12:21] sorry, I was offline: Is "Table 'commonswiki.uw_campaigns' doesn't exist" known? [18:12:50] err, that sounds like a problem. [18:12:57] Neil, was there a new table for the WLM stuff? [18:13:09] UUUUUGH [18:13:10] yes [18:13:12] *johnduhart sounds the alarm [18:13:33] dammit, that is the one thing I do need Roan for. I didn't know he reverted the changes [18:13:45] Table missing again? [18:14:06] well, he'll be back in a minute or two. [18:15:18] it shouldn't be an issue unless someone tries to WLM-related pages. [18:15:23] Uploadwizard seems to work, on a first glance, just the campaigns are brokwn [18:15:25] s/to/to use/g [18:15:26] yes [18:17:16] neilk_ / RoanKattouw : Good luck guys. Going home now. Hope you got it working when I get home ;-) [18:20:38] neilk_: Also, maybe this is an intermittent sync-induced error or maybe it's legit: 1 PHP Fatal error: Class 'PermissionsError' not found in /usr/local/apache/common-local/php-1.17/includes/SpecialPage.php on line 1050 [18:20:56] RoanKattouw: never heard of that before. [18:21:04] although... [18:21:05] oh no [18:21:09] yes that is related [18:21:28] Yeah thought so [18:21:30]