[19:02:29] yo, anyone seen alolita? [19:02:49] hi guillom [19:10:18] i got email from her this morning early but i am not in the office so i haven't seen her. [19:20:34] guillom: hey are you here? [19:20:43] guillom: one question if you're free [19:20:52] jorm: she's here, she's w/ me in R5 [19:21:02] oh. say hi for me. [19:21:03] flipzagging, I'm sort of around, yes [19:21:45] guillom: ok, I need to redo texts and such for the wizard, particularly all the stuff I just made up :) [19:21:58] now, I think you defined new ones, but I can't recall where that is [19:22:30] http://usability.wikimedia.org/wiki/Multimedia:Upload_wizard#Messaging [19:22:52] http://usability.wikimedia.org/w/index.php?title=Multimedia%3AUpload_wizard&action=historysubmit&diff=8839&oldid=8559 [19:24:05] I knew about those, but I thought there was more [19:24:27] nope [19:25:21] well, those edits are a bit old now... didn't I integrate most of them? Or not? [19:25:49] anyway there were new texts for the licensing step, and also you wanted me to change/eliminate the blurb in the file step [19:26:11] sorry, you did all this work weeks and weeks ago and I wasn't in a position to fix it then. [19:26:20] now I have to at least try [19:26:55] flipzagging, I think we consolidated that in bugzilla [19:27:05] ok, so I should just look there -- ok [19:27:23] you waiting for the plane? [19:27:33] me? [19:27:53] no, just resting at home [19:28:03] and preparing for the move [19:28:27] anyway I'm in a meeting w/Alolita -- thanks for the info [19:31:09] alolita: http://www.mediawiki.org/wiki/Extension:UploadWizard/Prototype_TODO [19:41:11] alolita: http://www.mediawiki.org/wiki/Extension:UploadWizard/Test_plan [19:58:47] RoanKattouw: i see how it is? Works for me eh? [19:59:26] s/is?/is! [19:59:53] I'm just being pedantic today [19:59:56] *RoanKattouw blames today's math exam [20:33:24] I find these new jimmy banners somewhat alarming [20:33:28] http://upload.wikimedia.org/centralnotice/images/Jimmy-window-light.jpg [20:39:37] it's not worse than previously, eh? [20:42:06] WIKIPEDIA FOREVER!!!! [21:05:05] <^demon> robla: I'm pulling the latest trunk FR changes, pushing them to branch and deploying them [21:05:11] <^demon> To prototype [21:05:16] ^demon: wait a sec [21:05:37] <^demon> ok [21:06:09] I'm working on /srv/org/wikimedia/prototype/wikis/flaggedrevs-w-new ... [21:06:27] ...fixing it up so that we don't have to have such a screwy setup [21:06:47] I see some of the probs with our existing setup have to do with CommonSettings.php being tuned for trunk [21:07:04] <^demon> Yea, I was working around that on our last deployment [21:07:08] <^demon> Earlier this week [21:07:25] <^demon> Anyway, I'll finish the merge. Then chads-pre-wmf-merge branch should be up to date for deployment [21:07:52] great....I'll finish up what I'm doing here....I think I'm close [21:08:26] <^demon> A no-conflict merge? [21:08:31] *^demon gasps [21:11:26] <^demon> robla: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76596 [21:12:21] <^demon> I think I need to back out a few changes though [21:12:25] ^demon: great...I think I've got everything right on prototype now [21:12:35] *robla needs to test still [21:13:08] if you do a diff there, you'll still see a localmod that I don't know if it's checked in anywhere [21:14:35] I suspect the problem is merely that I've got the wrong wmf4 version [21:16:13] ah...yup, just fixed [21:18:56] ah crap...anonymous looks busted [21:21:47] <^demon> robla: Backed out some changes [21:21:54] <^demon> r76597 [21:23:30] I just reverted prototype to the old version temporarily (moved what I had back to flaggedrev-w-new [21:24:24] I need to figure out what was different there [21:26:47] ^demon: just doublechecking, are you also working on prototype? [21:27:04] <^demon> I'm logged in, but not doing anything since you told me to wait :) [21:27:09] good :) [21:27:34] <^demon> Whoops, just timed out. So not even logged in now :p [21:33:58] ^demon: looks like our cache was masking a problem we had all along [21:34:56] <^demon> I hate that cache [21:35:00] <^demon> Annoys me to no end [21:35:43] http://prototype.wikimedia.org/flaggedrevs?action=purge [21:36:57] <^demon> That error makes no sense [21:37:17] <^demon> robla: Is that running chad-pre-wmf-merge of 1.16wmf4? [21:38:31] it's running the exact version you had set up (hybrid 1.16wmf core + FR from chad-pre-wmf-merge) [21:39:12] <^demon> We should deploy chad-pre-wmf-merge instead. [21:39:36] k....I'll do that right now [21:41:38] so.. should we not be using FR trunk? [21:42:36] <^demon> Trunk's all been merged to my branch [21:42:44] <^demon> Commit changes to trunk and I'll pull them in [21:43:18] ok [21:43:39] what's wrong? [21:43:53] ^demon: prototype is now on chad-pre-wmf-merge [21:44:06] AaronSchulz: visit http://prototype.wikimedia.org/flaggedrevs/Main_Page as an anon [21:44:23] and then tack on ?action=purge [21:45:26] possibly changes by reedy? let me check [21:45:39] servers exts broken by for loop changes [21:45:46] *several [21:46:56] argh [21:47:32] I fixed another fatal from that. The changes look ok at first glance...but then the errors show and I see why. [21:48:01] 75973 [21:48:11] on the money :) [21:51:43] <^demon> Yep [21:51:47] <^demon> http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/FlaggedRevs/FRDependencyUpdate.php?&pathrev=75973&r1=75972&r2=75973 very last change [21:52:25] *robla fixes... [21:52:43] (locally on prototype for now) [21:53:00] *AaronSchulz kicks tsvn [21:53:09] reverse merge not changing anything :) [21:54:20] that seems to have fixed it on prototype [21:54:33] I just fixed the one line rather than backing out the whole diff [21:55:09] thanks AaronSchulz! [21:56:32] *AaronSchulz uses the revert option at the log [21:56:36] I'd be happy if we backed out everything in r75973 that touches FlaggedRevs [21:57:47] not needed, all it did was change the foreach ( FlaggedRevs::getDimensions() as $tag => x ) loops [21:58:08] most of which totally broke, but then I fixed them and look through each by hand [21:58:35] most cases really just needed getTags() anyway, which is cleaner [21:58:58] I just reverted the FRDependancy file change though [22:00:12] ah, cool [22:00:43] that was r76229 [22:00:59] (the getDimension() fixes) [22:02:23] ^demon: could you merge in Aaron's fix to your branch? (pulling in pdhanda's change as well) [22:02:35] <^demon> I was about to merge his change. [22:02:45] <^demon> Which rev of pdhanda's am I missing? [22:03:05] <^demon> Oh, got it. [22:03:58] *AaronSchulz wanders off in search of sustenance [22:05:24] <^demon> I need to do the same soon [22:05:29] ditto [22:08:37] k...prototype now running latest chad-pre-wmf-merge [22:20:44] cool [22:24:11] hey is ariel around? [22:27:51] Skud: not usually on this channel. try #mediawiki [22:28:08] ok. what nickname? [22:28:21] atglenn [22:29:25] thanks [22:36:34] well hrmph [22:36:47] may have declared victory a little early on http://prototype.wikimedia.org/flaggedrevs/Main_Page [22:37:27] ...or there may be a subtle difference between the one-liner local fix and the revert that Aaron did [22:38:22] oh...nm [22:38:52] weird....I had to do action=purge as a logged-in user, and then the anonymous version worked fine [22:41:11] pdhanda: you're working on more 1.16wmf4 compatibility fixups? [22:41:51] (that's what I'm reading into your last commit log message) [22:41:52] possibly one more [22:42:18] i'm looking into making the latest contents load faster [22:42:40] and another js issue but that is not compatibility related [22:44:41] robla: i'll make sure to commit into trunk and merge to the branch [22:46:39] <^demon|away> Remember like I said in my e-mail, the change to ParserOptions wasn't merged. [22:50:58] ^demon|away: yeah i saw that.. and i think that is ok. seems like a lot was changed between then and now [23:02:01] *^demon|away goes back to eating [23:07:45] pdhanda: is your commit name linked to a MW.org account? [23:08:45] AaronSchulz: pdhanda [23:09:01] and is email enabled? [23:09:07] yeah [23:09:13] hmm [23:31:59] ^demon|away: whenever you get the chance, can you add r76604 to your branch. It won't let me [23:40:03] robla: looks like flaggedrevs-de is already there [23:40:18] Ryan_Lane: that was where I started on it :) [23:40:23] heh [23:40:31] that's the codebase we want [23:40:56] that was purely the result of "cp -rp flaggedrevs-w flaggedrevs-de" [23:41:22] one thing to note about our current flaggedrevs-w setup: [23:42:17] I had to do some mucking in LocalSettings.php today, in particular, creating local copies of CommonSettings.php and PrototypeSettings.php [23:42:57] also, we're also not including SecuritySettings.php...the recaptcha stuff was breaking our install [23:44:12] so....what we're looking for: copy some dewiki content in, and use as close to the dewiki production configuration of FlaggedRevs as possible [23:44:25] well, I was just going to set the wiki up :) [23:44:35] I can pull some content in too if you'd like though [23:44:36] heh [23:45:46] however far you're willing to take it....we'll do the rest :) [23:46:54] Ryan_Lane: I was merely going to suggest copying the dewiki prototype db over to a new db as a starting point [23:47:41] probably a lot easier to just import conent [23:47:42] content [23:48:05] CommonSettings.php is broken [23:48:18] it's looking for a flaggedrevs.php file in the same directory [23:49:28] ok. it's up [23:49:32] lemme import some content [23:51:49] ugh [23:52:08] robla: messing around with commonsettings.php is screwing things up [23:52:22] why'd you need to make a copy of it? [23:52:50] because we're trying to test off of 1.16wmf4. other instances are trying to test trunk [23:53:16] there are many incompatibilities in CommonSettings.php between those two [23:53:20] *^demon catches up on back scroll [23:56:38] ah [23:56:48] it occurs to me that now that we know what the full list is (just do a diff) we could conceivably just use a variable [23:57:19] well, I got it going at /flaggedrevs-de [23:57:26] and /flaggedrevsde [23:57:40] but CommonSettings.php is broken [23:57:48] I'll let you work that out :) [23:58:07] some old content is at /srv/org/wikimedia/prototype/exports [23:58:19] <^demon> pdhanda: Not sure why it wouldn't let you commit to that branch. But got it in r76605 [23:58:34] Ryan_Lane: thanks! [23:58:40] cool. thanks ^demon [23:58:52] which can be imported via maintenance/importDump.php [23:59:14] it is configured to use dewiki's settings