[00:01:13] <^d> Shit already gets weird. You've Parser::doAllQuotes() yes? [00:03:29] (03CR) 10Brion VIBBER: [C: 04-1 V: 04-1] "(1 comment)" [extensions/MultimediaViewer] - 10https://gerrit.wikimedia.org/r/90267 (owner: 10MarkTraceur) [00:04:41] marktraceur: ok it still doesn't work, because it's looking for 'extendedmetadata' but there is only an 'extmetadata' in the imageinfo [00:05:43] Agh, yeah [00:05:50] There's where I'm out of sync with the latest. [00:05:54] * marktraceur will update that [00:05:58] \o/ [00:07:07] (03CR) 10Brion VIBBER: [C: 032 V: 032] "Provisionally merging to this experimental repo so it's easier to test MultimediaViewer which depends on it. :)" [extensions/CommonsMetadata] - 10https://gerrit.wikimedia.org/r/80403 (owner: 10Brian Wolff) [00:07:09] (03Merged) 10jenkins-bot: Extension to screen scrape metadata out of commons [extensions/CommonsMetadata] - 10https://gerrit.wikimedia.org/r/80403 (owner: 10Brian Wolff) [00:08:18] (03CR) 10Brion VIBBER: [C: 032 V: 032] "Confirmed this basically works for now; MultimediaViewer latest changesets can't be tested without this so merging this work to the extens" [extensions/CommonsMetadata] - 10https://gerrit.wikimedia.org/r/90213 (owner: 10MarkTraceur) [00:08:34] (03CR) 10Brion VIBBER: [C: 032 V: 032] "self-merging small fix" [extensions/CommonsMetadata] - 10https://gerrit.wikimedia.org/r/90675 (owner: 10Brion VIBBER) [00:08:36] (03Merged) 10jenkins-bot: Must declare function parameter as pass-by-reference [extensions/CommonsMetadata] - 10https://gerrit.wikimedia.org/r/90675 (owner: 10Brion VIBBER) [00:09:23] marktraceur: ok that was a fun review sprint :D i'll make another pass on these later so there should be fewer left on monday :D [00:09:29] (03PS11) 10Bartosz Dziewoński: Rewrite rendering of Vector simple search [core] - 10https://gerrit.wikimedia.org/r/82100 [00:11:53] (03CR) 10Bartosz Dziewoński: "Done! This always uses one-button form, fulltext if no JS, direct if JS. Dive into the code to see how it's done, because it's 2 AM and I'" [core] - 10https://gerrit.wikimedia.org/r/82100 (owner: 10Bartosz Dziewoński) [00:12:13] blergh [00:12:25] that commit fixes at least five known bugs. nice, huh? ^ [00:19:14] Woot [00:22:15] (03PS3) 10PleaseStand: Remove $wgBlockOpenProxies [core] - 10https://gerrit.wikimedia.org/r/87302 [00:22:35] (03CR) 10PleaseStand: "Rebase only." [core] - 10https://gerrit.wikimedia.org/r/87302 (owner: 10PleaseStand) [00:25:31] (03PS1) 10JGonera: Add no-dimensions option to MediaTransformOutput::toHtml [core] - 10https://gerrit.wikimedia.org/r/90679 [00:28:46] csteipp: 77645 seems reasonable except for the tests() functions and the static/factory stuff not being it's own class mainly [02:36:24] Krenair: around? [02:37:25] lego: idle; it's 3:37 am for him [02:37:36] oh right >.> [04:28:54] (03PS2) 10Dan-nl: item specific categories throws an exception [extensions/GWToolset] - 10https://gerrit.wikimedia.org/r/90527 [04:30:03] (03CR) 10Dan-nl: "rebased with master." [extensions/GWToolset] - 10https://gerrit.wikimedia.org/r/90527 (owner: 10Dan-nl) [04:51:13] (03PS1) 10Legoktm: Expose the revid of the event revision in the API [extensions/Echo] - 10https://gerrit.wikimedia.org/r/90688 [07:59:08] (03PS1) 10Legoktm: Replace wfMessage calls with $this->msg [extensions/Echo] - 10https://gerrit.wikimedia.org/r/90689 [09:38:38] (03CR) 10Tpt: [C: 032] Remove most of injected global variables [extensions/ProofreadPage] (pagePagesRefactoring) - 10https://gerrit.wikimedia.org/r/89221 (owner: 10Tpt) [09:38:47] (03Merged) 10jenkins-bot: Remove most of injected global variables [extensions/ProofreadPage] (pagePagesRefactoring) - 10https://gerrit.wikimedia.org/r/89221 (owner: 10Tpt) [09:47:54] (03PS1) 10Tpt: Support for custom image width [extensions/ProofreadPage] (pagePagesRefactoring) - 10https://gerrit.wikimedia.org/r/90690 [10:18:27] (03PS1) 10Tpt: Remove the zoom system from Page: pages view [extensions/ProofreadPage] (pagePagesRefactoring) - 10https://gerrit.wikimedia.org/r/90691 [11:01:57] (03CR) 10Bartosz Dziewoński: [C: 031] "(2 comments)" [extensions/SecurePoll] - 10https://gerrit.wikimedia.org/r/90555 (owner: 10Diederik) [11:03:28] (03CR) 10Bartosz Dziewoński: [C: 04-1] Split changes list classes into separate files [core] - 10https://gerrit.wikimedia.org/r/90299 (owner: 10Aude) [11:05:01] (03CR) 10Bartosz Dziewoński: [C: 04-1] Make it possible for EditPage::getCopyrightWarning to return HTML [core] - 10https://gerrit.wikimedia.org/r/90289 (owner: 10Legoktm) [11:05:57] (03CR) 10Bartosz Dziewoński: [C: 04-1] "(1 comment)" [core] - 10https://gerrit.wikimedia.org/r/83220 (owner: 10Nemo bis) [11:06:46] MatmaRex: -1 to all? ;) [11:08:25] Nikerabbit: -1 to things i reviewed earlier and should have -1'd ;) [11:10:18] (03CR) 10Bartosz Dziewoński: [C: 04-1] "(1 comment)" [core] - 10https://gerrit.wikimedia.org/r/87170 (owner: 10Jdlrobson) [11:11:20] Nikerabbit: bored? looking for some trivial CR? [11:22:59] (03CR) 10Bartosz Dziewoński: [C: 04-1] "Doesn't merge… rebasing." [core] - 10https://gerrit.wikimedia.org/r/70215 (owner: 10Krinkle) [11:26:20] (03CR) 10Bartosz Dziewoński: [C: 032] deleteEqualMessages: Exclude messages that are empty by default [core] - 10https://gerrit.wikimedia.org/r/88792 (owner: 10Krinkle) [11:28:11] (03CR) 10Bartosz Dziewoński: "(1 comment)" [core] - 10https://gerrit.wikimedia.org/r/88033 (owner: 10Hoo man) [11:28:39] (03CR) 10Bartosz Dziewoński: [C: 031] "Has this been tested with an actual screenreader and is it actually an improvement? If yes, just poke me to merge, code looks okay." [core] - 10https://gerrit.wikimedia.org/r/88033 (owner: 10Hoo man) [11:29:21] (03Merged) 10jenkins-bot: deleteEqualMessages: Exclude messages that are empty by default [core] - 10https://gerrit.wikimedia.org/r/88792 (owner: 10Krinkle) [11:29:31] (03CR) 10Bartosz Dziewoński: "Gabriel, reply please?" [core] - 10https://gerrit.wikimedia.org/r/83112 (owner: 10Liangent) [11:32:07] (03Abandoned) 10Bartosz Dziewoński: Replaced every HTMLFormField::flattenOptions for $this->flattenOptions [core] - 10https://gerrit.wikimedia.org/r/62007 (owner: 10Luis Felipe Schenone) [11:35:23] (03PS4) 10Bartosz Dziewoński: Correct release notes for I9dd9f0fd499c37f2 [core] - 10https://gerrit.wikimedia.org/r/70215 (owner: 10Krinkle) [11:36:26] (03CR) 10Bartosz Dziewoński: [C: 032] "1.22 release is coming, it's about time we merged this. If there are any more concerns about the exact text, please submit followups, it l" [core] - 10https://gerrit.wikimedia.org/r/70215 (owner: 10Krinkle) [11:36:29] MatmaRex: not bored, full of work [11:36:47] :( [11:39:18] (03CR) 10Bartosz Dziewoński: [C: 04-1] "No longer merges." [core] - 10https://gerrit.wikimedia.org/r/83217 (owner: 10Mattflaschen) [11:39:45] (03CR) 10Bartosz Dziewoński: [C: 04-1] skin: Make the "Categories:" heading optional in getCategoryLinks [core] - 10https://gerrit.wikimedia.org/r/78000 (owner: 10Pypt) [11:40:13] (03Merged) 10jenkins-bot: Correct release notes for I9dd9f0fd499c37f2 [core] - 10https://gerrit.wikimedia.org/r/70215 (owner: 10Krinkle) [11:43:55] (03CR) 10Bartosz Dziewoński: [C: 04-1] "No longer merges (again) :(" [core] - 10https://gerrit.wikimedia.org/r/45506 (owner: 10Liangent) [12:01:07] (03CR) 10Nikerabbit: [C: 032] Rename Toolbox to Tools [core] - 10https://gerrit.wikimedia.org/r/90645 (owner: 10Bartosz Dziewoński) [12:01:11] MatmaRex: I lied [12:01:21] taking a break [12:04:05] (03Merged) 10jenkins-bot: Rename Toolbox to Tools [core] - 10https://gerrit.wikimedia.org/r/90645 (owner: 10Bartosz Dziewoński) [12:04:40] Nikerabbit: heh [12:07:38] (03PS2) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:08:38] (03CR) 10Bartosz Dziewoński: "Added tests." [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:08:39] (03CR) 10jenkins-bot: [V: 04-1] Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:09:13] fucking syntax errors. [12:10:04] (03PS3) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:11:06] (03CR) 10jenkins-bot: [V: 04-1] Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:12:42] * MatmaRex stabs PHP [12:12:45] (03PS4) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:13:39] (03CR) 10jenkins-bot: [V: 04-1] Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:14:53] what in god's name [12:14:56] (new RawMessage( '$1' ))->inLanguage( $lang )->numParams( 123456.789 )->plain(), [12:15:00] is that not going to work? [12:15:32] shitty-ass bullshit excuse for a programming language [12:16:31] yes php sucks [12:16:54] Nikerabbit: oh, you could also review those tests i'm adding there ^ [12:16:56] (03PS5) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:17:01] (03CR) 10jenkins-bot: [V: 04-1] Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:17:02] they're language stuff [12:17:22] what. [12:17:30] what do you mean, This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset. [12:17:50] you could use call_user_func( function () { return new RawMessage( ... ); } )->foo(); I think [12:18:05] (03CR) 10Aude: "sure, we could also move RecentChange there" [core] - 10https://gerrit.wikimedia.org/r/90299 (owner: 10Aude) [12:19:19] (03PS6) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:19:21] it rebased with no conflicts, you dumb jenkins. [12:19:52] (03PS2) 10Aude: Split changes list classes into separate files [core] - 10https://gerrit.wikimedia.org/r/90299 [12:20:42] (03CR) 10jenkins-bot: [V: 04-1] Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:20:54] (03CR) 10Bartosz Dziewoński: "Sorry about the noise, it turns out I am unable to write PHP code that parses." [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:21:19] (03CR) 10jenkins-bot: [V: 04-1] Split changes list classes into separate files [core] - 10https://gerrit.wikimedia.org/r/90299 (owner: 10Aude) [12:21:25] gaaah [12:21:25] what [12:21:27] DBConnectionError: DB connection error: Access denied for user 'wikiuser'@'localhost' (using password: NO) (localhost) [12:21:39] this is whgy you use Vagrant :P [12:21:42] Nikerabbit: help? :( [12:21:48] YuviPanda: this is why you don't use PHP [12:21:52] MatmaRex: with what? [12:21:58] MatmaRex: we've lost that battle [12:22:08] Nikerabbit: with jenkins failing that test because it can't connect to database [12:22:10] https://integration.wikimedia.org/ci/job/mediawiki-core-phpunit-databaseless/13960/console [12:22:22] YuviPanda: not really... we are using more and more javascript etc. [12:22:31] (03CR) 10MZMcBride: "I agree with Brion. This is basically a non-issue and I'd like to see the previous Bugzilla attachment behavior restored as soon as possib" [wikimedia/bugzilla/modifications] - 10https://gerrit.wikimedia.org/r/90546 (owner: 10Aklapper) [12:22:47] MatmaRex: well, I can't help with that... perhaps waiting a bit and then rebasing again? [12:22:54] heh [12:23:14] i assumed you must have run into something like this with Messages [12:24:52] (03CR) 10Bartosz Dziewoński: "What now… I hope that's an intermittent failure." [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:24:58] (03PS7) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:26:14] (03CR) 10jenkins-bot: [V: 04-1] Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:26:21] ok, it's not. [12:29:25] WHAAAT. [12:29:34] why does Language#formatExpiry() need the database [12:29:39] seriously [12:32:46] * MatmaRex files a bug [12:33:06] it's mediawiki [12:34:34] (03PS8) 10Bartosz Dziewoński: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:34:57] (03CR) 10Bartosz Dziewoński: "I filed bug 55912 for the test issue and added a workaround." [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:34:59] Hi. Any Windows GIT experts here? [12:35:16] Edokter: sorta kinda. what's up? [12:35:28] pulling my hair out [12:35:39] day like every day with php, eh. [12:35:55] cloning for the 3rd time now becuase I can't seem to figure out how to undo error in commit [12:36:24] Windows. :-( [12:36:32] done so far: [12:36:36] clone core [12:36:50] (oh, git naturally has multiple different ways for everything, what exactly are you trying to do?) [12:38:29] 2 create branch [12:38:35] 3 made change [12:38:44] now I'm trying to create clean commit [12:38:55] (03CR) 10Bartosz Dziewoński: [C: 032] "There. Sorry about all that mail you've gotten again. I updated the docs at https://www.mediawiki.org/wiki/Manual:Messages_API#Parameters " [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:39:00] but I end up with error in patch corrupting 1st line [12:39:11] can't seem to undo or delete commit [12:39:28] "error in patch corrupting 1st line"? [12:40:00] yes... " (or something like that [12:40:22] aaaah [12:40:33] something is adding a byte-order mark, i guess [12:40:36] aka BOM [12:40:39] can't edit patch in any way, or undo commit alltogether [12:40:47] Which text editor are you using? [12:40:50] notepad [12:40:52] https://en.wikipedia.org/wiki/Byte_order_mark [12:40:55] don't use notepad. [12:41:03] used to work before [12:41:11] Notepad is pretty much the fucking worst. :-) [12:41:12] or have it save the file in UTF-8 without BOM format, or something like that [12:41:21] Try Notepad++ or Sublime or something. [12:41:23] it will fail like this if you have any non-ASCII characters in the file [12:41:31] brb [12:41:43] (03Merged) 10jenkins-bot: Added more Message parameter functions [core] - 10https://gerrit.wikimedia.org/r/80663 (owner: 10Parent5446) [12:42:09] Still... is there any way to edit the patch before committing? [12:42:25] Did you already run git commit? [12:42:29] no [12:42:33] Then just edit the files? [12:42:41] I'm not sure what the issue is. [12:42:43] WHAT file? [12:42:53] Whichever ones you want to change? :-) [12:43:11] did that... where is the patch stored? [12:43:15] Git generally involves cloning a repo, making changes, and then commit and pushing those changes. [12:43:26] committing * [12:43:35] Edokter: What happens when you run "git status"? [12:43:45] It should tell you a bunch of helpful info. [12:43:52] About which branch you're on, what files you've changed, etc. [12:43:57] can't test now... recloning [12:44:12] Heh. [12:44:18] You should only need to clone once. [12:44:45] I know, but tried to many things so that I keep red icons [12:44:53] Hrm. [12:44:55] rebase doesn't seem to do what I want [12:45:54] You shouldn't need to be rebasing anything, I don't think. [12:46:19] GIT GUI is very untransparent [12:46:38] I'll try another editor [12:46:54] Most devs use the command line for Git. [12:47:01] Text editors vary very widely. [12:47:02] Edokter: there's something called Notepad2 for Windows [12:47:25] Edokter: which, if you disable some config options, looks and acts just like Notepad, but without the BOM issues and it can open files larger than a megabyte [12:48:09] Edokter: for real coding i'd recommend Notepad++ or Sublime, though, I used both and they're both nice [12:48:23] hmm, I can remove the BOM with DOS EDIT :) [12:48:29] Edokter: if you just want to edit something now without fucking up the files, then use wordpad instead of notepad (no, seriously) [12:48:54] I'm in physical pain over here at the suggestion of using either. [12:48:56] Literally cringing. [12:49:14] the editing is solved now [12:49:31] wordpad can open files larger than a megabyte and not fuck them up on saving. that's a clear improvement over notepad. :P [12:49:42] what I'd like to know is how to completely undo a chgange pre-commit/stage [12:51:30] trying notepad2 [12:51:41] Edokter: `git reset --hard` will reset all uncommited changes you've made [12:55:30] I'll remember that. [12:55:38] Got a clean patch now in Commit Tool [12:56:25] (03PS8) 10Bartosz Dziewoński: mediawiki.notification: Expose close method to hide a Notification [core] - 10https://gerrit.wikimedia.org/r/74407 (owner: 10Alex Monk) [12:59:06] (03CR) 10Bartosz Dziewoński: [C: 032] mediawiki.notification: Expose close method to hide a Notification [core] - 10https://gerrit.wikimedia.org/r/74407 (owner: 10Alex Monk) [12:59:35] Now staged for commit. [13:00:55] Committed to branch [13:01:00] now what? [13:02:21] (03Merged) 10jenkins-bot: mediawiki.notification: Expose close method to hide a Notification [core] - 10https://gerrit.wikimedia.org/r/74407 (owner: 10Alex Monk) [13:04:35] (03PS15) 10Hashar: debian-glue macros and jobs [integration/jenkins-job-builder-config] - 10https://gerrit.wikimedia.org/r/71245 (owner: 10AzaToth) [13:09:15] Edokter: push it to gerrit, i guess? [13:09:22] Edokter: we had a guide somewhere… [13:10:20] Edokter: the process is a little broken on windows, but there's a workaround [13:10:34] bugs me for username [13:10:49] (03PS1) 10Hashar: debian-glue simplification [integration/zuul-config] - 10https://gerrit.wikimedia.org/r/90695 [13:10:59] (03CR) 10Hashar: "I could not find a way to fetch the proper artifacts from different builds and I did not really want to have sub jobs. So, I simply merged" [integration/jenkins-job-builder-config] - 10https://gerrit.wikimedia.org/r/71245 (owner: 10AzaToth) [13:11:31] "We don't know where your gerrit is. Please manually create a remote named "gerrit" and try again." [13:11:38] !jenkins operations-debs-pybal-debian-glue [13:11:38] https://integration.wikimedia.org/ci/job/operations-debs-pybal-debian-glue [13:11:49] Edokter: are you using git-review ? [13:11:53] yes [13:11:55] Edokter: hmm okay, let's do it manually [13:12:02] Edokter: what does `git remote -v` print? [13:12:02] git remote rename origin gerrit [13:12:12] when you clone, it by default use a remote named 'origin' [13:12:15] (don't do what hashar said yet) [13:12:17] when git-review is expecting 'gerrit' [13:12:18] BUT [13:12:28] you can also configure git-review to look for origin instead [13:12:48] origin ssh://edokter@gerrit.wikimedia.org:29418/mediawiki/core.git (fetch) [13:12:48] origin ssh://edokter@gerrit.wikimedia.org:29418/mediawiki/core.git (push) [13:12:49] hashar: i think pushing will fail if your 'gerrit' remote is https instead of ssh [13:12:50] (03CR) 10Hashar: [C: 032] debian-glue simplification [integration/zuul-config] - 10https://gerrit.wikimedia.org/r/90695 (owner: 10Hashar) [13:12:57] (03Merged) 10jenkins-bot: debian-glue simplification [integration/zuul-config] - 10https://gerrit.wikimedia.org/r/90695 (owner: 10Hashar) [13:13:01] in this case it is fine [13:13:02] Edokter: ah, that's nice then [13:13:02] hmm [13:13:08] or just configure git-review to use origin [13:13:10] that is easier this way [13:13:29] * MatmaRex has just renamed his remote [13:13:45] ori did a patch to git-review so it can be set to recognize origin [13:13:57] but yeah gerrit is probably a safer choice [13:14:00] that is unambigiuous [13:14:24] ok [13:14:28] so, Edokter, `git remote rename origin gerrit` [13:15:17] then try `git review` again (assuming you're using it), or `git push gerrit HEAD:refs/for/master` if you're not [13:15:38] Problems encountered installing commit-msg hook [13:15:38] Permission denied (publickey). [13:16:12] right [13:16:15] okay, this is a known bug [13:16:28] (03CR) 10Hashar: [C: 032] "Carl, this change is good enough to actually run debian packaging on some repository. Since I would like to add it to more repositories, " [integration/jenkins-job-builder-config] - 10https://gerrit.wikimedia.org/r/71245 (owner: 10AzaToth) [13:16:28] "a new version is available..." [13:16:37] what you need to do is to install it manually [13:16:43] oh, try updating, maybe they fixed it [13:16:49] (03Merged) 10jenkins-bot: debian-glue macros and jobs [integration/jenkins-job-builder-config] - 10https://gerrit.wikimedia.org/r/71245 (owner: 10AzaToth) [13:16:51] :) [13:16:56] can [13:17:03] can't use pip I guess [13:17:17] oh I can :) [13:18:16] yeahhhh pip :-] [13:18:21] and [13:18:22] also [13:18:24] git-review -s [13:18:41] that install the commit hooks in your local repository to automatically add a Change-Id: field in your commit message [13:18:44] that is expected by Gerrit [13:18:54] Install succeeded, but then..... [13:18:54] Traceback (most recent call last): [13:18:54] File "C:\Python27\Scripts\git-review", line 1196, in [13:18:54] main() [13:18:54] File "C:\Python27\Scripts\git-review", line 1072, in main [13:18:55] (top_dir, git_dir) = git_directories() [13:18:55] ValueError: too many values to unpack [13:19:02] doh [13:19:24] I was too fast eh? [13:19:43] damn [13:20:04] Edokter: Are you familiar with Vagrant? [13:20:07] I think the issue is Windows. [13:20:09] no [13:20:12] You can just use a virtual machine. [13:20:14] And run Linux. [13:20:17] It's pretty easy. [13:20:22] And it comes with all this shit already installed. [13:20:27] or just don't use git-review :-] [13:20:30] Edokter: we can install the hook manually [13:20:47] Edokter: https://www.mediawiki.org/wiki/MediaWiki-Vagrant [13:20:51] ok [13:20:52] Edokter: git review -s should have printed a command starting with "ssh", can you copy it? [13:21:02] (the one that supposedly fails) [13:21:33] still getting the errors [13:23:16] (03CR) 10Bartosz Dziewoński: [C: 04-1] "(1 comment)" [core] - 10https://gerrit.wikimedia.org/r/27971 (owner: 10Daniel Friesen) [13:23:35] its broken now, probably needs a complete reinstall [13:23:40] Edokter: no [13:24:18] Edokter: let's do it this way: [13:24:38] Edokter: in windows explorer or whatever, navigate to mediawiki\core\.git\hooks (.git is a hidden folder) [13:24:59] I'm there [13:25:16] Edokter: then save this file in there: https://dl.dropboxusercontent.com/u/10983006/tmp/commit-msg [13:25:23] and presto, it should all work [13:25:36] (it should have no extension, just "commit-msg") [13:26:06] done [13:26:16] (that's what `git review -s` should do, except that it sucks) [13:26:22] Edokter: `git review` should work now. [13:26:30] -s or -R [13:26:52] none, just `git review` (-R is default for some time now, i think) [13:27:07] (`git review -R` is still okay, of course) [13:27:17] still ValueErrors [13:27:23] D: [13:27:35] can you pastebin the entire error? [13:27:36] !pastebin [13:27:36] To avoid overflowing the channel with inane amounts of text, use https://dpaste.org/ or other awesome pastebin sites to share code, errors, and other large texts. [13:27:49] Hmmmm. [13:28:03] MatmaRex: https://www.mediawiki.org/wiki/User:Kaldari/Interview_task_1?veaction=edit [13:28:05] Traceback (most recent call last): [13:28:05] File "C:\Python27\Scripts\git-review", line 1196, in [13:28:05] main() [13:28:05] File "C:\Python27\Scripts\git-review", line 1072, in main [13:28:05] (top_dir, git_dir) = git_directories() [13:28:06] ValueError: too many values to unpack [13:28:25] just a few lines [13:28:36] MatmaRex: Does the toolbar float for you? [13:28:41] It seems to stick at the top of the page for me. [13:28:51] Elsie: known bug [13:28:58] Hrmph. [13:29:08] Elsie: (not sure if reported, but known, i saw them chat about it yesterday on #-visualeditor) [13:30:05] Edokter: hmmmmmm. [13:30:28] Edokter: what does `git rev-parse --show-toplevel --git-dir` output for you? [13:30:52] argh [13:31:08] i bet the path to your mediawiki/core directory has a space in it [13:31:11] D:/DATA/MediaWiki GIT/core [13:31:11] .git [13:31:20] and git-review is a fucking dumb shitty piece of code and it doesn't understand it [13:31:23] jesus [13:31:24] seriously [13:31:27] is it 1980? [13:31:29] okay [13:31:38] Edokter: please move it to somewhere without any spaces in the path [13:32:05] i am just appaled by that. dude. [13:32:15] hmm, it used to work... I know I pushed one change successfully once [13:32:30] https://gerrit.wikimedia.org/r/#/c/90576/1/modules/ve/ui/styles/ve.ui.SurfaceToolbar.css,unified [13:32:33] Edokter: just rename "MediaWiki GIT" to something with no spaces in it, eh [13:32:39] Edokter: git will work perfectly well [13:32:43] MatmaRex: Thanks for the pointer to -visualeditor, I got the answer. [13:32:45] Edokter: it's git-review that doesn't [13:33:04] one moment [13:33:08] MatmaRex: You need to have shell access so you can push out changes like that. ;-) [13:34:39] Now it gives me: fatal: Not a git repository (or any of the parent directories): .git [13:35:21] Elsie: if you want a university student with limited time for other stuff, i'm free for hire ;) [13:35:37] Edokter: you're in a wrong directory :) `cd ..` [13:35:51] (hmm, or i hope at least) [13:36:09] ah OK :) [13:36:16] MatmaRex: How much more schooling? [13:36:50] trying again... [13:37:01] Oops... [13:37:19] "multiple commits [13:38:14] it wants to push two other commits that aren't mine [13:38:27] Edokter: that's most likely not a problem [13:38:40] Yes. [13:38:44] 'most likely'? [13:38:45] Edokter: there was some magic incantation to make it not complain, but i forgot it [13:38:46] Even though it tripped me up for about an hour or two. [13:38:51] It's some stupid shit. [13:38:54] Just ignore it and push. [13:38:56] Edokter: just say 'yes' [13:38:59] OK [13:39:32] Permission denied (publickey). [13:39:32] fatal: The remote end hung up unexpectedly [13:39:37] AAGH [13:39:39] Elsie: well, i just started this month ;) [13:39:46] Grah. [13:39:53] So a few years, then. [13:40:00] But you can still be a volunteer! Or a contractor. [13:40:23] anyone tried the web uploader? [13:40:34] MatmaRex has. [13:40:36] It works. [13:40:42] Edokter: valhalla's one? yeah, it's okay [13:40:44] Or you can use GitHub. [13:40:50] Edokter: let's try a little more [13:40:51] Or Bugzilla. [13:40:56] Edokter: have you uploaded your public key to gerrit? [13:41:07] Or Vagrant. [13:41:13] Which I think is your best option. [13:41:25] MatmaRex, yes, looong ago [13:41:53] In my experience, people on Windows make every attempt to be Linux-like. With virtual machines now so easy to set up, using actual Linux makes sense. [13:41:54] Edokter: okay, do you still have the corresponding private key? is git using it? [13:42:12] Edokter: (if it's not named "id_rsa", then git's probably not using it) [13:42:14] I'll have to rememebr where I put it [13:42:33] Edokter: %userprofile%\.ssh [13:42:44] (that's where mine are, yours probably should be there too) [13:42:52] (03Restored) 10Merlijn van Deen: Another test commit, now in an integrated setting. [test/mediawiki/extensions/examples] - 10https://gerrit.wikimedia.org/r/89410 (owner: 10Merlijn van Deen) [13:43:10] I have 2: id_rsa and id_rsa.pub [13:43:29] Edokter: hm, that looks okay, so it should work [13:43:39] Edokter: can you double-check gerrit has the same public key? (id_rsa.pub) [13:43:47] https://gerrit.wikimedia.org/r/#/settings/ssh-keys [13:44:02] (or just add it again) [13:45:32] public key matches [13:46:18] blergh. [13:46:25] Edokter: can you pastebin the entire error message? [13:47:21] hold on... trying to readd kay, but get invalid rsa key [13:47:36] invalid ssh key [13:47:59] never mind, re-added [13:48:46] the entire errro is the above two lines [13:49:11] Permission denied (publickey). [13:49:11] fatal: The remote end hung up unexpectedly [13:49:17] (03CR) 10Merlijn van Deen: "Some nits need to be fixed" [test/mediawiki/extensions/examples] - 10https://gerrit.wikimedia.org/r/89410 (owner: 10Merlijn van Deen) [13:49:21] heh. [13:49:57] (03CR) 10Merlijn van Deen: "Some nits need to be fixed" [test/mediawiki/extensions/examples] - 10https://gerrit.wikimedia.org/r/89410 (owner: 10Merlijn van Deen) [13:51:58] Edokter: i have no idea then. you should try the patch uploader [13:52:35] gladly, how to build a patch file? [13:54:46] have patch file [13:55:58] Edokter: output of `git diff` is okay [13:56:05] http://tools.wmflabs.org/gerrit-patch-uploader/ [13:56:26] git diff no work [13:57:19] Edokter: ah, i assume you have that change committed [13:57:32] Edokter: then `git diff HEAD~1 HEAD` (diff previous commit with the current one) [13:57:53] (`git diff` with no arguments diffs last commit with uncommited changes) [13:58:30] (03CR) 10Bartosz Dziewoński: [C: 04-1] "Autoloader needs update." [core] - 10https://gerrit.wikimedia.org/r/90299 (owner: 10Aude) [13:58:37] I have a patch file now; it includes the commit message [13:59:08] Do I have to extract it? [13:59:31] no, but it will be ignored by the uploader [13:59:38] so copy it to the other field [13:59:44] So I still have to copy the message [13:59:52] yes [13:59:52]