[00:13:57] so, 1.17wmf1 [00:15:16] Yeah [00:15:39] Before we do that, I need to add a few more of the ex-UsabilityInitiative extensions [00:18:04] I'd forgotten about that, my apologies. I'll be done in like 5-10 mins [00:20:15] we probably want $mainSourceUrl = '^/branches/REL1_17' [00:22:12] Yes [00:22:16] Oops, thanks for pointing that out [00:22:40] also you can't have an extension which is both in $normalExtensions and $specialExtensions [00:22:58] there are 7 [00:23:00] Also, we still have r67177 (use APC instead of memcached for languageconverter) in the merge list, is there a reason for that? [00:23:02] Oh right [00:23:05] Will fix [00:24:26] you mean r60970? [00:24:34] Yeah sorry [00:26:29] What's the 7th duplicated extension? I found 6 [00:26:51] Contribution{Reporting,Tracking} DonationInterface FundraiserPortal LandingCheck VariablePage [00:28:47] I' [00:28:51] CentralNotice [00:29:02] Right [00:29:05] I'm clearly blind [00:29:13] I just committed a bunch of changes, I'll take that one out too [00:29:38] r60970 should stay, there's about 2MB in that cache entry [00:29:48] it's better not to stress out the memcached servers unnecessarily [00:29:58] OK [00:30:00] in the long term, APC fetches and stores should be integrated into ObjectCache.php [00:30:24] we should have wfGetCache(CACHE_LOCAL)->set(...) [00:30:46] There's CACHE_ACCEL, right? [00:31:37] yes, but that won't work properly if there's no accelerator [00:31:42] you want it to fallback to memcached [00:32:05] Right [00:32:25] so I'm saying there should be a CACHE_LOCAL, the meaning of which is "use a local cache if a fast one is available, otherwise use a fast shared cache" [00:33:07] maybe CACHE_FAST_LOCAL [00:33:15] Right [00:33:18] Either way [00:33:21] since being fast is more important than being local [00:33:24] I have like 20 mins left [00:33:36] So do I just run make-wmf-branch 1.17wmf1 1.16wmf4 ? [00:35:16] yes [00:35:28] do a dry run first, it'll most likely fail horribly [00:35:44] I did a lot of dry runs with 1.16wmf4 before I finally committed it [00:35:47] Right [00:35:57] echo '$dryRun = true;' > local.conf right? [00:36:04] yes [00:36:42] It's running now [00:37:15] Does ^ have a special meaning in SVN paths? [00:38:06] yes, in subversion 1.6 or later it means the root of the repository of the working copy [00:38:15] Nice [00:38:31] so ^/trunk = svn+ssh://svn.wikimedia.org/svnroot/mediawiki/trunk [00:38:49] That's very cool, I'm sure this'll save me time in the future [00:38:59] I thought ^ was just magic handled by the script at first [00:51:54] What the... [00:52:02] It just committed the new branch even though it was in dry run mode [00:53:09] heh [00:54:03] edit the script to tell you whether it's in dry run mode at the start [00:54:12] It does [00:54:15] OOoooooh wait [00:54:18] so that you don't have to wait for the actual commit to find out [00:54:24] local.conf needs Not just $dryRun=true; [00:54:29] *RoanKattouw slaps self [00:54:31] details [00:54:50] OK I have to go to this meeting with this Google Wave guy now, but I'll keep working on this [00:54:53] And run the script again [00:55:18] so it would have echoed "$dryRun=true;", and you thought, nice of it to tell me that it is true [00:55:34] but strange formatting for a diagnostic message [00:57:08] Google Wave? I thought that was dead and buried [00:57:36] Indeed [01:27:16] Oh, awesome [01:27:18] 'svn' 'merge' '-q' '-c' '60970' '^/branches/wmf/1.16wmf3' '1.17wmf1' [01:27:20] Conflict discovered in '1.17wmf1/languages/LanguageConverter.php'. [01:28:00] that should be fun [01:28:02] Oh, whitespace conflict, was fine [01:28:02] yeah, that happens [01:28:23] *awjr shakes fist at whitespace [01:31:24] Alright, script ran [01:31:32] Will test run the code in a bit [15:18:14] huskyr: Heb je al een WordPress.org account ? Dat is nodig om een plugin toe te kunnen voegen en/of als 'author' gelinkt te kunnen zijn vanaf de plugin pagina [15:18:14] http://wordpress.org/support/register.php [15:18:29] krinkle: dacht van wel [15:18:39] zelfde als forums? [15:18:41] dan wel idd [15:20:20] nee, ze hebben twee account systemen [15:20:29] ik weet niet welke waaraan grenst. [15:24:06] Krinkle heb jij nog wat van Indiers gehoord ? [15:24:37] GerardM-: nee, nog niet. [15:24:57] huskyr: Kun je ff checken op wp.org/extend in loggen en je gebruikersnaam doorgeven ? [15:25:26] GerardM-: hoewel.. Ik check ff mn mail. Heb nogal wat gekregen laatste tijd. [15:25:45] krinkle: ik kan er gewoon in [15:25:55] als 'huskyr' ? [15:25:59] jep [15:26:51] zelfde als forum [15:27:15] k [15:50:33] huskyr: Ik heb je op MW.org aan de Coders usergroup toegevoegd zodat je revisions kunt checken. Zie http://www.mediawiki.org/w/index.php?title=Special:Code/MediaWiki/path&path=%2Ftrunk%2Ftools%2Fwp-photocommons%2F [15:50:48] krinkle: woei! [15:50:51] wat kan ik dan? :) [15:51:00] je krijgt een mail als iemand een follow-up doet of reacties achterlaat (sowieso al) [15:51:11] ah, dat kreeg ik al dacht ik [15:51:12] maar wat nieuw is dat je kunt zetten naar "fixme", of "ok" [15:51:19] ah, ok [15:51:23] en ik kan jouw code bekijken :) [15:51:28] ie. mijn commits dus (altijd handig als we elkaar checken iff) [15:51:29] idd( [15:51:52] ik heb die van jou zojuist even langs gelopen. Geen reacties nodig, lijkt OK. [15:52:13] als je vanuit die link hierboven begint kun je navigeren van de ene commit naar de andere [15:52:20] (geen nood voor 20 tabbladen openen :) ) [15:55:40] ok :) [17:19:29] wheee! tahoe trip canceled. [17:25:11] :( [17:29:48] hey Krinkle, yt? [17:30:21] you thirsty or your turn ? [17:30:40] "you there" [17:30:46] ah, didn't know that one yet :) [17:30:50] I would offer you a drink, if I could dcc it. [17:31:04] hehe :) - So what's up ? [17:31:16] Trevor & Roan aren't in yet, mdale and I were looking at mediawiki.js [17:31:38] specifically mediaWiki.html.element. If we have jquery, what's the purpose of this function? [17:31:59] For the record, Tim-away wrote that. [17:32:04] I know [17:32:11] but you modified it a little :) [17:32:13] One of the usecases is that it doesn't make it into a DOM element right away. [17:32:26] which is good because... ? [17:32:26] ie. , and in the edit page [22:20:49] Which works on a normal edit page, but breaks horribly when the edit page is dynamically insereted by LiquidThreads [22:21:10] Where "breaks horribly" means the entire page is replaced by a single, disabled (!) "Save draft" button [22:21:13] Hm... RoanKattouw am I missing something or is there no "exact" search method ? [22:21:36] I'm searching for "document.write" (both on-wiki and through API) and I'm getting a lot of false positives [22:21:47] like jQuery(document.ready . foobar.write() [22:22:13] How does that match document.write? [22:22:33] it contains both "document" and "write" [22:22:47] Can't you just search for the literal string 'document\.write' ? [22:23:04] Maybe by using "document.write" if you're using Lucene [22:23:10] http://meta.wikimedia.org/w/index.php?title=Special%3ASearch&search=%22document.write%22&ns8=1 [22:23:10] (with the double quotes) [22:23:17] Nope, doesn't seem that way [22:23:24] ugh [22:23:30] the second result from the top [22:23:40] heh, written by me [22:23:43] jquery(document). ..... write [22:23:47] yeah [22:24:00] :( [22:49:24] RoanKattouw: can you tell me if my idea is sane: http://www.mediawiki.org/wiki/Extension:OpenStackManager#Configuration [22:49:33] specifically for $wgOpenStackManagerInstanceUserData [22:50:02] when an instance is created, these things will be added to the instance's user data [22:50:23] scripts and upstarts are added from the user data [22:51:12] I'm letting mediawiki admins configure the cloud-config (which sets up things like puppet, apt sources, etc.), and add scripts and upstart scripts [22:51:31] Looks fine [22:51:50] But since I have almost no background on this ext, I guess it's kinda hard to tell [22:52:15] I just want to make sure it is sane to tell people to write scripts as strings in variables [22:52:38] heredocs work well for that, but I'm wondering if it may be prone to misconfiguration [22:54:13] Which language are these scripts going to be in? [22:54:21] they can be in any [22:54:35] Right [22:54:37] php is likely a bad idea though [22:54:45] because they are shell scripts [22:54:49] So Heredoc is gonna be a PITA for languages that use $ signs [22:54:55] upstart scripts are specifically upstart [22:54:56] ah [22:55:04] You have to use \$ everywhere [22:55:09] that's annoying [22:55:11] Is there a specific reason not to allow loading from a file? [22:55:21] that would work too [22:55:53] *RoanKattouw disappears into a meeting [22:56:04] thanks [22:56:14] loading from a file is probably better [22:58:56] Ryan_Lane: http://www.mediawiki.org/w/index.php?title=Extension:OpenStackManager&diff=prev&oldid=379385 [22:59:04] So it's not php ? [22:59:47] did I have bash? :) [22:59:50] heh [22:59:56] it's php [22:59:59] you can haz bash [23:00:12] well, the configuration is definitely php [23:00:16] HULK /bin/bash! [23:00:25] (I hate bash scripts) [23:01:02] HULK BASH RYAN LANE! [23:01:48] cloud-init is pretty great :) [23:02:18] Ryan_Lane: I wasn't sure since you mentioned allowing admins to configure it [23:02:21] Ryan_Lane: Somebody I'm working with on a hosted-on-a-hosting-package website mentioned your extension the other day [23:02:23] I'm not going to have to create my own images [23:02:28] thought perhaps it would be in a interface message or something. [23:02:28] hah [23:02:29] awesome [23:02:44] "Came across this page also, http://ryandlane.com/blog/2011/01/02/building-a-test-and-development-infrastructure-using-openstack/ [23:02:47] An interesting development for providing a single seamless interface across multiple wikis." [23:02:53] Krinkle: ah. $wgOpenStackManagerInstanceUserData will have admin configured scripts [23:02:54] *werdna sighs [23:03:13] Okay, sounds pretty awesome. [23:03:19] single interface across wikis? :) [23:03:32] yeah, that's what I thought [23:03:44] I haven't finished adding this feature yet. it's a PITA from a backend perspective [23:04:02] you have to take all of the scripts and the cloud-config yaml, and multipart-mime encode them [23:04:26] then gzip and base64 encode the entire thing