| Friday, December 3rd, 2010, 00:02 UTC | ||
| [00:02:45] | inordkuo1 (inordkuo1!~inorkuo@nsc64.16.142-198.newsouth.net) has quit (Quit: Leaving.) | |
| [00:09:09] | markk_ (markk_!~mark@srv120.dedicated.netrino.co.uk) has joined #mythtv | |
| [00:16:16] | stuartm: | xris, Beirdo: who is updating the --version stuff for git? |
| [00:16:29] | xris: | ? |
| [00:18:21] | stuartm: | --version spits out the SVN revision number and whether it's built from a clean checkout or patched source, that would need updating for git? |
| [00:19:21] | stuartm: | uses svninfo atm |
| [00:21:24] | Beirdo: | If nobody else does, I can retrofit it to use git describe easily enough |
| [00:23:19] | iamlindoro: | Oh yay, I'm running .20 per git describe ;) |
| [00:23:34] | iamlindoro: | That must explain why it's so stable ;) |
| [00:25:21] | xris: | yeah, that's because the svn import tags the branches, not master. |
| [00:25:42] | xris: | we'll create a "git start" tag or something once we import |
| [00:25:54] | iamlindoro: | cool |
| [00:26:04] | xris: | and going forward, will tag master before we create the branch, not tag the branch itself |
| [00:26:25] | Beirdo: | I did put a tag at the 0.24 branchpoint recently |
| [00:26:36] | Beirdo: | on the github repo. |
| [00:27:20] | Beirdo: | b0.24 but I'm not sure that git describe will find it :) |
| [00:28:08] | xris: | I think we covered some of that with the revision stuff we talked about awhile back.. 0.25-pre and such |
| [00:28:10] | Beirdo: | as git describe just traverses up the tree, and it may still not necessarily see that tag as it's hanging off the side of the tree, essentially, and the next commit is kinda beside it, not after |
| [00:28:17] | xris: | I lost the email with the actual info Captain_Murdoch came up with |
| [00:29:28] | stuartm: | Beirdo, xris: I just figured that as the git gurus you would know how the version stuff might work with git :) |
| [00:30:09] | Beirdo: | yeah, that's one thing that will need to be tweaked in short order |
| [00:34:38] | xris: | stuartm: didn't know it was autogenerated at the moment |
| [00:34:53] | xris: | ok, trac auth migrated |
| [00:39:27] | jannau: | pushed the new repo |
| [00:39:48] | jannau: | and now only using 0.20GB/0.30GB |
| [00:46:00] | xris: | iamlindoro, stuartm, etc... svn switch --relocate svn+ssh://svn.mythtv.org/var/lib/svn-www/www.mythtv.org svn+ssh://new.mythtv.org/opt/svn/www/www.mythtv.org |
| [00:46:07] | xris: | you will need me to give you an account on the new box |
| [00:46:40] | iamlindoro: | ok, what do you need from us to get one? |
| [00:46:59] | iamlindoro: | (and will we be at "new." indefinitely?) |
| [00:47:21] | xris: | no.. new is only the temporary host until we migrate things back to the current hardware after reformat |
| [00:47:29] | xris: | it'll respond to svn.mythtv.org once osu updates dns |
| [00:48:05] | xris: | so you could wait for me to have a moment later this evening to create the accounts, and then dns won't have to change. |
| [00:48:10] | ** xris is trying to do too many things at once ** | |
| [00:49:22] | stuartm: | how long are we likely to be on the temporary server? |
| [00:50:18] | xris: | month? |
| [00:50:23] | xris: | two? |
| [00:50:31] | xris: | it'll be a LOT easier to move back, though |
| [00:51:44] | xris: | http://www.mythtv.org/ |
| [00:52:31] | stuartm: | ok then, best I switch the repo, If it was only going to be a matter of a couple of days I could wait :) |
| [00:53:30] | xris: | well, wait for the dns to updat |
| [00:53:35] | xris: | then it'll be a cleaner migration |
| [00:58:42] | xris: | TO ANYONE WHO CLONED THE GIT REPOSITORY BEFORE 5 MINUTES AGO: PLEASE DELETE AND RE-CLONE. |
| [00:59:26] | stuartm: | err, I'm not sure whether it was 5 minutes or 4 minutes 59 seconds, any way we can tell? |
| [00:59:39] | xris: | :P |
| [01:00:00] | xris: | don't force me to correct myself and make another all-caps announcement. heh |
| [01:00:18] | iamlindoro: | What are we to expect with themes? |
| [01:00:25] | iamlindoro: | Or are we on our own? |
| [01:01:27] | iamlindoro: | By which I mean, are we supposed to just manage our own themes now, or? |
| [01:02:40] | elmojo: | does anyone know what happened to the signal monitor (alt-f7)? |
| [01:02:58] | stuartm: | xris: no seriously, I started a clone about 5 minutes ago, but I'm not sure whether I'm good or not |
| [01:03:28] | iamlindoro: | stuartm, There wouldn't have been a repo between 5–15 or so minutes ago, so if you got code, you should be okay |
| [01:04:10] | stuartm: | ok, good :) |
| [01:07:45] | cesman_ is now known as cesman | |
| [01:07:57] | cesman (cesman!~cecil@pool-71-254-162-41.lsanca.fios.verizon.net) has quit (Changing host) | |
| [01:07:57] | cesman (cesman!~cecil@pdpc/supporter/professional/cesman) has joined #mythtv | |
| [01:12:03] | stuartm: | xris: did you get the TTL decreased? |
| [01:12:34] | xris: | stuartm: yeah, it's been set to 5m for a week or so |
| [01:12:52] | stuartm: | cool |
| [01:18:41] | superm1: | xris, what about that about those two merge requests that were based on the earlier git repo? |
| [01:18:45] | superm1: | do they need to be redone too? |
| [01:20:18] | xris: | superm1: yeah. we actually split the packaging stuff out from the main repo completely |
| [01:20:29] | xris: | should hopefully be able to just grant access directly to people |
| [01:20:48] | xris: | that's why we warned people not to do any work against the testing repo |
| [01:20:49] | DanC2 (DanC2!~connolly@CPE-70-94-1-208.kc.res.rr.com) has joined #mythtv | |
| [01:20:51] | superm1: | hum, where is the repo for packaging being kept? |
| [01:20:58] | DanC2: | argh! mythfilldatabase failed to run again! |
| [01:21:13] | DanC2: | what mechanism is supposed to run mythfilldatabase periodically? is it a cron job? |
| [01:21:25] | xris: | DanC2: wrong channel |
| [01:21:33] | xris: | superm1: it'll be under mythtv. we're not quite done importing the stuff we split out |
| [01:21:37] | superm1: | i'm still peplexed why separate repos make sense though for packaging too. keeping it all in one allows people to clone git and run the packaging helper script of their choice |
| [01:22:12] | xris: | how is that different from before, where it lived outside of the branch/trunk setup? |
| [01:22:26] | xris: | it *was* in a separate repo before... as far as the paths go |
| [01:22:32] | superm1: | well it was going to be nicer that it was all together now i mean :) |
| [01:22:38] | superm1: | something i was certainly looking forward to |
| [01:22:56] | superm1: | it's just a pull request to service otherwise for packaging, so ACLs should hopefully be NA if it stayed together |
| [01:23:04] | xris: | we may move it back in someday... |
| [01:23:31] | xris: | it's currently separate because isaac didn't want the packaging code mixed in with the rest |
| [01:23:51] | xris: | but as far as things go I'd much rather have the spec in the tarball... then can just build straight from the tarbal |
| [01:25:16] | superm1: | sigh. okay |
| [01:25:25] | xris: | superm1: fwiw I think we screwed a few things up... we had a few weeks of time for people to test stuff, comment, complain... |
| [01:25:37] | xris: | but none of the other devs did until we said "it's good, we're going live on thursday" |
| [01:25:45] | xris: | so then we scrambled |
| [01:25:46] | superm1: | yeah, the way things were was awesome |
| [01:25:54] | superm1: | i was quite happy (other than that mythweb thing) |
| [01:26:09] | xris: | the themes needed to be split out |
| [01:26:17] | jya (jya!~avenardj@60-242-40-141.static.tpgi.com.au) has quit (Read error: Connection reset by peer) | |
| [01:26:22] | xris: | since we won't be maintaining them officially anymore. |
| [01:26:35] | jya (jya!~avenardj@60-242-40-141.static.tpgi.com.au) has joined #mythtv | |
| [01:26:59] | Beirdo: | actually, the debian/ dir should be under packaging, I think |
| [01:27:04] | xris: | and I asked janne to split out mythextras and packaging because I thought that they weren't part of the tree (they weren't in my import). |
| [01:27:12] | superm1: | Beirdo, it can't work there |
| [01:27:14] | xris: | forgot that you had been able to fork and get the data |
| [01:27:14] | superm1: | it needs to be top level |
| [01:27:22] | superm1: | i tried to do it with a symlink, but it freaks things out |
| [01:27:43] | xris: | superm1: but don't you have a script that creates the build environment? creates tarballs, etc? |
| [01:28:10] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has quit (Ping timeout: 245 seconds) | |
| [01:28:27] | superm1: | that lived in packaging/deb/ |
| [01:28:32] | superm1: | at least for what was in my merge request |
| [01:28:52] | xris: | superm1: in svn, packaging lived *above* mythtv |
| [01:28:58] | xris: | the current setup mimics svn |
| [01:29:03] | superm1: | yeah, i know :( |
| [01:29:07] | xris: | we can discuss merging them later |
| [01:29:38] | superm1: | like i said,i was a fan of the way things got changed. it had potential to have simplified a lot of what we did and made it easier for everyone to make debs |
| [01:29:53] | superm1: | but i think i'm just going to have to wait a week or two and see how things settle before adjusting again |
| [01:29:56] | superm1: | and just turn off autobuilds for now |
| [01:30:25] | xris: | yeah |
| [01:32:16] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has joined #mythtv | |
| [01:32:24] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has joined #mythtv | |
| [01:32:57] | Beirdo: | sounds like a plan. |
| [01:34:00] | stuartm: | I've switched Ohloh over to git |
| [01:34:20] | stuartm: | will take a while before it's ingested the code |
| [01:34:24] | Beirdo: | yay. Did you add the mythweb and nuvexport repos as well? |
| [01:34:31] | stuartm: | yup |
| [01:34:35] | Beirdo: | sweet :) |
| [01:34:59] | mrguitar (mrguitar!~mrguitar@72-48-199-12.dyn.grandenetworks.net) has joined #mythtv | |
| [01:35:11] | xris: | cool |
| [01:35:18] | Beirdo: | missing nuvexport it seems. that's OK, I guess :) |
| [01:35:23] | xris: | heh |
| [01:35:34] | stuartm: | Beirdo: nah it's there, I just forgot to hit return |
| [01:35:47] | Beirdo: | heheh |
| [01:35:55] | Beirdo: | there it is :) |
| [01:37:09] | stuartm: | or course it's going to break all the existing user mappings :( |
| [01:37:16] | Beirdo: | such is life |
| [01:38:54] | XChatMav (XChatMav!~MaverickT@111.86.233.220.static.exetel.com.au) has joined #mythtv | |
| [01:40:32] | xris: | stuartm: ohloh should know my @mythtv.org |
| [01:40:35] | stuartm: | then again, it might not if the same names are used, my github username is the same as my svn username |
| [01:40:41] | xris: | we'll need to do user mappings in fisheye, too, if we want that |
| [01:40:58] | ** xris still needs to make some time for fully setting up crowd/fisheye/jira ** | |
| [01:41:19] | elmojo: | is it possible to crosslink commit messages and Trac tickets in github? |
| [01:41:30] | xris: | elmojo: I'll be working on that |
| [01:41:35] | elmojo: | ok |
| [01:41:41] | MavT (MavT!~MaverickT@111.86.233.220.static.exetel.com.au) has quit (Ping timeout: 255 seconds) | |
| [01:41:53] | xris: | it's more difficult now that we can't seem to get it moved to mysql |
| [01:42:21] | xris: | there are some seriously annoying issues with trac 0.12 |
| [01:43:10] | gigem (gigem!~david@host137.12.intrusion.com) has joined #mythtv | |
| [01:43:19] | jya: | iamlindoro: looking at doing the audio test page using MythUI thinking it would allow cool theme, but this is very new to me. I can write the code itself, but as for the theme that goes with it and the xml, I'm at loss |
| [01:43:59] | iamlindoro: | jya, If you'd like to write the code and give me an approximate idea of what arrangement you'd like in the default theme, I'm happy to take care of that |
| [01:44:14] | xris: | outta here for a couple of hours... |
| [01:44:25] | superm1: | xris, actually it doesn't mimic how things were with svn entirely – you were able to do a checkout of the top level svn directory if you wanted to, which isn't possible here. so you could have cloned top level, got packaging, mythtv, mythextras, mythplugins etc |
| [01:44:38] | iamlindoro: | even sketch something out as an image, or whatever, and I'll produce XML |
| [01:44:43] | jya: | well, the information relevant, is how many speakers there are, and what speakers is currently being played |
| [01:44:57] | xris: | superm1: did you really have enough disk space to check out all of tags? ;) |
| [01:44:58] | stuartm: | hmm, statetypes |
| [01:45:04] | iamlindoro: | yep |
| [01:45:09] | iamlindoro: | a statetype would be perfect |
| [01:45:30] | jya: | could duplicate some of those videos: http://www.avenard.org/files/media/mediatest/ . . . Test-DTS.mkv |
| [01:45:32] | iamlindoro: | statetype name="8channel" with states "frontleft" "frontright" etc. |
| [01:45:54] | xris: | superm1: I'm open to the idea of moving packaging back in.. just can't deal with it tonight with so much other stuff going on |
| [01:46:00] | superm1: | ok |
| [01:46:04] | ** xris goes afk for real ** | |
| [01:47:04] | jya: | iamlindoro: that sounds good.. now , I need to find some code to get inspired from :P |
| [01:47:31] | iamlindoro: | Some good statetype examples in the playbackbox, or anyplace showing ratings |
| [01:47:32] | gigem_ (gigem_!~david@host137.12.intrusion.com) has quit (Ping timeout: 265 seconds) | |
| [01:48:10] | jya: | ok... will digg into that |
| [01:48:11] | iamlindoro: | Basically you create a statetype, when when the state changes (ie, when the channel changes, all you have to do is m_statetype->SetState("frontleft"); etc. |
| [01:48:33] | iamlindoro: | Taht *may* be pseudocodeish, I don't have statetype code in front of me, but that's the jist |
| [01:49:07] | jya: | well, I do have to take care of doing the display of the elements no ? or it's just as simple as calling a mythui thingy ? |
| [01:49:11] | stuartm: | DisplayState(), but otherwise correct |
| [01:49:39] | stuartm: | jya: just call DisplayState() and mythui/theme handles the rest |
| [01:50:22] | iamlindoro: | And, in fact, my above example was overcomplex-- you just need one statetype, not one for each speaker arrangement |
| [01:50:23] | stuartm: | it will hide what needs hiding, display what needs displaying and the themer decides what images/text etc to associate with each state |
| [01:50:46] | jya: | I was looking at the code for the Channel Scanner, and MythUIprogressdisalog |
| [01:50:58] | jya: | or I don't even have to bother going that low level? |
| [01:51:41] | stuartm: | I wouldn't say that is the best example |
| [01:52:09] | jya: | it's the first example I found running a separate thread and updating a UI in another |
| [01:52:22] | stuartm: | I'll leave you in iamlindoro's capable hands as it's 2a.m. here and I'm calling it a night |
| [01:52:32] | jya: | good night |
| [01:52:42] | iamlindoro: | There are a bunch of ways to do it, and probably a number that are ok |
| [01:52:47] | DanC2 (DanC2!~connolly@CPE-70-94-1-208.kc.res.rr.com) has left #mythtv ("Ex-Chat") | |
| [01:53:22] | iamlindoro: | I think creating a mythuiscreen with a member QThread that plays the audio/cycles through the channels might work nicely |
| [01:53:51] | iamlindoro: | then you can have the QThread emit events and toggle the statetype in the AudioSetup::customEvent |
| [01:54:19] | stuartm: | jya: there are others, possibly better ones, all UI access must be in the main thread with events back from any additional threads, I'm struggling to think where we use a progress dialog with a thread but there are examples and ones I wrote so I know they are correct |
| [01:54:53] | iamlindoro: | Heck, if you want to write a QThread that just plays the audio and sends the events indicating channel number/speaker location/whatever back, I'll write the MythUI part myself |
| [01:55:02] | stuartm: | and since you're not actually dealing with a progress dialog it might just confuse the issue |
| [01:55:07] | jya: | stuartm: the channel scanner do just that, run a thread to scan the channels, and it sends event back to calling window |
| [01:55:34] | jya: | oh, I didn't intend to use a progress dialog, I was just looking at what was there, considering I have no idea what I'm doing |
| [01:55:36] | stuartm: | jya: ok interesting, I didn't know there was any mythui code being used there |
| [01:56:11] | jya: | and I also looked into it, because you have a standard QT Widget stuff, using mythui, just like it would happen in the general settings |
| [01:56:29] | iamlindoro: | jya, I feel your pain on the learning curve, so will leave it entirely up to you-- if you have a working audio toggler/player thread that sends events to the parent, I daresay I could throw something working together in an hour or two |
| [01:56:42] | jya: | I have that yes |
| [01:56:50] | iamlindoro: | But will leave it up to you if you'd like to slog through it and learn (which I would totally understand) or have me do it, which I am happy to |
| [01:57:04] | jya: | well, I learn by reading other's work better |
| [01:57:13] | jya: | so having a clear example is a great bit |
| [01:57:38] | iamlindoro: | Basically, what I would do if you pastebinned me code for speakertester.cpp or whatever right now is |
| [01:57:38] | jya: | let me clean up some stuff, and I could push my branch. Is git ready yet ? |
| [01:58:16] | jya: | it's a big changeset, I've move the audio settings from the general settings completely |
| [01:58:34] | iamlindoro: | open up one of my mythvideo settigns screens, change the class name, add the thread as a member, hook up a button to start and stop the thread, add a ::customEvent function to handle the events, add a statetype, and toggle the states from customEvent |
| [01:58:35] | jya: | give me 5' ... I'll have something to show |
| [01:58:36] | iamlindoro: | viola, done :) |
| [01:58:40] | iamlindoro: | sure, no rush |
| [01:58:43] | iamlindoro: | er voile |
| [01:58:45] | iamlindoro: | voila |
| [01:58:47] | iamlindoro: | ;) |
| [02:04:37] | Beirdo: | and a commit. :) just added the .gitignores |
| [02:04:49] | Beirdo: | MythTV/mythtv should be good to go |
| [02:05:05] | iamlindoro: | Beirdo, Am I right to say that e-mails will not be coming yet? |
| [02:05:19] | Beirdo: | correct. |
| [02:05:28] | iamlindoro: | ok... any ETA on that? |
| [02:05:39] | Beirdo: | we'll get that shortly though, just gotta make sure that the mailing list won't reject it. |
| [02:05:45] | Beirdo: | actually, I can point it there now. |
| [02:06:33] | Beirdo: | thank you for the reminder :) |
| [02:06:38] | iamlindoro: | np, thanks |
| [02:07:33] | Beirdo: | mailman may need a tweak to let that through, but I just sent a test |
| [02:09:18] | Beirdo: | hehe |
| [02:09:33] | skd5aner: | so... I've read through enough of the backlog to only be severly lost... what's the status on SVN --> git? |
| [02:09:39] | Beirdo: | I think we are still missing some tags :) They only go up to 0.19 :) |
| [02:09:46] | skd5aner: | are people making commits to git yet? |
| [02:10:05] | Beirdo: | skd5aner: it is available (the core part) |
| [02:10:07] | elmojo: | danielk22, jpabq: any idea on what happened to the signal monitor (alt-f7)? I thought it wasn't working even before the OSD port |
| [02:10:13] | skd5aner: | Beirdo: [02 20:37] <jannau> pushed tags until 0.19, which is the first one I would trust |
| [02:10:13] | skd5aner: | [02 20:37] <jannau> rest follows tommorrow |
| [02:10:21] | Beirdo: | the themes are not yet ready |
| [02:10:25] | Beirdo: | yep |
| [02:10:46] | Beirdo: | I know, I just got: v0.19-13104-gf067f43 |
| [02:10:54] | Beirdo: | from git describe, so I checked :) |
| [02:11:09] | skd5aner: | Beirdo: so, break it down for me... if I look at -commits, will I see code being commited? |
| [02:11:14] | Beirdo: | I just added the hook to email -commits. |
| [02:11:27] | skd5aner: | and tested it? |
| [02:11:38] | Beirdo: | but mailman may not be letting them through, we'll have to check. I don't have the password to check |
| [02:11:53] | skd5aner: | hmmm, ok |
| [02:11:56] | skd5aner: | what about trac? |
| [02:12:01] | skd5aner: | will it pick up the commits? |
| [02:12:14] | Beirdo: | trac should, but the best way is to use github |
| [02:12:25] | Beirdo: | https://github.com/MythTV/mythtv/commits/master |
| [02:12:29] | Beirdo: | in particular :) |
| [02:13:00] | Beirdo: | trac's "browse source" will kick you back to github |
| [02:13:04] | skd5aner: | So, if someone makes a change to any part of "trunk" (is it still called trunk?) including mythtv/mythweb/myththemes/nuvexpert/etc, will it show up there? |
| [02:13:12] | Beirdo: | the timeline is super-slow |
| [02:13:21] | Beirdo: | well, no |
| [02:13:22] | Beirdo: | :) |
| [02:13:28] | Beirdo: | it's called master :) |
| [02:13:42] | Beirdo: | and mythweb and nuvexport and themes are in separate repos |
| [02:13:50] | Beirdo: | all of which will be sending commit messages |
| [02:13:57] | Beirdo: | (aren't yet, but will be) |
| [02:14:04] | skd5aner: | so... hrmmmmmm |
| [02:14:24] | Beirdo: | so give us a wee bit of time, and we'll get the mailing list happy with us :) |
| [02:14:38] | skd5aner: | yea, I'm just thinking about how I'm going to track changes now for the release notes |
| [02:14:51] | skd5aner: | trac/svn made it easy, everything was sequential across all "projects" |
| [02:14:53] | Beirdo: | mailing list will still have all the commit messages for all the repos |
| [02:15:07] | markk_ (markk_!~mark@srv120.dedicated.netrino.co.uk) has quit (Ping timeout: 240 seconds) | |
| [02:15:08] | skd5aner: | yea, mailing list will still probably save me |
| [02:16:16] | elmojo: | how long are we going to use github for? |
| [02:16:18] | ** Beirdo goes to add the email in for each repo while he remembers ** | |
| [02:16:22] | skd5aner: | ARGH... every {{changeset|######}} is now broke on the wiki :'( |
| [02:16:33] | skd5aner: | https://github.com/MythTV/mythtv/commit/27382 |
| [02:16:54] | Beirdo: | hehehe |
| [02:16:54] | elmojo: | is that permanent or are we going to use our own git server one day? |
| [02:16:55] | skd5aner: | is there any way to link an existing SVN r# to a git release? |
| [02:17:04] | jya: | ohhh... that's going to be painful to fix ! |
| [02:17:17] | Beirdo: | elmojo: no plans to make our own in the near future |
| [02:17:41] | Beirdo: | skd5aner: we'll have to do a cleanup script, I guess |
| [02:17:47] | elmojo: | too bad.. github doesn't like me and the feeling is mutual |
| [02:17:58] | Beirdo: | how doesn't it like you? |
| [02:18:16] | skd5aner: | Beirdo: all existing svn release # have been given new git release numbers right? |
| [02:18:25] | elmojo: | in every way |
| [02:18:37] | Beirdo: | skd5aner: svn release numbers? |
| [02:18:42] | skd5aner: | r#s |
| [02:18:45] | Beirdo: | you mean revisions, riht? |
| [02:18:53] | skd5aner: | yes |
| [02:19:03] | Beirdo: | yes, all svn revisions have corresponding git SHA1 |
| [02:19:22] | Beirdo: | elmojo: not much I can help with with no info :) |
| [02:19:34] | skd5aner: | Is there an easy way to coorespond the old revision number with the new git number? |
| [02:19:58] | Beirdo: | elmojo: I don't see you in the list... didn't I add you yesterday? |
| [02:20:31] | elmojo: | I deleted my account because I couldn't get the keys to work and figured I might try again some other day |
| [02:20:40] | jya: | skd5aner: if the repo has been converted with the svn->git tool, it generates a file containing all the equivalent, but as a lot wasdone by hand, I'm not sure how that went |
| [02:20:43] | Beirdo: | gah |
| [02:20:50] | elmojo: | I'll probably just post patches on track and let someone else check my stuff in |
| [02:21:37] | jya: | ok, so how do we rebase our old (yesterday) clone to the new one ? |
| [02:21:48] | Beirdo: | all you need to do is create the account, create an ssh key with ssh-keygen, and put the public key into the form to submit it |
| [02:22:10] | Beirdo: | jya: git clone again into a new dir |
| [02:22:25] | jya: | what about my local changes ? |
| [02:22:46] | skd5aner: | jya: sigh, I hope we can come up with some easy way to translate svn-to-git revision/commit numbers... Beirdo? |
| [02:22:49] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has quit (Ping timeout: 265 seconds) | |
| [02:22:49] | Beirdo: | gimme a sec |
| [02:22:54] | Beirdo: | then do: |
| [02:23:15] | Beirdo: | git remote add otherrepo /old/repo/dir |
| [02:23:26] | Beirdo: | pick your own name instead of otherrepo if you wnat |
| [02:23:30] | elmojo: | Beirdo: I did that over and over and over – I guess we get what we pay for |
| [02:23:36] | Beirdo: | then git fetch otherrepo |
| [02:23:46] | Beirdo: | elmojo: did it reject your key? |
| [02:23:54] | elmojo: | it denied me |
| [02:23:57] | Beirdo: | likely it was whitespace in the paste |
| [02:24:14] | elmojo: | I used the xclip command |
| [02:24:32] | elmojo: | but it's probably the only logical explanation on why it didn't work |
| [02:24:52] | Beirdo: | elmojo: xclip likely hit enter at the end of each "line" which is bad for keys |
| [02:24:59] | Beirdo: | it has to be one long line |
| [02:25:16] | elmojo: | it did have a return at the end IIRC |
| [02:25:31] | elmojo: | I'm not very smart with computers |
| [02:25:31] | Beirdo: | jya: once you've pulled the old repo into the new one... |
| [02:25:34] | jya: | Beirdo: when I pasted my ssh public key, it had carriage return in there, worked okay |
| [02:25:53] | jya: | Beirdo: I'm doing the clone now.. not especially fast (40kB/s) |
| [02:26:17] | Beirdo: | ah. Nice thing is, the new repo's smaller |
| [02:26:42] | jya: | is there a way to see on github the fancy graph with the branches and how they merge ? |
| [02:26:51] | Beirdo: | elmojo: it's finicky about the keys. a carriage return at the end is OK, but within the key, not so much :) |
| [02:26:53] | elmojo: | can we achieve better integration by using our own git server? |
| [02:26:58] | Beirdo: | yes, the "network" button |
| [02:27:08] | aloril (aloril!~aloril@dsl-tkubrasgw3-fe7ef900-153.dhcp.inet.fi) has quit (Read error: Connection reset by peer) | |
| [02:27:25] | jya: | it's a very austere graph :) |
| [02:27:39] | Beirdo: | it's a very horizontal one :) |
| [02:27:52] | Beirdo: | you can scroll all the way back to the beginning of the repo |
| [02:28:48] | Beirdo: | elmojo: I'm not sure what you want to integrate with better, but all the tools we have don't care where the git repo is |
| [02:29:08] | jya: | all the nice commits text, with the revision number used when backporting, none of it makes sense now :( |
| [02:29:25] | jya: | and git doesn't even seem to be aware it got merged from trunk |
| [02:29:45] | Beirdo: | it didn't get merged |
| [02:29:54] | jya: | it did .. |
| [02:29:57] | Beirdo: | a merge is when you merge the entire branch |
| [02:30:02] | Beirdo: | we cherry-picked |
| [02:30:38] | jya: | it was a merge of a full revision |
| [02:30:44] | Beirdo: | right |
| [02:30:46] | jya: | and is marked as merge in mergeinfo |
| [02:30:49] | Beirdo: | not of a whole branch |
| [02:31:04] | Beirdo: | the graph doesn't show cherry-picking, it shows merges |
| [02:31:09] | jya: | normally, if done the same in git, I would have seen a little line between master and the branch |
| [02:31:16] | jya: | ah, maybe it |
| [02:31:17] | jya: | s |
| [02:31:21] | jya: | a different graph system then |
| [02:31:35] | jya: | then one I've used before, shows a little line linking the two |
| [02:31:36] | Beirdo: | go back to daniels' myth-rec branch |
| [02:31:37] | markk_ (markk_!~mark@cm69.delta193.maxonline.com.sg) has joined #mythtv | |
| [02:31:47] | Beirdo: | you'll see places where he merged in all of trunk |
| [02:31:50] | Beirdo: | that's a merge |
| [02:31:51] | elmojo: | so how do you check out revision 17b7c7abe9bb0017cd6d |
| [02:32:16] | Beirdo: | elmojo: first you clone the repo |
| [02:32:39] | Beirdo: | then if you need that particular commit, git checkout 17b7c7abe9bb0017cd6d |
| [02:32:39] | jya: | 17% clone.. going to get myself a coffee |
| [02:32:48] | Beirdo: | but normally, you won't need to do that |
| [02:32:50] | elmojo: | ah |
| [02:33:01] | Beirdo: | normally you'd checkout master or the branch |
| [02:33:02] | elmojo: | I do that alot to track down regressions |
| [02:33:05] | Beirdo: | right |
| [02:33:07] | Beirdo: | :) |
| [02:33:11] | Beirdo: | man git-bisect |
| [02:33:12] | Beirdo: | :) |
| [02:33:22] | Beirdo: | it will help you with that as well |
| [02:33:24] | elmojo: | I like to specify which commit |
| [02:33:25] | jya: | Beirdo: I remember a tool I used in the past (can't remember which one) it let you create aliases of the svn changeset number into git |
| [02:33:34] | jya: | so you could do git checkout r12345 |
| [02:33:50] | Beirdo: | really? likely used git svn though |
| [02:33:52] | elmojo: | that sounds awesome |
| [02:34:18] | jya: | it was part of the tool doing the git svn conversion |
| [02:34:22] | Beirdo: | yeah |
| [02:34:27] | jya: | mirror I mean |
| [02:34:40] | jya: | I was running a cron doing that when I created the hdaudio branch |
| [02:34:50] | jya: | cant find it now :( |
| [02:34:54] | Beirdo: | yech :) |
| [02:35:02] | aloril (aloril!~aloril@dsl-tkubrasgw3-fe7ef900-153.dhcp.inet.fi) has joined #mythtv | |
| [02:35:21] | skd5aner: | oops, well... {{changeset|gitcommit#}} only works when pointing to commits in the "mythtv" repository, not the nuvexport, mythweb, or myththemes repository :( |
| [02:35:39] | jya: | surely, those revision number can be used somewhere . On the other hand, if the history of mythweb got completely extracted, all this info is gone anyway |
| [02:35:41] | Beirdo: | once I get home, I think I'll squash up my mythsystem-rewrite branch and push it (as a branch) |
| [02:36:39] | jya: | tbh: having to choose between a big repo with perfect history identical to svn, and a small one that I can't match, I prefer the first solution. |
| [02:36:49] | jya: | I guess with time, it will be long forgotten |
| [02:37:22] | Beirdo: | yeah, you can still manually match, of course |
| [02:37:32] | Beirdo: | as the SVN commit number is in the logs |
| [02:37:54] | jya: | Am I to understand right, that the history that mythweb was ever in the mythplugin folder gone ? |
| [02:38:12] | Beirdo: | it's gone from mythplugins, yes |
| [02:38:18] | Beirdo: | it's still there in the mythweb repo |
| [02:38:23] | jya: | ok... |
| [02:39:02] | Beirdo: | likewise with nuvexport, and eventually, with the themes (once the man's had some sleep) |
| [02:39:05] | jya: | yeah, so the revision number cant be matched precisely anymore. I mean we can't do a loop going one change at a time in svn, and the same in git) |
| [02:39:13] | jya: | and matching the two |
| [02:39:15] | Beirdo: | sure you can |
| [02:39:26] | Beirdo: | but they might match in more than one repo |
| [02:39:39] | Beirdo: | and there might be holes |
| [02:39:55] | Beirdo: | as the change isn't in this one |
| [02:39:55] | skd5aner: | Beirdo: when I look at the timeline, I don't see changes to anything not in the mythtv repo |
| [02:40:02] | jya: | I was referring of doing svn log , loop thought all entry, do the same in the mythtv git repo |
| [02:40:02] | jya: | well, I know what I mean :P |
| [02:40:15] | Beirdo: | skd5aner: true. trac is only looking at that one repo |
| [02:41:04] | skd5aner: | I think I'm going to have to create new wiki templates for each repo |
| [02:41:16] | Beirdo: | possibly |
| [02:41:33] | jya: | skd5aner: BTW, congrats on the tracking history job on the wiki.. that must have taken you hours... |
| [02:41:41] | jya: | very impressive |
| [02:41:53] | JEDIDIAH__ (JEDIDIAH__!~jedi@cpe-76-185-72-21.tx.res.rr.com) has quit (Quit: Ex-Chat) | |
| [02:42:10] | Beirdo: | OK, I'm heading home |
| [02:42:19] | skd5aner: | jya: thank you, happy to lend a hand where I can... it actually shocks me how long it takes to go through about 2–3 days worth of tickets and commits at a time, usually several hours a week |
| [02:42:41] | skd5aner: | so... what's the point of several repos in github? |
| [02:43:01] | skd5aner: | I'm litterally github ignorant – I know nothing about it |
| [02:43:05] | Beirdo: | hehe |
| [02:43:08] | skd5aner: | or, git in general |
| [02:43:23] | Beirdo: | well, kormoc showed us something that precipitated it, really |
| [02:43:25] | jya: | Beirdo.. right , the clone is finished.. So the new clone is mythtv-git, the old clone is mythtv-git2.. |
| [02:43:40] | Beirdo: | if he wants to checkout ONLY mythweb... he can't |
| [02:43:55] | jya: | so I do git remote add mythtv-git mythtv-git2 ? |
| [02:44:05] | Beirdo: | jya: OK. cd into the new one |
| [02:44:15] | jya: | ok |
| [02:44:26] | Beirdo: | and git remote add (whatevername) /path/to/old |
| [02:44:27] | skd5aner: | Beirdo: so what was the reasoning? |
| [02:44:58] | skd5aner: | It just made a ton of sense to me how svn/cvs was structured... heirarchical |
| [02:45:00] | Beirdo: | then do git fetch (whatevername) |
| [02:45:03] | Beirdo: | from above |
| [02:45:08] | jya: | avenardj@ubuntu:~/Work/mythtv-git$ git add oldrepo ../mythtv-git2 |
| [02:45:08] | jya: | fatal: '../mythtv-git2' is outside repository |
| [02:45:08] | jya: | avenardj@ubuntu:~/Work/mythtv-git$ git add oldrepo ~/Work/mythtv-git2 |
| [02:45:09] | jya: | fatal: '/home/avenardj/Work/mythtv-git2' is outside repository |
| [02:45:13] | danielk22: | Is there anything we can do to speed up trac? SSD? |
| [02:45:20] | Beirdo: | git remote add |
| [02:45:25] | Beirdo: | you need that remote |
| [02:45:34] | jya: | duh |
| [02:45:35] | jya: | ok |
| [02:45:37] | Beirdo: | danielk22: yeah, don't use the timeline :) |
| [02:46:00] | Beirdo: | it's shelling out to git (as the trac-git plugin is... crap) |
| [02:46:22] | jya: | Beirdo: so now it is just like branching back ? |
| [02:46:44] | danielk22: | well i already reduced my timeline time from 25 days to 5 and that helps.. but it's still painfully slow |
| [02:46:47] | Beirdo: | yeah, basically, all the branches on your old repo are available |
| [02:47:13] | jya: | what about the work in the old repo on master? |
| [02:47:25] | Beirdo: | as (whatevername)/branch |
| [02:47:36] | Beirdo: | how many commits? |
| [02:47:47] | jya: | just 2.. could redo them by hand I guess |
| [02:47:51] | Beirdo: | if it's a handful, it's easy |
| [02:48:00] | Beirdo: | git log (whatever)/master |
| [02:48:06] | jya: | but then I did a merge in my private branch |
| [02:48:20] | Beirdo: | get the two sha1 (only need the first 6 or 7 characters) |
| [02:48:34] | markk_ (markk_!~mark@cm69.delta193.maxonline.com.sg) has quit (Ping timeout: 260 seconds) | |
| [02:48:41] | Beirdo: | then (in the correct order): git cherry-pick (fill in sha1) |
| [02:48:49] | jya: | ambiguous argument 'oldrepo/master' |
| [02:48:50] | Beirdo: | while on master |
| [02:49:10] | wagnerrp (wagnerrp!~wagnerrp_@NR-FT1-66-42-240-159.fuse.net) has joined #mythtv | |
| [02:49:32] | Beirdo: | git log oldrepo/master |
| [02:49:36] | Beirdo: | didn't do it? |
| [02:49:43] | jya: | nope |
| [02:49:52] | jya: | git log oldrepo/master |
| [02:49:52] | jya: | fatal: ambiguous argument 'oldrepo/master': unknown revision or path not in the |
| [02:49:52] | jya: | Use '--' to separate paths from revisions |
| [02:49:58] | Beirdo: | ummm |
| [02:50:06] | Beirdo: | did you git fetch oldrepo? |
| [02:50:22] | Beirdo: | after adding the remote, you have to fetch |
| [02:50:25] | jya: | course not, you didn't tell me :) |
| [02:50:33] | Beirdo: | umm, think I did :) |
| [02:50:51] | jya: | tad faster here, 44MB/s (in vmware), thanks SSD |
| [02:50:56] | Beirdo: | but anyways :) |
| [02:51:15] | jya: | all there |
| [02:51:16] | jya: | col |
| [02:51:17] | jya: | cool |
| [02:51:22] | jya: | this is very neat.. |
| [02:51:25] | Beirdo: | OK, NOW git log oldrepo/master |
| [02:51:27] | Beirdo: | heh |
| [02:51:56] | jya: | I worked with mercurial for a while, I had to do the exact same thing once, and it took me hours because I had to redo all diff by diff |
| [02:52:00] | Beirdo: | heh |
| [02:52:12] | Beirdo: | yeah, for 2 diffs, cherry-picking is simple |
| [02:52:19] | Beirdo: | for the branch, we'll rebase it |
| [02:52:35] | Beirdo: | as it's local anyways (not pushed elsewhere) |
| [02:53:08] | jya: | no need to commit if doing git cherry-pick ? |
| [02:53:10] | skd5aner: | um, can you view the source at github? |
| [02:53:22] | Beirdo: | nope, cherry-picking actually commits for you |
| [02:53:24] | Beirdo: | skd5aner: yes |
| [02:53:28] | jya: | ok done... |
| [02:53:33] | skd5aner: | doh, nm... I was in "mythtv/themes |
| [02:53:36] | skd5aner: | repo |
| [02:53:38] | skd5aner: | nothing there |
| [02:53:51] | Beirdo: | so git log should show those commits |
| [02:53:57] | jya: | git log | less |
| [02:54:01] | jya: | oops wrong winfow |
| [02:54:03] | Beirdo: | you don't need | less |
| [02:54:08] | Beirdo: | it does it for you :) |
| [02:54:15] | jya: | ohhhh |
| [02:54:20] | jya: | aaahhhh |
| [02:54:25] | Beirdo: | Linus is a smart man :) |
| [02:54:47] | iamlindoro: | what does one need to do after a git add to get something to show up in a git diff? |
| [02:55:14] | Beirdo: | you've staged it already for commit, so git diff --staged |
| [02:55:43] | iamlindoro: | ew... what about the changes since I added it? |
| [02:55:54] | Beirdo: | git diff (with no — after) shows unstaged changes only |
| [02:56:25] | jya: | so Beirdo, before you head home... how do I rebase my old private branch on the new one ? |
| [02:56:37] | jya: | (I can feel like you're going to be hassled about git for weeks now :) ) |
| [02:56:37] | iamlindoro: | I git added two files, then made more changes... so how do I just see a dif of the current status? |
| [02:56:42] | Beirdo: | jya: OK. create a branch with the same name |
| [02:56:58] | jya: | done |
| [02:56:59] | Beirdo: | iamlindoro: git diff :) |
| [02:57:04] | iamlindoro: | Beirdo, nope |
| [02:57:15] | Beirdo: | gimme a sec :) |
| [02:57:15] | iamlindoro: | just shows changes minus the git add'ed files |
| [02:57:35] | jya: | yeah, give him a sec, I was first :P |
| [02:57:41] | Beirdo: | jya... now for the fun part :) |
| [02:57:42] | Beirdo: | heh |
| [02:57:58] | Beirdo: | git checkout branchX |
| [02:57:59] | wagnerrp (wagnerrp!~wagnerrp_@NR-FT1-66-42-240-159.fuse.net) has quit (Remote host closed the connection) | |
| [02:58:29] | Beirdo: | git pull oldrepo +branchX:branchX |
| [02:58:44] | Beirdo: | I'm SURE there's a shortform, but hell, this works |
| [02:59:02] | Beirdo: | what that does is force pulls from the old repo into the local branch |
| [02:59:13] | jya: | magic ! |
| [02:59:17] | jya: | everything seems there |
| [02:59:17] | Beirdo: | but... |
| [02:59:24] | Beirdo: | it's still based on the old repo |
| [02:59:26] | Beirdo: | so... |
| [02:59:36] | Beirdo: | git rebase --onto master branchX |
| [03:00:03] | jya: | $ git rebase --onto master newaudiosetup |
| [03:00:03] | jya: | First, rewinding head to replay your work on top of it... |
| [03:00:03] | jya: | Nothing to do. |
| [03:00:15] | Beirdo: | blargh |
| [03:00:30] | Beirdo: | git log still shows it there, right? |
| [03:00:40] | markk_ (markk_!~mark@srv120.dedicated.netrino.co.uk) has joined #mythtv | |
| [03:00:40] | jya: | hum.. and now my changes are gone from the old repo |
| [03:00:48] | jya: | now, it shows the log of the new master |
| [03:00:58] | jya: | with the cherry-pick I added |
| [03:01:05] | Beirdo: | git status |
| [03:01:15] | Beirdo: | (I fat fingered the rebase, sorry) |
| [03:01:21] | jya: | # On branch newaudiosetup |
| [03:01:21] | jya: | nothing to commit (working directory clean) |
| [03:01:33] | Beirdo: | OK, do the git pull oldrepo line again |
| [03:01:46] | jya: | done |
| [03:01:59] | Beirdo: | it should be back, correct? |
| [03:02:09] | jya: | yes, log shows all my changes |
| [03:02:13] | Beirdo: | good :) |
| [03:02:26] | jya: | before the new change on master |
| [03:02:52] | Beirdo: | git rebase -i --onto master oldrepo/master newaudiosetup |
| [03:03:04] | Beirdo: | I THINK is it. -i makes it interactive, brings up vi |
| [03:03:28] | jya: | otherwise I'm just going to do it by hand again |
| [03:03:32] | Beirdo: | it should have a list of all your commits on that branch, and nothing more |
| [03:03:34] | jya: | plus, the bad svn habit |
| [03:03:40] | jya: | I could have done some extra commit |
| [03:04:07] | jya: | looks okay yes |
| [03:04:20] | Beirdo: | it has only the changes you want, nothing more, nothing less? |
| [03:04:34] | jya: | yes.. it seems to have merge automatically with the new master too |
| [03:04:46] | jya: | even the changes I didn't have merge before |
| [03:05:06] | Beirdo: | I assume you saved and quitted from vi then? ;) |
| [03:05:20] | jya: | wasn't VI actually |
| [03:05:26] | jya: | another editor |
| [03:05:28] | Beirdo: | well ${EDITOR} |
| [03:05:43] | jya: | I don't have it defined |
| [03:05:48] | jya: | not sure which one it used |
| [03:06:00] | jya: | oh well, all seems good now |
| [03:06:01] | Beirdo: | but you saved/quit out, it did the rebase? |
| [03:06:06] | jya: | it did |
| [03:06:10] | Beirdo: | sweet |
| [03:06:21] | Beirdo: | at that point you should be good |
| [03:06:46] | Beirdo: | good enough for me to go home anyways :) |
| [03:06:51] | Beirdo: | iamlindoro: back to you first :) |
| [03:07:02] | jya: | thanks for that |
| [03:07:08] | Beirdo: | git diff will show the unstaged changes |
| [03:07:10] | iamlindoro: | I give up, I'm with elmojo, I'll just open tickets |
| [03:07:23] | iamlindoro: | I just want to see all of the potentially committable changes |
| [03:07:26] | Beirdo: | git diff --staged shows the ones you've added but not committed yet |
| [03:07:48] | iamlindoro: | I added some files, made some changes to them, now I just want to see a diff as an applyable patch |
| [03:08:01] | iamlindoro: | neither git diff not git diff --staged gives me that |
| [03:08:05] | Beirdo: | diff from what to what though? |
| [03:08:10] | Beirdo: | oooh |
| [03:08:14] | iamlindoro: | from stock source to current course |
| [03:08:16] | Beirdo: | one sec |
| [03:08:20] | iamlindoro: | er source |
| [03:09:05] | itp (itp!~itp@c-68-33-63-35.hsd1.va.comcast.net) has joined #mythtv | |
| [03:09:21] | itp (itp!~itp@c-68-33-63-35.hsd1.va.comcast.net) has left #mythtv () | |
| [03:10:02] | jya: | Beirdo: can I delete the information about the old repo in .git/config ? it's giving me error messages now that I need to tell which one to use |
| [03:10:27] | Beirdo: | looks like git diff HEAD |
| [03:10:44] | Beirdo: | jya: sure, if you are done with it. |
| [03:10:46] | iamlindoro: | jya, any chance you have just the audio player thread you can pastebin? It doesn't even have to be perfect, I just have a UI to plug it in to now and have guests coming in a bit so was hoping to give you something to work with tonight |
| [03:11:03] | jya: | imalindoro |
| [03:11:06] | jya: | I'm just committing |
| [03:11:22] | Beirdo: | iamlindoro: try git diff HEAD |
| [03:11:23] | jya: | you can do git checkout newaudiosetup to get the new code, |
| [03:11:34] | iamlindoro: | oh no, there are git steps involved? |
| [03:12:04] | jya: | well, it's on a private branch |
| [03:12:08] | iamlindoro: | Any chance I can just have a pastebin of the changes? |
| [03:12:11] | jya: | but swapping branches with git is instant |
| [03:12:15] | jya: | sure |
| [03:12:22] | iamlindoro: | I'm never going to figure out git in time to get you anything to work with |
| [03:12:23] | jya: | let me work that one out :) |
| [03:12:30] | iamlindoro: | Beirdo, git diff HEAD seems to work |
| [03:12:36] | iamlindoro: | (and might for what jya needs too) |
| [03:13:02] | Beirdo: | cool |
| [03:13:12] | Beirdo: | I'll head home at this point. :) |
| [03:14:00] | jya: | iamlindoro: I've already comitted my changes locally, so git diff doesn't work :( |
| [03:14:22] | iamlindoro: | hmm... then any idea how I can check out your branch? |
| [03:14:28] | iamlindoro: | Hopefully while maintaining my changes? |
| [03:14:30] | jya: | I know that |
| [03:14:36] | jya: | but I don't know how to commit it yet :( |
| [03:18:07] | jya: | ok, let's go for a diff then :) |
| [03:19:14] | jams: | jya you could run gitk and then right click on the commit and export it to a file(patch) |
| [03:19:33] | jya: | iamlindor: git rebase -i --onto master oldrepo/master newaudiosetup |
| [03:19:35] | jya: | damn |
| [03:19:39] | jya: | wrong paste |
| [03:19:44] | jya: | http://mythtv.pastebin.ca/2009196 |
| [03:20:16] | iamlindoro: | K, thanks, let me digest for a minute and plug in, then get you something in a few |
| [03:20:54] | jya: | for the explanation. |
| [03:21:14] | jya: | the file you want to look into is in program/mythfrontend/audiosetup.cpp |
| [03:21:53] | jya: | the class running the audio test is AudioTestThread |
| [03:22:18] | jya: | and it is called from AudioConfigSettings::AudioTest() |
| [03:22:36] | iamlindoro: | No problem-- I am just going to steal the thread itself and hook it in to what I've got, make it work, and then give it all to you and then you'll be able to see how it works |
| [03:22:47] | jya: | that sounds good |
| [03:23:08] | jya: | the AudioTestThread should work anywhere |
| [03:23:41] | jya: | it takes 3 arguments: main audio device name , passthrough device name or QString() , and how many channels |
| [03:24:26] | jya: | and you start the test with AudioTestThread::start() |
| [03:25:27] | jya: | the channel order generated is SMPTE, I need to make it more human readable |
| [03:26:19] | jya: | it will play one second of pink noise on each speaker individually |
| [03:26:35] | iamlindoro: | OK... let me see if I can work it out and let you know if I have any questions |
| [03:27:51] | wagnerrp (wagnerrp!~wagnerr@NR-FT1-66-42-240-159.fuse.net) has joined #mythtv | |
| [03:29:49] | jya: | hum... you need to apply the fix o]I have on the trunk, otherwise it will crash |
| [03:31:00] | jya: | ah, I did push this one |
| [03:31:26] | jya: | so make sure you a git pull , this will update libs/libmyth/audio/audiooutbase.cpp |
| [03:34:14] | Beirdo^2 (Beirdo^2!~beirdo@166.205.8.56) has joined #mythtv | |
| [03:36:59] | iamlindoro: | will do |
| [03:39:19] | holomntn (holomntn!~Joe@71-93-231-1.dhcp.mdfd.or.charter.com) has joined #mythtv | |
| [03:49:45] | jya: | is there anything you want me to simplify or add ? What I ultimately wanted was to be able to play the test in a loop, with a button to cancel |
| [03:54:37] | iamlindoro: | Honestly, I'm just sort of lifting code and copying it in to what I've got right now, What you end up with won't be a final product but it will do what you described right now |
| [03:54:47] | iamlindoro: | Hopefully it will at least give you something to work with |
| [03:55:26] | Beirdo^2 (Beirdo^2!~beirdo@unaffiliated/beirdo) has joined #mythtv | |
| [03:55:26] | Beirdo^2 (Beirdo^2!~beirdo@166.205.8.56) has quit (Changing host) | |
| [03:57:10] | Beirdo is now known as Guest65277 | |
| [03:59:59] | jya: | that's ace.. can always work on something from there, at least from the code point of view.. I'm no graphist |
| [04:02:21] | inordkuo (inordkuo!~inorkuo@adsl-35-15-47.int.bellsouth.net) has joined #mythtv | |
| [04:05:03] | Guest65277 is now known as Beirdo | |
| [04:07:46] | mrec (mrec!~markus@sundtek.de) has joined #mythtv | |
| [04:07:48] | mrec (mrec!~markus@sundtek.de) has left #mythtv () | |
| [04:21:23] | jya: | iamlindoro: you can get the branch with git checkout newaudiosetup, but easiest to work on the same branch |
| [04:28:53] | superm1: | so if you won't have other people contributing to that topic branch, it should have been made as a personal branch (IMO) rather than on the mythtv organization's area |
| [04:33:02] | J-e-f-f-A (J-e-f-f-A!~J-e-f-f-A@unaffiliated/j-e-f-f-a) has quit (Quit: Oh No!!!! ;-)) | |
| [04:33:29] | Beirdo: | oO |
| [04:34:15] | Beirdo: | this will work fine though |
| [04:35:06] | Beirdo: | I'd rather see people using branches than not :) although if you want to push it as jyavenard/newaudiosetup that could be cool too |
| [04:36:02] | jya: | superm1: I've deleted the branch, because I've just realised that while the end-result is identical to what I had before the new git repo... how it got there is messed up for some reasons |
| [04:36:25] | jya: | like the first 2 changeset shows pretty much nothing, and the 3rd one shows all of it |
| [04:36:44] | Beirdo: | odd |
| [04:36:53] | jya: | superm1: the whole point of switching to git, was to facilitate the use of merge.. so I'm certainly not going to refrain on using that feature ! |
| [04:37:32] | jya: | like here, in 2 minutes, we can have a great mechanism to share work in progress between iamlindoro and I, withou messing up with trunk |
| [04:37:41] | Beirdo: | yup |
| [04:38:00] | jya: | so not wanting branch on the master is a rather odd point of view |
| [04:38:05] | Beirdo: | that's precisely what git is superb for |
| [04:38:33] | Beirdo: | we aren't going to ask the mythtv devs to fork a personal copy |
| [04:38:39] | jya: | and it's much easier for other dev to work from the master repo, than suddenly working of mine.. |
| [04:38:43] | Beirdo: | you are welcome to if ya want, but no need |
| [04:39:09] | jya: | Beirdo: and I certainly not have the bandwitdh at home to have my own repo and people sucking from it |
| [04:39:25] | Beirdo: | heh |
| [04:39:51] | Beirdo: | well, if you did, you could do it as a forked repo on github, but still no real need |
| [04:40:05] | jya: | yeah, but aren't I limited to 300MB then ? |
| [04:40:16] | Beirdo: | for your own, yes |
| [04:40:17] | iamlindoro: | jya, OK, I have something that works. The Theme is ugly as hell, and all it does is the speaker test, but it's only meant to prove how to do it. It would be very very easy to built a proper MythUI audio setup, but hopefully this gives you some ideas. |
| [04:40:22] | iamlindoro: | jya, http://mythtv.pastebin.ca/2009235 |
| [04:40:22] | Beirdo: | we are at 200M right now |
| [04:40:32] | jya: | having to pay for doing free work and spend so much time.. no thanks :) |
| [04:40:41] | iamlindoro: | jya, It also just hardcodes ALSA:default and ALSA:iec958 right now |
| [04:40:51] | Beirdo: | you don't have to pay. :) |
| [04:41:00] | Beirdo: | and the 300M is a soft limit anyways |
| [04:41:03] | jya: | if I dtay < 300MB |
| [04:41:11] | Beirdo: | but still, no need |
| [04:41:17] | iamlindoro: | jya, It would be really easy to convert the entire Audio setup over to proper MythUI, I could do it in a couple of evenings-- everything there is easily representable in MythUI |
| [04:41:24] | jya: | I'm already buying a sound processor doing DTS-HD, just so I can test my bloody code :) |
| [04:41:39] | Beirdo: | heh |
| [04:41:41] | Beirdo: | nice |
| [04:41:45] | iamlindoro: | jya, speakertest.cpp/h is what is relevant, to test it out you may need to adjust the device strings I put in there |
| [04:41:50] | jya: | I think myth is one of the most expensive hobby of all |
| [04:42:04] | Beirdo: | try getting a pilot's license :) |
| [04:42:21] | Beirdo: | have a friend who did that |
| [04:42:35] | iamlindoro: | jya, actually, let me get you a better diff |
| [04:42:38] | jya: | iamlindoro: it's a full diff from trunk ... what files did you change ? |
| [04:42:57] | iamlindoro: | let me see if I can get more targeted |
| [04:43:40] | jya: | don't worry, I'll find my way.. just re-creating my branch right now, so I have plenty of commit and details like jannau likes :P |
| [04:44:11] | Captain_Murdoch: | does pastebin have an API or is there a command-line script for pasting? would be nice sometimes to be able to just "git diff | post_at_pastebin.sh" and have that return a URL |
| [04:44:34] | iamlindoro: | jya, http://mythtv.pastebin.ca/2009236 |
| [04:44:38] | jya: | Captain_Murdoch, I save as a file, and do an upload file often |
| [04:44:40] | iamlindoro: | That only includes the files I've changed |
| [04:44:53] | iamlindoro: | a couple of cross-hunks with yours, but you'll get the idea |
| [04:44:55] | Beirdo: | Captain_Murdoch: I think there's a perl module that makes that simple |
| [04:45:06] | Captain_Murdoch: | jya, same here, but would be nice to get rid of the intermediate file. |
| [04:45:14] | iamlindoro: | jya, Basically, apply as best you can, then find the speaker test item under the "Audio" item you added to the menu |
| [04:46:24] | Captain_Murdoch: | although I normally have 10–20 versions of a diff. guess I may not need that if I commit locally now every so often and have good backups. |
| [04:46:55] | jya: | does github handles patch stack too ? |
| [04:46:57] | iamlindoro: | jya, There are a lot of places it coudl be better-- first off, because I was in a rush I just hardcoded the device names in the code. If we just did a proper port to MythUI of the audio settings, which we ought to, then it wouldn't be an issue. The theme is also ugly, and currently just passes the channel number back as the statetype-- it should probably instead pass back a "friendly" string like frontleft, frontright, etc. |
| [04:46:58] | jya: | those are great... |
| [04:47:02] | Beirdo: | if you want to, you can squash them down before pushing your tree |
| [04:47:35] | Beirdo: | which is what I'm doing in mythsystem-rewrite at the moment |
| [04:47:57] | iamlindoro: | Anyway, my suggestion would be we convert the entire audio setup to MythUI, and just do a switch() before sending back the ChannelChangedEvent and convert channum to friendly name... Anyway, hope that gives you something to start with |
| [04:48:12] | iamlindoro: | I gotta go, have been working with guests here for an hour |
| [04:48:20] | Captain_Murdoch: | Beirdo, yeah, I'd want to just push the final version, especially since I revert/rework things sometimes. |
| [04:48:44] | Beirdo: | yeah, as long as you haven't pushed it yet... |
| [04:48:58] | Beirdo: | git rebase -i master (or whatever you branched from) |
| [04:49:08] | Beirdo: | assuming you are working on a branch |
| [04:49:20] | Captain_Murdoch: | right. I'm just talking about doing a "git commit" instead of a "git diff > ~/patches/some_new_feature/some_new_feature_v12.diff" |
| [04:49:21] | Beirdo: | then you tell it what to squash together, etc |
| [04:50:07] | Beirdo: | ahh |
| [04:50:28] | Captain_Murdoch: | let git keep my history for me then squash before pushing. does squash lose intermediate changes? |
| [04:51:01] | Beirdo: | it basically applies the patches together in turn, then commits the results |
| [04:51:35] | Beirdo: | so basically, it's compressed into one commit |
| [04:51:45] | Captain_Murdoch: | but if i want to see the diff from change 3 out of 5, can I get to that history later? or does squash get rid of it and just put in the one aggregate diff? |
| [04:51:58] | Beirdo: | puts in the aggregate |
| [04:51:59] | Captain_Murdoch: | talking local commit right? |
| [04:52:02] | Beirdo: | yes |
| [04:52:03] | Beirdo: | :) |
| [04:52:19] | Captain_Murdoch: | ok. so I'll want to keep diffs around probably. sometimes I refer back to them depending on what they are. |
| [04:52:19] | Beirdo: | if you've pushed the commits, you will mess up anyone who has pulled |
| [04:52:36] | Captain_Murdoch: | nah, only push when I'd normally do a svn commit. |
| [04:53:08] | Captain_Murdoch: | so other people only see my 30th version, not hte first 29. :) |
| [04:53:43] | Beirdo: | well, if the history is in git, it will push the history :) |
| [04:54:05] | Beirdo: | so you may want to create your own snapshots :) |
| [04:55:21] | Captain_Murdoch: | so squash doesn't get rid of that history? |
| [04:55:34] | Captain_Murdoch: | this may be what I saw stuartm asking about the other day. |
| [04:55:52] | Beirdo: | it does, yes |
| [04:56:08] | Beirdo: | but then you lose your series of diffs |
| [04:56:50] | Captain_Murdoch: | yeah, fine with that normally. I'll keep it in mind, habit will probably have me diff-ing to multiple versioned diff files for a long time anyway. |
| [04:56:52] | Beirdo: | it's a way of taking the nearly 100 commits on my tree, compressing it down as much as I can while keeping the commits topical. I *want* to lose some of the history :) |
| [04:57:04] | Captain_Murdoch: | right, ditto. |
| [04:57:07] | Beirdo: | I just want the end working result :) |
| [04:57:50] | ** Captain_Murdoch runs his first binaries compiled from the git checkout and as expected they work just like the svn checkout. ** | |
| [04:57:58] | Beirdo: | yay :) |
| [04:58:03] | Beirdo: | except --version |
| [04:58:04] | Beirdo: | hehe |
| [04:58:10] | Captain_Murdoch: | no speed degredation, no majic smoke escaping, etc.. |
| [04:59:02] | Captain_Murdoch: | could almost say technically this is a version 'exported' from svn though. :) |
| [04:59:21] | Beirdo: | heh, true |
| [04:59:28] | Beirdo: | that will get fixed soon enough |
| [04:59:44] | ** Captain_Murdoch hopes he doesn't have ot ask for help on the -users list before that gets fixed. ** | |
| [05:01:06] | Captain_Murdoch: | almost thought my compile didn't finish though, normally I just make && sudo make install, but this time I just ran make. when it stopped after compiling mythfrontend I thougth it must have stopped in one of hte parallel makes on another file. didn't realize that mythfrontend was the last thing to compile now. |
| [05:02:53] | Captain_Murdoch: | iamlindoro, I was able to playback a mpg file off my remote webserver using mythavtest with current trunk. |
| [05:05:59] | iamlindoro: | Captain_Murdoch, cool, not I |
| [05:06:10] | iamlindoro: | well, I tried mov, avi, and wmv, anyway |
| [05:06:37] | Captain_Murdoch: | not sure where this file came from, it was one of my old mythcommflag test samples from a user. probably ivtv source. |
| [05:07:18] | iamlindoro: | Just tried mpeg-2, no dice |
| [05:07:26] | Captain_Murdoch: | if seeking doesn't work, then anything that has to seek in the file won't work. ie, you won't be able to pay a nuv since it tries to seek to the end to load the extra data. |
| [05:07:37] | iamlindoro: | Only thing they all share in common is that they return some value less thank peek() requests |
| [05:07:39] | elmojo (elmojo!~elmojo@unaffiliated/elmojo) has quit (Remote host closed the connection) | |
| [05:07:51] | iamlindoro: | It's just plain playback that doesn't work |
| [05:07:56] | iamlindoro: | fails out before getting anything at all |
| [05:09:06] | Captain_Murdoch: | right, but I believe some containers have to seek when they are opened. that might break playback if they can't seek. not sure... |
| [05:09:43] | elmojo (elmojo!~elmojo@unaffiliated/elmojo) has joined #mythtv | |
| [05:09:49] | iamlindoro: | ah, I get what you're saying |
| [05:12:13] | iamlindoro: | well sounds like we need to get seeking working, then ;) |
| [05:13:06] | Captain_Murdoch: | those files failed also for me. |
| [05:13:38] | Captain_Murdoch: | adding a simpl url_seek() call in ::Seek() didn't help, but I don't have time to debug. baby monitor is starting to make noise.... |
| [05:14:05] | iamlindoro: | http://dveo.com/downloads/VGA2/sample-digital . . . streams.html those seem to behave |
| [05:14:18] | iamlindoro: | albeit very choppily here |
| [05:15:17] | iamlindoro: | Yikes, we definitely need to implement better buffering, too |
| [05:15:30] | iamlindoro: | (since 18–35 Mbit samples are too much for my poor connection) |
| [05:25:43] | Captain_Murdoch: | pretty sure default buffer size is only 4MegaBytes, so that doesn't hold much at that bitrate. you might try bumping that up in ringbuffer.cpp as a test. |
| [05:26:10] | Captain_Murdoch: | and you can always pause. :) |
| [05:26:21] | iamlindoro: | heh, doesn't help |
| [05:26:22] | iamlindoro: | I tried |
| [05:26:53] | iamlindoro: | pausing, that is |
| [05:27:36] | Captain_Murdoch: | constant stuttering or spurts? |
| [05:31:34] | iamlindoro: | constant |
| [05:31:48] | ** iamlindoro heads off to bed, sick and have a marathon to run Sunday ** | |
| [05:39:59] | rooaus1 (rooaus1!~cameron@ppp118-209-13-249.lns20.mel4.internode.on.net) has joined #mythtv | |
| [05:41:05] | rooaus (rooaus!~cameron@ppp118-209-9-132.lns20.mel4.internode.on.net) has quit (Ping timeout: 255 seconds) | |
| [05:48:42] | inordkuo (inordkuo!~inorkuo@adsl-35-15-47.int.bellsouth.net) has quit (Quit: Leaving.) | |
| [05:56:29] | mrand (mrand!~mrand@ubuntu/member/mrand) has left #mythtv () | |
| [05:57:33] | J-e-f-f-A (J-e-f-f-A!~J-e-f-f-A@unaffiliated/j-e-f-f-a) has joined #mythtv | |
| [06:31:56] | mrand (mrand!~mrand@ubuntu/member/mrand) has joined #mythtv | |
| [07:01:25] | ghoti (ghoti!~paul@74-51-38-192.telnetcommunications.com) has quit (Read error: Operation timed out) | |
| [07:01:30] | ghoti (ghoti!~paul@74-51-38-192.telnetcommunications.com) has joined #mythtv | |
| [07:03:13] | discernica (discernica!~bfleming@76-10-179-162.dsl.teksavvy.com) has quit (Ping timeout: 240 seconds) | |
| [07:03:35] | discernica (discernica!~bfleming@76-10-179-162.dsl.teksavvy.com) has joined #mythtv | |
| [07:05:58] | Chutt_ (Chutt_!~ijr@cpe-24-166-52-87.neo.res.rr.com) has quit (Read error: Connection reset by peer) | |
| [07:06:33] | Chutt_ (Chutt_!~ijr@cpe-24-166-52-87.neo.res.rr.com) has joined #mythtv | |
| [07:06:59] | Gibby (Gibby!~gibby@204.118.10.244) has quit (Remote host closed the connection) | |
| [07:07:45] | skd5aner (skd5aner!~skd5aner@cpe-069-132-082-180.carolina.res.rr.com) has quit (Ping timeout: 245 seconds) | |
| [07:09:31] | skd5aner (skd5aner!~skd5aner@cpe-069-132-082-180.carolina.res.rr.com) has joined #mythtv | |
| [07:09:50] | elmojo (elmojo!~elmojo@unaffiliated/elmojo) has quit (Ping timeout: 255 seconds) | |
| [07:10:21] | elmojo (elmojo!~elmojo@unaffiliated/elmojo) has joined #mythtv | |
| [07:14:40] | Gibby (Gibby!~gibby@204.118.10.244) has joined #mythtv | |
| [07:26:15] | Goga777 (Goga777!~Goga777@shpd-92-101-129-236.vologda.ru) has joined #mythtv | |
| [07:28:31] | MavT (MavT!~MaverickT@111.86.233.220.static.exetel.com.au) has joined #mythtv | |
| [07:31:11] | XChatMav (XChatMav!~MaverickT@111.86.233.220.static.exetel.com.au) has quit (Ping timeout: 240 seconds) | |
| [07:35:54] | natanojl (natanojl!~jonatan@c83-252-237-63.bredband.comhem.se) has joined #mythtv | |
| [07:47:15] | raynop (raynop!~quassel@41.14.63.38) has joined #mythtv | |
| [07:56:18] | raynop (raynop!~quassel@41.14.63.38) has quit (Quit: LONG LIVE THE WUG!!) | |
| [07:59:54] | Beirdo: | heh. two new branches. |
| [08:05:03] | ghoti (ghoti!~paul@74-51-38-192.telnetcommunications.com) has quit (Read error: Operation timed out) | |
| [08:06:05] | natanojl (natanojl!~jonatan@c83-252-237-63.bredband.comhem.se) has quit (Ping timeout: 264 seconds) | |
| [08:07:00] | jya: | Beirdo: okay took me a while to get where I wanted.. For some reason it would allow me to name my branch straight into temp/newaudiosetup |
| [08:07:09] | jya: | had to create newaudiosetup then rename it.. |
| [08:07:55] | Beirdo: | odd |
| [08:08:20] | jya: | is there a way in github to remove all teh biggerish at the top like URL to clone the repo etc? |
| [08:08:33] | Beirdo: | doubt it |
| [08:08:37] | jya: | It told me already, I don't need to have it shown every single time I access it |
| [08:08:51] | jya: | it's like 1/3rd of the real estate lost for nothing |
| [08:09:02] | Beirdo: | you can dig through account settings, but doubtful |
| [08:09:29] | Beirdo: | so we both pushed a branch :) |
| [08:09:30] | Beirdo: | heh |
| [08:09:42] | jya: | I did... though technically I pushed like 5 :) |
| [08:09:48] | Beirdo: | mine got cut down from about 90ish to 65 or so commits |
| [08:10:10] | jya: | it's very bizarre the rebase you guided me to .. |
| [08:10:49] | jya: | looking at the changeset of the first branch, there was a mistmatch between the comment in the log and the actual change |
| [08:11:02] | jya: | like everything was shifted by one commit |
| [08:12:08] | jya: | the network graph is pretty useless |
| [08:12:33] | jya: | would be better vertical I think.. |
| [08:12:38] | jya: | even though my screen is wider |
| [08:13:12] | jya: | how does the graph bit calculates its stats? |
| [08:13:21] | jya: | It says 64% of the project is in C |
| [08:13:31] | jya: | 30% in C++ |
| [08:13:36] | Beirdo: | which is correct |
| [08:13:49] | Beirdo: | 64% of the lines of code is ffmpeg libraries |
| [08:13:52] | jya: | isn't the only C part ffmpeg (or mainly ffpeg) |
| [08:13:56] | jya: | is it ? |
| [08:13:58] | jya: | that much? |
| [08:14:50] | Beirdo: | yup |
| [08:15:15] | Beirdo: | it's a buttload of code |
| [08:15:47] | jya: | we've never done any tags since 0.19 ? |
| [08:16:51] | Beirdo: | no, Our git-master ran out of juice and went to bed |
| [08:17:15] | jya: | they are applied by hand ? |
| [08:17:18] | Beirdo: | he said he'll do the rest tomorrow, but I think he was passing out |
| [08:17:27] | jya: | they don't carry from the history ? |
| [08:17:44] | Beirdo: | they do, but we filtered history |
| [08:17:46] | jya: | though I guess it's hard to tell the difference between a tag and a branch in svn |
| [08:18:05] | Beirdo: | yeah. I just would rather Janne get them right for us :) |
| [08:18:40] | jya: | allright, let's look what iamlindoro has prepared for me and the channel test... |
| [08:52:09] | markk_ (markk_!~mark@srv120.dedicated.netrino.co.uk) has quit (Ping timeout: 272 seconds) | |
| [08:58:37] | XChatMav (XChatMav!~MaverickT@111.86.233.220.static.exetel.com.au) has joined #mythtv | |
| [08:59:13] | Goga777 (Goga777!~Goga777@shpd-92-101-129-236.vologda.ru) has quit (Remote host closed the connection) | |
| [09:01:13] | MavT (MavT!~MaverickT@111.86.233.220.static.exetel.com.au) has quit (Ping timeout: 240 seconds) | |
| [09:08:26] | markk_ (markk_!~mark@cm69.delta193.maxonline.com.sg) has joined #mythtv | |
| [09:16:38] | MavT (MavT!~MaverickT@111.86.233.220.static.exetel.com.au) has joined #mythtv | |
| [09:19:11] | XChatMav (XChatMav!~MaverickT@111.86.233.220.static.exetel.com.au) has quit (Ping timeout: 240 seconds) | |
| [09:19:31] | ** jannau slaps Beirdo with a myththemes/.gitignore trout ** | |
| [09:20:40] | Beirdo: | I thought I cleaned that one out. |
| [09:20:43] | Beirdo: | crap |
| [09:21:12] | Beirdo: | dammit. |
| [09:22:54] | Beirdo: | deleted. |
| [09:23:20] | Beirdo: | minor blip in the history |
| [09:23:36] | Beirdo: | sorry. We still have some themes under mythtv/themes, BTW |
| [09:23:46] | Beirdo: | I guess those are later. |
| [09:24:40] | Beirdo: | when we make a new default-wide and (as I like to call it) default-square |
| [09:24:52] | jannau: | those can't be removed with filter-branch |
| [09:25:16] | Beirdo: | gotcha |
| [09:25:39] | Beirdo: | once we move stuff, they'll remain in the history when they are moved |
| [09:26:01] | Beirdo: | but we did get 300M out of the size of the history of mythtv, to be moved into other repos :) |
| [09:28:35] | XChatMav (XChatMav!~MaverickT@111.86.233.220.static.exetel.com.au) has joined #mythtv | |
| [09:30:53] | MavT (MavT!~MaverickT@111.86.233.220.static.exetel.com.au) has quit (Ping timeout: 240 seconds) | |
| [09:33:07] | simonckenyon: | getting multiple commit messages in a single mythtv-commits email – is this going to continue, or just teething problems? |
| [09:33:34] | Beirdo: | that's how github sends them. Every commit that's pushed together goes in one email |
| [09:33:37] | jannau: | no, only 100M. the unrewritten repo is 280M I don't know why it ended up larger on github |
| [09:34:24] | Beirdo: | on github we went from 500M to 200M |
| [09:34:38] | simonckenyon: | Beirdo: ah well, you win some – you lose some. makes it harder to follow progress |
| [09:34:39] | Beirdo: | according to their "disk space" meter |
| [09:35:33] | Beirdo: | simonckenyon: we could write our own hook URL handler to do it differently should we care enough to |
| [09:37:04] | simonckenyon: | i would give it a month – maybe it will not be a big deal |
| [09:39:29] | Beirdo: | yeah, we'll let stuff settle :) |
| [09:40:29] | simonckenyon: | by the way – congrats on the move. git was a good choice IMHO |
| [09:40:44] | Steve_Goodey (Steve_Goodey!~steve@host86-144-3-74.range86-144.btcentralplus.com) has joined #mythtv | |
| [09:40:54] | Beirdo: | It's been a rocky road, and it's not quite over yet. :) |
| [09:42:02] | simonckenyon: | anyway, this conv is more appropriate for mythtv-users, so ooo |
| [09:50:40] | stuartm: | Beirdo: email template needs editing, file list moved so that it appears after the log message |
| [09:50:55] | Beirdo: | we can't edit that template. |
| [09:51:08] | Beirdo: | if we want to change it, we need to make our own hook |
| [09:51:25] | Beirdo: | let's live with it for the near future :) |
| [09:51:44] | stuartm: | . |
| [09:51:56] | Beirdo: | I'd like to see it closer to how we had it too, but it will take a touch of work, ya know? |
| [09:52:24] | Beirdo: | it wouldn't be hard to implement, mind. |
| [09:52:35] | Beirdo: | they push JSON of the changeset details |
| [09:53:18] | Beirdo: | if someone wants to spend the time sooner rather than later, it shouldn't be hard to do |
| [09:56:32] | lightpriest (lightpriest!~orc@bzq-84-108-246-6.cablep.bezeqint.net) has joined #mythtv | |
| [09:57:43] | Beirdo: | hmm, seems we can run their services daemon locally and have them hit it with the URL hook, should we want |
| [09:58:27] | Beirdo: | not sure though :) |
| [09:58:42] | andreax (andreax!~Andreaz@tmo-108-219.customers.d1-online.com) has joined #mythtv | |
| [09:58:42] | Beirdo: | too tired to completely grok it right now |
| [10:00:37] | Beirdo: | I'll think about it tomorrow when I'm more awake, I think |
| [10:02:11] | lightpriest (lightpriest!~orc@bzq-84-108-246-6.cablep.bezeqint.net) has quit (Ping timeout: 240 seconds) | |
| [10:10:57] | Steve_Goodey (Steve_Goodey!~steve@host86-144-3-74.range86-144.btcentralplus.com) has quit (Remote host closed the connection) | |
| [10:13:06] | lightpriest (lightpriest!~orc@bzq-84-108-246-6.cablep.bezeqint.net) has joined #mythtv | |
| [10:21:34] | lightpriest (lightpriest!~orc@bzq-84-108-246-6.cablep.bezeqint.net) has quit (Quit: Ex-Chat) | |
| [10:28:31] | MavT (MavT!~MaverickT@111.86.233.220.static.exetel.com.au) has joined #mythtv | |
| [10:29:44] | NightMonkey (NightMonkey!debian-tor@pdpc/supporter/professional/nightmonkey) has quit (Quit: Body blow! Body blow!) | |
| [10:31:28] | XChatMav (XChatMav!~MaverickT@111.86.233.220.static.exetel.com.au) has quit (Ping timeout: 265 seconds) | |
| [10:35:49] | dekarl1 (dekarl1!~deKarl@e180146253.adsl.alicedsl.de) has joined #mythtv | |
| [10:37:49] | dekarl (dekarl!~deKarl@e180154231.adsl.alicedsl.de) has quit (Ping timeout: 276 seconds) | |
| [10:43:09] | jamesba (jamesba!~jamesba@gateb.kw.bbc.co.uk) has joined #mythtv | |
| [11:38:16] | lightpriest (lightpriest!~orc@bzq-84-108-246-6.cablep.bezeqint.net) has joined #mythtv | |
| [11:56:51] | lightpriest (lightpriest!~orc@bzq-84-108-246-6.cablep.bezeqint.net) has quit (Quit: Ex-Chat) | |
| [12:01:51] | jya: | stuartm: is there any ways to display a MythUI windows on top of the old Myth/Qt widgets ? |
| [12:03:52] | stuartm: | no, well ... there was a hack to allow it at one point, but I don't know that it still exists |
| [12:04:41] | jya: | damn... |
| [12:05:49] | stuartm: | it's not something we've ever invested any time on, it didn't seem necessary as mythui was to replace the old widgets not work alongside them |
| [12:06:04] | jya: | what's the primary reason the mythui windows isn't displayed? |
| [12:06:16] | jya: | yeah, but writing the screen in mythui is going to take me forever :( |
| [12:07:12] | stuartm: | the QT screens are in new windows sitting in front of the main window where all the mythui drawing takes place |
| [12:07:50] | jya: | ok... could I make the Qt screen temporary transparent or something? |
| [12:08:04] | stuartm: | the hack I spoke of hides those QT windows for the duration, but that doesn't permit popups etc |
| [12:08:13] | stuartm: | jya: yes, that should be possible |
| [12:09:03] | jya: | any hint ? :P |
| [12:11:10] | stuartm: | old ui code isn't my thing, I probably know as much about it as you :) |
| [12:11:58] | jya: | ok... maybe I'm better off trying to reimplement the whole audio screen using mythui as iamlindoro suggested |
| [12:12:11] | stuartm: | http://doc.trolltech.com/4.5/qwidget.html#hide |
| [12:13:13] | jya: | yeah, I need to find the link to the original Qt windows |
| [12:15:08] | stuartm: | you might take iamlindoro up on his offer to write it, at least the basic stuff which you can then tweak |
| [12:16:47] | stuartm: | it's easier to work from an example, not that mythui is difficult and the more people familiar with creating screens, the easier my life becomes |
| [12:16:58] | jya: | yeah, I wanted him to start so I could start learning on MythUI.. kind of interested in doing it.. just a bit hard to know where to start |
| [12:17:18] | jya: | he's provided me a screen already |
| [12:22:33] | andreax (andreax!~Andreaz@tmo-108-219.customers.d1-online.com) has quit (Read error: Connection reset by peer) | |
| [12:30:05] | stuartm: | fwiw there's a certain structure and order I'd prefer people to follow when creating new screens, it makes maintenance and bug finding much easier for everyone if the code is consistent, so don't take offence if I later make some changes |
| [12:31:22] | jya: | no probs, I have no doubt that you will make some provided that would be my first one.. |
| [12:31:42] | jya: | so, looking at the default audio settings page, what MythUI object should I look into ? |
| [12:37:22] | stuartm: | hmm, good question |
| [12:40:17] | stuartm: | mythvideo/metadatasettings.cpp or playersettings.cpp maybe |
| [12:40:32] | stuartm: | both former qt settings screens converted to mythui |
| [12:43:05] | stuartm: | between those two you have checkboxes, buttons, lists (buttonlist serves as select box replacement in mythui) and spinboxes (lists that are auto-populated based on a range of numerical values) |
| [12:43:08] | gigem_ (gigem_!~david@host137.12.intrusion.com) has joined #mythtv | |
| [12:43:16] | stuartm: | http://miffteevee.co.uk/documentation/develop . . . Widgets.html |
| [12:43:25] | stuartm: | documentation should help |
| [12:45:12] | jya: | you have boxes that gets hidden if a checkbox is checked or not ? |
| [12:45:25] | jya: | anyhow, I think I have enough to start.. |
| [12:45:30] | stuartm: | so the current audio screen would use mythuibuttonlists for the speaker configuration/audio output device selection, mythuicheckbox for the checkboxes, mythuibutton to trigger the audio scan |
| [12:45:33] | inordkuo (inordkuo!~inorkuo@nsc64.16.142-198.newsouth.net) has joined #mythtv | |
| [12:47:05] | stuartm: | jya: no, but if you connect to the MythUICheckBox toggled(bool) signal, then you can hide the widgets with somewidget->SetVisible(false); |
| [12:47:33] | jya: | ok, you still have similar mechanism to Qtwidget |
| [12:47:49] | gigem (gigem!~david@host137.12.intrusion.com) has quit (Ping timeout: 276 seconds) | |
| [12:47:50] | stuartm: | yeah, it's deliberately not too different |
| [12:48:18] | stuartm: | or maybe I should have said, it's deliberately similar |
| [12:50:54] | stuartm: | case is different, mythui capitalises the first letter of each word for methods, so SetVisible vs setVisible |
| [13:03:31] | andreax (andreax!~Andreaz@tmo-109-163.customers.d1-online.com) has joined #mythtv | |
| [13:15:03] | el_duerino (el_duerino!~afey@2001:4bd8:2:2:223:aeff:fe91:6669) has joined #mythtv | |
| [13:15:24] | el_duerino (el_duerino!~afey@2001:4bd8:2:2:223:aeff:fe91:6669) has left #mythtv () | |
| [13:26:09] | raynop (raynop!~quassel@41.14.63.38) has joined #mythtv | |
| [13:29:24] | discernica (discernica!~bfleming@76-10-179-162.dsl.teksavvy.com) has quit (Remote host closed the connection) | |
| [13:40:25] | Dave123 (Dave123!~dave@cpe-74-74-222-96.rochester.res.rr.com) has quit (Quit: Leaving) | |
| [13:45:48] | Dave123 (Dave123!~dave@cpe-74-74-222-96.rochester.res.rr.com) has joined #mythtv | |
| [14:02:26] | ghoti (ghoti!~paul@74-51-38-192.telnetcommunications.com) has joined #mythtv | |
| [14:12:37] | mrguitar (mrguitar!~mrguitar@72-48-199-12.dyn.grandenetworks.net) has quit (Ping timeout: 272 seconds) | |
| [14:16:19] | stuartm: | err, what just happened there – https://github.com/MythTV/mythtv/commit/55f84 . . . a4341a519557 |
| [14:21:58] | stuartm: | is every 'push' going to result in us re-committing stuff that someone else already committed? jya's commit just now included my changes, mine included jannau's |
| [14:22:32] | jya: | you just need to run git pull |
| [14:22:37] | jya: | it will automatically merge that |
| [14:23:03] | stuartm: | that's what I did ... |
| [14:24:24] | jya: | it can be confusing when this happens.. but my commit didn't include your changes... just that once you start modifying something locally, you effectively create a local branch, until you merge again |
| [14:25:03] | jya: | if you look at the graph, you see what's happening https://github.com/MythTV/mythtv/network |
| [14:25:38] | superm1: | Beirdo, where are themes at now for 0.24 checkouts? |
| [14:25:42] | jya: | what's confusing is that changes date do not appear as when you push, but when you committed locally |
| [14:28:25] | stuartm: | jya: yeah, I just mean that the email/commit log now reads like I modified a whole bunch of files that weren't part of my changes, it's very messy |
| [14:28:54] | jya: | ah, I see what you're referring to now... |
| [14:36:18] | raynop (raynop!~quassel@41.14.63.38) has quit (Quit: LONG LIVE THE WUG!!) | |
| [14:51:26] | gigem_ is now known as gigem | |
| [15:28:32] | ikonia (ikonia!~mattd@unaffiliated/ikonia) has quit (Ping timeout: 240 seconds) | |
| [15:35:14] | Steve_Goodey (Steve_Goodey!~steve@host109-158-210-145.range109-158.btcentralplus.com) has joined #mythtv | |
| [15:42:12] | ikonia (ikonia!~mattd@unaffiliated/ikonia) has joined #mythtv | |
| [16:11:51] | andreax (andreax!~Andreaz@tmo-109-163.customers.d1-online.com) has quit (Read error: Connection reset by peer) | |
| [16:25:56] | stuartm: | you can expect a bunch of little bitty commits from me as I learn to get to grips with git, plus I need to move this small stuff out of my svn tree |
| [16:26:32] | stuartm: | it's stuff that didn't seem worth the effort of committing before |
| [16:28:36] | Steve_Goodey (Steve_Goodey!~steve@host109-158-210-145.range109-158.btcentralplus.com) has quit (Quit: Konversation terminated!) | |
| [16:46:16] | MythLogBot (MythLogBot!~bot@unaffiliated/beirdo) has quit (Ping timeout: 250 seconds) | |
| [19:06:13] | Beirdo: | trac is now up |
| [19:12:51] | j-rod: | Hm. Should I be showing up in the "Organization Members" list? |
| [19:12:56] | j-rod: | (I'm not) |
| [19:13:30] | Beirdo: | you should be. |
| [19:13:32] | Beirdo: | one sec |
| [19:14:01] | Beirdo: | I see "jarodwilson" in the developer list |
| [19:14:16] | Beirdo: | did you add the jwilson@mythtv.org email to that github account? |
| [19:14:57] | Beirdo: | ahh, you haven't pubicized your membership either |
| [19:15:11] | Beirdo: | that's likely it |
| [19:15:17] | Beirdo: | https://github.com/MythTV |
| [19:15:34] | Beirdo: | (have to be logged in to see yourself in the list, I'm sure) |
| [19:17:48] | wagnerrp: | im getting close, and currently in a quarter the lines of the bourne script |
| [19:20:46] | wagnerrp: | bleh... wrong channel |
| [19:23:19] | j-rod: | Beirdo: oops, didn't add jwilson@, only jarod@. but I see 14 others in the list there w/o being logged in. |
| [19:23:35] | Chutt_: | click the 'publicize membership' button |
| [19:23:56] | Beirdo: | yeah, if you don't publicize, your presence in that list is hidden :) |
| [19:24:13] | Beirdo: | we didn't do it for people as some may not want it publicized |
| [19:24:32] | Beirdo: | and the email jwilson@ needs to be there for the old commits to match up to you |
| [19:24:57] | j-rod: | ah, ok. now I see a publicize button. |
| [19:28:59] | j-rod: | (and the alias is added) |
| [19:35:27] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has quit (Ping timeout: 265 seconds) | |
| [19:39:38] | Goga777 (Goga777!~Goga777@shpd-78-36-182-88.static.vologda.ru) has quit (Remote host closed the connection) | |
| [19:42:21] | Goga777 (Goga777!~Goga777@shpd-78-36-182-88.static.vologda.ru) has joined #mythtv | |
| [19:47:39] | steve3030 (steve3030!~steve3030@pool-74-99-92-147.nrflva.fios.verizon.net) has joined #mythtv | |
| [19:50:42] | gigem_ is now known as gigem | |
| [20:03:03] | jannau: | Beirdo: the problem is that v0.24 is tagged on the fixes/0.24 branch |
| [20:04:09] | jannau: | we shoud tag the version after branching to dev-0.25 or so |
| [20:16:00] | paul-h: | stuartm: that's fine it wont conflict with my changes, the only change I have in there is to use the mythui version of the metadata editor. |
| [20:18:07] | stuartm: | paul-h: thanks, I've another incomplete patch which replaces the menu dialog, I guess that won't conflict either |
| [20:19:14] | skd5aner: | whoa.... talk about hard to read – http://mythtv.org/pipermail/mythtv-commits/20 . . . /075850.html |
| [20:20:20] | stuartm: | you ain't seen nothing yet |
| [20:20:26] | skd5aner: | why are there multiple commits shown? |
| [20:21:04] | skd5aner: | stuartm: yikes, you're right – http://mythtv.org/pipermail/mythtv-commits/20 . . . /075854.html |
| [20:21:27] | stuartm: | does anyone know of something similar to patch which features an interactive mode? I've a large patch that I need to extract certain hunk from |
| [20:21:36] | j-rod: | wagnerrp: good reply on that va-api bit. I'd started pondering a reply, then gave up. |
| [20:22:11] | stuartm: | it wouldn't hurt if the app was better at fuzzy matching than patch, or at least allowed some sort of semi-manual intervention |
| [20:27:15] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has joined #mythtv | |
| [20:39:43] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has quit (Remote host closed the connection) | |
| [20:40:00] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has joined #mythtv | |
| [20:43:17] | wagnerrp: | j-rod: yeah... support would be nice, but its just not going to make anything usable that wasnt already |
| [20:43:31] | wagnerrp: | i dont think most people know how limited intel support for vaapi is |
| [20:44:46] | iamlindoro (iamlindoro!~iamlindor@unaffiliated/iamlindoro) has quit (Ping timeout: 255 seconds) | |
| [20:48:34] | Beirdo: | jannau: I (with j-rod's help) fixed it to have a tag at the branch-point, which now git describe likes fine |
| [20:49:00] | iamlindoro (iamlindoro!~iamlindor@unaffiliated/iamlindoro) has joined #mythtv | |
| [20:54:29] | iamlindoro (iamlindoro!~iamlindor@unaffiliated/iamlindoro) has quit (Ping timeout: 265 seconds) | |
| [20:54:45] | iamlindoro (iamlindoro!~iamlindor@unaffiliated/iamlindoro) has joined #mythtv | |
| [20:58:20] | steve3030 (steve3030!~steve3030@pool-74-99-92-147.nrflva.fios.verizon.net) has quit (Ping timeout: 240 seconds) | |
| [21:02:14] | tstorm (tstorm!~tstorm@173-164-230-21-SFBA.hfc.comcastbusiness.net) has quit (Ping timeout: 255 seconds) | |
| [21:04:37] | kwizart (kwizart!~kwizart@fedora/kwizart) has joined #mythtv | |
| [21:09:45] | JEDIDIAH__ (JEDIDIAH__!~jedi@cpe-76-185-72-21.tx.res.rr.com) has joined #mythtv | |
| [21:10:46] | j-rod: | wagnerrp: yep, exactly, gma500-based slow cpu systems are the only exception, but gma500 is such bonghits to begin with... |
| [21:11:34] | j-rod: | I can't tell… is that hdmi-cec thing a pass-through? |
| [21:11:48] | j-rod: | debating getting one regardless |
| [21:15:50] | xris: | Beirdo: which means people should fetch --tags ?? did you replace the tag or create a new one? |
| [21:17:27] | wagnerrp: | j-rod: yeah, HDMI passthrough, and you control it through USB |
| [21:17:52] | wagnerrp: | i think its available as a kit for a bit less, if you feel like getting out the soldering iron |
| [21:18:15] | j-rod: | nah, not really :) |
| [21:18:46] | j-rod: | xris: replaced |
| [21:19:15] | Beirdo: | yes, fetch --tags this once may be a good plan |
| [21:19:23] | Beirdo: | if you have already cloned |
| [21:20:00] | Beirdo: | version.sh has been fixed on master and fixes/0.24 |
| [21:20:14] | Beirdo: | any others we want to cherry-pick it to? |
| [21:20:38] | Beirdo: | I'll let jya deal with his newaudiosetup branch if he wants to |
| [21:21:09] | jannau: | git fetch --tags shouldn\t be necessary since the tag is reachable from master |
| [21:21:10] | wagnerrp: | j-rod: er... no |
| [21:21:14] | Beirdo: | MythTV Version : b0.24-320-gf7ad913 |
| [21:21:14] | Beirdo: | MythTV Branch : master |
| [21:21:14] | Beirdo: | Network Protocol : 64 |
| [21:21:18] | wagnerrp: | it seems you have to have to open HDMI ports on your device |
| [21:21:30] | wagnerrp: | and connect the video card and this bridge in parallel |
| [21:21:34] | Beirdo: | yay |
| [21:21:51] | j-rod: | wagnerrp: damn, yuck, that's what I was slightly afraid of, looking at the pics. |
| [21:22:40] | j-rod: | all five ports rear hdmi inputs are already in use on my receiver |
| [21:23:01] | wagnerrp: | its also write only, so you cannot receive information through it |
| [21:23:10] | j-rod: | ? |
| [21:23:20] | j-rod: | I was pretty sure the docs said bi-directional |
| [21:23:20] | Goga777 (Goga777!~Goga777@shpd-78-36-182-88.static.vologda.ru) has quit (Remote host closed the connection) | |
| [21:23:59] | j-rod: | device is polled every .1ms for data, converted to plain hex strings, available via tty |
| [21:24:00] | wagnerrp: | oh, no... thats talking about something else |
| [21:24:18] | wagnerrp: | you need to set the DDC channel manually |
| [21:24:25] | wagnerrp: | normally, devices pull that off some other pin |
| [21:24:27] | wagnerrp: | but this one cannot |
| [21:24:45] | wagnerrp: | since CEC is a dedicated, shared bus |
| [21:24:53] | wagnerrp: | you could probably wire one of these up as passthrough |
| [21:24:54] | j-rod: | I want one of those toshiba laptops now :) |
| [21:25:20] | j-rod: | there's an EE here in the boston area who was supposedly going to try to hack some hardware together w/passthru |
| [21:25:56] | j-rod: | (a guy who knows a guy… will have to forward some info to the guy in the chain that I know…) :) |
| [21:27:22] | wagnerrp: | heres the forum i was reading that mentioned them... http://www.avsforum.com/avs-vb/showpost.php?p . . . ;postcount=9 |
| [21:28:00] | wagnerrp: | seems the ATI hardware, and possibly Intel hardware, supports access to that bus |
| [21:28:10] | wagnerrp: | there are just no commonly available drivers for it |
| [21:28:21] | jya (jya!~avenardj@60-242-40-141.static.tpgi.com.au) has quit (Quit: jya) | |
| [21:36:12] | rooaus (rooaus!~cameron@ppp118-209-151-148.lns20.mel6.internode.on.net) has joined #mythtv | |
| [21:37:05] | eharris (eharris!~eharris@99-179-7-82.lightspeed.austtx.sbcglobal.net) has quit (Quit: leaving) | |
| [21:37:40] | eharris (eharris!~eharris@99-179-7-82.lightspeed.austtx.sbcglobal.net) has joined #mythtv | |
| [21:38:04] | stoffel (stoffel!~quassel@p57B4D34C.dip.t-dialin.net) has quit (Remote host closed the connection) | |
| [21:43:37] | jya (jya!~avenardj@60-242-40-141.static.tpgi.com.au) has joined #mythtv | |
| [21:44:33] | j-rod: | just read through the pdf about the thing. I'll get one. |
| [21:45:19] | j-rod: | while I'd like to do a kernel-space driver, it probably makes more sense to just write a simple lirc userspace driver for it, attaching to /dev/ttyACMx or whatever |
| [21:45:35] | Steve_Goodey (Steve_Goodey!~steve@host109-158-210-145.range109-158.btcentralplus.com) has quit (Remote host closed the connection) | |
| [21:48:21] | danielk22: | Gah. Those commit e-mails are really bad. |
| [21:49:52] | stuartm: | yup |
| [21:52:58] | cattelan (cattelan!~cattelan@c-24-118-127-188.hsd1.mn.comcast.net) has quit (Ping timeout: 265 seconds) | |
| [21:56:16] | xris: | danielk22: the commit emails are doing exactly what they're supposed to. they send out all of the info that was pushed at the time. |
| [21:56:39] | xris: | for now, if we want more granular messages, people should try to push one commit at a time. or squash their commits before pushing |
| [21:57:44] | skd5aner: | xris: even 1 commit is a lot more convoluted and not extremely easy to read |
| [21:57:59] | skd5aner: | xris: too much information, and not clearly presented (imho) |
| [21:58:20] | xris: | skd5aner: yeah, the formatting is annoying. but the main complaint is "too much info" |
| [21:59:00] | xris: | I like the html email ones I made for svn |
| [21:59:14] | skd5aner: | the -commit email list is the tool I use to update the release notes, going commit by commit. I'm afraid I'm going to have to find another way, as I can't makes heads or tells via the emails |
| [21:59:45] | xris: | what we *should* do is track all work in a bug/ticket |
| [21:59:55] | xris: | and then use the milestone list in trac (or jira) to build the release notes |
| [22:00:27] | xris: | then you get a summary of everything and have a list you can link to for people who want more details |
| [22:00:53] | skd5aner: | Well, maybe, but I do filter (and dumb down to a 5'th grade level) the changes most relavent to an actual user... so, by estimate, only about 5–15% of commits actually get represented in the release notes |
| [22:01:20] | skd5aner: | if people want to see the whole set of changes in a release, they can leverage the reports in trac – that was my MO at least |
| [22:02:00] | xris: | skd5aner: right. but that's my point. *you* filter... based on commit messages, etc. |
| [22:02:17] | xris: | but if there was a pre-filtered list yo could just copy/paste and save a ton of time |
| [22:02:34] | skd5aner: | the release notes only show the tip of the iceburg... it'll demonstrate a bullet points for something like blu-ray playback, but it doesn't list all ~140 commits that might have been commited in that release to support bluray |
| [22:03:01] | xris: | anyway, we *do* plan to reformat those emails.. but things like getting the repo finished are higher up on the list |
| [22:03:20] | skd5aner: | xris: yea, if there's a better way... I'm not resisting, just letting you know what I've been doing |
| [22:03:39] | xris: | yeah, good to know. I couldn't imagine reading every commit even for the svn list |
| [22:04:17] | xris: | we have a lot of trivial merges that are mucking things up, too |
| [22:04:38] | skd5aner: | heh, been doing it for nearly 5 or so years, just finally decided that I might take it to the next level and volunteer to help with user-centric release notes |
| [22:04:40] | xris: | would be nice if we could filter those out from the emails |
| [22:05:07] | cattelan (cattelan!~cattelan@c-24-118-127-188.hsd1.mn.comcast.net) has joined #mythtv | |
| [22:05:15] | skd5aner: | MythTV releases for me were always like Christmas – I wanted to know what was in the box, what new "toys" and features I was going to get by upgrading :) |
| [22:06:01] | skd5aner: | xris: yea, that (the merges) are something I'm totally not understanding... it looks liek people merging the "master" back into their local copy or something? |
| [22:06:14] | superm1: | one way to attack this could be asking all developers to make sure the first line of every commit hits the main topic of the commit |
| [22:06:25] | superm1: | additional lines could be reserved for additional details |
| [22:06:47] | skd5aner: | superm1: and... if so, using non-cryptic language |
| [22:06:52] | jya: | so, have we planned to switch to svn now ? :P |
| [22:07:11] | superm1: | skd5aner, yeah exactly. the whole thing can be scripted from git log then |
| [22:07:23] | superm1: | and just needs a human to go pull out the crap that didn't stand out |
| [22:08:22] | skd5aner: | Still – I don't see how a user-centric release notes could be automated to say something like "Add menu support for blu-ray movies" when that's the sum of 48 seperate commits that iamlindoro makes over 5 months? |
| [22:08:28] | xris: | superm1: yeah. that's a git-ism that we should take as standard practice |
| [22:08:31] | superm1: | if people do work in topic branches it scales pretty nicely too – you won't care about the 140 commits in the topic branch, but you do care about "Merge topic branch x: add support for whiz bang featre y" |
| [22:08:46] | superm1: | skd5aner, ^ that's how |
| [22:08:56] | jannau: | myththmes pushed to https://github.com/MythTV/myththemes |
| [22:09:00] | skd5aner: | superm1: that makes sense |
| [22:09:05] | superm1: | but that means that people have to make sure that things that are features are done as topic branches and not just directly to master |
| [22:09:13] | xris: | superm1: personally I still like to see the individual commits (imho that's one of the big benefits of git merges over svn merges).. but yeah, some people like to squash |
| [22:09:20] | xris: | jannau: sweet! |
| [22:09:32] | xris: | extras and packaging should go quickly, I hope |
| [22:09:41] | superm1: | xris, well even if you do merge individual commits, there's a single commit that has the comment for the merge |
| [22:09:46] | xris: | superm1: imho *everything* should be done as topic branches |
| [22:09:52] | xris: | superm1: good point |
| [22:09:54] | superm1: | so you ignore everything in the merged branch and just use the single comment commit's comment |
| [22:10:21] | superm1: | but again this only works if all developers follow suit in how they work |
| [22:10:22] | skd5aner: | well, I'm along for the ride... just giving my perspective though it shouldn't be worth as much as the people who truly are "using" the system – I'm just a reader of the output of such |
| [22:10:48] | xris: | skd5aner: we can also show you some tricks for using git itself |
| [22:10:51] | Beirdo: | the emails do need work. If nobody else tackles it, I may do so :) |
| [22:11:01] | xris: | the log command has some really powerful formatting options |
| [22:11:11] | danielk22: | Partly it's growing pains, I'm sure all those .gitignores are supposed to be in every other commit. :) But also having multiple commits in one e-mail is annoying. All that wasted space is also annoying. |
| [22:11:20] | danielk22: | Also having unrelated commits in one e-mail forces me to read the whole thing even if the headliner commit is not something I'm tracking. |
| [22:11:26] | stuartm: | heh, so now we're saying that git can be as simple as svn but that's pretty irrelevant because we don't want anybody to use it that way |
| [22:11:32] | skd5aner: | Appreciate it... I'm losing daylight, and need to do some chores outside... be back later |
| [22:11:46] | jya: | skd5aner: I think you would have a better experience simply by using the git log command. I find it more useful than the svn log one, and it's instant... want to know the change in the 0.24 branch, checkout fixes/0.24, git log |
| [22:12:19] | Beirdo: | danielk22: yeah, I'd like to break them apart to make them easier to digest |
| [22:12:20] | xris: | stuartm: nah, just need to stop treating it as if it was exactly svn.. and use some of the git magic to get that simplistic usability |
| [22:12:29] | superm1: | and if you are in the middle of something but not ready to commit, but need to look at a different branche's log, you can just stash it with git stash too |
| [22:12:46] | skd5aner: | oh, also a quick note... someone needs to update the instructions on trac's homepage for checkout – it still references SVN |
| [22:12:57] | xris: | superm1: have been trying to avoid stuff like stash until the svn users are a little more comfortable with git |
| [22:13:02] | superm1: | hehe |
| [22:13:15] | mrguitar (mrguitar!~mrguitar@72-48-199-12.dyn.grandenetworks.net) has joined #mythtv | |
| [22:13:35] | jya: | hum... trac timeline doesn't show if the work was done on a branch or not.. |
| [22:13:37] | xris: | superm1: will hopefully someday get to the point where trivial merges on master don't get pushed upstream, either... |
| [22:13:54] | skd5aner: | jya: yea, I mentioned that last night – trac's timeline is only conected to master |
| [22:14:01] | xris: | though I think the one I saw in a commit email means that Beirdo doesn't have "pull" configured to auto-rebase |
| [22:14:22] | danielk22: | Beirdo: Yeah, I think that alone would go a long way, I can then just scroll through the list of e-mails & not have to tab into each e-mail and scroll down (unless it's something I really need to look at). |
| [22:14:35] | Beirdo: | xris: correct. :) |
| [22:14:41] | jya: | skd5aner: well it does show the changes I've done on the branch, just that it doesn't appear. before the path would contain trunk or 0.24.. |
| [22:15:11] | skd5aner: | danielk22: +1 |
| [22:15:24] | jya: | I liked trac's timeline, everyday I would have a quick glance to see what changed .. it's far better than the github version, way too much facebook look info |
| [22:16:00] | Beirdo: | xris: I wouldn't suggest that to anyone as a default |
| [22:16:07] | Beirdo: | read man git-pull to see why |
| [22:16:12] | jya: | now it's full of Beirdo's photos everywhere ! |
| [22:16:12] | xris: | jya: just need to get things into jira. ;) |
| [22:16:26] | Beirdo: | not just mine ;) |
| [22:16:37] | jya: | like one push, 4 photos ! |
| [22:17:31] | jya: | why would you try to make a history page like it was facebook or some kind of social event? |
| [22:18:40] | jya: | I guess it goes with their "social coding" thingy |
| [22:20:22] | jya: | I enjoyed how good git merging was yesterday... I cherry-picked a particular commit , used the hash, aplied it on master and fixes/0.24 . even when the path was different, it had no problem applying it |
| [22:20:28] | jannau: | jya: why would you switch the branch to look at its history? git log fixes/0.24 works just fine |
| [22:20:44] | j-rod is now known as j-rod|afk | |
| [22:21:43] | jya: | jannau: could do to :) I just usually in the branch I'm working on... |
| [22:21:46] | Beirdo: | jannau: because we all learn something new every day? :) |
| [22:26:44] | stuartm: | see the analogy I'd go for is that we're told flying a space shuttle is just like driving a car, but a little better because you can go into space. Having strapped into the shuttle we're told that while you can drive the shuttle on the roads to pick up your shopping that's not really the way it should be used. Plus theirs actually there's no steering wheel, gears or anything you're familiar with in a car and you have to |
| [22:26:46] | stuartm: | follow a 50-point checklist before each flight but don't worry once you're used to it it's just like as driving a car! After 3 hours of pre-flight preparations and fueling you're able to take off, into space, orbiting briefly before descending to land 5 miles from where you took off where you disembark, run around Walmart with your shopping list then return to the shuttle to make the trip home. Turns out that a space shuttle |
| [22:26:47] | stuartm: | is just like driving a car in that you were to travel to the shop to buy food, it's also just a whole lot different because it's taken much longer, required a complex sequence of actions and necessitated a complete change in your normal routine. |
| [22:27:30] | stuartm: | s/theirs actually// |
| [22:29:04] | iamlindoro: | and when you ask where you're traveling today, you first get a list of every trip you've ever ever taken, including detailed directions and who went with you |
| [22:31:08] | inordkuo (inordkuo!~inorkuo@nsc64.16.142-198.newsouth.net) has quit (Quit: Leaving.) | |
| [22:34:57] | Chutt_: | heh |
| [22:35:17] | stuartm: | apologies for grammar, spelling and missing words. For all those issues that was remarkably more coherent than I expected |
| [22:37:02] | jya: | ahah |
| [22:38:19] | Chutt_: | y'all should standardize on a commit message format, too |
| [22:38:46] | Chutt_: | the one the vim hook tries to color-code works well, imo |
| [22:41:32] | wagnerrp (wagnerrp!~wagnerr@NR-FT1-66-42-240-159.fuse.net) has quit (Ping timeout: 265 seconds) | |
| [22:42:16] | clever (clever!~clever@142.167.218.74) has quit (Ping timeout: 265 seconds) | |
| [22:48:26] | clever (clever!~clever@142.167.151.212) has joined #mythtv | |
| [22:51:01] | jannau: | I would very happy if we could enforce first line below 72 chars, empty line, than 80 chars lines |
| [22:51:41] | jannau: | packaging pushed to https://github.com/MythTV/packaging |
| [22:53:40] | jannau: | and please try to to avoid merge commits |
| [22:53:48] | wagnerrp (wagnerrp!~wagnerr@NR-FT1-66-42-240-159.fuse.net) has joined #mythtv | |
| [22:54:04] | stuartm: | jannau: sorry to keep pushing on the subject, but did you give your ok to enabling symbol visibility by default? |
| [22:54:38] | stuartm: | jannau: how do we avoid merge commits? |
| [22:55:03] | jannau: | stuartm: I think I did |
| [22:56:35] | stuartm: | jannau: ok thanks |
| [22:57:00] | jannau: | I work in local branches and rebase before pushing |
| [23:00:05] | jannau: | merging is ok for work with multiple commits spanning at least a couple of days |
| [23:01:35] | jannau: | but one merge commit for ever 2–3 commits is ugly and makes history reading hard |
| [23:02:52] | kwizart (kwizart!~kwizart@fedora/kwizart) has quit (Quit: Quitte) | |
| [23:12:15] | Nachtschatten (Nachtschatten!~rooms@p508D6175.dip.t-dialin.net) has joined #mythtv | |
| [23:12:22] | Nachtschatten (Nachtschatten!~rooms@p508D6175.dip.t-dialin.net) has left #mythtv () | |
| [23:16:40] | iamlindoro: | How does one delete a folder entirely from git? |
| [23:16:55] | xris: | iamlindoro: git rm |
| [23:17:01] | xris: | maybe needs a -r ? |
| [23:19:50] | kormoc: | if the folder is empty, it goes poof, no? |
| [23:20:14] | kormoc: | I ran into that recently where directories would disappear because all the files were removed |
| [23:24:44] | xris: | I've never actually deleted a directory in git |
| [23:24:51] | xris: | but yeah, if you rm it it might do that out of convenience |
| [23:25:00] | xris: | git doesn't track empty directories |
| [23:50:38] | stuartm: | if you're working on something in a branch but aren't ready to commit, will switching back to master or another branch wipeout those changes? |
| [23:51:10] | inordkuo (inordkuo!~inorkuo@adsl-35-15-47.int.bellsouth.net) has joined #mythtv | |
| [23:51:33] | Beirdo: | if you want an empty dir to stay, the easiest way is to put a .gitignore file in it, BTW |
| [23:52:08] | Beirdo: | stuartm: it shouldn't, but it will apply them to the other branch. The way to do it without committing: git stash |
| [23:52:17] | Beirdo: | then switch branches. |
| [23:52:27] | Beirdo: | when you switch back: git stash pop |
| [23:53:55] | Beirdo: | once it's stashed, it's on a stack (basically) of saved patches... you do the other work, and pop it back off the stack when you need it back |
| [23:54:45] | Beirdo: | answer the question? :) |
IRC Logs collected by
BeirdoBot.
Please use the above link to report any bugs.