[09:17:04] aude: Reedy: regarding the isAnon bug: Henning_WMDE will submit a fix for it which SHOULD work, and in case it does not there are additional sanity checks to avoid the JS error [09:17:55] would be nice if someone could backport it to WMF8 [09:21:03] New patchset: Henning Snater; "(bug 44051) Adding mediawiki.user dependency to entityViewInit" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44387 [09:27:34] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44387 [09:27:48] aude: Reedy: https://gerrit.wikimedia.org/r/#/c/44387/ [09:55:59] Henning_WMDE: https://gerrit.wikimedia.org/r/#/c/44245/ [09:56:07] just in case u're bored [09:56:14] ;) [10:01:01] rschen7754: thanks @ en:wp [10:01:12] Lydia_WMDE: yw [10:01:42] yeah, things could get messy if we don't have that discussion :P [10:49:22] anyone can help me with an apache config file? [10:57:21] New review: Jeroen De Dauw; "lol, there is a "Wiki data and tools" section :D" [mediawiki/extensions/Wikibase] (master); V: 2 C: 2; - https://gerrit.wikimedia.org/r/44339 [10:57:21] Change merged: Jeroen De Dauw; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44339 [10:57:38] Denny_WMDE1: can try [11:03:43] New patchset: Jeroen De Dauw; "rem unused use statements" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44391 [11:03:52] New patchset: Tobias Gritschacher; "(bug 43870 - bug 43871 - bug 43872) New Special Pages to edit entities without javascript" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43583 [11:04:10] lazowik: thanks for your help! [11:04:40] New patchset: Tobias Gritschacher; "(bug 43870 - bug 43871 - bug 43872) New Special Pages to edit entities without javascript" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43583 [11:07:40] no problem [11:15:42] New patchset: Henning Snater; "Making remove button state changeable" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44394 [11:18:43] Denny_WMDE1: https://gerrit.wikimedia.org/r/#/c/43850 ?? [11:19:33] Nikerabbit: did i miss something on this? [11:19:47] (checking your comments on previous patchset) [11:20:39] I got the impression none of my comments were noticed [11:21:00] Nikerabbit: oh! I thought i addressed them all ... [11:21:00] sorry [11:21:07] rechecking [11:24:39] New patchset: Henning Snater; "(bug 43006) Disable/enable methods for valueview widgets" [mediawiki/extensions/DataValues] (master) - https://gerrit.wikimedia.org/r/44395 [11:25:44] New patchset: Henning Snater; "(bug 43006) Disable input element and toolbar on saving/removing" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44396 [11:25:49] Nikerabbit: can you have a look at the last patchset (that was merged)? it's quite different from what you reviewed. [11:26:26] it's not that different from PS5 [11:26:49] sorry, PS4 [11:32:27] Nikerabbit: You're correct. I'm sorry, I didn't answer your comments. I will address the problems in a new commit. [11:32:58] np [11:33:11] I know comments are easily lost in gerrit when you make new patchets [11:37:04] New patchset: Henning Snater; "Entity selector: Check for entity id when validating input" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44398 [11:45:15] New patchset: Henning Snater; "(bug 43006) Disable/enable methods for valueview widgets" [mediawiki/extensions/DataValues] (master) - https://gerrit.wikimedia.org/r/44395 [11:47:07] New patchset: Henning Snater; "(bug 43006) Disable input element and toolbar on saving/removing" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44396 [11:50:31] New patchset: Tobias Gritschacher; "(bug 44051) Adding mediawiki.user dependency to entityViewInit" [mediawiki/extensions/Wikibase] (mw1.21-wmf8) - https://gerrit.wikimedia.org/r/44401 [11:51:35] Denny_WMDE1: aude: Reedy: https://gerrit.wikimedia.org/r/#/c/44401/ [11:53:30] it would be great if we could deploy this in order to get the error message removed. and the functionality working :) [11:53:46] hi [11:54:07] hi aude [11:54:21] Tobi_WMDE: adding the dependency is what i would have done, but couldn't really test it last night [11:54:52] good. and they also check for the object to exist. if we can get that deployed, this should solve the issue [11:55:07] yes [11:55:59] i do think mw.user does exist [11:56:19] just incomplete... mw.user.isAnon does not without the dependency being registered [11:57:28] aude: we were not able to test the fix, cause the issue is not reproducable, neither on our systems nor on wikidata-test or -dev [11:58:30] aude: but if the added dependency does not fix the issue, at least the JS error should be gone due to the additional sanity checks [11:58:46] i an quickly trying it [11:58:57] aude: thx [11:59:00] see it at least breaks nothing [11:59:22] what you did is consistent with what kaldari suggested and sane [12:03:45] patch works fine, as far as i can tell [12:05:19] great [12:05:26] i hope we will find a short slot to deploy it [12:05:38] were there any further issues yestrday? [12:06:23] New patchset: Micha? ?azowik; "(bug 41007) Localized numbers in WikiBase js" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44403 [12:09:37] just the api, no longer supports unprefixed ids [12:09:46] some bot folks had issues with that [12:09:52] not a bug though [12:10:15] and i think in some places, some people (logged out) were getting old, cached js and thus errors [12:10:35] * aude thinks that is resolved, but something to be aware of in the future that can be a recurring problem [12:11:18] Change merged: Aude; [mediawiki/extensions/Wikibase] (mw1.21-wmf8) - https://gerrit.wikimedia.org/r/44401 [12:11:22] New patchset: Henning Snater; "Entity selector: Show id when focusing an entity without a label" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44404 [12:15:46] Denny_WMDE1: when you see Reedy or ^demon, they can approve and deploy https://gerrit.wikimedia.org/r/#/c/44405/ [12:15:59] easy as we can make it for them [12:51:56] ok, signing off for now.... [13:09:07] ok thanks [13:19:42] benecloudstar: lazowik: thanks for your patches! :) [13:20:14] lazowik: it's a good idea to add reviewers to your requests so the right people notice them and review them - feel free to poke me to figure out who it should be [13:23:50] * Lydia_WMDE throws something hard @ JeroenDeDauw [13:24:58] Lydia_WMDE: censorship, suppression of free speech, tyranny [13:25:08] JeroenDeDauw: yes! [13:25:21] !nyan | Lydia_WMDE [13:25:21] Lydia_WMDE: ~=[,,_,,]:3 [13:25:28] :P [13:26:00] lol [13:27:15] what is that? [13:28:04] Danny_B: nyancat, the one who will save us of Lydia_WMDE's dictatorship [13:28:42] * Danny_B looks up nyancat in dictionary [13:28:55] ohh dear [13:29:02] Danny_B: you missed out so far [13:29:17] and have clearly not been around JeroenDeDauw enough [13:30:36] who on earth doesn't know about Nyan cat??? [13:30:44] * Danny_B [13:30:48] http://en.wikipedia.org/wiki/Nyan_cat [13:33:36] Sannita: let me correct that for you: http://www.wikidata.org/wiki/Q149 [13:34:21] aude: you just gained an approval for creating that item :D [13:34:33] LOL [13:38:20] hey @ all [13:38:23] anyone speaking hungarian who can post an answer to the last thing here? http://hu.wikipedia.org/wiki/Wikip%C3%A9dia:Kocsmafal_(h%C3%ADrek)#Megkezd.C5.91d.C3.B6tt_a_Wikidata_tesztje [13:38:46] SUL is enabled and working [13:40:06] who is Tobias Gritschacher? [13:40:19] benestar: Tobi_WMDE [13:40:36] ah, is he here? [13:40:42] yes [13:40:52] benestar: yes [13:40:58] hi Tobi [13:41:05] hi [13:41:24] Tobi_WMDE: you did some new patchsets here: https://gerrit.wikimedia.org/r/#/c/43583 [13:41:38] What did you do there? [13:41:43] benestar: just a rebase & an adjustment to a failing test [13:42:08] does it belong to the special pages? [13:43:01] Tobi_WMDE: I am just a bit confused ;) [13:43:12] yes, there was a test testing the SetLabel specialpage & since you changed the form it failed [13:43:23] ah, k [13:43:56] I only changed the selenium/lib/pages/set_label_page.rb file [13:44:12] no [13:44:39] in patchset 17 I did [13:44:56] in patchset 16 I did a rebase because there were conflicts [13:44:56] Tobi_WMDE: and in 16? [13:45:11] what kind of conflicts? [13:45:25] in the i18n file [13:45:34] :/ [13:45:34] messages [13:46:07] Tobi_WMDE: but what was in the clien thing? [13:47:20] I rebased to current master [13:48:00] so all files which have changed in the extension since you started your changeset (or last rebased) were updated to the current version [13:48:09] ah [13:48:29] Tobi_WMDE: but what did you do when a file was changed by me, too? [13:49:52] what git rebase do is putting away your changes, taking current master and apply all your changes again on the top of it [13:49:59] so nothing is lost [13:50:29] do I have to update my local clone now? [13:51:37] you just have to do git review -d 43583 [13:51:57] and you have the latest version of your changeset [13:53:27] Lydia_WMDE: ok, will do next time [13:53:32] and amend changes to it as you used to do [13:55:09] benestar: allright? [13:55:22] just ask if you have further questions [13:55:22] Tobi_WMDE: think so [13:55:41] I will try to fix the blocked user bug [13:56:45] benestar: I did not look into it too much, but it seems to throw an exception which then is not displayed properly [14:02:09] please check the actions of beta16 [14:02:17] i'm not sure it's correct [14:03:34] Lydia_WMDE: could you take a look at https://bugzilla.wikimedia.org/show_bug.cgi?id=42543 [14:03:46] lazowik: ok [14:04:42] lazowik: hmm that is an option though we try to avoid showing the IDs to the user [14:04:47] Denny_WMDE1: what do you think? [14:05:33] When title is absent it is presented already [14:05:42] you have to have a place to click at... [14:05:52] oh [14:05:53] true [14:05:56] no identifier please [14:06:41] i would suggest: if no label is present, do not display the description [14:06:49] in the mouse over [14:07:05] this is a weird situation anyway [14:07:19] that's a good idea i think [14:07:23] it should not happen too often [14:07:35] ok [14:07:43] so no mouse over at all? [14:07:50] when label is empty? [14:08:00] yes [14:08:05] the only case i see that happen [14:08:12] is when sth is a disambiguation page [14:08:16] it sometimes gets a description [14:08:18] but not a label [14:08:19] currently [14:08:22] but that's life [14:09:45] so the mouseover will be present only when label is present, with or without description [14:09:53] sorry for asking so much [14:09:57] just want to be sure :) [14:10:29] lazowik: jep :) [14:10:30] New patchset: Tobias Gritschacher; "(testing) snaktype selector seleneium tests (DNM)" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44412 [14:11:11] the wikidata-vagrant is not working anymore. can someone have a look at this? [14:11:26] Silke_WMDE: ^ [14:12:16] lazowik: ah hey :) re your last email: you can find the items in the contributions of your account [14:12:34] link is at the top of the page [14:12:43] eh sorry [14:12:51] lbenedix: ^ that was for you [14:12:58] tab-fail [14:13:05] ok [14:13:10] was a bit confused... [14:13:14] ;-) [14:13:56] lbenedix: :) Good to know people use it. I think, I'll have to adapt the settings for the new dispatcher script that was omplemented this week. I'll update vagrant as soon as I can! [14:15:06] ah [14:15:22] just found out that subject of this bug was already coded [14:15:35] but checket !== "" instead of null [14:15:48] now it is $target->getPrefixedText() [14:16:01] Silke_WMDE: thanks a lot [14:16:03] which outputs ItemQ [14:16:13] New patchset: Daniel Werner; "(minor) snakview value() didn't update view in all cases" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44413 [14:16:25] sory, Item:Q [14:16:47] so should I delete that and proceed as concluded? [14:16:58] New patchset: Jeroen De Dauw; "Added claims diffing and added this to entitydiff" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44414 [14:17:01] Lydia_WMDE: Denny_WMDE1: [14:17:11] lazowik: yes [14:17:12] wait [14:17:26] New patchset: Daniel Werner; "(minor) snakview value() didn't update view in all cases" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44413 [14:17:41] i would like it to be consistent with what happens on mouse over in mediawiki usually [14:17:47] just checking a few places [14:17:50] ok [14:18:58] ok [14:19:05] leave the Q [14:19:11] resp. Namespace:Q [14:19:17] if there is no label [14:19:25] Tobi_WMDE: found the bug [14:19:32] if there is only the label, show the label [14:19:40] if there is a label and a description, show these [14:19:48] ok [14:19:51] this seems to be the most consistent with how it is used [14:20:11] it is coded that way right now [14:20:18] only checks are to be changed [14:20:25] benestar: good [14:20:46] you have just call the parent constructor with another argument [14:20:54] to* [14:21:30] benestar: ok. I'll have a look at it in a few minutes [14:22:50] DanielK_WMDE: y u no review? [14:23:59] New patchset: Micha? ?azowik; "(bug 42543) Corrected checks of emptiness of labels and descriptions" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44416 [14:24:13] Take a look at that patch description :) [14:25:16] Lydia_WMDE: who should review that [14:25:17] ? [14:25:48] lazowik: got a link to the review request? [14:26:13] https://gerrit.wikimedia.org/r/#/c/44416/ [14:26:20] looking [14:26:48] and for the last patch i noticed that some bot added comment on bugzilla with link [14:27:02] is it always doing that [14:27:12] for wikidata, yes [14:27:25] ok, thanks [14:28:41] lazowik: added two reviewers - let's see :) [14:28:47] thanks [14:29:24] I don't know whether there is a whole lot of volunteers [14:29:38] but if certain people are responsible for some topics [14:29:47] mayby a list could be made? [14:30:03] *maybe [14:30:10] i'll think about it [14:30:22] so one would know who to ask to review [14:30:54] we can make that list very short: me ;-) [14:31:04] :D [14:31:17] honestly though it's usually best to just poke me because i know who's around and who's super busy and will not get to it anyway [14:31:33] right [14:31:37] it's usually more than one person who can review something [14:36:11] JeroenDeDauw: i did review?... [14:36:42] 22 comments :) [14:36:54] DanielK_WMDE: oh, 2 mins before I posted here :p [14:37:01] ;) [14:40:53] New patchset: Tobias Gritschacher; "(bug 42995) selenium tests for statements UI errorhandling" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44417 [14:44:12] DanielK_WMDE: https://encyclopediadramatica.se/Citation_needed [14:52:50] Tobi_WMDE: is there a specific wikibase exception? [14:56:35] I don't think so but eventually DanielK_WMDE knows better [15:02:42] New patchset: Jeroen De Dauw; "Added claims to entity patching" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44420 [15:15:51] Change merged: Daniel Werner; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44394 [15:26:51] aude: hi [15:27:43] aude: I have just recognized that I have changed some i18n keys but they are still in the other lang's arrays. What to do? [15:44:29] New patchset: Jeroen De Dauw; "Make use of new sites code in core" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44074 [15:44:34] New patchset: Tobias Gritschacher; "(hotfix) selenium sitelinks tests fix" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44424 [15:47:37] Change merged: Jeroen De Dauw; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44391 [15:54:21] DanielK_WMDE: revieeeeeeeeeeew [15:56:36] Lydia_WMDE: is there any spam on wikidata.org or the test-server? [15:59:20] JeroenDeDauw: I just read (erm, skimmed) the ultimate bikeshed thread. What has u started?? [16:01:24] New review: Daniel Kinzler; "Some small questions/issues. -1 for the way error handling is done." [mediawiki/extensions/Wikibase] (master); V: 0 C: -1; - https://gerrit.wikimedia.org/r/43583 [16:02:31] New review: Huji; "I am assuming mw.language.convertNumber is available everywhere wikiBase is used." [mediawiki/extensions/Wikibase] (master) C: 1; - https://gerrit.wikimedia.org/r/44403 [16:08:07] DanielK_WMDE: thanks for your review [16:08:17] yw [16:08:22] some questions [16:08:39] what is the difference between urlencode and wfUrlencode? [16:10:42] DanielK_WMDE: 2nd where to place a static function getStaticEditUrl ? [16:11:16] New review: Micha? ?azowik; "This is function of mediawiki js, not WikiBase. And why should this code be executed anywhere not on..." [mediawiki/extensions/Wikibase] (master) C: 0; - https://gerrit.wikimedia.org/r/44403 [16:16:05] New patchset: Henning Snater; "Claimview/Claimlistview: Set tooltip before setting error class" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44426 [16:16:05] New patchset: Henning Snater; "Improved snakview error handling" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44427 [16:31:23] lbenedix: I am seizing the occasion to look at the upstream/master to fork the vagrant from. Would it be a problem for you if vagrant required hardware virtualisation to be turned on? [16:39:38] New patchset: Daniel Werner; "Re-apply "Added EntityId and EntityIdParser in JS"" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43995 [16:44:59] nearly meeting time [16:45:04] Could somebody tell me if you need in the next phases a Item to create a Statement about something? [16:46:23] Change merged: Jeroen De Dauw; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43995 [16:46:37] New patchset: Jeroen De Dauw; "Make use of new sites code in core" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44074 [16:46:43] New patchset: Jeroen De Dauw; "Added claims diffing and added this to entitydiff" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44414 [16:47:03] New patchset: Jeroen De Dauw; "Added claims to entity patching" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44420 [16:52:36] New patchset: Daniel Kinzler; "(bug 44067) add --max-time param to dispatchChanges" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44433 [16:53:41] Change merged: Daniel Werner; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44398 [16:53:47] Change merged: Daniel Werner; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44404 [16:58:47] Sk1d: yes [16:59:31] New patchset: Jeroen De Dauw; "fix error detection in createclaim api" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44435 [17:00:34] benestar: sorry, got distracted. [17:00:56] benestar: wfUrlencode is a bit nicer, e.g. it doesn't encode "/". no big difference. [17:01:19] benestar: getStaticEditUrl can just be in EntityView, I guppose.# [17:01:23] ok [17:02:22] New patchset: Henning Snater; ""change" event for valueview widget" [mediawiki/extensions/DataValues] (master) - https://gerrit.wikimedia.org/r/44437 [17:02:40] DanielK_WMDE: it isn't static now ;) [17:02:51] DanielK_WMDE: ok this should be a little bit more prominent. As there are many people who dont know this. eg: https://www.wikidata.org/wiki/Wikidata_talk:Notability#Wikidata_items_with_no_links [17:03:06] even I was unsure ^^ [17:03:36] DanielK_WMDE: or what do you mean with static? [17:07:17] New patchset: Henning Snater; "claimview widget: Attach to valueview widget's change event" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44438 [17:15:27] JeroenDeDauw: thx for the review [17:17:15] DanielK_WMDE: Have you also seen SiteConfiguration/$wgConf? [17:17:35] That does some stuff with all our configs, and might be useable in some way [17:18:54] Who was the other guy on the Wikidata side of the camera? [17:19:18] Reedy: that was hoo-man [17:19:52] Aha [17:19:52] Reedy: i'll look into $wgConf, but I'd hate to much around with the globals too much. I can haz pretty interface? [17:19:59] Config rewrite? [17:20:02] * Reedy hides [17:20:02] :P [17:23:12] New patchset: Daniel Werner; "(bug 43609) 'wikibase-item' data type now uses 'wikibase-entityid' data value" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44440 [17:46:52] New review: Henning Snater; "Why are there so many lines commented out in the test files without any explanation?" [mediawiki/extensions/Wikibase] (master); V: 2 C: 0; - https://gerrit.wikimedia.org/r/44420 [18:04:55] New review: Jeroen De Dauw; "Oops, these should be uncommented" [mediawiki/extensions/Wikibase] (master); V: 0 C: -2; - https://gerrit.wikimedia.org/r/44420 [18:16:24] New patchset: Daniel Kinzler; "Define EntityChange::__toString()" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44446 [18:19:02] New patchset: Daniel Kinzler; "Fix ExternalRecentChange::getParam()" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44447 [18:19:51] New patchset: Daniel Kinzler; "Combine runs of consecutive changes into one (DNM)" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43621 [18:23:00] New patchset: Daniel Werner; "(bug 43609) 'wikibase-item' data type now uses 'wikibase-entityid' data value" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44440 [18:27:23] Change merged: Henning Snater; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/44440 [18:55:18] aude: help [19:00:23] New patchset: Bene; "(bug 43870 - bug 43871 - bug 43872) New Special Pages to edit entities without javascript" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43583 [19:05:38] DanielK_WMDE: are you here? [19:05:51] benestar: yea, what's up? [19:06:38] I fear I have broken something [19:07:21] DanielK_WMDE: https://gerrit.wikimedia.org/r/43583 with the last patchset [19:08:57] benestar: broken how? I dun't follow... [19:09:36] benestar: looks like you rebased your change - and also did some manual changes? [19:09:44] you have added slots of files and they are gone [19:10:10] have added... hm? [19:10:59] benestar: i'm nto sure what you mean. can you describe exactly what you are seeing, and what you expect to be seeing? [19:11:18] (and where you are seeing it - are we talking about gerrit's web interface?) [19:12:17] i think i have rebased [19:12:22] let me explain [19:12:37] I have made local changes and wanted to commit them [19:13:21] but I noticed that i wasn't in my mode and thus i did git checkout specialpages [19:14:38] probably I have overwritten all myl local changes and even the ones you have made [19:15:25] DanielK_WMDE: can I atleast revert the last patchset? [19:16:43] uh, i didn't make any changes to your patch set. [19:16:49] you mean changes to master? [19:17:06] benestar: anyway, do not panic, git lets you undo pretty much everything. git reflog is your friend. [19:17:42] so, you modified, then checkout out your branch, then did a git commit --amend, and then a git review? [19:17:42] ah, it was Tobi [19:18:05] yes [19:18:18] i can tell you how to get back to a previous version of the change, no problem [19:18:30] :) [19:18:42] i can't tell you how to preserve your local changes though - that depends on a lot of things... [19:18:49] hm... [19:18:54] all I vwant is to get all changes of patch set 16 [19:19:39] DanielK_WMDE: my local changes aren't so heavy [19:19:44] uh... you can try to take the diff between 15 and 16 and apply them as a patch on top of 18... [19:19:49] that can get poretty messy, though [19:20:03] also, patchset 18 seems to be a rebase, which you may not really want [19:20:14] so... [19:20:46] do you just want to roll back to changeset 16? or 17? [19:21:09] DanielK_WMDE: jut revert 17 [19:21:10] was a typo [19:21:16] *to 17 [19:22:11] all you have to do is "git reset a1ded299". add --hard to that to throw away all modifications of the working tree (recommended to get a clean slate) [19:22:21] you should be on your branch when doing that [19:22:43] k [19:24:09] daneilerror: Your local changes would be overwritten by checkout [19:24:34] * DanielK_WMDE [19:24:58] i cannot switch the branch [19:25:27] stash them. "git stash" [19:25:37] you can decide later whether you want to use them or not [19:27:46] DanielK_WMDE: a1ded299 <-- what does it mean? [19:29:13] benestar: that's the (start of) a commit hash. it identifies the commit that is change set 17. [19:29:38] when ammending a commit, the commit is not really changed, it's replaced by a new version. the old version stays around though [19:29:40] ok [19:29:47] (until git decides to garbage collect) [19:30:06] xD [19:35:22] DanielK_WMDE: and now again git commit --amend? [19:35:47] only if you changed something [19:35:58] best to not change anything yet [19:36:06] just send the revert itself to gerrit. [19:36:11] git review -R [19:36:22] hm [19:36:27] then, on gerrit, add a comment saying "reverted to change set 17" [19:36:34] then continue from there. [19:36:35] I have integrated my local changes already :/ [19:36:41] integrated how? [19:36:57] as long as you don't do git commit, it doesn't matter [19:37:04] git review will send whatever the last commit was. [19:37:13] it won't touch what you did since. [19:37:17] ok [19:39:41] DanielK_WMDE: error: failed to push some refs to 'ssh://bene@gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase.git' [19:40:02] does it give a reason in the lines before or after? [19:40:14] no [19:40:20] o_O [19:40:23] that'S very odd [19:40:47] there we enter the strange world of git review + gerrit, which i do not really understand. [19:41:02] maybe try to ask saper or ^demon [19:43:40] benestar: sorry, dropped off [19:43:50] benestar: try this instead of git review: push gerrit HEAD:refs/for/master [19:44:25] New patchset: Bene; "(bug 43870 - bug 43871 - bug 43872) New Special Pages to edit entities without javascript" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43583 [19:46:49] DanielK_WMDE_: worked now [19:46:50] I don't know why :/ [19:48:19] benestar: try this instead of git review: push gerrit HEAD:refs/for/master? [19:48:26] git review sometimes gets confused. [19:48:47] when it does, i use the "manual" push to gerrit thingy. usually works. [19:48:55] also works for merge commits, etc [19:57:51] New patchset: Daniel Kinzler; "(bug 42189) merge runs of changes for RC." [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/43621 [19:58:40] New review: Daniel Kinzler; "Note: this has some lose ends and has not been tested extensively. If it passes testing, it should b..." [mediawiki/extensions/Wikibase] (master); V: 0 C: 0; - https://gerrit.wikimedia.org/r/43621 [21:29:22] hey, are you sure you want to drop the "www" in wikidata? [21:29:33] got 2 pending changes, one Mediawiki config and one Apache config [21:29:40] about to merge them [21:39:44] isn't www so 90s [21:44:16] i did it [21:44:18] it [21:44:21] it's gone [21:45:01] https://gerrit.wikimedia.org/r/#/c/44406/1/wmf-config/InitialiseSettings.php and others [21:52:25] Nikerabbit: no it is not [21:52:31] it actually has its sense [21:54:05] was requested per https://bugzilla.wikimedia.org/show_bug.cgi?id=41847 [21:54:08] Danny_B: I'm not gonna bikeshed about this with you [21:54:18] use the ticket if you want to [21:54:46] people are used to type www, it's recognizable, but that's it, it serves no functional purpose [21:55:30]