=== rogpeppe1 is now known as rogpeppe === gary_pos` is now known as gary_poster [13:50] busy here today! [13:50] wheeee [13:55] rick_h__ any idea what the best way is to pull down a branch from a merge request for qa? [13:55] hatch: git checkout -b qa-something [13:56] right, except the pr page doesn't include the full paths anywhere does it? [13:56] actually it's in the pull request notes [13:56] look at the block with the "Merge pull request" button [13:56] there's a not about "on the command line" [13:56] skip step 1, just go to develop, create a new branch to qa into [13:56] ahhh, I totally missed that link [13:57] and do step 2 [13:57] qa, and then comment on the pull request [13:57] obvious skip step 3 since that's a landing step [13:57] yup, I just didn't want to go and get the url myself :) [13:57] <--- lazy today [13:58] there's another way [13:58] if you do a git fetch, and you've got pull reqests in your refspec [13:58] it'll note them and you can git pull origin/$huwsbranch I think [13:58] sec [13:59] hmm right but I have uncommitted changes in my active branch and have to stash them [13:59] I will make a qa'ing repo [14:00] hatch: k, so git stash [14:00] hatch: and then git co develop [14:00] right [14:00] git co -b qz [14:00] qa [14:00] git stash makes sublime over ssh go crazy [14:00] it like loses track of the file references or something [14:01] hatch: looks like really good http://www.somethingorothersoft.com/2012/05/22/pulling-github-pull-requests-with-git/ [14:01] rick_h__, git make distfile conversation after standup? [14:01] gary_poster: sure thing [14:01] ok thanks [14:02] our repo is large [14:08] the qa of huws branch is pretty cool [14:10] wow, new kanban... it has card subtasks, seems interesting [14:11] looks the same to me :( [14:11] heh yea. It took me a while to find the external card id this weekend [14:11] guihelp: I need two review for https://codereview.appspot.com/39380043 (python/quickstart). Anyone available? Thanks! [14:11] frankban: I've got a call, but can look later in the day [14:12] maybe I've got to log out and log back in [14:12] * gary_poster on calls till a lot later [14:12] rick_h__: thanks [14:16] * bac hi [14:16] frankban: i'll look [14:17] bac: thank you [14:23] * frankban bbiab [14:26] wow...so Microsoft is issuing takedown notices for Ubuntu now... [14:34] * benji issues a takedown notice to Mondays [14:35] hatch: so I tried out the shortcut in that blog post and you can git checkout pr/6 [14:35] hatch: works nice [14:35] rick_h__ so `git clone ` then `git checkout pr/6` ? [14:35] hatch: hmm, actually no. Well it adds a fetch-pr command [14:36] rick_h__ so I made a new folder called qa [14:36] cloned juju-gui into that [14:37] made a branch for his stuff [14:37] then pulled his branch into that [14:37] took a while, but future branches should be faster [14:39] ah there we go [14:40] hatch: ok, so with that fetch-pr the process would be http://paste.ubuntu.com/6546053/ [14:40] oh wait, that final checkout should be a merge [14:40] * rick_h__ starts over with a fresh repo [14:40] is co 'checkout' ? [14:40] ok that's more steps than I did [14:40] :) [14:41] hatch: yes, but fast [14:42] it looks like a good candidate for an alias method [14:42] :) [14:42] hatch: yes, although you need names for the branch and the pull request number [14:43] I was sure you could create methods in git [14:43] but git qa-pr 6 qa-sticky-headers would work [14:43] yeah [14:43] hatch: definitely, it's what this link is doing [14:43] the fetch-pr is a new helper as an alias [14:44] hah alias = "!sh -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || echo \"usage: git alias \" >&2 && exit 1' -" [14:52] hatch: http://paste.ubuntu.com/6546113/ [14:52] hatch: changes it to be [14:52] git qa-pr juju 6 qa-stick-headers [14:53] juju is the remote of the official juju repository (vs your fork since the pr is there) and 6 is the pr number and finally the name of the qa branch to create [14:56] marcoceppi so does it usually take a couple weeks to get a charm approved for the store? Anything I can do to speed up the process of getting that Ghost charm in there? [14:57] hatch: do my work for me [14:57] haha well you can just approve it [14:57] it passes proof [14:57] I'm the only reviewing charmer atm [14:57] ohh [14:58] hatch: proof != passing review [14:58] hatch I'll review tonight [14:58] ok cool - I'm more concerned that outsiders are in the same boat [14:58] I'm not blaming you btw [14:59] just that we may need to figure out a more streamlined process [15:00] marcoceppi I know - make me a reviewer, I'll review it :D [15:03] hatch: feel free to apply :) [15:03] oh man I gotta apply? [15:03] :P [15:04] yeah, I know right? Such barrier [15:04] ╯□）╯︵-┻━┻ [15:08] rick_h__ curious - when I make edits to posts do you get emails of each edit? [15:09] hatch: yea, I've been getting double emails [15:09] sorry :) [15:09] I'll remember that [15:09] hatch: all good, "delete thread" :) [15:09] haha [15:09] now that I've done that, back to fighting with d3 [15:10] hatch: did you try the alias? ^ [15:10] negative [15:10] I have it open though [15:10] note it for next one? [15:10] I'll set it up for the next time [15:10] yep [15:10] paste the two commands into your .gitconfig :) [15:20] this weekend I wrote a js solution to the Secret Santa Dart Dare https://gist.github.com/hatched/7873759 I think it's the most performant way, maybe someone else has a better solution [15:23] review done frankban [15:24] rick_h__ get your light installed this weekend? [15:24] hatch: yep [15:24] so you found the right breaker then? :) [15:24] kitchen looks nice. Now the only issue is that I've gone with the 53k daylight led bulbs and the other areas are looking odd with their yellow-ish tint [15:24] hatch: hah, I flipped a few off. Never can be too safe :) [15:25] sorry, 5300 not 53k [15:25] yeah my house is like that too, half the lights are white and the rest are yellow...I'm slowly converting them to LED's but damn they are pricey [15:25] yea, I've gotten 20 of these white leds in the last month. :/ [15:26] a few years ago I picked up one of these http://www.fluke.com/fluke/caen/digital-multimeters/Fluke-170.htm?PID=56027 [15:27] heh, I've got the Fluke 117 [15:27] and one of those circuit breaker tester things [15:27] trying to find a link but I can't :/ [15:27] ah, cool [15:28] the ones where you attach things to the wires and then the tool thing tells you which breaker it's hooked too [15:28] yep [15:28] my house wiring wasn't labeled -at-all- [15:28] there wasn't a SINGLE label on the panel lol [15:30] hatch: i had them run all of the phone/data to a central closet so i could hook it all up to a router/panel. none of it was labeled. infuriating. [15:31] lol ugh that's the worst! I don't even know of a way to test those....trial and error? [15:31] they make tone tools to check [15:31] oh cool [15:35] the more I work on d3, the more I'm convinced it was not designed for our usecase lol [15:36] academically, it's approach to problems is pretty interesting..... [15:36] bac: thanks [15:50] jujugui call in 10, kanban now. [15:50] Makyo after the call mind pairing on this perf branch? I'm running into some d3 funnyness that I'm at a total loss on what's going on [15:51] hatch, sure. [15:51] thx [15:58] jujugui call in 2 [16:00] coming [16:19] gary_poster: if you have a suggested next card speak now. :) [16:21] bac, :-) any non-blocked card is good. you could take point on jujucharms or you could fix that new charm bug or you could fixthe charmworld bug, or...lotsa things [16:22] gary_poster: ok, cool [16:22] gary_poster: forgot to mention i'll probably have to go about 4 to retrieve post-op jojo [16:25] hatch, https://plus.google.com/hangouts/_/7acpibqvsna48s50l5ibn5eci0?hl=en [16:27] bac, ok. hope he is ok [16:28] gary_poster: should be. "just" quilting his ear to get rid of a hematoma. not like a lung transplant or anything. [16:28] ok cool-ish [16:29] he probably isn't so cavalier about it, since it is his ear [16:30] :-) yeah [16:36] gary_poster Makyo figures he knows what the problem is but isn't sure of a workaround so I'm going to pass it off in hopes that it's a trivial fix [16:36] ack thanks hatch & Makyo [16:36] gary_poster, hatch going to land current SSH keys branch first, + call with rick_h__ when free. [16:36] yeah that [16:36] sounds good [16:39] Makyo https://github.com/hatched/juju-gui/tree/inspector-performance thanks [16:40] here is the commit of this branch https://github.com/hatched/juju-gui/commit/8a9b79b36da3a39b7dd6f7dccdc882ad4712416a [16:41] gary_poster any preference for cards for me? Shall I start on the fullscreen removal? [16:41] sure hatch sounds good :-) [16:45] rick_h__ there appears to be an issue with our gitignore.... it throws an error when I try and use `git add *` instead of adding the changed files not in the .gitignore it fails with a 'fatal' error [16:45] not sure if you have seen the same [16:45] hatch: otp, sec [16:50] rick_h__, http://pastebin.ubuntu.com/6546619/ for later. [16:51] why did branch commits make it over on the gh migration? as opposed to mainline.. [17:12] hazmat: it's what bzr fastimport did. I didn't see a lot of material on exporting from bzr into git and getting to tweak it. [17:12] hazmat: there's a *~ in there already? [17:12] sorry, hatch ^ [17:13] hatch: maybe that's throwing it off? I don't know tbh. I just moved the bzr one over and it 'worked' by trial so left it alone [17:13] Makyo: thanks for the paste. [17:14] rick_h__ yeah ok cool something to take a look at sometime [17:14] hatch: k, works here so have fun :) [17:14] hatch: why did you want to ignore *? [17:14] I want to add * [17:15] say I have 10 changed files [17:15] I want to add all of them to the commit [17:15] hatch: oic, git add -A :) [17:15] or --all [17:15] oh crap right [17:16] that was bzr that had `add *` [17:20] hatch, https://twitter.com/horse_js/status/410094798062628864 [17:20] HAHAHAHA [17:20] * hatch looks around [17:20] is the horse in here??? [17:21] Hah, well, it's not me! [17:25] wow I really forgot a lot of git stuff in the past year [17:33] jujugui could I get a really quick review of a doc update branch https://github.com/juju/juju-gui/pull/8 [17:34] hatch: sure [17:34] thanks [17:37] hatch: your branch, the words flow together and seem to form something akin to English. but for the life of me i'm not sure what i would do with them. this coming from a total git-dummy. [17:38] so that package, i download it and put it somewhere? [17:38] and the aliases, they go somewhere too? [17:38] i wonder where [17:38] bac lol, so you're saying you want documentation on how to add aliases? the Git Remote Branch has installation instructions on their repo [17:39] oh, ok [17:39] sorry it's not really clear that the code is aliases [17:39] I can clean that up [17:39] yeah, maybe just "stuff the following aliases in your ~/.git/aliases file" (i made that up. was i close?) [17:40] ~/.gitconfig [17:40] :) [17:40] close [17:43] hatch: ok, so i added two comments in-line and wrote a top-level comment that said everything was good. is that all we're doing for reviews in github? [17:43] bac: so once you've reviewed it and you're ok, add a LGTM comment [17:44] ok [17:44] oops, i guess closing it is bad [17:44] bac https://gist.github.com/hatched/7876600 here are the new changes.....look good? [17:44] bac: hah! close all hatch's pull requests [17:45] bac: yea, he can re-open it I think [17:45] lovely [17:45] lol [17:45] hatch: yes those changes are fine [17:45] we'll get this figured eventually :D [17:46] I for one think that this new process is pretty darn cool [17:46] just need to figure out all the proper commands :D [17:48] I'm going to need a shortcut for 'refresh folders' in sublime if I keep switching between branches heh [17:48] Makyo if you have any questions about my changes on my branch just lemme know [17:48] hatch, will do; trying to find a better test for SSH keys now. [17:48] Dolla Dolla MERGE YO! [17:49] jujugui researching, but in the meantime, if anyone has suggestions for checking for valid ssh keys that does not rely on a) find, or b) ssh-agent, I'd be interested to hear :) [17:50] rick_h__ If I click this HUGE green 'Merge pull request' button, does that bypass our CI? [17:50] jujugui (or uses ssh-agent atomically) [17:51] * gary_poster does not; sorry [17:52] Makyo: what's wrong with just searching for an id_rsa.pub? [17:52] probably slow [17:52] TWAG though [17:52] i wonder if landscape would accept our browser sniffer/intercept code? they only support firefox but happily let you have a diminished experience if you don't know that. [17:54] frankban, that leaves out id_dsa.pub and id_ecdsa.pub, and identity files can be specified in other locations using ssh config. I'm fine with that as a last resort, but would like something that actually checks for ssh identity availability. [17:55] Makyo: ack [17:56] frankban, want to just go with that for now and land this, then see if we need to investigate further? [17:57] Up to you ¯＼(º_o)/¯ [17:57] hatch: your branch failed to land. You have to delete the comment about it being 'merge request accepted' to get another run [17:59] rick_h__ hmm how did you know that it failed? [18:00] hatch: was looking [18:00] hatch: eventually it should add a new comment on failure, but it's not hooked up yet [18:00] Makyo: +1 [18:00] frankban, ack, on it. [18:00] Makyo: thanks [18:10] rick_h__ ohh ok so the issue here is that it commented after I typed $$merge$$ ? [18:11] hatch: right, the system adds a comment saying the merge request has been accepted, so that it won't run it more than 1 time in case it takes a while to get to your merge [18:12] hatch: say 3 branches all get the request to merge at once, the cron job runs every 2min, so it has to be able to know "these 3 are already queued, don't add them again" [18:13] hatch: so remove that comment and the system will re-queue on the next 2min cron run [18:14] ok so saying $$merge$$ again won't help? [18:14] frankban, worth another quick look just for completeness' sake? https://codereview.appspot.com/36080044/diff/20001/quickstart/app.py [18:15] hatch: no [18:15] Makyo: on it [18:15] hatch: it's looping and looking for the command once. [18:15] ohh ok [18:15] the one cancels the other out [18:20] hatch: cool worked [18:21] yup - so that was just an unfortunate race condition there then? [18:21] Makyo: looks good, even if I hoped we were able to use python to check for ssh keys (e.g. os.walk, glob.glob etc) . Perhaps you can follow up in another card? [18:21] hatch: right, and I'm proposing a branch right now to get around that. Will be looking for review shortly [18:21] cool - and about the butt [18:21] on [18:21] if I press the merge button will it bypass the CI? [18:22] hatch: yes, and I get angry with you [18:22] frankban, understood; it just still seems fragile, as we're not checking on actual identities , just whether or not files following a certain name exist. If someone snags a public key to add to authorized_keys and forgets to clean up after themselves, this will false-positive. [18:23] rick_h__ haha, can we disable that somehow? [18:23] hatch: not that I know of atm [18:23] That's why I went with ssh-add at first. [18:23] I thought `ssh-agent ssh-add -l` might work, but that just always fails :P [18:26] Makyo: ok right, you intend this as a temporary solution. ok then, added a new LGTM. please create another card to investigate further [18:26] frankban, Yep, thank you. [18:30] hatch: care to peek at https://github.com/juju/juju-gui/pull/7 please? [18:30] sure [18:32] I love how github keeps the diffs up to date [18:36] rick_h__ lgtm'd with some notes [18:37] hatch: rgr, replied to one [18:37] hatch: well, replied to both in the end [18:37] cool - yeah I figured the caching would be a followup [18:38] well, post-ci stuff :) [18:38] right [18:38] yeah [18:38] so the 'failure' stuff is going to be done soonish? [18:39] the 'bug' which I ran into previously? Or do we need to keep our eye on the merges for now? [18:39] hatch: yea, I've got to find a post-build plugin and figure out how to wire it up. jenking-github-lander supports posting the failure notices already [18:39] hatch: keep an eye on merges for now [18:39] cool gotcha [18:39] oh cool github gives the option to delete merged branches [18:40] yea, button to help keep things clenaed [18:41] rick_h__ possible idea for disabling the 'merge' green button - allow only the jujugui user to merge stuff in then the button should be hidden? [18:41] hatch: yea, but we're all in the org [18:41] so it gets into tricky perms of "you can do stuff, but not this one thing" and haven't looked too closely at it [18:41] just trusting out devs [18:41] ahh ok [18:42] e.g. the idea to do a release is you checkout just the juju project, merge develop into master, push up the updated master as a release [18:43] so if you can't do the merge button, you can't do a release [18:43] ok wtf google, I said "about" into hangouts, and it typed "a boot" lol!!!! [18:43] damnit I'm not THAT Canadian [18:43] lol [18:44] rick_h__: trusting devs may be dangerous at least until we're all up to speed [18:44] big green buttons are so tempting [18:45] bac the good thing about git is you can always roll back from anyones repo [18:45] bac: understand. Like I said though, there's not a ton I can do about it for now [18:45] there is nothing 'special' about the github repo vs anyones local one [18:45] well that's a lie [18:45] but on face value :) [18:45] i'm just apologizing in advance... :) [18:45] haha [18:45] bac feel free to ask [18:46] bac: let me konw if you'd like a walk through or anything. I'm not aware of everyone's git levels so I left 'training' out to some notes/docs but happy to help walk anyone through things [18:46] just don't push upstream with -f :D [18:46] rick_h__: did you write a getting started guide? if so i missed it but would like to read if available [18:47] rick_h__ it might be best to also add `git remote add upstream ...` and `git fetch upstream` for updating the local fork [18:47] bac: in the email linked the repo with a README [18:47] hatch: it's in the notes [18:47] ohh ok [18:47] I mised that line I guess heh [18:47] hatch: the notes have you add a remote juju, and git pull juju origin when starting a new branch [18:47] bac: sec, will PM you think linke [18:47] link [18:48] ugh my email is a mess [18:48] I need to set up filters [18:48] I am the antitheses of inbox-0 [18:48] haha [18:52] so for our christmas party do we just sit in-front of our computers in a hangout drinking rum and eggnog? [18:52] playing virtual beer pong [18:52] antithesis: inbox infinity? [18:52] CO-Canonicalites have a party next Thursday, so there. [18:52] hatch: i can see the bacardi distillery from my patio. :) [18:52] gary_poster I'm working towards it...haha [18:52] ! [18:53] Makyo lol lucky [18:53] :-) [18:53] Makyo: MI-Canonicalites always party! right jcastro? [18:53] bac haha nice [18:53] HP used to have their open source lab here, so there's a few of us (and a few RH folk, too) [18:54] do you shun them when you get together? [18:54] they need to execute a proper apt-get command to get in the door [18:54] lol [18:54] its the shibboleth [18:54] Pff. [18:54] We just don't invite them :) [18:54] hahaha [18:54] It's a company holiday party, after all. [18:55] * bac recalls the one Canonical-NC party that was a huge success [18:55] I'm going to host the biggest Canonical-SK party EVER this year [18:55] working remotely makes company parties actually fun. [18:55] the brick-and-mortar company parties just seemed like a continuation of the work day [18:56] http://deadlygeek.myshopify.com/ [18:56] bac - sounds like a lame party to me [18:56] :/ [18:57] hatch: the existence of that belt buckle is why i am opposed to any gift giving. :) [18:57] lol damnit I'm buying myself one! [19:04] rick_h__ do you have time for a discussion on removing fullscreen and followup direction? [19:06] hatch: yea, second [19:07] https://plus.google.com/hangouts/_/7ecpj8dfhvb68a9eaplojbk1bg?hl=en [19:07] crap it crashed [19:08] I'll try inviting you directly [19:39] I can't find my own bundles in the store [19:39] I am trying to find the cloudfoundry bundle [19:41] https://jujucharms.com/fullscreen/search/?text=jorge don't see cloudfoundry atm though [19:41] jcastro: did you update it recently and maybe it failed proof? [19:41] http://manage.jujucharms.com/bundle/~jorge/cloudfoundry/cloudfoundry [19:42] it's just not in jujucharms.com the non-manage part afaict [19:42] looking [19:45] jcastro: hmm, it's showing on staging so something is up between staging/production http://staging.jujucharms.com/search?search_text=cloudfoundry&op= [19:45] jcastro: will have to look into it [19:45] oh cool, so I found a real bug? [19:45] jcastro: or a mis-configure or something. [19:55] jcastro: updating my local env and doing a fresh pull of data. I'll have to chase it down, will get back to you tomorrow [19:55] no worries [19:55] I wonder how long it's been broken [19:55] I don't suppose we can add a "bundles" category? [19:55] yea, not sure. I only seem to see it missing. Others look fine. So something is up with that one bundle [19:56] jcastro: yea, there's a todo to figure out something, but not sure where it's at. [20:28] * bac -> vet [20:44] bug #1217383 [20:44] <_mup_> Bug #1217383: inspector should be the default [20:44] thanks mup [20:45] rick_h__ ""This is horrible and we know it"" lol [20:47] :) [21:12] Makyo hey, curious if you're making any headway on that d3 stuff? [21:13] * hatch is curious what the solution (if any) there is :) [21:13] hatch, git problems, just getting started, have an idea. [21:13] ahh ok cool np [21:13] git is a problem until you understand how it works hah [21:13] * hatch does not understand it [21:13] :P [21:18] I just had some weirdness left over from setting up 2fa. Helped to switch to ssh urls. [21:20] jujugui looking for a smallish review/qa https://github.com/juju/juju-gui/pull/9 [21:21] I still can't decide what kind of laptop to get so my whole setup is a mess - I feel your pain haha [21:21] doh [21:22] jujugui remember to make lint && make test-debug before issuing a PR :) [21:22] How about make check? [21:22] yeah that's fine too I SUPPOSE :P [21:23] It's almost like it's there for a reason... :) [21:23] I know right? [21:23] crazyyyyy [21:24] woah, apple.com has a huge picture of Nelson Mandela [21:27] unfortunately the apple.ca financing deals aren't nearly as good as the US ones :( [21:29] US financing is always so much better than in Canada :( [21:35] hatch, you still want review? [21:35] yup I do [21:35] k on it [21:35] I'm trying to remove this in as many atomic pieces as possible [21:35] it's very.....connected heh [21:36] :-) I believe it [21:37] ok, this is really I time for me to set up a decent git qa pattern... [21:37] gary_poster I created a new clone of the repo then run the two aliases that I added to the HACKING docs [21:37] the aliases were thanks to rick_h__ [21:37] yeah was just stealing those myself :-) [21:39] man I REALLY want to buy a MBP with 18mo 0% interest financing [21:40] anyone want to buy it for me and trust that I'll pay you back? ;) [21:43] ai-yai-yai, I need a cheat sheet [21:43] haha yeah [22:02]