[08:06] Saviq: no release? :/ [08:06] tsdgeos, your action branch conflicted and then I couldn't get anyone to reconfigure :| [08:06] when I resubmitted as ~unity-team [08:07] so yeah, that's pretty crap [08:08] sorry :/ [08:08] what it conflicted with? [08:08] tsdgeos, audioPlayer [08:08] really? [08:08] damn [08:09] tsdgeos, yeah, /// vs. //! apparently [08:09] :/ [08:10] tsdgeos, but don't be sorry, that's what this system causes [08:10] tsdgeos, that would be an advantage of the staging branch [08:11] yeah [08:11] why did we decide against it? [08:11] more work than worth it [08:12] tsdgeos, a solution would probably be to start pushing as ~unity-team instead [08:12] tsdgeos, or well, not require a special person to be able to push a button... [08:14] Saviq: well, pushing as ~unity-team doesn't solve much since it still needs someone to approve your branch, no? [08:14] s/branch/change [08:15] tsdgeos, no, 'cause there's no change in the CI train system [08:15] tsdgeos, you just build again [08:15] tsdgeos, reconfiguration is only needed when MPs change [08:15] as in MP URL [08:17] oki [08:21] tsdgeos, could you review https://code.launchpad.net/~unity-team/unity8/unity8-card-overlay/+merge/204790 please? [08:22] sure [08:22] about the build thing [08:22] so what do we do? [08:22] do i remerge my thing? [08:22] approve yours? [08:22] or? [08:23] did you resubmit all the dependant branches on mine to depend on the new one? [08:23] tsdgeos, I approved mine already, we just need to get someone to reconfigure the silo [08:23] tsdgeos, let me see if any dependant branches conflict [08:24] there's only one [08:32] ok [08:32] Saviq: do we need to resubmit it for the prerequisite branch to be updated, or that's old stuff we don't need anymore in this silo approach? [08:32] tsdgeos, yeah, just did [08:32] tsdgeos, prerequisite still helps to show the diff correctly [08:33] ok [08:33] tsdgeos, https://code.launchpad.net/~saviq/unity8/new-preview/+merge/205297 [08:33] tsdgeos, so while it's not required, it's useful still [08:34] ok [08:36] done [08:40] how THE FUCK is that a conflict http://pastebin.ubuntu.com/6890078/ [08:41] criss cross [08:41] merge with a different algorithm [08:41] that's what we get for moving stuff around and merging it in weird orders [08:41] it's a bit of sad [08:42] but as said, without staging it's what we are doomed with :D [08:42] yeah, problem is, will the train try --weave [08:42] i guess that's a question for didrocks [08:42] tsdgeos, your branch would probably merge with --weave fine, too [08:43] /have merged [08:43] oh maybe not [08:43] there was an actual conflict there [08:44] tsdgeos, anyway, I think staging is just more work, in the normal case we'd land every day, maybe two [08:44] tsdgeos, and also I'd need a `pull` instead of `merge` there, I can't live with a history of "pull from staging" [08:45] he he [08:45] sure [08:45] we just need to land every day :D [08:45] tsdgeos, and we'd have to merge stuff manually into staging, keeping authors and commit messages... bleh [08:45] tsdgeos, TBH what we really need is more control, and less waiting for didrocks to WAKE UP! ;P [08:46] or that [08:50] Saviq: readonly property var headerHeight: card.headerHeight ? [08:50] why not an alias? [08:50] tsdgeos, good question [08:52] tsdgeos, fixed [08:54] hmmmm [08:54] otoh an alias is not readonly [08:55] Saviq: can you also make it readonly? :D [08:58] tsdgeos, I did [08:58] tsdgeos, "upstream" [08:59] ¿? [08:59] tsdgeos, it's readonly in Card.qml [08:59] ah [08:59] tsdgeos, so if it's an alias in CardTool.qml, it's readonly there, too [08:59] makes sense [08:59] Saviq: shoudl that "gray" be Theme.palette.selected.backgroundText ? [08:59] tsdgeos, maybe it makes sense to mark it readonly there, too, for doc purposes [09:01] tsdgeos, did that ↑ [09:01] tsdgeos, if you branched, pull --overwrite [09:02] tsdgeos, fixed color [09:02] oki [09:02] Saviq: hi. still row 42 reconfiguring needed I guess? [09:03] Mirv, indeed :| [09:03] Saviq: we had a team dinner so obviously no-one was looking at irc even from hotel room [09:03] ok, doing [09:03] Mirv, there's one more issue... we have a criss-cross there, do you know if it will try --weave? [09:03] Saviq: no way to show the overlay in testXYZ or at least tryXYZ? [09:04] tsdgeos, let me add [09:05] Saviq: we'll find soon enough http://162.213.34.102/job/prepare-silo/73/console [09:05] tsdgeos, pushed [09:05] Mirv, thanks [09:05] Saviq: I don't see 'weave' in the sources at least [09:06] Mirv, do you know what to do with the branches to fix it? [09:06] ok let's see (/me doesn't have high hopes ;( http://162.213.34.102/job/landing-004-1-build/11/console) [09:07] Saviq: not offhand, but let's see and we should have didrocks woken up soon hopefully (7 minutes late! :) [09:08] !! [09:11] tsdgeos, added a test case, too [09:11] tsdgeos, sorry for this not being really-ready ;) [09:11] Saviq: darn [09:12] Mirv, yeah :| [09:12] Saviq: so I guess it does bzr merge after another, in the order of branches, so that should be tweaked to succeed [09:12] Saviq: or, we'd need a feature to use '--weave' [09:12] Mirv, the last branch has the second-to-last as prerequisite, so the order can't be changed there [09:13] Mirv, so yeah, we need --weave (maybe with a job param, but yeah...) [09:14] if only we could have rebase... [09:16] didrocks: http://pastebin.ubuntu.com/6890228/ [09:20] Saviq: I think we don't wait weave merge for every merge though, right? [09:22] "Bazaar no longer uses weaves by default, because they were found to have poor performance and could not provide append-only guarantees." [09:22] so, not sure we want that for everything [09:23] and if we add an option to build, it will be for every merges in the set [09:23] didrocks, oh no, but maybe if a merge fails, it will try remerge with --weave? [09:23] Saviq: do you think it will be something that everyone would wait? [09:23] like first merge [09:23] if fail, -> merge --weave? [09:23] didrocks, yeah, I think option would be good enough [09:24] didrocks, with a clear message in the log or so [09:24] didrocks, and maybe only if criss-cross is detected (if possible) [09:25] hum [09:25] not sure if I can get some easy info about criss-cross [09:25] Saviq: do you have the branches so that I can play and see? [09:26] Saviq: meanwhile, I think you will have to rebase, if possible :/ [09:26] * sil2100 looks into that in source [09:27] didrocks, row 42 in CI train [09:27] didrocks, the last two I think [09:27] * Saviq checks [09:28] didrocks, rebase... not like that's something easy in bzr :/ [09:29] Saviq: you have a plugin [09:29] didrocks, discontinued and unsupported... never had any luck with it... [09:29] oh, worked pretty good for me [09:30] * Saviq tries, then [09:30] * Saviq generally doesn't seem to have much luck with bzr... bisect never worked, either... [09:31] * didrocks didn't try bisect for a while [09:33] didrocks, rebase → first commit, full of conflicts, files lost, MAYHEM [09:35] Saviq, you are doing it wrong! [09:35] * seb128 hides [09:35] seb128, probably [09:35] Saviq, sorry, friday, troll day, all that ... happy friday! how are you? [09:36] seb128, sad atm, can't land since yesterday evening :( [09:36] :-( [09:36] ok, let's see, something rebased [09:40] Saviq: cool looking overlay! [09:40] tsdgeos, /me happy [09:41] Saviq: i don't know much/anything about shaders though [09:41] so i'll just assume the shader works because it does work [09:41] tsdgeos, it's pretty simple - the vertex shader is just the default [09:41] tsdgeos, i.e. no modification [09:41] and the other multiplies [09:41] tsdgeos, the other applies the images' opacity on black [09:41] sure i can see that [09:41] tsdgeos, that it [09:41] i just don't have a clue if it can be made faster/better [09:42] tsdgeos, ah well [09:42] tsdgeos, it's temporary anyway [09:42] hum conflict in tst_Indicators.qml, that's weird [09:42] Saviq: dednick changed lots of stuff in indicators [09:43] maybe it didn't play well together [09:43] tsdgeos, yeah, but I'm rebasing [09:43] ah [09:43] Saviq: so your card CI didn't succeed [09:43] tsdgeos, neither branch should be touching it... [09:43] but it's obviously not related to your change [09:43] tsdgeos, autopilot? [09:43] checklist-approve anyway [09:43] yeah [09:45] http://pastebin.ubuntu.com/6890343/ [09:45] WTF [09:46] weird. spacing? [09:46] on end.? [09:48] dednick, no, whitespace would've complained [09:49] anyway, no, that rebase isn't happening [09:59] * Saviq went for manual rebase [09:59] * Saviq crosses fingers http://162.213.34.102/job/landing-004-1-build/12/console [09:59] * sil2100 crosses fingers as well [10:05] \o/ [10:05] \o/ [10:05] in your FACE, bzr [10:08] HA [10:08] Saviq: good work! [10:08] ;) [10:21] sil2100, Mirv, can you please reconfigure row 42 again? just added one more MP that can land [10:24] Saviq: ok, will do [10:29] Saviq: ok, reconfigured, re-build [10:30] sil2100, thanks! [10:40] Saviq: so looking at cardheader <-> previewheader [10:41] tsdgeos, yup? [10:41] the json specifies emblem and attribute-x [10:41] that cardheader doesn't have ¿yet? [10:47] Saviq: so ignore those attribs for the moment? or? [10:48] tsdgeos, yeah [10:48] okidoki [11:00] karni, hey, rebased title alignment on trunk, but I believe it's reversed: https://code.launchpad.net/~unity-team/unity8/header-alignment/+merge/205334 [11:01] karni, it should always be Left-aligned in horizontal, sometimes center-aligned in vertical, no? [11:09] * tsdgeos kicks launchpad [11:09] so https://code.launchpad.net/~saviq/unity8/new-preview tells me there's 1 branch that depends on that one [11:09] but then the link says none [11:09] aaaaaaaa [11:09] Saviq: do you know what comes after that one? [11:11] tsdgeos, card-overlay, no? === anpok_ is now known as anpok|lunch [11:11] hmm no [11:14] Saviq: ok, looks positive you'll have a landing PPA to run tests from soonish? built for armhf now :) [11:16] Mirv, yeah [11:30] * Saviq TestPlans [11:49] jamesh: hello! [11:49] jamesh: are you around? I have some problems with the new mediascanner [12:06] Saviq: cardheader doesn't define width nor implicitwidth, that ok? === MacSlow is now known as MacSlow|lunch [12:10] mhr3: hi! [12:10] sil2100, hey [12:10] mhr3: you in the office today? [12:10] sil2100, on my way there [12:10] sil2100, btw did you see my libunity landing request? [12:10] mhr3: I'll snatch you once you appear, since I see jamesh seems to be away, and I don't see Satoris as well [12:11] sil2100, satoris in on #canonical [12:11] mhr3: poke robru for that today - he's doing most landings now as part of practicing ;) [12:11] mhr3: oh, ok, I'll poke him there as well, but you'll be poked as well [12:11] In person [12:12] Since we have a big regression related to mediascanner [12:12] And its scope [12:12] sil2100, hmm? [12:12] sil2100, i was testing that yesterday it seemed fine [12:13] sil2100, anyway, will be there in ~30 [12:13] mhr3: yeah, so... it's something that's happening only on newest images, since after the release of unity-scopes-mediascanner and mediascanner2 the grilo plugin for mediascanner got dropped [12:13] mhr3: so, basically the music-app stopped working [12:13] mhr3: like, completely [12:14] sil2100, it shouldn't have been dropped if music-app deps on it [12:14] mhr3: also, I noticed a packaging problem I guess [12:14] sil2100, but the scopes dont [12:14] mhr3: I don't think it does, it's a click app and I'm not really into how click apps deal with deps [12:14] they don't afaik [12:15] mhr3: yeah, so basically the scopes dropped the dependency and now we don't have grilo anymore [12:15] mhr3: it's not being used in either the new and old mediascanner scope? [12:15] (like, at all?) [12:15] sil2100, no, the scopes (both old and new) use mediascanner2 [12:16] that doesn't do grilo [12:16] mhr3: ok, but we still need the old mediascanner for music-app then, right? Those two can still run in parallel? [12:16] sil2100, yes [12:17] sil2100, but music-app will also transition to mediascanner2 at some point [12:17] then we'll drop the whole mediascanner1 + grilo [12:17] mhr3: ok then, so I guess we can either add grilo-mediascanner to the seed to fix it, or simply add a quick dependency to mediascanner to fetch grilo-mediascanner [12:17] mhr3: right, but for now we need to fix the image ;) [12:17] mhr3: but thanks for the info [12:24] mhr3: ok, so we decided to seed the grilo plugin in the meantime, so it's being done ;) [12:24] mhr3: so no action required from you, thanks for clearing things up [12:25] Cimi: Saviq: this one shall be easy https://code.launchpad.net/~aacid/unity8/preview_header/+merge/205354 [12:25] sil2100, good decision :) [12:29] tsdgeos, one extra new line on tests, after imports :) [12:29] and probably too many imports [12:30] tsdgeos, tests could have something more maybe? [12:30] but card header is already tested though [12:31] Cimi: yeah the only thing i am testing is my code [12:38] Cimi: fixed [12:59] tsdgeos, it should implicitHeight, yes [12:59] tsdgeos, the widget, that is, yeah - what you did [13:00] tsdgeos, header itself has explicit height [13:00] sil2100, if you still need, i'm here [13:00] tsdgeos, 127 + function test_something() { a better name maybe? === MacSlow|lunch is now known as MacSlow [13:09] tsdgeos, actually, it should be explicit height for the widget, too, no? i.e. the header doesn't really adapt when its height is changed === dandrader is now known as dandrader|afk [13:33] o/ === dandrader|afk is now known as dandrader === dandrader is now known as dandrader|afk [13:52] Saviq: am I sleepy, or tryCardTool shows 11 cases in the drop down, while source contians 15 cases for that dropdown. [13:52] karni, there's a gazillion of branches, which one? ;) [13:53] Saviq: sorry, the one you rebased https://code.launchpad.net/~unity-team/unity8/header-alignment/+merge/205334 [13:53] I fixed what you suggested (yeah.. that indeed was reversed) and wanted to inspect that visually as well [13:53] karni, just swipe ;) [13:55] NACK. First one for me is "art, header, summary", last one is "art, header - portrait" [13:55] I can see the full list from top to bottom [13:55] FTR my network is a bit laggy [13:57] let me rebuild this [13:57] I think that's my problem [13:57] Saviq: ignore me for now. [13:57] karni, ;) [14:00] tsdgeos: if you'd review this related branch as well, we'd have slick overlay both in trunk and new-scopes https://code.launchpad.net/~unity-team/unity8/newscopes-card-overlay/+merge/205359 [14:00] * karni sets description === dandrader|afk is now known as dandrader [14:02] done [14:08] Saviq: fixed [14:09] tsdgeos, cheers [14:14] Saviq, I'm writing the style for rating component, and I realised styleItem works even if I don't import Ubuntu.Components in the delegate file... why? [14:15] Cimi, it's probably the one from external scope [14:15] if your whole chain of parents won't have Ubuntu.Components, it won't be there [14:17] wooo, my hud-service went crazy [14:17] * tsdgeos kills it [14:17] better [14:18] tsdgeos: can you reproduce that? [14:18] tsdgeos: I am desperate to find a way [14:18] first time it happens [14:18] I've a report that sublimetext can send the new HUD into an infinite loop [14:19] not using that [14:19] i was using firefox, kate, kontact [14:19] the same stuff i have open all the time [14:19] mhall119, you forgot about me :( [14:20] okay, thanks, I'll try running those [14:20] but had never had this 100% before [14:20] so it must not be because of them [14:20] i notice when the laptop fan spins :D [14:20] okay, fair point, but still :) [14:20] mhr3: I could never forget you [14:21] pete-woods: anything you want me to do if it happens a next time? [14:21] (where/how did I forget you?) [14:21] mhall119, no new scopes docs [14:21] oh, right, docs [14:22] mhr3: I'm going to blame the hotel wifi and claim that I didn't forget :) [14:22] tsdgeos: if you could try and get a stacktrace out of it, that would be very helpful [14:22] mhall119, and i'll *almost* believe you [14:22] pete-woods: ok, will do if it happens again, sorry to have been to trigger fast killing it [14:22] tsdgeos: no worries [14:23] even better would be a reproducable way to cause the loop [14:23] :) [14:23] I realise that would be making my job far too easy, though [14:23] mhall119, if you said that the sun in florida melted your enter, that would be more believable :) [14:23] karni: i'm a bit confused about that MR [14:23] it wants to merge to lp:~unity-team/unity8/new-scopes but has a branch that wants to merge to lp:unity8 as pre-requisite ¿? [14:24] * karni looks [14:24] Saviq, I started working on the textSummary branch, but I didn't merge there the latest changes of audioPlayer, so when I set textSummary as prerequisite I don't have the right diff on lp https://code.launchpad.net/~cimi/unity8/units8.previews_RatingStars/+merge/205370 [14:25] tsdgeos: Correct. Saviq helped me out pull as much as we could into trunk, so this change is specific to new-scopes, but does require the other branch to be merged to unity8 trunk first. [14:25] tsdgeos: These are the new-scopes specific overlay bits. [14:26] mhr3: uploading now... [14:26] karni: i don't understand how does it matter what is in unity8 since new-scopes is a different branch [14:27] mhall119, thx [14:27] tsdgeos: in my understanding new-scopes is unity8 with only set of changes required to enable new scopes UI/toolkit. [14:27] yes [14:27] tsdgeos: when we work on dash toolkit, we do as much as we can in trunk, and as little as we can in new scopes [14:28] ok, maybe it's different understanding of "prerequiste" branches [14:28] because trunk does not contain CardFilterGrid and CardCarousel [14:28] for me a prerequisite is "something that you need landed before you land this one" [14:28] tsdgeos: I still believe the other merge to trunk is required for this merge to go smooth. [14:28] * karni looks [14:28] ok [14:29] tsdgeos: give me a sec please [14:29] sure [14:30] mhr3: check the docs and let me know if your new stuff is there [14:30] mhr3: it would be nice if you could write a parser for your docs to push them to the new API website on your own [14:30] mhall119, yep, it is, thx [14:31] mhall119, i might get to that... in 2015 [14:31] :-P [14:31] but it's easy [14:32] I even made a nice python library for you [14:32] s/nice/functional/ [14:32] can't it be both? :) [14:34] tsdgeos: unity8-card-overlay (being merged to unity8 trunk) defines property bool showHeader in qml/Dash/Card.qml, which is then used in new-scopes. My bad, please don't review the other branch now. We'll first get the trunk one merged, we'll merge changes from trunk to new-scopes, and only then we'll approve the MR I sent over into new-scopes. [14:34] tsdgeos: Now I understand the flow Saviq usually executes when there are related changes to trunk and new-scopes. [14:35] oki [14:35] first merge to trunk, then merge trunk to new-scopes, only then approve and merge related branches into new-scopes [14:35] tsdgeos: unless, you want to review it, but not top-approve it yet. that'd be the same thing, basically. [14:35] mhr3: it can be, if it was written by somebody with more talent than me :) [14:35] You're fresh on the subject, as you just reviewed the trunk one [14:36] mhr3: I just have a bad habit of re-inventing Django's model objects for any given python project [14:37] but in this case it makes sense, because it's talking directly with Django models on the server-side [14:40] mzanetti, ping === rachelliu_ is now known as rachelliu [14:40] tvoss: hi [14:42] ping mterry: I have the test passing, without depending on the calendar [14:43] elopio, calendar? [14:43] sorry, still early. s/calendar/camera [14:43] I'm wondering if we want this test in unity8, because to make it work we need the real application manager. [14:48] Saviq: pushed fix to https://code.launchpad.net/~unity-team/unity8/header-alignment/+merge/205334 . All tests pass, but the problem appears when you switch card layouts more than once in testCardTool. "Title - horizontal" > "Title - vertical" > "Title - horizontal" boom Card height undefine., no card displayed. [14:54] oh god [14:54] someone did add the automagically creating setters and getters for QPROPERTIES [14:54] \o/ [14:54] at last :D [14:55] wohoo [14:56] https://plus.google.com/117221897452321521192/posts/hZQDDnwduhs [14:57] tsdgeos, help with rating widget? from the json, I don't understand which are the data I get [14:58] let me see [14:59] tsdgeos: nice" that is awesome! [14:59] Cimi: which one are you doing? "rating-input" ? [15:00] tsdgeos, I currently just worked on the rating widget under COmponents [15:00] greyback, hey... can you make it to the hangout? [15:01] elopio, hey, do you have a maguro? [15:01] Cimi: ok, so i didn't understand your question :D [15:01] Saviq: I don't. [15:02] but I know people. What do you need? [15:02] mhr3: ping? [15:02] tsdgeos, sup [15:02] elopio, http://ci.ubuntu.com/smokeng/ we're getting some apparently random ap failures on maguro [15:02] mhr3: so how do we do progress reporting for "type": "progress" ? [15:02] tsdgeos, but I was expecting a rating bar [15:02] tsdgeos, not input and review [15:03] tsdgeos, there's some progress provider thing [15:03] tsdgeos, it looks like we're missing that widget in the spec [15:03] Cimi: the rating bar is part of the header i think [15:03] tsdgeos, scope like IMDB won't feature single reviews [15:03] tsdgeos, it's used by the app preview [15:03] tsdgeos, the old one [15:03] Saviq: robotfuel and davmor2 have maguros. Any of you have some time to try to reproduce them? [15:03] elopio, one of them was in the emulators tests, another in hud, will have to check it out then [15:03] elopio, davmor2 was already looking into it [15:04] elopio: tests are rerunning now :) [15:04] Saviq: elopio can try to reproduce on a maguro, if you need me to [15:05] mhr3: com.canonical.applications.Downloader ? [15:05] Saviq: yeah, I saw the error they mentioned on the open scope test I added. Without a maguro or a video of the run, it's really hard to understand what's going on. The log says autopilot tried the drag correctly. [15:05] elopio, indeed [15:05] mhr3: but that's too specific, no? [15:05] tsdgeos, yea, that thing [15:05] robotfuel: thanks, but it seems davmor2 is way ahead. [15:06] ack :D [15:06] tsdgeos, we didn't really define much what's the data for that widget [15:06] tsdgeos, see.... [15:06] mhr3: i know, but if we need to code it ... :D [15:06] tsdgeos, http://people.canonical.com/~mhr3/unity-scopes-api/classunity_1_1scopes_1_1_preview_widget.html#progress [15:06] mhr3: maybe that name should come as part of the json too? [15:08] mhr3: i can't edit the json document, so it would be "source": ["dbus-name" : "somename", "dbus-object": "somestring" ]; instead of "source": null , yes? [15:11] tsdgeos, ? [15:11] karni, mhr3, tsdgeos, merged everything into lp:unity-team/unity8/new-scopes [15:11] karni, tsdgeos, so reviews of https://code.launchpad.net/~unity-team/unity8/new-scopes/+activereviews can be done again [15:11] Cimi: which ratings are you speaking about? [15:12] Cimi: i.e. do you have a design so we can we sure we're speaking about the same thing :D [15:12] ack [15:13] * karni tries to reproduce with a test the problem in tryCardTool in header-alignment branch [15:14] Ironically, when using tryCardTool, problem is obvious, but from the test (by setting the drop down selector) test passes, when it should fail. === anpok|lunch is now known as anpok [15:20] tsdgeos, get my branch [15:20] tsdgeos, well, I have design in mind [15:20] didn't check specs [15:21] ah I see [15:21] basically rate this [15:21] tsdgeos, Saviq putting just an icon of a star with a label (4.9) means nothing [15:22]