| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| * nash is back | 00:01 | |
| nash | greywhind: Sort it out> | 00:01 |
|---|---|---|
| nash | ? | 00:01 |
| greywhind | nash: not sure - mithro hasn't told me whether it worked or not | 00:02 |
| nash | greywhind: So what are you trying to do? | 00:11 |
| greywhind | nash: generate a patch to show mithro the code for winIdleFinder | 00:11 |
| nash | So you commited it? | 00:12 |
| greywhind | nash: yes, then did a cg-update to merge with the current changes | 00:12 |
| nash | What platform are you on? | 00:13 |
| greywhind | nash: mac | 00:13 |
| nash | Okay - are you using hte command line for this? | 00:13 |
| greywhind | nash: yes. | 00:14 |
| *** mithro has quit IRC | 00:15 | |
| nash | Two ways... one: Just generate a list of all patches in your tree not in mainline: | 00:15 |
| nash | git-format-patch -r origin..master | 00:15 |
| nash | Or use git-log to find the patch id, then use git-format-patch -r patchid^..patchid | 00:16 |
| greywhind | is the 2nd one the same as cg-patch -r patchid..patchid? | 00:17 |
| greywhind | i mean cg-mkpatch | 00:17 |
| * nash looks | 00:20 | |
| nash | You need cg-mkpatch id^..id | 00:21 |
| nash | The carat says 'go back one revision from there', then up to the patch you want | 00:21 |
| greywhind | ah. | 00:21 |
| nash | id..id (changes from id..id is the empty set) | 00:21 |
| greywhind | but git-format-patch -r origin..master will do it without as much hassle? | 00:22 |
| nash | It will give you all the patches in your local tree not in master... | 00:24 |
| nash | If you only have one... it's pretty easy ;-) | 00:24 |
| *** mithro has joined #tp | 00:25 | |
| nash | origin..master (Assuming the trees are called that) is a quick and easy way | 00:25 |
| mithro | greywhind: sadly, that patch didn't include everything either :/ | 00:26 |
| mithro | hey nash | 00:26 |
| greywhind | mithro: alright - let me try it the way nash suggested | 00:26 |
| nash | heyo mithro | 00:26 |
| nash | mithro: Did you look at the API for my struct extraction thing? | 00:26 |
| mithro | nash: nope | 00:27 |
| nash | Okay... | 00:27 |
| mithro | my laptop died last Thursday night | 00:27 |
| nash | It's only first round, but does it do the basics you need? | 00:27 |
| mithro | so I got a new one on Friday night, and spent most of the weekend setting it up | 00:27 |
| * mithro is still getting use to the keyboard | 00:27 | |
| greywhind | mithro: sent | 00:28 |
| mithro | greywhind: checking now | 00:28 |
| mithro | nash: did you get the Summit email? | 00:28 |
| nash | mithro: Which summit email? | 00:29 |
| * nash guesses not | 00:29 | |
| nash | When was it sent, and to where? | 00:29 |
| mithro | nash: about the Summer of Code mentor summit | 00:30 |
| mithro | you should have gotten an email from me, and an email from Tiffany | 00:30 |
| nash | Ahh... yep - lost in my unspam-filtered inbox... | 00:30 |
| mithro | nash: what is your prefered email these days? | 00:31 |
| nash | mithro: No chance... my wedding anniversary is the 1st of october, we start a massive new project on the day for our largest client, with 3 new staff starting | 00:31 |
| mithro | greywhind: looking much better | 00:31 |
| nash | mithro: That's it. | 00:31 |
| mithro | nash: ahh well :/ | 00:31 |
| greywhind | mithro: k, great | 00:31 |
| nash | Just no filtering at the moment - so things are a bit vrap | 00:31 |
| mithro | looks like it is going to be too expensive for me to get there, Lee is planing on going however | 00:31 |
| mithro | cheapest flight I can get so far is $2000 AUD | 00:32 |
| nash | About right | 00:32 |
| nash | Try a good agent though, you should be able to get 1600 AUD if you try | 00:32 |
| mithro | (specially at such short notice( | 00:32 |
| mithro | also have to figure out if I can get out of work | 00:33 |
| mithro | I figure that my first day isn't the best time to ask for 1 week leave :P | 00:34 |
| nash | heh | 00:34 |
| nash | How long is it? | 00:34 |
| mithro | only 1 day, but by the time you add in getting there and back it would work out to be about one week for me | 00:34 |
| nash | Yech | 00:36 |
| nash | To be frank, the listed reason would only be a maybe for me to go | 00:37 |
| mithro | I've never been to the US, and Google is paying in theory :P | 00:38 |
| nash | Well they are paying quite a substantial chunk | 00:39 |
| * mithro ponders | 00:39 | |
| mithro | nash: I'll see if I'm up to looking at the struct stuff tonight | 00:39 |
| nash | Cool | 00:40 |
| nash | mithro: I'm going to continue rebuilding my machine in the next day or so | 00:40 |
| nash | So I'll have mail filtering soon ;-) | 00:40 |
| mithro | nash: would be a good idea | 00:40 |
| nash | mithro: It's scary how much my filters were taking care of | 00:42 |
| mithro | I have 108 filters | 00:43 |
| nash | Not bad | 00:43 |
| nash | All procmail I assume? | 00:44 |
| greywhind | mithro: so... did it work? | 00:45 |
| mithro | greywhind: will have to wait till tonight | 00:45 |
| mithro | greywhind: but the patches look okay | 00:46 |
| greywhind | mithro: alright. no problem. | 00:46 |
| mithro | nash: nope, just Evolution's email filtering | 00:46 |
| nash | Wow - | 00:46 |
| nash | Evolution's mail filtering i've tried many times, but never found it up to the task | 00:46 |
| mithro | I can do all types of things, like color emails too | 00:49 |
| nash | formail -X"X-Status: Important" | 00:49 |
| *** mithro has quit IRC | 01:00 | |
| *** mithro has joined #tp | 01:00 | |
| *** mithro has joined #tp | 01:01 | |
| *** mithro has quit IRC | 01:18 | |
| *** mithro has joined #tp | 01:18 | |
| *** xdotx has quit IRC | 01:23 | |
| *** mithro has quit IRC | 02:11 | |
| *** mithro has joined #tp | 02:14 | |
| *** daxxar has quit IRC | 02:47 | |
| *** daxxar has joined #tp | 02:47 | |
| mithro | nash: you sorted out your internet at home yet? | 03:23 |
| nash | mithro: Yeah | 03:27 |
| nash | BUt not my computer ;-) | 03:27 |
| mithro | been really busy at home then? :P | 03:27 |
| nash | I got fed up with being so farked so I reinstalled | 03:27 |
| nash | Still farked however | 03:27 |
| nash | You bet | 03:27 |
| nash | We have lots of work to do fix our house up | 03:28 |
| nash | Spent all weekend in the garden | 03:28 |
| *** mithro has quit IRC | 04:15 | |
| *** mithro has joined #tp | 04:44 | |
| tpb | aloril_ has quit worldforge (Ping timeout: 624 seconds) | 04:50 |
| tpb | aloril has joined on worldforge | 05:13 |
| *** peres has joined #tp | 05:26 | |
| mithro | hi peres | 05:28 |
| mithro | I don't think we have seen you here before | 05:28 |
| peres | hi mithro :) | 05:29 |
| peres | i'm pretty new | 05:29 |
| peres | i was reading your motivation page and got somewhat attracted by that text generator stuff | 05:29 |
| mithro | peres: what are you interested in? | 05:30 |
| mithro | what other games have inspired you? Stars!? VGA Planets? MOO? | 05:31 |
| peres | no one actually, i was just wondering how hard could it be to create that planet name/description generators | 05:31 |
| peres | and was also wondering what is the expected output for that | 05:32 |
| mithro | peres: text files would be good | 05:46 |
| peres | mithro: of course ;) | 05:47 |
| mithro | peres: cool text descriptions would be a good start | 05:53 |
| peres | something like 'third moon of klingon'? | 05:53 |
| mithro | peres: yeah | 05:54 |
| peres | ok, so parametrized names are fine | 05:54 |
| peres | what about descriptions? | 05:54 |
| mithro | Something similar? | 05:55 |
| peres | i see, so what are the differences between name and descriptions? | 05:56 |
| mithro | name is the thing which gets displayed on the starmap | 05:56 |
| mithro | so should be quite short | 05:57 |
| mithro | description should be a more interesting stuff | 05:57 |
| peres | like planet features? | 05:57 |
| mithro | like "The planet has wild planes with strange bird like animals eating grass. ....." | 05:57 |
| peres | i see, so it's another parametric generator with a *large* combinatorial space | 05:58 |
| mithro | well, the name would be best something which isn't parametric - something which just tries to produce pronouncable words | 05:59 |
| peres | a database with real names and attributes might be ok for that | 06:00 |
| mithro | https://sourceforge.net/tracker/index.php?func=detail&aid=1460527&group_id=132078&atid=829724 | 06:00 |
| tpb | Todo #1460527: Design a Planet name/description generator | 06:00 |
| peres | i should have found that on my own ;) | 06:01 |
| mithro | http://www.seventhsanctum.com/gens/planetname.html | 06:02 |
| tpb | <http://ln-s.net/tLJ> (at www.seventhsanctum.com) | 06:02 |
| peres | the generator at seventhsanctum is not seeded, though | 06:03 |
| mithro | peres: I'm sure there is a seed somewhere :P | 06:04 |
| peres | well, the same code yields different names :P | 06:04 |
| peres | it's nice so get a fair idea of what you need, though | 06:04 |
| peres | s/so/to | 06:04 |
| mithro | if you generate to a file, we can then load it into the server independent of what you write it in | 06:05 |
| mithro | anyway, I'm off to dinner | 06:05 |
| mithro | bblr | 06:05 |
| peres | see you | 06:05 |
| * peres off for lunch | 06:30 | |
| *** Demitar has quit IRC | 06:37 | |
| *** peres has quit IRC | 06:51 | |
| CIA-23 | noegnud tpclient-pywx-development * rc530e5dd6df8 / (tpclient-pywx windows/winIdleFinder.py windows/winUpdate.py): | 07:05 |
| CIA-23 | Added winIdleFinder.py, a window that displays a table of all units that | 07:05 |
| CIA-23 | have no orders for the current turn and are owned by the player viewing the | 07:05 |
| CIA-23 | report. Currently, it hides the main window when shown, but Mithro is | 07:05 |
| CIA-23 | working to resolve that. Will be fixed as soon as possible. | 07:05 |
| CIA-23 | noegnud tpclient-pywx-development * rf1aecca7ce56 / (6 files in 3 dirs): | 07:05 |
| CIA-23 | Modified winIdleFinder to make it a popup window from winMain, rather than | 07:05 |
| CIA-23 | a separate main window that hides winMain when it is shown. | 07:05 |
| mithro | greywhind: ping? | 07:32 |
| mithro | brb | 07:34 |
| *** mithro has quit IRC | 07:34 | |
| *** mithro has joined #tp | 07:35 | |
| mithro | nash: ping? | 07:47 |
| *** Demitar has joined #tp | 08:25 | |
| *** Demitar has quit IRC | 08:48 | |
| *** peres has joined #tp | 08:51 | |
| *** Demitar has joined #tp | 10:31 | |
| *** zipola has quit IRC | 11:39 | |
| *** zipola has joined #tp | 12:06 | |
| *** peres has quit IRC | 12:35 | |
| greywhind | mithro: pong? | 12:57 |
| *** peres has joined #tp | 14:14 | |
| peres | hello | 14:14 |
| *** tuna-fish has quit IRC | 16:18 | |
| mithro | greywhind: you see that your changes where merged in? | 18:34 |
| nash | mithro: pong | 18:42 |
| mithro | nash: I send an email instead | 18:44 |
| nash | okay | 18:45 |
| peres | mithro: here? | 18:59 |
| *** mithro has quit IRC | 19:03 | |
| *** mithro has joined #tp | 19:12 | |
| mithro | peres: sorry went to work | 19:16 |
| mithro | peres: anything quick? | 19:16 |
| peres | nothing so quick, we can talk later | 19:16 |
| peres | have a good day :) | 19:17 |
| *** peres has quit IRC | 19:17 | |
| mithro | nash: had a chance to read the email? | 19:20 |
| nash | Yeah, reviewing my code before I comment | 19:20 |
| mithro | I think I can see why you have done it the way you have, which matches your use case better then mine | 19:22 |
| greywhind | mithro: yeah, i see that. :) | 19:28 |
| mithro | greywhind: now of course, you have to figure out how to make git understand that your changes have been merged | 19:28 |
| greywhind | mithro: right. | 19:28 |
| mithro | i think it's related to git-rebase | 19:29 |
| greywhind | mithro: so you checked that the code worked for you? | 19:35 |
| mithro | greywhind: I had to make a small change for it to work properly | 19:35 |
| greywhind | mithro: what change? | 19:35 |
| mithro | moved the file from ./windows to ./windows/main | 19:36 |
| mithro | changed to the __init__ method | 19:36 |
| mithro | and a change to ./windows/winMain.py | 19:36 |
| greywhind | mithro: ah... i think i forgot to add windows/main/winIdleFInder.py to the list of files tracked by git | 19:36 |
| mithro | greywhind: oh | 19:38 |
| greywhind | mithro: ok, i think i've got it merged correctly... let me make sure it still works | 19:42 |
| greywhind | yep - works great | 19:46 |
| mithro | greywhind: I think you actually wanted git-rebase - you did a cg-update and merged in the upstream changes right? | 19:49 |
| greywhind | yeah | 19:49 |
| mithro | what does the git-am output produce now? | 19:49 |
| mithro | (hopefully one patch?) | 19:50 |
| greywhind | although cg-update says it recognizes when your patches have been merged... | 19:50 |
| mithro | greywhind: oh? | 19:50 |
| mithro | greywhind: I really should test your situtation more | 19:50 |
| greywhind | git-am is just sitting there... | 19:51 |
| mithro | greywhind: could you email me the output of your cg-update ? | 19:51 |
| greywhind | hold on a bit | 19:51 |
| mithro | greywhind: oopps, not git-am - the one nash gave you to send me your patches | 19:51 |
| *** greywhind has left #tp | 19:52 | |
| nash | git-format-patch? | 19:52 |
| *** greywhind has joined #tp | 19:52 | |
| greywhind | sorry - hold on. | 19:52 |
| mithro | nash: yes, git-am to apply patches | 19:52 |
| nash | Yep | 19:52 |
| greywhind | nope, i did it wrong. | 19:52 |
| greywhind | how do i remove commits again? | 19:53 |
| nash | cg-admin-uncommit | 19:56 |
| greywhind | cg-admin-uncommit: cannot rewind merges; please 'cg-switch -f -r parentid master' instead | 19:57 |
| nash | try that then | 19:59 |
| nash | mithro: I just responded | 19:59 |
| greywhind | "parentid" needs to be replaced with something | 19:59 |
| nash | cg-log to get the id of the patch or if it is just the last commit HEAD^ | 20:00 |
| nash | mithro: BTW: This has got to be my worst 3 lines of code ever: | 20:00 |
| nash | *((char**)(dest+off2)) = malloc(slen+1); | 20:01 |
| nash | memcpy(*(char **)(dest+off2),buf,slen); | 20:01 |
| nash | *(char **)(dest+off2))[slen] = 0; | 20:01 |
| nash | It's like lisp with C extensions | 20:01 |
| greywhind | http://rafb.net/p/O4cXnx52.html (9 lines) | 20:01 |
| tpb | Title: Nopaste - No description (at rafb.net) | 20:01 |
| nash | greywhind: Look at git-reset and git-revert | 20:03 |
| greywhind | nash: i figured it out, i think. | 20:03 |
| nash | cool | 20:04 |
| greywhind | so now that i've got it back to the state before i updated today | 20:04 |
| greywhind | do i do git-rebase, then cg-update? | 20:04 |
| nash | I'm not sure what you are doing... mithro? | 20:05 |
| greywhind | he merged in my patches. now i have to get my local copy to understand what happened | 20:05 |
| nash | Right - rebase is the canonical way of doing it. | 20:06 |
| nash | If you like can see if update handles it okay | 20:06 |
| greywhind | i already tried that... didn't work. | 20:06 |
| greywhind | maybe after git-rebase it will though | 20:07 |
| nash | Yep - have you seen the tuts on tehgit website about rebase? | 20:07 |
| greywhind | no | 20:08 |
| nash | Have a peak, or at least man git-rebase | 20:12 |
| greywhind | nash: it's giving me a lot of errors. | 20:13 |
| nash | Okay - which ones? | 20:14 |
| * nash is not very familiar with rebased | 20:14 | |
| greywhind | http://rafb.net/p/pQGwbF81.html (43 lines) | 20:14 |
| tpb | Title: Nopaste - No description (at rafb.net) | 20:14 |
| nash | back in a few minutes - meetings | 20:15 |
| *** mithro has quit IRC | 20:22 | |
| *** mithro has joined #tp | 20:24 | |
| greywhind | k - i'm pretty sure i fixed everything. | 20:25 |
| mithro | sorry my laptop went to sleep | 20:25 |
| greywhind | says i no longer have any patches when i git-format-patch -r origin..master | 20:25 |
| nash | All good | 20:32 |
| nash | greywhind: You can also just use git-diff -r origin..master or even cg-status - look at the revision ids | 20:32 |
| greywhind | nash: thanks | 20:33 |
| nash | greywhind: Does gitk or giggle work for you? | 20:33 |
| nash | (both are probably separate downloads, but I find them invaluable)( | 20:33 |
| greywhind | gitk works, it seems | 20:33 |
| nash | Useful? | 20:34 |
| greywhind | looks like it | 20:34 |
| nash | If you are visually inclined - it's greay | 20:35 |
| nash | Click on a patch - note it shows you which trees it is in - priceless | 20:35 |
| greywhind | yeah | 20:35 |
| *** tuna-fish has joined #tp | 20:36 | |
| mithro | i love gitk | 20:39 |
| *** mithro has quit IRC | 21:50 | |
| *** mithro has joined #tp | 22:28 | |
Generated by irclog2html.py 2.5 by Marius Gedminas - find it at mg.pov.lt!