[00:22:36] 06Collaboration-Team-Triage, 10Edit-Review-Improvements-RC-Page, 10Collaboration-Community-Engagement, 07Documentation: Improve Filters for Special:Recent Changes documentation page on mediawiki.org - https://phabricator.wikimedia.org/T151477#2819720 (10Mattflaschen-WMF) [00:25:34] James_F, I think the old version of https://www.mediawiki.org/w/index.php?title=Topic:Tfw5yq61a4susnus&action=compare-post-revisions&topic_newRevision=tfwxpdtio9cm8c0u may have been a VE glitch. I am pretty confident it didn't look like that when I saved it. [00:30:49] (03CR) 10Catrope: [C: 032] build: Replace jscs/jshint with eslint [extensions/Echo] - 10https://gerrit.wikimedia.org/r/322339 (owner: 10Esanders) [00:31:46] (03PS1) 10Catrope: Fix missing doublecheck icon on Special:Notifications on mobile [extensions/Echo] - 10https://gerrit.wikimedia.org/r/323350 (https://phabricator.wikimedia.org/T146706) [00:41:24] (03Merged) 10jenkins-bot: build: Replace jscs/jshint with eslint [extensions/Echo] - 10https://gerrit.wikimedia.org/r/322339 (owner: 10Esanders) [00:44:19] 06Collaboration-Team-Triage (Collab-Team-Q2-Oct-Dec-2016), 10Flow, 10VisualEditor, 07Regression, 05WMF-deploy-2016-11-29_(1.29.0-wmf.4): [betalabs-regression] Flow board - switching to VE produces "TypeError: this.parseHtml is not a function" - https://phabricator.wikimedia.org/T151233#2819783 (10Catrope... [00:52:24] (03PS2) 10Catrope: Follow-up 21a2cdb550: Stop passing config parameter to dm.List [extensions/Flow] - 10https://gerrit.wikimedia.org/r/323331 [00:53:43] matt_flaschen, er, ok, if I push my commit now it will probably "eat" at yours. Do I commit mine locally and then rebase --onto your latest patch to fix this? [00:54:24] mooeypoo, yeah, that should work fine. If it doesn't, I'll fix it. [00:54:48] mooeypoo: Rebase may not work exactly, but Matt or I can fix it up in that case [00:54:55] (03CR) 10Mooeypoo: [C: 032] Follow-up 21a2cdb550: Stop passing config parameter to dm.List [extensions/Flow] - 10https://gerrit.wikimedia.org/r/323331 (owner: 10Catrope) [00:55:24] RoanKattouw, so should I try it at all or just push mine to gerrit now? [00:55:39] I'm a little concerned about losing my changes [00:55:55] If I commit now and then pull matt's so I can rebase, I'll lose the data [00:55:57] ... [00:55:58] mooeypoo, you won't lose it. If it goes horribly wrong, I'll help you recover from reflog. [00:56:17] But yeah, first commit yours. You should do that before even downloading mine. [00:56:21] ^ mooeypoo [00:56:29] matt_flaschen, ok I'm a little confused on how to do it, though. It seems I should commit into another branch? [00:56:42] commit+send to gerrit? Or commit just locally [00:57:05] Commit yours (I assume you're still on mw-recentchanges-filters [Edit topic (Shortcut: t)] [00:57:08] Then: [00:57:32] (ok, I did 'git commit --all --amend' ) [00:57:55] mooeypoo, what do you see when you do git status, just want to check something? [00:58:11] mooeypoo, I just need the branch name. [00:58:12] On branch review/mooeypoo/mw-recentchanges-filters [00:58:12] Your branch and 'origin/master' have diverged, [00:58:12] and have 2 and 173 different commits each, respectively. [00:58:12] (use "git pull" to merge the remote branch into yours) [00:58:12] nothing to commit, working directory clean [00:58:30] (03CR) 10Catrope: [C: 032] Update for API error i18n [extensions/Echo] - 10https://gerrit.wikimedia.org/r/321421 (owner: 10Anomie) [00:58:33] * mooeypoo knows better now than to try "git pull" [00:58:33] mooeypoo, oh, good, that's what I wanted to check. Yeah, it's easiest if you branch. [00:58:54] how do I do that now? :\ just git branch -b 'blah' ? isn't it too late that I already committed? [00:58:57] git checkout -b mw-recentchanges-filters-without-new-tests [00:59:21] done [01:00:21] mooeypoo, now: [01:00:28] git review -d 320332 [01:00:52] git checkout mw-recentchanges-filters [01:01:03] git reset --hard mw-recentchanges-filters-without-new-tests [01:01:13] * mooeypoo shrieks [01:01:20] reset --hard always scares me [01:01:30] mooeypoo, you can stash first if you want. There shouldn't be anything there. [01:01:44] Or check git status. [01:01:54] matt_flaschen, wait a minute [01:01:57] Sure [01:02:51] http://pastebin.com/R3RdhU4C [01:03:17] I'm still on the same branch.. it didn't go to review/mooeypoo/mw-recentchanges-filters like it was supposed to...? [01:03:36] (03Merged) 10jenkins-bot: Follow-up 21a2cdb550: Stop passing config parameter to dm.List [extensions/Flow] - 10https://gerrit.wikimedia.org/r/323331 (owner: 10Catrope) [01:03:54] mooeypoo, are you sure? What does git status show? [01:04:50] It does look like that, but maybe your prompt just removes that. [01:05:03] matt_flaschen, http://pastebin.com/4r0hNyCU [01:05:06] this is the whole thing [01:05:10] mooeypoo, do you normally use review -d? Maybe it's broken. [01:05:14] Except I stopped after review -d... because it looked weird [01:05:32] I do "review XXXX" because I have an alias 'git review -d' but it does the same thing [01:06:07] I just tried it again with 'review 320332' but it gives me the same thing [01:06:18] mooeypoo, have you seen that warning about gerrit/origin before? [01:06:28] the 'deprecated' warning? Yeah [01:06:35] but it's usually harmless, it keeps going afterwards [01:06:40] mooeypoo, you can fix that by getting rid of gerrit origin. [01:06:54] mooeypoo, anyway, try removing the review/ branch first. [01:06:58] matt_flaschen, yeah I've had an issue since upgrading to ubuntu 16.x [01:07:05] ... removing it? [01:07:10] * mooeypoo is worried about her code [01:07:20] mooeypoo, okay, we can do it by git sha. [01:07:31] I just thought it would be less mysterious this way. [01:08:02] git checkout mw-recentchanges-filters [01:08:10] git status (verify nothing is untracked or modified) [01:08:23] git reset --hard mw-recentchanges-filters-without-new-tests [01:09:09] wait, you mean mw-recentchanges-filters or review/mooeypoo/mw-recentchanges-filters [01:09:22] my changes are in that^^ and in mw-recentchanges-filters-without-new-tests [01:09:38] mooeypoo, wait, actually we don't want to rebase it. We want to merge them. [01:09:45] * RoanKattouw amusedly watches his coworkers wrestle git on his phone from an airplane seat [01:10:10] * mooeypoo tosses git pieces at RoanKattouw [01:10:22] RoanKattouw, some of the mystery is not my fault. :) (why doesn't git review -d work?) [01:10:30] I'm going to be arriving two hours late at the wrong airport, but I did get upgraded on both flights [01:10:37] RoanKattouw, by "Rebase may not work exactly" did you mean "Why are you rebasing to begin with, that's wrong", because that would have been helpful. :) [01:10:44] Looking at the pastie, hold on [01:10:49] matt_flaschen, ok, so I already have mw-recentchanges-filters in my branch history thing but that's the old one that wasn't updated from gerrit [01:11:07] RoanKattouw, it's fine, I can still figure it out. [01:11:07] Nah I think rebase is fine but you probably want to squash after [01:11:12] mooeypoo, did you change any tests? [01:11:21] I want to say no [01:11:33] Let's settle with "not purposefully" [01:11:43] mooeypoo: git diff 73558ebab6 mw-recentchanges-filters-without-new-tests tests [01:12:02] that did nothing? [01:12:06] mooeypoo, that's good. [01:12:36] Huh, WTF @ the git review -d behavior there [01:13:07] meh I'm alone in the floor... starting to worry about setting the alarm thing with the cleaners now.. do I even set it if they're here? I assume no. [01:13:21] I guess it's fetched the commit so you can switch to the/a branch and git reset --hard [01:13:24] I don't think so: [01:13:39] mooeypoo: Leave before the cleaners leave and you'll be fine [01:13:49] RoanKattouw, I think she can just checkout the tests from mine. [01:14:01] anyways, guess what I just did [01:14:02] mooeypoo, RoanKattouw, let me propose a full step, then you can look it over if you want and mooeypoo can do it. [01:14:10] RoanKattouw, so far with git it sounds like I'm about to stay here all night [01:14:24] so guess what I did? I just backed up mediawiki/src/mediawiki.rcfilters folder [01:14:40] so I'm a little less panicky about losing data now, it's in a zip file tucked away for a rainy day [01:15:16] mooeypoo, I should show you the reflog sometime. [01:15:22] Anyway, RoanKattouw, mooeypoo, http://pastebin.com/qG6ju53L [01:15:24] That should do it. [01:15:44] The sha is my commit from Gerrit, which as Roan said is probably downloaded even though review -d is being weird. [01:16:03] Ha nice [01:16:10] matt_flaschen, mw-recentchanges-filters exists already as an *old* branch though [01:16:22] Cool use of checkout with a directory [01:16:22] if I switch to it, it sounds like i'll be super backwards, no? [01:16:45] mooeypoo, I know that, that's why I said to reset. [01:16:47] 06Collaboration-Team-Triage (Collab-Team-Q2-Oct-Dec-2016), 10Flow, 13Patch-For-Review, 05WMF-deploy-2016-11-08_(1.29.0-wmf.2), 07Wikimedia-log-errors: Undefined property: DeletedContribsPager::$newOnly in ContributionsFormatter::format - https://phabricator.wikimedia.org/T148979#2738306 (10Etonkovidova)... [01:17:15] Maybe insert a git diff before that git commit --amend, as a sanity check? [01:17:22] ok, cross your fingers and toes [01:17:29] RoanKattouw, diff --cached, but sure. [01:17:30] RoanKattouw, way ahead of you [01:17:51] git status after the reset showed that only matt's test file was added, so it SHOULD BE FINE [01:17:53] Right, yeah, wasn't sure if it would stage or not [01:17:55] .... should... be.... [01:18:06] https://gerrit.wikimedia.org/r/#/c/320332/ [01:18:12] Going over gerrit to check my pieces [01:18:27] sweet! looks like mine are in [01:18:47] matt_flaschen, can you verify your changes to the tests are there too? [01:18:52] You can use an inter-patchset diff to verify too [01:19:04] RoanKattouw, rght now I want to leave the office before the cleaners :P [01:19:22] quick-check would do it... I'll do a more thorough test and go over all comments and matt's additions on Friday [01:19:40] RoanKattouw, oh wait, you mean in gerrit? I thought you are talking about another git-method-to-learn-now [01:19:51] Tests are there: https://gerrit.wikimedia.org/r/#/c/320332/13..16/tests/qunit/suites/resources/mediawiki.rcfilters/mediawiki.rcfilters.dm.FiltersViewModel.test.js [01:20:31] yay [01:20:36] matt_flaschen, RoanKattouw awesome!! thanks! [01:20:45] For future reference, the way I usually solve these things is git review -d 12345,2 ; git branch ps2 ; git review -d 12345,3 ; git branch ps3 ; git review -d 12345 ; git diff ps2..ps3 | patch -p1 ; git commit--amend [01:20:47] ok I'm going home. Have a great thanksgiving! [01:21:01] You too! [01:21:11] mooeypoo, have a good Thanksgiving. :) [01:21:15] Also wait it's only 5:20pm there, how is everyone gone already? [01:21:23] Because of Thanksgiving I guess? :) [01:22:05] Yeah, it could probably have been done more simply with git fetch (then you don't need to worry about the branch names). [01:22:41] I think we all do this infrequently enough that we end up improvising every time [01:23:43] RoanKattouw, I guess usually it does get clobbered, and it's slightly different then (then you don't have to worry about digging through the reflog, since worst case it's on Gerrit). This time, we actually anticipated it, and the Gerrit was never clobbered. [01:24:09] But I still instinctively thought it was a rebase problem which it's really not. [01:27:20] Well that is a way you could do it, if you rebased her version onto yours and then squashed, you'd probably get the same result [01:28:48] True, I tend not to use squash, I probably should more. [01:30:14] 06Collaboration-Team-Triage (Collab-Team-Q2-Oct-Dec-2016), 10Flow, 10VisualEditor, 07Regression, 05WMF-deploy-2016-11-29_(1.29.0-wmf.4): [betalabs-regression] Flow board - switching to VE produces "TypeError: this.parseHtml is not a function" - https://phabricator.wikimedia.org/T151233#2819835 (10Etonkovi... [01:35:27] Not sure about that though because rebasing two different versions of the same commit onto each other often causes trouble [01:35:50] So maybe that just barfs conflicts all over your code [01:37:20] * RoanKattouw goes offline again, plane is taxiing [02:28:56] matt_flaschen: Hmm. Looks like the CE and DM might have got out of sync. That's a bit worrying. RoanKattouw might have thoughts. [02:29:55] James_F, yeah, I know that report is not really helpful, but I don't think it was just cut-and-paste fail by me. [02:30:19] matt_flaschen: Oh, indeed, it's quite familiar as a "something went really bad inside VE" output. [02:30:23] That wouldn't explain the ununun, plus I remember reviewing. [02:30:49] "wouldn't explain the ununun" re why it's not cut-and-paste fail. [02:31:16] matt_flaschen: Unfortunately, what triggered it isn't obvious. Mostly it's "your browser put your cursor somewhere bad, like between the '<' and 'b' of '', and VE didn't spot it and fix it". [02:32:33] I didn't even know the selection model let you put your cursor inside an HTML tag. That's weird. [02:32:41] Normally it doesn't. [02:32:47] Which is, indeed, the issue. [04:01:58] 10Collab-Notifications-Page, 06Collaboration-Team-Triage (Collab-Team-Q2-Oct-Dec-2016), 07Mobile, 13Patch-For-Review: [mobile] Special:Notifications the counter does not display the count - https://phabricator.wikimedia.org/T150999#2819935 (10Catrope) There was code that tried to make the button with the b... [05:21:11] Have a great Thanksgiving, everyone (if you celebrate it)! [09:44:07] 06Collaboration-Team-Triage, 10Notifications: Double email notification sent when mentioned on a page you are watching - https://phabricator.wikimedia.org/T151532#2820339 (10Krenair) [12:01:44] You are the only woman [12:06:17] (03CR) 10Sbisson: "Sorry, I still don't understand why the thanks icon is removed from the Thanks extension (I750c00f12dd6abdaae15de3c0e894a7e339e849c) and a" [extensions/Echo] - 10https://gerrit.wikimedia.org/r/320947 (https://phabricator.wikimedia.org/T149352) (owner: 10Catrope) [15:32:03] 06Collaboration-Team-Triage (Collab-Team-Q2-Oct-Dec-2016), 10Edit-Review-Improvements-RC-Page, 10Collaboration-Community-Engagement, 06Community-Liaisons (Oct-Dec-2016): Create dedicated pages for ERI Recent Changes Beta project - https://phabricator.wikimedia.org/T146669#2821312 (10Trizek-WMF) [17:31:41] (03PS1) 10Amire80: Add Russian special page aliases for Ukrainian for backwards compatibility [extensions/Echo] - 10https://gerrit.wikimedia.org/r/323418 (https://phabricator.wikimedia.org/T39314) [20:49:49] 06Collaboration-Team-Triage, 10Flow, 10Notifications, 10VisualEditor, 10Wikimedia-Developer-Summit (2017): Tackling Chat - https://phabricator.wikimedia.org/T149661#2759125 (10Yair_rand) I feel like this topic needs a reminder of certain important [[ https://en.wikipedia.org/wiki/User:Risker/Risker%27s_c... [21:27:52] 06Collaboration-Team-Triage, 10Flow, 10Tool-Labs-tools-Global-user-contributions, 10Tool-Labs-tools-Xtools: Add Flow contributions to GUC and Xtools - https://phabricator.wikimedia.org/T114777#2822141 (10Krinkle)