|
2019-04-24 14:00:21
|
<wm-bot>
|
Technical Advice IRC meeting starting in 60 minutes in channel #wikimedia-tech, hosts: @CFisch_WMDE - all questions welcome, more infos: https://www.mediawiki.org/wiki/Technical_Advice_IRC_Meeting
|
|
2019-04-24 14:05:11
|
<Amir1>
|
I'm also hosting :)
|
|
2019-04-24 14:50:20
|
<wm-bot>
|
Technical Advice IRC meeting starting in 10 minutes in channel #wikimedia-tech, hosts: @CFisch_WMDE - all questions welcome, more infos: https://www.mediawiki.org/wiki/Technical_Advice_IRC_Meeting
|
|
2019-04-24 15:00:22
|
<Amir1>
|
o/
|
|
2019-04-24 15:00:54
|
<CFisch_WMDE>
|
\o/
|
|
2019-04-24 15:01:11
|
<RhinosF1>
|
Hey Amir1, CFish_WMDE, I think for once I've got nothing to ask!!
|
|
2019-04-24 15:01:21
|
<CFisch_WMDE>
|
Welcome to the Technical Advice IRC Meeting!
|
|
2019-04-24 15:01:22
|
<RhinosF1>
|
^CFisch
|
|
2019-04-24 15:01:36
|
<Amir1>
|
RhinosF1: You have an hour to come up with questions :D
|
|
2019-04-24 15:01:42
|
<CFisch_WMDE>
|
RhinosF1: ;-D
|
|
2019-04-24 15:03:04
|
<RhinosF1>
|
I normally ask something whether it be about a bug or something or even last week making quarry queries but I think all my tasks are just waiting on fixes etc. Hopefully, it won't be too quiet
|
|
2019-04-24 15:04:01
|
<CFisch_WMDE>
|
RhinosF1: No worries, it's not that we do not have stuff that we can do while listening to the chat :-)
|
|
2019-04-24 15:05:03
|
<RhinosF1>
|
Have a good evening, I'm always around. I'll probably think of something eventually
|
|
2019-04-24 15:05:11
|
<CFisch_WMDE>
|
Hehe :-)
|
|
2019-04-24 15:05:40
|
<xSavitar>
|
Hi Amir1 & CFisch_WMDE, can we reboot the culture of cleaning pending patches backlog? I remember some years ago, there was a culture as such
|
|
2019-04-24 15:06:01
|
<Reedy>
|
some years ago? lol
|
|
2019-04-24 15:06:06
|
<xSavitar>
|
Something like patch review day? Where we have an IRC channel say #wikimedia-code-review for this purpose only?
|
|
2019-04-24 15:06:22
|
<xSavitar>
|
Reedy: I can't really remember, but there was something like that when I just joined the movement
|
|
2019-04-24 15:06:29
|
<Amir1>
|
we also used to have code-review-office hours
|
|
2019-04-24 15:06:38
|
<xSavitar>
|
Amir1: I didn't know, truly
|
|
2019-04-24 15:06:42
|
<xSavitar>
|
When does that happen?
|
|
2019-04-24 15:07:08
|
<Amir1>
|
might be of interest of developer productivity team (just a wild guess)
|
|
2019-04-24 15:07:18
|
<xSavitar>
|
Okay!
|
|
2019-04-24 15:07:19
|
<Amir1>
|
xSavitar: let me dig
|
|
2019-04-24 15:07:23
|
<xSavitar>
|
Thanks a lot
|
|
2019-04-24 15:07:32
|
<xSavitar>
|
waits for Amir1 to dig :)
|
|
2019-04-24 15:07:54
|
<Amir1>
|
https://www.mediawiki.org/wiki/Code_Review/Office_Hours
|
|
2019-04-24 15:08:27
|
<xSavitar>
|
Thanks for the link
|
|
2019-04-24 15:08:51
|
<xSavitar>
|
And yes, there is already a channel
|
|
2019-04-24 15:09:04
|
<xSavitar>
|
But Amir1 seems this is no longer happening as the page say obsolete?
|
|
2019-04-24 15:09:22
|
<xSavitar>
|
then T177974 too :(
|
|
2019-04-24 15:09:22
|
<stashbot>
|
T177974: Drop #wikimedia-codereview channel - https://phabricator.wikimedia.org/T177974
|
|
2019-04-24 15:09:28
|
<Amir1>
|
yup :(
|
|
2019-04-24 15:09:50
|
<xSavitar>
|
Oh no, I really wish this could be rebooted.
|
|
2019-04-24 15:10:00
|
<Amir1>
|
maybe good idea to revive it but I would consult with the technical engagement team first
|
|
2019-04-24 15:10:31
|
<xSavitar>
|
Amir1: please do that, we'll keep in touch, I'm open for any little help I can offer, no matter how little :)
|
|
2019-04-24 15:10:50
|
<xSavitar>
|
I also know people are busy, very busy but please please please, we need this :)
|
|
2019-04-24 15:11:07
|
<CFisch_WMDE>
|
Amir1: xSavitar So also https://phabricator.wikimedia.org/T128371#4471446
|
|
2019-04-24 15:11:57
|
<CFisch_WMDE>
|
We might also find the time to about this at the Hackathon
|
|
2019-04-24 15:12:11
|
<Amir1>
|
T200987
|
|
2019-04-24 15:12:12
|
<stashbot>
|
T200987: Set up volunteer code review queue - https://phabricator.wikimedia.org/T200987
|
|
2019-04-24 15:12:20
|
<Amir1>
|
This also might be useful
|
|
2019-04-24 15:12:35
|
<xSavitar>
|
Yeah, that prev links to it, thanks a lot
|
|
2019-04-24 15:14:25
|
<xSavitar>
|
Also, I'm not sure if this is the right time or right place to ask this but is it possible for volunteers to have access to Log stash, if so, what is the criteria. Could help cleanup or file some incidents if I spot
|
|
2019-04-24 15:14:38
|
<xSavitar>
|
Or maybe useful for me to understand the details about a particular problem
|
|
2019-04-24 15:17:29
|
<CFisch_WMDE>
|
xSavitar: Hmm I'm not sure what the official policy is there.
|
|
2019-04-24 15:17:40
|
<Amir1>
|
xSavitar: The logsatsh requires NDA
|
|
2019-04-24 15:17:49
|
<Amir1>
|
because it has lots of private data
|
|
2019-04-24 15:17:58
|
<xSavitar>
|
Okay Amir1 & CFisch_WMDE
|
|
2019-04-24 15:18:34
|
<Reedy>
|
Really, we shouldn't have people doing that manually. It should be an automated process
|
|
2019-04-24 15:18:54
|
<xSavitar>
|
Amir1: Does it mean it's only for staffs or for anyone willing to sign the NDA?
|
|
2019-04-24 15:18:57
|
<Amir1>
|
for that, you need a point of contact in WMF, so if you can convince a manger to support that, it should be doable (specially since it's just LDAP group and not a real production shell access)
|
|
2019-04-24 15:19:28
|
<xSavitar>
|
Amir1: Can I say I have you? :)
|
|
2019-04-24 15:19:32
|
<xSavitar>
|
Or maybe Reedy :D
|
|
2019-04-24 15:19:47
|
<Amir1>
|
seconding Reedy, now nagios makes automatic phab tickets, why not :D
|
|
2019-04-24 15:19:59
|
<Amir1>
|
xSavitar: I'm not a manager nor working for WMF
|
|
2019-04-24 15:20:00
|
<Amir1>
|
:D
|
|
2019-04-24 15:20:06
|
<xSavitar>
|
:)
|
|
2019-04-24 15:20:28
|
<Amir1>
|
Reedy: removing PII would be fun though :P
|
|
2019-04-24 15:20:39
|
<Reedy>
|
We redact stack traces already..
|
|
2019-04-24 15:21:30
|
<Amir1>
|
I have a feeling something somewhere might still leak info
|
|
2019-04-24 15:21:47
|
<Reedy>
|
Shit happens
|
|
2019-04-24 15:21:55
|
<Reedy>
|
People leak PII on a semi regularly basis
|
|
2019-04-24 15:22:13
|
<Amir1>
|
/o\
|
|
2019-04-24 15:22:18
|
<xSavitar>
|
Reedy: what is PII so I know what I'm reading please?
|
|
2019-04-24 15:22:26
|
<CFisch_WMDE>
|
Reedy: Not really a good argument though ^^'
|
|
2019-04-24 15:22:27
|
<Reedy>
|
Pentium II
|
|
2019-04-24 15:22:34
|
<eprodromou>
|
Personally identifying information
|
|
2019-04-24 15:22:36
|
<xSavitar>
|
Eh
|
|
2019-04-24 15:22:48
|
<Amir1>
|
i.e. private data
|
|
2019-04-24 15:22:54
|
<Amir1>
|
IP, user agent
|
|
2019-04-24 15:23:38
|
<xSavitar>
|
Oh, I get it now, "personally identifiable information"
|
|
2019-04-24 15:25:37
|
<xSavitar>
|
!bash Reedy: what is PII so I know what I'm reading please?
|
|
2019-04-24 15:25:37
|
<stashbot>
|
xSavitar: Stored quip at https://tools.wmflabs.org/bash/quip/AWpP88buEHTBTPG-qjAz
|
|
2019-04-24 15:25:58
|
<xSavitar>
|
!bash Reedy: Pentium II
|
|
2019-04-24 15:25:58
|
<stashbot>
|
xSavitar: Stored quip at https://tools.wmflabs.org/bash/quip/AWpP9BeYOwpQ-3Pko1e9
|
|
2019-04-24 15:26:07
|
<Reedy>
|
Those are seperate quips now
|
|
2019-04-24 15:26:13
|
<xSavitar>
|
Oh no :(
|
|
2019-04-24 15:27:32
|
<xSavitar>
|
!bash 16:25 xSavitar: !bash Reedy: what is PII so I know what I'm reading please?, Reedy: Pentium II
|
|
2019-04-24 15:27:33
|
<stashbot>
|
xSavitar: Stored quip at https://tools.wmflabs.org/bash/quip/AWpP9YoGEHTBTPG-qjLB
|
|
2019-04-24 15:27:54
|
<Amir1>
|
good old days, I had Pentium IV and was so proud 2.4GHz
|
|
2019-04-24 15:29:11
|
<CFisch_WMDE>
|
Technical question: How do I use the !bash command for multi-line quotes :-D
|
|
2019-04-24 15:29:23
|
<xSavitar>
|
Okay, there is this very weird problem I'm having with Git + Gerrit
|
|
2019-04-24 15:29:29
|
<xSavitar>
|
I made this patch a long time ago: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/487057
|
|
2019-04-24 15:29:47
|
<xSavitar>
|
But the patch for removing all $wgParser has been made recently by simetrical
|
|
2019-04-24 15:30:10
|
<xSavitar>
|
It's clear that I can't rebase on Gerrit now because there is a merge conflict and I need to do a manual rebase
|
|
2019-04-24 15:30:29
|
<xSavitar>
|
But the funny issue is that I can't bring down that patch locally anymore, I get an error such as;
|
|
2019-04-24 15:31:44
|
<xSavitar>
|
reproduces the error to paste the link here...
|
|
2019-04-24 15:31:46
|
<Amir1>
|
You can paste it in phabricator
|
|
2019-04-24 15:31:59
|
<Amir1>
|
https://phabricator.wikimedia.org/paste/edit/form/14/
|
|
2019-04-24 15:32:05
|
<xSavitar>
|
https://pastebin.com/LmnVrsrG
|
|
2019-04-24 15:32:19
|
<xSavitar>
|
Oh, I already used pastebin but next time, I'll use that :)
|
|
2019-04-24 15:33:02
|
<xSavitar>
|
Now here: https://phabricator.wikimedia.org/P8431
|
|
2019-04-24 15:33:11
|
<xSavitar>
|
Has anyone faced such an issue before?
|
|
2019-04-24 15:33:31
|
<xSavitar>
|
I'm not sure how I can force this thing to overwrite those files
|
|
2019-04-24 15:33:53
|
<Amir1>
|
xSavitar: you need to make the commit and then rebase it
|
|
2019-04-24 15:34:00
|
<Amir1>
|
using git fetch and then git rebase
|
|
2019-04-24 15:34:19
|
<Amir1>
|
or get a clean version and then use git cherry-pick
|
|
2019-04-24 15:34:29
|
<Amir1>
|
(let me get a really good documentation)
|
|
2019-04-24 15:34:46
|
<xSavitar>
|
Okay
|
|
2019-04-24 15:34:58
|
<xSavitar>
|
Amir1: I don't have this patch locally anymore, I think I deleted the branch locally or so
|
|
2019-04-24 15:35:17
|
<xSavitar>
|
I can get it only online and my best bet should be with git-review right?
|
|
2019-04-24 15:35:46
|
<CFisch_WMDE>
|
xSavitar: From the error it seems your local working dir is in some weird state. - What's the output of git status?
|
|
2019-04-24 15:35:48
|
<Amir1>
|
xSavitar: https://gerrit.wikimedia.org/r/c/operations/mediawiki-config/+/84206#message-d387ac2aa2a6e83b72f18296d1a249ca2c197704
|
|
2019-04-24 15:35:52
|
<xSavitar>
|
Or is there a way to get patches down from Gerrit using git only, not git review? My understanding tells me that git-review runs git in the background
|
|
2019-04-24 15:36:15
|
<Reedy>
|
yes, you can
|
|
2019-04-24 15:36:15
|
<Amir1>
|
you can do "git reset --hard origin/master"
|
|
2019-04-24 15:36:21
|
<xSavitar>
|
On branch core-dev
|
|
2019-04-24 15:36:21
|
<xSavitar>
|
└─ $ ▶ git status
|
|
2019-04-24 15:36:22
|
<xSavitar>
|
nothing to commit, working tree clean
|
|
2019-04-24 15:36:27
|
<Amir1>
|
this throws out everything you have locally
|
|
2019-04-24 15:36:31
|
<Reedy>
|
Download link in the top right from gerrit
|
|
2019-04-24 15:36:31
|
<Reedy>
|
git fetch "ssh://reedy@gerrit.wikimedia.org:29418/mediawiki/extensions/Flow"; refs/changes/82/505782/3 && git cherry-pick FETCH_HEAD
|
|
2019-04-24 15:36:34
|
<Reedy>
|
Gives you nice stuff like that
|
|
2019-04-24 15:37:25
|
<CFisch_WMDE>
|
xSavitar: so no untracked files in git status? o.O
|
|
2019-04-24 15:37:38
|
<xSavitar>
|
CFisch_WMDE: No, this problem is very weird :(
|
|
2019-04-24 15:37:50
|
<xSavitar>
|
Reedy, Amir1, CFisch_WMDE, can any of you try to reproce this?
|
|
2019-04-24 15:38:11
|
<xSavitar>
|
Like try pulling down that patch, my core-dev branch is in sync with mw 1.34 master
|
|
2019-04-24 15:38:22
|
<xSavitar>
|
*reproduce
|
|
2019-04-24 15:38:53
|
<CFisch_WMDE>
|
xSavitar: I can download the patch just fine
|
|
2019-04-24 15:39:07
|
<xSavitar>
|
Hmm...
|
|
2019-04-24 15:39:49
|
<Reedy>
|
git clean -fd?
|
|
2019-04-24 15:39:59
|
<Reedy>
|
deletes untracked stuff...
|
|
2019-04-24 15:40:02
|
<Reedy>
|
so be careful
|
|
2019-04-24 15:40:14
|
<xSavitar>
|
Reedy: I can't dare that, it broke my previous local installation
|
|
2019-04-24 15:40:21
|
<xSavitar>
|
CFisch_WMDE: Do you have this patch locally? https://gerrit.wikimedia.org/r/c/mediawiki/core/+/502996
|
|
2019-04-24 15:40:33
|
<CFisch_WMDE>
|
xSavitar: Now yes, :-)
|
|
2019-04-24 15:40:35
|
<xSavitar>
|
I have 1.34 master right now and I made that patch a while ago befure the but
|
|
2019-04-24 15:40:47
|
<xSavitar>
|
CFisch_WMDE: You can reproduce it?
|
|
2019-04-24 15:41:04
|
<xSavitar>
|
1.33 cut
|
|
2019-04-24 15:41:09
|
<CFisch_WMDE>
|
Ahh ... I'm on the current master soo maybe it's related to the cut
|
|
2019-04-24 15:41:19
|
<xSavitar>
|
Kind of, I'm not sure
|
|
2019-04-24 15:41:43
|
<xSavitar>
|
That stuff made me run the command Reedy suggested and lost my beautiful LocalSettings.php with a bunch of so nice configs :(
|
|
2019-04-24 15:41:50
|
<xSavitar>
|
But I won't dare anymore :D
|
|
2019-04-24 15:41:58
|
<Reedy>
|
!backups
|
|
2019-04-24 15:42:02
|
<Reedy>
|
Copy the file :P
|
|
2019-04-24 15:42:06
|
<xSavitar>
|
Reedy: Yes, I'll be doing that daily :D
|
|
2019-04-24 15:42:44
|
<CFisch_WMDE>
|
So before downloading that patch maybe git checkout master
|
|
2019-04-24 15:43:07
|
<CFisch_WMDE>
|
git reset --hard origin/master
|
|
2019-04-24 15:43:18
|
<CFisch_WMDE>
|
and try again
|
|
2019-04-24 15:43:36
|
<xSavitar>
|
Okay, let me try that asap
|
|
2019-04-24 15:44:34
|
<xSavitar>
|
Oh CFisch_WMDE, before I do that, should my master be like up to date?
|
|
2019-04-24 15:44:40
|
<xSavitar>
|
Does it matter, I guess not?
|
|
2019-04-24 15:44:48
|
<CFisch_WMDE>
|
Would not hurt :-)
|
|
2019-04-24 15:45:02
|
<CFisch_WMDE>
|
!always everything up2date
|
|
2019-04-24 15:45:27
|
<xSavitar>
|
on it
|
|
2019-04-24 15:45:34
|
<CFisch_WMDE>
|
You also want to rebase on the current master anyways
|
|
2019-04-24 15:46:52
|
<[1997kB]>
|
anybody having issues with editor in mobile site?
|
|
2019-04-24 15:48:10
|
<[1997kB]>
|
like when there's a long message, and new text is typed in bottom, it goes below keyboard.
|
|
2019-04-24 15:49:22
|
<xSavitar>
|
CFisch_WMDE: Ops, same problem :(
|
|
2019-04-24 15:49:33
|
<xSavitar>
|
I don't know why git is getting confused or maybe it's git-review?
|
|
2019-04-24 15:50:02
|
<xSavitar>
|
Reedy: I've seen one weird scenario where a PR on github gets closed and a new one opened and the comments from the previous reappears on the new one
|
|
2019-04-24 15:50:04
|
<Amir1>
|
[1997kB]: Is it visual editor or ordinary editor
|
|
2019-04-24 15:50:11
|
<xSavitar>
|
Is that normal? I mean that is weird but maybe it's normal behavior
|
|
2019-04-24 15:50:26
|
<[1997kB]>
|
Amir1: ordinary
|
|
2019-04-24 15:50:32
|
<xSavitar>
|
Same code, same everything but just a new PR
|
|
2019-04-24 15:51:04
|
<Amir1>
|
then it's hard to say, because VE team is working on editing on mobile
|
|
2019-04-24 15:51:11
|
<Amir1>
|
[1997kB]: I would recommand filing a bug
|
|
2019-04-24 15:52:00
|
<CFisch_WMDE>
|
xSavitar: No this is just strange. I mean in theory you should be on the master branch now. What's the output of git status now?
|
|
2019-04-24 15:52:06
|
<[1997kB]>
|
I was just checking, it's just me or is it really bug.
|
|
2019-04-24 15:52:43
|
<[1997kB]>
|
if anyone can confirm..
|
|
2019-04-24 15:52:50
|
<xSavitar>
|
CFisch_WMDE: nothing to commit, working tree is clean
|
|
2019-04-24 15:53:03
|
<xSavitar>
|
Truth, the problem is a very strange one
|
|
2019-04-24 15:53:38
|
<CFisch_WMDE>
|
Maybe you should throw away the complete local git dir and clone it anew :-D
|
|
2019-04-24 15:54:15
|
<xSavitar>
|
:D
|
|
2019-04-24 15:54:59
|
<CFisch_WMDE>
|
You could also clone it to somewhere else just to download that patch and rebase it ;-)
|
|
2019-04-24 15:55:06
|
<Reedy>
|
That's often less effort...
|
|
2019-04-24 15:55:14
|
<xSavitar>
|
Before `die()` on my old repo, let me try what Reedy proposed about the gerrit link
|
|
2019-04-24 15:55:14
|
<Reedy>
|
But you don't really learn what went wrong/how to fix it
|
|
2019-04-24 15:55:20
|
<xSavitar>
|
Reedy: :D
|
|
2019-04-24 15:55:39
|
<xSavitar>
|
Reedy: Yeah, I'm really still trying to figure out what is going on
|
|
2019-04-24 15:55:54
|
<CFisch_WMDE>
|
Reedy: Deleting and re-cloning is a fix! :-P
|
|
2019-04-24 15:56:06
|
<xSavitar>
|
CFisch_WMDE: A hot fix :D
|
|
2019-04-24 15:56:09
|
<Reedy>
|
CFisch_WMDE: Let me know if you can do that for the UK Gov
|
|
2019-04-24 15:56:28
|
<xSavitar>
|
The issue is, recloning will still have the same code structure
|
|
2019-04-24 15:56:31
|
<xSavitar>
|
Like master 1.34
|
|
2019-04-24 15:56:37
|
<xSavitar>
|
So I don't think logically, it will still work
|
|
2019-04-24 15:56:47
|
<xSavitar>
|
I mean, I can try that but I wonder if it will work
|
|
2019-04-24 15:57:38
|
<xSavitar>
|
I tried the command Reedy, same problem :(
|
|
2019-04-24 15:57:38
|
<xSavitar>
|
https://phabricator.wikimedia.org/P8432
|
|
2019-04-24 15:58:13
|
<xSavitar>
|
I also see something related to those files
|
|
2019-04-24 15:58:22
|
<xSavitar>
|
On 1.34 master, the naming is different
|
|
2019-04-24 15:58:46
|
<xSavitar>
|
it's SpecialActiveUsers for example instead of SpecialActiveusers
|
|
2019-04-24 15:58:52
|
<Reedy>
|
Is that from my renames?
|
|
2019-04-24 15:58:58
|
<xSavitar>
|
Yes
|
|
2019-04-24 15:59:01
|
<Reedy>
|
git reset HEAD --hard
|
|
2019-04-24 15:59:04
|
<Reedy>
|
delete includes/specials/
|
|
2019-04-24 15:59:05
|
<Reedy>
|
git pull
|
|
2019-04-24 15:59:13
|
<xSavitar>
|
You did this to me once around Echo I think ;)
|
|
2019-04-24 15:59:17
|
<xSavitar>
|
I remember I didn't sleep that night
|
|
2019-04-24 15:59:45
|
<xSavitar>
|
Reedy: Should that be on any branch?
|
|
2019-04-24 15:59:57
|
<Reedy>
|
just do it wherever you currently are
|
|
2019-04-24 16:00:03
|
<Reedy>
|
as your working copy isn't clean
|
|
2019-04-24 16:04:19
|
<CFisch_WMDE>
|
Ok, I'll have to leave now. I hope you get this solved xSavitar ;-)
|
|
2019-04-24 16:04:31
|
<CFisch_WMDE>
|
I'll read about the results in the log tomorrow :-D
|
|
2019-04-24 16:04:32
|
<xSavitar>
|
CFisch_WMDE: I really do hope
|
|
2019-04-24 16:04:46
|
<xSavitar>
|
Reedy: Same problem and now no more includes/specials :)
|
|
2019-04-24 16:04:53
|
<Reedy>
|
git pull should bring them back
|
|
2019-04-24 16:05:23
|
<xSavitar>
|
It didn't strangely enough
|
|
2019-04-24 16:05:40
|
<xSavitar>
|
It told me everything was up to date
|
|
2019-04-24 16:06:21
|
<xSavitar>
|
Redoing for benefit of doubt
|
|
2019-04-24 16:07:03
|
<Reedy>
|
`git reset HEAD --hard` again?
|
|
2019-04-24 16:08:13
|
<xSavitar>
|
Yes I already did that, that should bring back specials
|
|
2019-04-24 16:08:20
|
<xSavitar>
|
So after that, I'll redoing the steps you gave above
|
|
2019-04-24 16:09:10
|
<xSavitar>
|
*redo
|
|
2019-04-24 16:10:08
|
<xSavitar>
|
Same problem! We can leave it for now
|
|
2019-04-24 16:10:16
|
<xSavitar>
|
I'll work on it later tonight and see what I comeup with
|
|
2019-04-24 16:10:26
|
<xSavitar>
|
Reedy: Thanks a lot for the helping hand
|
|
2019-04-24 16:10:34
|
<Reedy>
|
The solution should be something like that
|
|
2019-04-24 16:10:41
|
<xSavitar>
|
usually, when I want to do renames, I use `git mv`
|
|
2019-04-24 16:11:06
|
<xSavitar>
|
I've realized that mv messes up git badly for some weird reason I can't tell for sure
|
|
2019-04-24 16:11:19
|
<Reedy>
|
it doesn't know waht you've done with the file
|
|
2019-04-24 16:11:21
|
<xSavitar>
|
In most cases, I use `git mv` instead of `mv` for renames
|
|
2019-04-24 16:11:28
|
<Reedy>
|
if you git add it at the new name, it should fix it
|
|
2019-04-24 16:11:31
|
<Reedy>
|
if it works out it's a rename
|
|
2019-04-24 16:11:38
|
<xSavitar>
|
Okay
|
|
2019-04-24 16:11:43
|
<Reedy>
|
The other one is just doing like `git reset HEAD~250 --hard`
|
|
2019-04-24 16:11:44
|
<Reedy>
|
And then git pull
|
|
2019-04-24 16:12:23
|
<xSavitar>
|
Reedy: Okay, in that case, I'll retry this tonight and see how it goes. I'll document this if it finally works
|
|
2019-04-24 16:12:32
|
<xSavitar>
|
Meh, I won't want someone to go through this kinda hustle :D
|
|
2019-04-24 16:12:50
|
<Reedy>
|
"don't use windows"
|
|
2019-04-24 16:12:52
|
<Reedy>
|
;)
|
|
2019-04-24 16:12:55
|
<xSavitar>
|
I don't
|
|
2019-04-24 16:13:05
|
<xSavitar>
|
I'm using a Mac
|
|
2019-04-24 16:13:08
|
<xSavitar>
|
based off unux
|
|
2019-04-24 16:13:11
|
<xSavitar>
|
unix
|
|
2019-04-24 16:13:39
|
<Reedy>
|
macs are stupid with case sensitivity
|
|
2019-04-24 16:13:51
|
<xSavitar>
|
Yup, I feel you, the pain :)
|
|
2019-04-24 16:13:58
|
<xSavitar>
|
I remember we had this kinda problem before
|
|
2019-04-24 16:14:10
|
<xSavitar>
|
When you did some rename around Echo when we were working on the namespace issue
|
|
2019-04-24 16:14:11
|
<Reedy>
|
I don't do this stuff locally... because it tends to just work better on linux
|
|
2019-04-24 16:14:14
|
<xSavitar>
|
It freaked me out the whole night
|
|
2019-04-24 16:14:32
|
<xSavitar>
|
Okay, so you do the renames on pure linux? Not a mac?
|
|
2019-04-24 16:14:59
|
<xSavitar>
|
Like ubuntu for example
|
|
2019-04-24 16:15:04
|
<Reedy>
|
Yup
|
|
2019-04-24 16:15:10
|
<Reedy>
|
I don't do much locally
|
|
2019-04-24 16:15:44
|
<xSavitar>
|
Reedy: Okay, wait in that case, let's try something, could you reproduce this? Like on master (latest), can you pull down that patch locally?
|
|
2019-04-24 16:16:15
|
<Reedy>
|
which patch?
|
|
2019-04-24 16:16:26
|
<xSavitar>
|
https://gerrit.wikimedia.org/r/c/mediawiki/core/+/487057
|
|
2019-04-24 16:16:34
|
<Reedy>
|
Numerous people do use mac... So if it was problematic, more people would've been shouting
|
|
2019-04-24 16:16:40
|
<Reedy>
|
I'm pretty sure it's going ot be a local to you problem :P
|
|
2019-04-24 16:16:53
|
<xSavitar>
|
CFisch_NA: reproduced it
|
|
2019-04-24 16:16:57
|
<xSavitar>
|
If I'm not making a mistake?
|
|
2019-04-24 16:18:18
|
<Reedy>
|
I didn't touch Special:Version though
|
|
2019-04-24 16:18:35
|
<Reedy>
|
Oh, I bet
|
|
2019-04-24 16:18:38
|
<Reedy>
|
let me rebase that patch for you
|
|
2019-04-24 16:18:41
|
<Reedy>
|
I bet that's enough to fix it
|
|
2019-04-24 16:18:57
|
<Reedy>
|
As then you're not swapping between trees
|
|
2019-04-24 16:19:04
|
<Reedy>
|
(you'll still need to cleanup locally)
|
|
2019-04-24 16:19:40
|
<xSavitar>
|
If you succeed in rebasing, I can download that patch
|
|
2019-04-24 16:20:13
|
<Reedy>
|
rebased
|
|
2019-04-24 16:20:46
|
<xSavitar>
|
I think you got conflicts and fixed them right?
|
|
2019-04-24 16:20:55
|
<xSavitar>
|
manually
|
|
2019-04-24 16:21:20
|
<Reedy>
|
yeah
|
|
2019-04-24 16:21:34
|
<xSavitar>
|
Now the download will work
|
|
2019-04-24 16:23:53
|
<Reedy>
|
FWIW, in future, if you use the gerrit download links, and then just do a cherry pick onto master... That saves the rebase issues
|
|
2019-04-24 16:24:25
|
<xSavitar>
|
Okay, copy that
|
|
2019-04-24 16:24:47
|
<xSavitar>
|
I just tried downloading the patch again, let's see how it goes
|
|
2019-04-24 16:24:55
|
<xSavitar>
|
And yes, Reedy, it worked
|
|
2019-04-24 16:25:01
|
<xSavitar>
|
Thanks a lot
|
|
2019-04-24 16:25:35
|
<xSavitar>
|
So it means in such a scenario, I need a rebase (with linux) or the other approach you suggested
|
|
2019-04-24 16:25:45
|
<xSavitar>
|
Hmm.... I need to rethink my OS :D
|
|
2019-04-24 16:25:49
|
<xSavitar>
|
Reedy: TU
|
|
2019-04-24 16:26:17
|
<Reedy>
|
It shouldn't be a regular problem
|
|
2019-04-24 16:26:34
|
<xSavitar>
|
Yeah, it's a rare one, Reedy, should we document this?
|
|
2019-04-24 16:26:56
|
<xSavitar>
|
For someone who doesn't have access to linux, the person can plead on IRC for someone to rebase
|
|
2019-04-24 16:27:06
|
<xSavitar>
|
If the "someone" has the time to do so, it's worth documenting
|
|
2019-04-24 16:32:36
|
<xSavitar>
|
owes Reedy 2 beers now :)
|
|
2019-04-24 16:34:53
|
<xSavitar>
|
Reedy: I'm documenting it, can you linked me to the rename you made?
|
|
2019-04-24 16:34:58
|
<xSavitar>
|
*link
|
|
2019-04-24 16:35:10
|
<xSavitar>
|
The patch that did the renaming
|
|
2019-04-24 16:52:48
|
<xSavitar>
|
Reedy: https://www.mediawiki.org/wiki/User:X-Savitar/Sub-pages/Manual_git_rebase_with_file_renames_on_Mac, I need the rename patch to complete the doc :), thanks
|
|
2019-04-24 16:56:52
|
<xSavitar>
|
Oh, I found one: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/139873, that should do it
|
|
2019-04-24 16:57:00
|
<xSavitar>
|
completes the doc :)
|
|
2019-04-24 17:18:13
|
<McJohn>
|
quietly chuckles at technical advice meeting becoming git office hour
|
|
2019-04-24 17:18:59
|
<McJohn>
|
I feel like GitHub probably has a whole team of “okay here’s how you use git” employees
|
|
2019-04-24 17:25:56
|
<xSavitar>
|
McJohn: Sorry about that, it was kinda Git + Gerrit related for a patch uploaded to Wikimedia Gerrit
|
|
2019-04-24 17:26:17
|
<xSavitar>
|
It took us a while to figure out but I think it will help someone in the future? :)
|
|
2019-04-24 17:26:27
|
<xSavitar>
|
Oh and Mac related too
|
|
2019-04-24 17:27:05
|
<McJohn>
|
haha not complaining at all! Just very bemused. It’s certainly appropriate, I think, just amusing. git makes us all smack our heads now and then
|
|
2019-04-24 20:10:07
|
<McJohn>
|
Browser stats are only available on a WMF-wide basis, is that right?
|
|
2019-04-24 20:10:27
|
<McJohn>
|
That is, can’t get this for a specific project/language: https://analytics.wikimedia.org/dashboards/browsers/#desktop-site-by-browser/browser-family-and-major-hierarchical-view
|
|
2019-04-24 20:15:12
|
<bawolff>
|
I know we keep more detailed stats internally (for 90 days), so if you have a reasonable reason, probably someone can calculate that for you
|
|
2019-04-24 20:15:33
|
<bawolff>
|
You might also want to try the #wikimedia-analytics channel as well
|
|
2019-04-24 20:16:18
|
<McJohn>
|
Thanks, but no need — trying to justify supporting IE11 for an enwiki thing. WMF-wide has it at ~10-11%, which is probably fine
|
|
2019-04-24 20:16:41
|
<McJohn>
|
And thanks, didn’t know that chan existed!
|
|
2019-04-24 20:17:12
|
<Reedy>
|
https://www.mediawiki.org/wiki/Compatibility#Browsers
|
|
2019-04-24 20:17:22
|
<McJohn>
|
Yeah
|
|
2019-04-24 20:21:16
|
<Reedy>
|
Guess IE11 won't be going away till windows 7 usage starts really dropping
|
|
2019-04-24 20:25:40
|
<McJohn>
|
7 is EoL next year I think
|
|
2019-04-24 20:26:57
|
<McJohn>
|
That should spur things forward, thank god, but I imagine windows 10 will persist
|
|
2019-04-24 20:36:09
|
<bd808>
|
"<CFisch_WMDE> Technical question: How do I use the !bash command for multi-line quotes :-D" -- https://tools.wmflabs.org/bash/help -- "f you want a multiline quip, use tabs where the newlines should go. You may need to write the quip in a text editor and paste it into your IRC client to do this."
|
|
2019-04-24 20:37:04
|
<bawolff>
|
But what if I want tabs in my quote!
|
|
2019-04-24 20:37:09
|
<bawolff>
|
jk
|
|
2019-04-24 20:37:19
|
<bd808>
|
use the web ui ;)
|