[07:45:40] hello I am back around :) [08:21:46] Hello. [08:22:07] Oh, hashar has just gone out. [15:34:17] hey Platonides, got a moment? NOT about GSoC :) [15:41:13] phew, glad gsoc is done :) [15:41:25] it took a lot of my time. [15:49:56] subbu: were you mentoring? [15:50:09] yes. jruby [15:50:17] sumanah, I only have 2 minutes right now [15:51:03] Platonides: ok, it's not urgent. Happy Monday :) [15:51:10] btw Platonides when does uni/college start again for you? [16:50:25] Hokay. Another git question for me. I just did a fetch and rebase because my last commit was rebased to an old master and was rejected by our friend jenkinsbot. Now that I've fixed it, I've merged all changes but can't commit because nothing has changed. [16:50:33] I feel like I'm missing something really obvious. [16:50:44] hi there nullspoon [16:50:49] hey sumanab [16:51:22] nullspoon: Run a `git status` [16:51:40] Make sure nothing actually has changed [16:51:43] marktraceur: nothing to commit [16:51:45] marktraceur: I was about to ask you to pipe up :) [16:52:09] sumanah: Great stuff! :) [16:52:29] nullspoon: And you're mid-rebase, or....you've completed the rebase? [16:52:36] I've completed rebase [16:52:45] marktraceur: Here are my steps [16:52:57] nullspoon: If you're done rebasing, you don't need to commit [16:53:06] Unless you change things even more [16:53:31] marktraceur: Right. But can I just push-for-review if my commit message doesn't contain my change id? [16:54:19] nullspoon: You should have retained the change ID....you're sure it's not there? [16:54:22] The only thing my patch set needed was a rebase. I fixed all the other issues (that I know of at least...) [16:54:22] :D [16:54:58] As spock would say - Logical Awesome. My codes are perfect. :) (google that if you don't know what I'm talking about) [16:55:23] marktraceur: I checked my commit_editmsg and it is empty [16:55:47] nullspoon: Check git log, make sure your last commit has a changeID [16:55:52] hokay [16:56:01] yup [16:56:10] Then you should be golden :) [16:56:17] so just do a push-for-review? [16:56:32] I'm all worried that I'm gonna break some protocol by doing so many checkins [16:56:33] Should be! Let me know if you need other help [16:56:36] :) [16:56:55] Huh. I didn't know that it would hit your last log entry [16:57:00] that could have saved me so much time [16:57:01] haha [16:57:22] I'm just waiting for jenkins bot to be upset with me. There's no way that worked. [16:57:25] lol [16:57:32] nullspoon: I wish you much luck [16:58:11] marktraceur: Many thanks. Hopefully this will be the last patch set. I was so close to getting this one accepted except for the style issues. [16:59:45] marktraceur: oh my goodness would ya look at that. The build succeeded. Many thanks mark! [16:59:54] Yay! Congrats. [17:20:15] Hey Dereckson, I have a quick coding convention question about one line in my patchset 11137 if you have a second to take a look. [17:21:25] or marktraceur [17:21:36] nullspoon: I'm down! [17:21:57] awesome. Thanks. Could you open up 11137 includes/Title.php [17:22:02] line 2048 [17:22:19] I'm there [17:22:50] marktraceur: I'm sorry: Line 2030 [17:23:03] A ways back platonides said that that indent looked wrong [17:23:26] marktraceur: So I indented it back. However, should I just bring the ') {' back up to the previous line? [17:23:26] It, um....it sort of does [17:24:01] That's one way to do it, yes [17:24:04] marktraceur: Since we've got indents it's not really necessary to have it on that line I don't think. Wanted to run it by someone though to avoid additional superflouous patchsets. [17:24:12] I think that could be construed as more in keeping with K&R [17:24:36] But there's certainly a three-hour heated argument that we could have about it as well [17:25:01] Heh. I'm happy to change here to line up with whatever you guys want. [17:25:05] I'd say "Yes, put it on the same line as the last condition" [17:25:12] But I don't speak for anyone but myself [17:25:19] The coding standards established by the wikimedia projects have greatly formed how I write php [17:25:36] Alrighty. I'll go ahead and do that then. [17:25:54] No worries. If someone asks why, I won't tell them that marktraceur told me to. ;) [17:26:23] Oooh, that seems so bad [17:26:34] Actually wait [17:26:44] http://www.mediawiki.org/wiki/Manual:Coding_conventions#General_style [17:26:46] Second example [17:27:00] I think that supports leaving it as-is [17:27:02] nullspoon: ^ [17:27:28] dang it [17:27:30] haha [17:27:39] oh. good thing my push for review failed [17:27:40] haha [17:29:13] marktraceur: not trying to be difficult but I don't see why. [17:29:24] OK [17:30:07] oh [17:30:12] marktraceur: I see [17:30:20] The way I see it, we can treat the 'if' statement as being a prefix, binary operator that operates on two expressions [17:30:24] Oh, good [17:31:15] And there's an if example later in that page, I just didn't look for it [17:32:02] marktraceur: oh hey look at that. I guess I'll leave it then. [17:32:07] Still looks kinda funny [17:32:23] It does, since it's a different style (apparently), but it makes things clearer [17:32:48] I can see going either way though. I put it in there originally becasue I wanted to make it obvious that the statements inside of the if obviously not a part of the if [17:32:50] <^demon> I end up writing MW-style PHP in pretty much everything now. [17:33:01] <^demon> Old habits die hard. [17:33:17] ^demon: I hope not while contributing to Java projects :/ [17:33:34] <^demon> I do! I constantly get -1'd over spacing nitpicks on upstream gerrit :p [17:33:40] Ha, hilarious [17:33:47] ^demon: Same here. Got a huge project at work in PHP that I'm working with another develolper/intern on and we desperately needed established coding standards. Send him the coding standards doc and all is well now. :) [17:34:04] It's always hard to go back to Pythonic standards when I work on things in Python [17:35:08] Okay. Well thanks for your help marktraceur. [17:35:23] I'll stop hogging the room now. :) [17:35:51] nullspoon: Nobody else is hogging it, you might as well :) [17:36:04] heh [18:21:38] James_F: What are we at?