| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** tansell_laptop has joined #tp | 00:06 | |
| greywhind_ | tansell: http://codereview.appspot.com/67114 | 00:06 |
|---|---|---|
| tpb | Title: Issue 67114: Fixed old way of finding types of objects to draw in Overlay.py, changed icon drawing in Systems.py. - Code Review (at codereview.appspot.com) | 00:06 |
| *** jmtan has joined #tp | 00:13 | |
| *** jmtan has quit IRC | 00:15 | |
| *** jmtan has joined #tp | 00:16 | |
| tansell_laptop | greywhind_, reviewing now | 00:17 |
| tansell_laptop | did you read the git-cl page? | 00:17 |
| greywhind_ | tansell_laptop: yes | 00:18 |
| tansell_laptop | okay | 00:18 |
| *** tansell-laptop has quit IRC | 00:23 | |
| tansell_laptop | greywhind_, comments added | 00:32 |
| greywhind_ | tansell_laptop: dealing with them | 00:34 |
| llnz | bbl | 00:38 |
| *** llnz has quit IRC | 00:38 | |
| greywhind_ | tansell_laptop: updated the commit: http://codereview.appspot.com/67114 | 00:40 |
| tpb | Title: Issue 67114: Fixed old way of finding types of objects to draw in Overlay.py, changed icon drawing in Systems.py. - Code Review (at codereview.appspot.com) | 00:40 |
| greywhind_ | tansell_laptop: i like this tool | 00:46 |
| tansell_laptop | I don't like the way it wraps at 80 characters | 00:54 |
| greywhind_ | tansell_laptop: you can set it in your preferences | 00:54 |
| greywhind_ | click "settings" at the top | 00:54 |
| *** greywhind has joined #tp | 01:12 | |
| tansell_laptop | greywhind, more comments | 01:13 |
| *** greywhind_ has quit IRC | 01:20 | |
| *** greenlion has joined #tp | 01:38 | |
| *** greenlion has quit IRC | 01:38 | |
| *** greenlion has joined #tp | 01:39 | |
| *** jmtan1 has joined #tp | 01:55 | |
| *** jmtan has quit IRC | 02:02 | |
| *** jmtan has joined #tp | 02:30 | |
| *** jmtan1 has quit IRC | 02:34 | |
| greywhind | tansell_laptop: still around? | 02:41 |
| tansell | greywhind, yes but currently busy | 02:42 |
| greywhind | ok | 02:42 |
| greywhind | well, when you get a chance, do you happen to know what the "references:" parameter inside a Ship List means? | 02:43 |
| tansell | greywhind, I think it's the design id that this ship is | 02:50 |
| tansell | but I could be wrong | 02:50 |
| tansell | I need more context | 02:50 |
| *** llnz has joined #tp | 02:52 | |
| greywhind | [Ship List: [references([iII]): [(9, 2, 1)]], Damage: [value(I): 0]] | 02:52 |
| greywhind | what's that mean? | 02:53 |
| greywhind | there's one ship of type 9, one of type 2, and one of type 1? | 02:53 |
| llnz | nope, read the spec | 02:58 |
| llnz | if you give a minute i'll find it | 02:58 |
| llnz | it's a reference quanity list | 03:00 |
| greywhind | llnz: i forget where the spec is | 03:01 |
| llnz | http://www.thousandparsec.net/tp/dev/documents/protocolxml.php | 03:01 |
| tpb | <http://ln-s.net/JXj> (at www.thousandparsec.net) | 03:01 |
| llnz | that's the html version | 03:01 |
| llnz | based on the xml in the document repo | 03:01 |
| llnz | Reference Quality ListGives a list of references and how many of each of them. | 03:02 |
| llnz | a list, the References, A list of as described in the Generic Reference System The References list contains: | 03:02 |
| llnz | 32 bit signed integer, the Reference Type, type of thing being referenced | 03:02 |
| llnz | 32 bit unsigned integer, the The ID of the thing referenced, | 03:02 |
| llnz | 32 bit unsigned integer, the The quantity of the referenced thing., | 03:02 |
| greywhind | ah! ok, thanks | 03:02 |
| llnz | ref type 9: design | 03:02 |
| llnz | ref id 2: design id 2 | 03:03 |
| llnz | quantity: 1 | 03:03 |
| greywhind | llnz: is there a mapping from ref type to "design" or something in the code somewhere? | 03:04 |
| llnz | yes | 03:05 |
| llnz | the generic reference system | 03:05 |
| greywhind | any idea where that is in the code? | 03:06 |
| llnz | http://www.thousandparsec.net/tp/dev/documents/protocol3.php#GenericReferenceSystem | 03:07 |
| tpb | <http://ln-s.net/1o6q> (at www.thousandparsec.net) | 03:07 |
| greywhind | llnz: ok, thanks | 03:07 |
| llnz | not sure where in code | 03:07 |
| mithro_ | see the tpclient-pywx/libtpproto-py/tp/netlib/GenericRS.py | 03:07 |
| greywhind | mithro_: ok. | 03:08 |
| llnz | greywhind: you are working on tp04 for lib*-py and tpclient-pywx? | 03:08 |
| greywhind | llnz: yeah | 03:08 |
| llnz | cool | 03:09 |
| mithro_ | llnz: it's his GSoC project :) | 03:09 |
| greywhind | it should be, eventually :P | 03:09 |
| llnz | i guess you will point out issues with tpserver-cpp and the rulesets | 03:09 |
| greywhind | i'll bring up anything that seems problematic, like the multiple coordinate/reference object problem | 03:10 |
| *** nash has quit IRC | 03:24 | |
| greywhind | mithro_: so... GenericRS.Types["Design"] doesn't seem to exist. | 03:37 |
| tansell | greywhind, feel free to fix :) | 03:37 |
| greywhind | there is no "9" | 03:37 |
| greywhind | any idea where Llnz got that list? | 03:38 |
| greywhind | where it says design should be 9? | 03:38 |
| mithro_ | greywhind: yeah - it's in the protocol definition I think | 03:38 |
| greywhind | the protocol says: | 03:39 |
| greywhind | # 8? - Category | 03:39 |
| greywhind | # 9? - Component | 03:39 |
| mithro_ | well - looks like the protocol document needs updating :) | 03:39 |
| greywhind | any idea what 8 should actually be? | 03:39 |
| llnz | just a second | 03:40 |
| llnz | 8 is category, 9 is design | 03:41 |
| greywhind | ok | 03:41 |
| greywhind | any above 9? | 03:42 |
| llnz | not yet | 03:42 |
| greywhind | ok | 03:42 |
| greywhind | updated in GenericRS | 03:42 |
| llnz | 10 will probably be component | 03:42 |
| greywhind | i'll commit and push it soon | 03:42 |
| mithro_ | post about it | 03:42 |
| mithro_ | llnz: also need property right? | 03:42 |
| llnz | mithro_: not sure | 03:42 |
| llnz | no need yet | 03:42 |
| greywhind | why does this cause a busy-loop, i wonder: | 03:43 |
| greywhind | # Don't draw the Universe: | 03:43 |
| greywhind | if obj.id == 0: | 03:43 |
| greywhind | return | 03:43 |
| mithro_ | probably the calling code is looping on the result | 03:44 |
| greywhind | mithro_: so i should send an e-mail about the change to GenericRS? | 03:54 |
| mithro_ | yes | 03:54 |
| greywhind | should i still push the change myself though? | 03:54 |
| mithro_ | yes | 03:55 |
| greywhind | ok | 03:55 |
| mithro_ | I'm assume it's pretty simple so not worth going a git-cl for | 03:55 |
| greywhind | yeah, it's quite simple | 03:55 |
| greywhind | mithro_: ok, one last git-cl for the night coming up | 04:02 |
| tansell_laptop | okay sure | 04:02 |
| tansell_laptop | okay | 04:03 |
| greywhind | tansell: hm... i've made changes to another file, and git cl doesn't seem to have a way to exclude it | 04:05 |
| greywhind | mind if i just commit that too? | 04:05 |
| greywhind | maybe if i make another branch? | 04:06 |
| greywhind | it still seems to want to include Systems.py :-/ | 04:08 |
| greywhind | tansell: oh, never mind. it seems to have worked like i wanted. issue is updated: http://codereview.appspot.com/67114/show | 04:10 |
| tpb | Title: Issue 67114: Fixed old way of finding types of objects to draw in Overlay.py, changed icon drawing in Systems.py. - Code Review (at codereview.appspot.com) | 04:10 |
| *** llnz2 has joined #tp | 04:12 | |
| *** llnz has quit IRC | 04:13 | |
| *** llnz2 is now known as llnz | 04:13 | |
| greywhind | mithro_: should I push the GenericRS change to the tp04 branch or the master? | 04:17 |
| greywhind | i'll go ahead and push to tp04. | 04:24 |
| greywhind | less chance of screwing things up | 04:24 |
| greywhind | actually, i'll just wait til' tomorrow | 04:26 |
| greywhind | i'm also going to wait until tomorrow for my blog post, because it's quite late and i need to sleep | 04:26 |
| greywhind | 'night | 04:26 |
| tansell_laptop | greywhind, okay | 04:29 |
| greywhind | tansell_laptop: i'm still here, actually. which should i do, in the morning? | 04:30 |
| tansell_laptop | greywhind, up to you | 04:31 |
| tansell_laptop | I'm looking at your CL now | 04:31 |
| greywhind | ok. i'll see any comments you make tomorrow. actually leaving now! | 04:32 |
| tansell_laptop | greywhind, comments published - quite a few more | 04:59 |
| tansell_laptop | shenki, ping? | 05:00 |
| tansell_laptop | shenki, can you do a pretend code-review of http://codereview.mithis.com/1/show | 05:00 |
| tpb | Title: Issue 1: Testing. - Code Review (at codereview.mithis.com) | 05:00 |
| *** greywhind_ has joined #tp | 05:15 | |
| *** greywhind has quit IRC | 05:15 | |
| llnz | tansell_laptop: I will | 05:34 |
| llnz | tansell_laptop: comment added | 05:37 |
| *** mithro_ has quit IRC | 06:19 | |
| *** tansell_laptop has quit IRC | 06:23 | |
| CIA-46 | llnz tpserver-cpp * r138206c6edf7 /tpserver/ (4 files): | 06:26 |
| CIA-46 | Added Media ObjectParameter to tpserver-cpp. | 06:26 |
| CIA-46 | Had not yet been added. Needs users in the rulesets. | 06:26 |
| *** reac has quit IRC | 06:49 | |
| *** tansell_laptop has joined #tp | 07:10 | |
| *** greywhind has joined #tp | 07:12 | |
| CIA-46 | llnz tpserver-cpp * rf4d0ba84e4b2 /tpserver/game.cpp: | 07:15 |
| CIA-46 | Updated default media base url. | 07:15 |
| CIA-46 | We moved to subversion a while ago. | 07:15 |
| tansell_laptop | llnz, whats the new URL? | 07:26 |
| llnz | svn.thousandparsec.net/svn/media/client/ | 07:26 |
| llnz | not really new | 07:27 |
| llnz | just newer than darcs.thousandparsec.net/repos/media/client | 07:27 |
| tansell_laptop | ha | 07:28 |
| llnz | :-) | 07:28 |
| tansell_laptop | the old URL still works | 07:28 |
| llnz | i know, but I thought I should update it, save the redirection | 07:28 |
| tansell_laptop | if you follow the permanent redirect | 07:29 |
| tansell_laptop | I was surprised that it did :P | 07:29 |
| *** greywhind_ has quit IRC | 07:30 | |
| tansell_laptop | llnz, what do you think of rietveld? | 07:31 |
| llnz | it looks useful | 07:32 |
| llnz | i'm not sure if I would use it for tp though | 07:32 |
| tansell_laptop | what would you use? | 07:32 |
| tansell_laptop | Nothing? | 07:33 |
| llnz | i tend to read the commit diffs on the mailing list | 07:38 |
| shenki | tansell_laptop: what arguments do you pass to 'ps'? | 08:00 |
| shenki | i remember you had a set of 3 that were quite good. i can't work out what tehy are tho | 08:01 |
| shenki | ah, fax | 08:09 |
| *** verhoevenv has joined #tp | 08:12 | |
| tansell_laptop | i found commenting on them is kinda hard | 08:13 |
| tansell_laptop | because they are already committed | 08:16 |
| llnz | but at least there is commits, a history trail | 08:22 |
| tansell_laptop | yes - but not a neat history trail | 08:24 |
| tansell_laptop | IE sometimes it takes a person a while to comment | 08:25 |
| tansell_laptop | so you get an interleaving of the patches | 08:25 |
| *** peres has joined #tp | 08:35 | |
| *** Noughmad has joined #tp | 08:48 | |
| *** verhoevenv has quit IRC | 09:04 | |
| * llnz wanders off | 09:21 | |
| llnz | later all | 09:21 |
| *** llnz has quit IRC | 09:21 | |
| *** mithro_ has joined #tp | 09:25 | |
| *** Landon_ has joined #tp | 09:37 | |
| *** Landon has quit IRC | 09:41 | |
| *** Landon has joined #tp | 09:42 | |
| *** Landon has quit IRC | 09:45 | |
| *** Landon has joined #tp | 09:46 | |
| *** Landon_ has quit IRC | 10:07 | |
| *** alanp has joined #tp | 10:08 | |
| *** verhoevenv has joined #tp | 10:20 | |
| *** peres has left #tp | 10:35 | |
| *** JLP has joined #tp | 10:46 | |
| *** alanp has quit IRC | 10:54 | |
| *** tansell_laptop has quit IRC | 11:10 | |
| *** greywhind_ has joined #tp | 11:12 | |
| *** greywhind has quit IRC | 11:12 | |
| *** mithro_ has quit IRC | 11:27 | |
| *** mhilmi has joined #tp | 11:51 | |
| *** peres has joined #tp | 12:35 | |
| *** verhoevenv has quit IRC | 13:25 | |
| *** greywhind_ has quit IRC | 13:32 | |
| *** peres has left #tp | 13:36 | |
| *** verhoevenv has joined #tp | 13:43 | |
| *** greywhind has joined #tp | 14:00 | |
| *** Erroneous has joined #tp | 14:17 | |
| *** greywhind has quit IRC | 14:23 | |
| *** greywhind has joined #tp | 14:32 | |
| *** jmtan has quit IRC | 14:57 | |
| *** llnz has joined #tp | 16:07 | |
| cherez | tansell: Ping? | 16:08 |
| llnz | cherez: it's 6am where he is | 16:10 |
| CIA-46 | noegnud libtpproto-py-tp04 * r2285115b777e /tp/netlib/GenericRS.py: | 16:10 |
| CIA-46 | Added two new types to GenericRS.py (8: Category, 9: Design) that were part of the spec but | 16:10 |
| CIA-46 | not in the code. | 16:10 |
| cherez | llnz: Well, I wasn't expecting a response, but there was a chance. :P | 16:11 |
| greywhind | you never know with Mithro - he's awake when you least expect it :P | 16:11 |
| *** greenlion has quit IRC | 16:22 | |
| *** greenlion has joined #tp | 16:24 | |
| cherez | Coming up with good numbers to test on xstruct is tricky. | 16:32 |
| cherez | It's like I have 2^32 choices, and none stand out as particularly good. | 16:32 |
| llnz | is this the serialisation in libpproto-py? | 16:39 |
| llnz | test boundaries, including invalid numbers | 16:39 |
| *** greenlion has quit IRC | 17:13 | |
| *** alanp has joined #tp | 17:20 | |
| cherez | Yikes, floats aren't supported?! | 17:26 |
| *** Noughmad has quit IRC | 17:36 | |
| *** alanp has quit IRC | 17:58 | |
| *** verhoevenv has quit IRC | 18:12 | |
| cherez | Freaking floats. | 18:32 |
| *** peres has joined #tp | 18:55 | |
| *** greywhind_ has joined #tp | 19:16 | |
| *** greywhind has quit IRC | 19:16 | |
| *** nash has joined #tp | 19:43 | |
| llnz | hi nash | 19:52 |
| nash | heyo | 19:52 |
| nash | how is life? | 19:52 |
| llnz | not bad, you? | 19:58 |
| nash | Tiring | 20:02 |
| tansell | I'm here now | 20:02 |
| nash | Too many wakeups for little babies at 3 and 4 am | 20:02 |
| greywhind_ | tansell: i made changes to deal with your suggestions | 20:02 |
| greywhind_ | tansell: but git-cl seems to have trouble with modified submodule | 20:02 |
| greywhind_ | greywhind (03:28 PM):~/Programming/tp04/tpclient-pywx > git cl upload origin/tp04 extra/objectutils.py | 32 ++++++++++++++++++++++- | 20:03 |
| greywhind_ | libtpproto-py | 2 +- | 20:03 |
| greywhind_ | windows/main/overlays/Overlay.py | 13 ++++++--- | 20:03 |
| greywhind_ | windows/main/overlays/Systems.py | 52 ++++++++++++++++++++++--------------- | 20:03 |
| greywhind_ | 4 files changed, 71 insertions(+), 28 deletions(-) | 20:03 |
| greywhind_ | This branch is associated with issue 67114. Adding patch to that issue. | 20:03 |
| greywhind_ | Got error status from 'git show aff2b4cf79ae082b797c8b8d19d25aff4a23c5f9' | 20:03 |
| tansell | what does | 20:04 |
| tansell | git show aff2b4cf79ae082b797c8b8d19d25aff4a23c5f9 | 20:04 |
| tansell | say? | 20:04 |
| greywhind_ | fatal: bad object aff2b4cf79ae082b797c8b8d19d25aff4a23c5f9 | 20:04 |
| greywhind_ | that's the patch in the submodule | 20:04 |
| *** jnengland77 has joined #tp | 20:05 | |
| greywhind_ | i need to run git show from inside the submodule directory, not the tpclient-pywx directory | 20:05 |
| tansell | ahh - it appears that you have run into a problem with git-cl not supporting submodules | 20:06 |
| greywhind_ | yeah | 20:06 |
| tansell | so the bumping of libtpproto-py to a new version was a seperate patch right | 20:07 |
| greywhind_ | yeah | 20:07 |
| greywhind_ | but... maybe not in this branch, actually | 20:07 |
| tansell | hrm? | 20:07 |
| greywhind_ | i have another branch where i did it as a separate commit | 20:08 |
| tansell | then you merged that branch into this one? | 20:08 |
| greywhind_ | no, they're not merged yet | 20:08 |
| greywhind_ | but i then committed another change to this one, which probably included the submodule update | 20:09 |
| greywhind_ | maybe i should revert that commit and leave the submodule update out? | 20:09 |
| tansell | greywhind_, yeah | 20:09 |
| greywhind_ | tansell: remind me what the command is for that? | 20:09 |
| tansell | I recommend fireing up gitk | 20:09 |
| greywhind_ | ok | 20:10 |
| tansell | then doing a "reset branch to here (soft) | 20:10 |
| greywhind_ | to the previous one? | 20:10 |
| greywhind_ | what do i do with the commit, then? it seems to still exist, just not as part of a branch | 20:11 |
| tansell | greywhind_, just ignore it | 20:13 |
| greywhind_ | ok | 20:13 |
| *** jnengland77 has quit IRC | 20:13 | |
| tansell | it'll go away when a git-gc is eventually called | 20:13 |
| tansell | just create a new commit now without the submodule changes | 20:13 |
| greywhind_ | ok | 20:13 |
| tansell | cherez, pong? | 20:13 |
| greywhind_ | how do i remove something from the list of changes to commit? | 20:13 |
| *** jnengland77 has joined #tp | 20:14 | |
| tansell | is it in the index? | 20:16 |
| tansell | git rm --cached | 20:16 |
| greywhind_ | i don't think that's what i wanted | 20:17 |
| greywhind_ | greywhind (05:16 PM):~/Programming/tp04/tpclient-pywx > git status | 20:17 |
| greywhind_ | # On branch icon-drawing-tp04 | 20:17 |
| greywhind_ | # Changes to be committed: | 20:17 |
| greywhind_ | # (use "git reset HEAD <file>..." to unstage) | 20:17 |
| greywhind_ | # | 20:17 |
| greywhind_ | # modified: extra/objectutils.py | 20:17 |
| greywhind_ | # deleted: libtpproto-py | 20:17 |
| greywhind_ | # modified: windows/main/overlays/Overlay.py | 20:17 |
| greywhind_ | # | 20:17 |
| greywhind_ | # Untracked files: | 20:17 |
| greywhind_ | # (use "git add <file>..." to include in what will be committed) | 20:17 |
| greywhind_ | # | 20:17 |
| greywhind_ | # libtpproto-py/ | 20:17 |
| tansell | opps :P | 20:17 |
| tansell | git-add -i | 20:18 |
| tansell | then | 20:18 |
| tansell | r | 20:18 |
| tansell | select the libtpproto-py patch | 20:18 |
| greywhind_ | ok | 20:18 |
| greywhind_ | then exit? | 20:19 |
| tansell | yeah | 20:19 |
| greywhind_ | greywhind (05:19 PM):~/Programming/tp04/tpclient-pywx > git status | 20:19 |
| greywhind_ | # On branch icon-drawing-tp04 | 20:19 |
| greywhind_ | # Changes to be committed: | 20:19 |
| greywhind_ | # (use "git reset HEAD <file>..." to unstage) | 20:19 |
| greywhind_ | # | 20:19 |
| greywhind_ | # modified: extra/objectutils.py | 20:19 |
| greywhind_ | # modified: windows/main/overlays/Overlay.py | 20:19 |
| greywhind_ | # | 20:19 |
| greywhind_ | # Changed but not updated: | 20:19 |
| greywhind_ | # (use "git add <file>..." to update what will be committed) | 20:19 |
| greywhind_ | # (use "git checkout -- <file>..." to discard changes in working directory) | 20:19 |
| greywhind_ | # | 20:19 |
| greywhind_ | # modified: libtpproto-py | 20:19 |
| greywhind_ | # | 20:20 |
| greywhind_ | that looks right, yes? | 20:20 |
| tansell | greywhind_, yeah | 20:20 |
| tansell | I'm working on making git-cl better | 20:20 |
| greywhind_ | still gives the same error | 20:21 |
| greywhind_ | do i have to reset libtpproto-py? | 20:21 |
| *** mithro_ has joined #tp | 20:22 | |
| *** Landon_ has joined #tp | 20:23 | |
| *** Landon has quit IRC | 20:23 | |
| *** Landon_ is now known as Landon | 20:23 | |
| greywhind_ | mithro_: do i have to reset libtpproto-py? | 20:27 |
| tansell | greywhind_, hrm | 20:29 |
| tansell | it still gave exactly the same error? | 20:29 |
| tansell | or a similar error? | 20:29 |
| greywhind_ | tansell: exactly the same | 20:32 |
| greywhind_ | This branch is associated with issue 67114. Adding patch to that issue. | 20:32 |
| greywhind_ | Got error status from 'git show aff2b4cf79ae082b797c8b8d19d25aff4a23c5f9' | 20:32 |
| greywhind_ | tansell: my computer just arrived! | 20:33 |
| tansell | greywhind_, yay | 20:33 |
| greywhind_ | i'll be switching back to developing on there within the next day or so | 20:33 |
| tansell | hrm that is a bit weird | 20:33 |
| greywhind_ | it seems that it takes even uncommitted changes | 20:33 |
| tansell | greywhind_, maybe do a git-stash | 20:33 |
| greywhind_ | what's that? | 20:34 |
| greywhind_ | and i don't seem to have that command | 20:34 |
| tansell | push you changes into a temporarily location | 20:34 |
| tansell | it's a standard part of git since 1.5.2 | 20:34 |
| greywhind_ | greywhind (05:38 PM):~/Programming/tp04/tpclient-pywx > git stash | 20:38 |
| greywhind_ | No local changes to save | 20:38 |
| tansell | hrm | 20:39 |
| tansell | git status show? | 20:39 |
| tansell | greywhind_, maybe just revert the libtpproto-py changes | 20:43 |
| greywhind_ | yeah, since they're still in another branch, that should be fine, right? | 20:44 |
| tansell | yeah | 20:45 |
| greywhind_ | greywhind (05:48 PM):~/Programming/tp04/tpclient-pywx > git reset --hard | 20:51 |
| greywhind_ | HEAD is now at cba784f Added a method to check whether an object is top level (the Universe or a galaxy). | 20:51 |
| greywhind_ | it doesn't seem to have reset libtpproto-py though | 20:52 |
| tansell | that was not what you wanted to do | 20:53 |
| tansell | git checkout libtpproto-py | 20:53 |
| greywhind_ | the change has already been pushed | 20:53 |
| tansell | which change? | 20:53 |
| greywhind_ | the one in libtpproto-py | 20:54 |
| tansell | thats fine | 20:54 |
| greywhind_ | so git checkout libtpproto-py does nothing | 20:54 |
| tansell | oh | 20:54 |
| tansell | duh | 20:54 |
| tansell | git submodule update libtpproto-py | 20:55 |
| greywhind_ | aha | 20:55 |
| greywhind_ | there we go | 20:55 |
| greywhind_ | uploaded! | 20:56 |
| tansell | yay | 20:56 |
| greywhind_ | sorry about all the trouble :-/ | 20:57 |
| tansell | greywhind_, so to understand how submodules work | 20:57 |
| tansell | the "parent" repository basically has information saying "this module is at commit X" | 20:57 |
| greywhind_ | ok | 20:58 |
| tansell | git submodule update makes the module go to the commit X | 20:58 |
| greywhind_ | gotcha | 20:58 |
| tansell | greywhind_, I don't like the a_b_c style of naming things | 20:59 |
| greywhind_ | oh, sorry - what do you prefer? (i've done too much C lately) | 21:00 |
| tansell | isTopLevel probably | 21:03 |
| tansell | and getPositionList | 21:03 |
| tansell | these functions should have docstrings | 21:07 |
| tansell | greywhind_, more feedback on your CL | 21:16 |
| greywhind_ | tansell: sorry, had a rather large amount of e-mail to sort through | 21:24 |
| greywhind_ | i'll look at the feedback now | 21:24 |
| tansell | same as the above really | 21:25 |
| greywhind_ | k | 21:25 |
| greywhind_ | after that, do you think it's ready to push? | 21:26 |
| mithro_ | greywhind_: pretty much | 21:29 |
| greywhind_ | oh... i forgot to remove that parent line when i changed the function parameters | 21:31 |
| greywhind_ | mithro_: ok, hopefully final version of commit is uploaded | 21:36 |
| tansell | whats the CL URL again? | 21:37 |
| tansell | greywhind_, you updated the theme for your blog? | 21:38 |
| *** Erroneous has quit IRC | 21:40 | |
| greywhind_ | tansell: it has been the same for a few days, i think? | 21:41 |
| tansell | I generally read it via the feed | 21:41 |
| greywhind_ | ah | 21:41 |
| greywhind_ | well, i like this theme a lot | 21:41 |
| greywhind_ | http://codereview.appspot.com/67114/show | 21:41 |
| tpb | Title: Issue 67114: Fixed old way of finding types of objects to draw in Overlay.py, changed icon drawing in Systems.py. - Code Review (at codereview.appspot.com) | 21:41 |
| greywhind_ | once this is pushed, i'll have another patch for review | 21:44 |
| mithro_ | greywhind_: it's pretty good | 21:44 |
| tansell | suits the contents :) | 21:44 |
| greywhind_ | yep | 21:44 |
| greywhind_ | besides, there're only so many themes you can pick from without installing wordpress into your own host | 21:45 |
| greywhind_ | and i don't have my own host, really | 21:45 |
| tansell | greywhind_, btw you should be able to upload to codeview.mithis.com now | 21:46 |
| greywhind_ | ok | 21:46 |
| greywhind_ | i'll do that for the next patch | 21:46 |
| tansell | greywhind_, you can also have multiple outstanding patches for review | 21:46 |
| greywhind_ | tansell: i wasn't sure which branch to diff from for the second, though | 21:47 |
| tansell | if you created a new branch for the second set of changes | 21:47 |
| tansell | you do it from your branch point | 21:47 |
| greywhind_ | ok | 21:47 |
| greywhind_ | fixed the comments again - uploaded | 21:48 |
| tansell | LGTM means you should just go ahead a submit it | 21:48 |
| tansell | Looks Good to Me | 21:48 |
| greywhind_ | ok | 21:48 |
| greywhind_ | now to look up how to merge those all into one commit... | 21:49 |
| tansell | http://www.thousandparsec.net/wiki/GitCL | 21:51 |
| tpb | Title: GitCL - Thousand Parsec Wiki (at www.thousandparsec.net) | 21:51 |
| greywhind_ | yeah, got it - thanks | 21:51 |
| greywhind_ | tansell: how do i push only the tp04 branch? | 21:54 |
| greywhind_ | tansell: never mind - i have to eat dinner. i'll be back in a bit. | 21:55 |
| tansell | greywhind_, by default I don't think it'll push new branches unless you tell it too | 21:57 |
| mithro_ | use your dry-run stuff to give it a go | 21:59 |
| *** peres has quit IRC | 22:09 | |
| CIA-46 | noegnud tpclient-pywx-tp04 * r23922ab9be53 / (4 files in 2 dirs): | 22:13 |
| CIA-46 | Fixed old method of determining what type of objects to draw in Overlay.py, | 22:13 |
| CIA-46 | modified how icons are drawn in Systems.py to work with DynamicObjects. | 22:13 |
| greywhind_ | mithro_: ok... so now i need to actually use the libtpproto-py change | 22:26 |
| greywhind_ | but i also want to upload this | 22:26 |
| cherez | Blasted. floating point comparison. | 22:32 |
| *** mhilmi2 has joined #tp | 22:50 | |
| tansell | greywhind_, commit the libtpproto-py change | 22:52 |
| tansell | hey cherez | 22:52 |
| greywhind_ | tansell: it's been committed. | 22:52 |
| cherez | Hey tansell. | 22:52 |
| tansell | greywhind_, there are two commits needed | 22:52 |
| tansell | 1) commit in libtpproto-py | 22:52 |
| tansell | 2) commit in tpclient-pywx to tell it to use the new libtpproto-py version | 22:53 |
| greywhind_ | did both | 22:53 |
| greywhind_ | but git cl upload still gives that error | 22:53 |
| tansell | greywhind_, so did you push 2) | 22:53 |
| greywhind_ | tansell: no | 22:53 |
| tansell | greywhind_, oh? | 22:53 |
| greywhind_ | i didn't push the commit in tpclient-pywx because it is only in the branch with the stuff i want to use git cl on | 22:54 |
| tansell | greywhind_, you have a couple of options | 22:54 |
| tansell | greywhind_, I would recommend doing a git-cherry-pick of the commit | 22:54 |
| tansell | pushing the commit | 22:54 |
| greywhind_ | tansell: ok, how do i do that? | 22:54 |
| tansell | and then rebase your changes onto the new head | 22:55 |
| tansell | fire up "gitk --all" | 22:55 |
| greywhind_ | ok | 22:55 |
| tansell | git checkout tp04 | 22:56 |
| tansell | then a | 22:56 |
| tansell | git cherry-pick <sha1> | 22:56 |
| tansell | you can find the sha1 in gitk | 22:56 |
| greywhind_ | can i right-click on the commit i want and select "cherry-pick this commit"? | 22:56 |
| mithro_ | should be able too | 22:57 |
| greywhind_ | ok, done | 22:57 |
| tansell | then you should be able to push that change right | 22:57 |
| CIA-46 | noegnud tpclient-pywx-tp04 * r5da97299e7a3 /libtpproto-py: Updated libtpproto-py to make use of GenericRS change. | 22:58 |
| greywhind_ | yep | 22:58 |
| greywhind_ | now i go back to my other branch | 22:58 |
| tansell | yeah | 22:58 |
| tansell | and do a git rebase | 22:58 |
| tansell | git-rebase is pretty tricky | 22:59 |
| tansell | so go to your branch | 22:59 |
| tansell | and do a | 22:59 |
| greywhind_ | i want to "git rebase tp04"? | 22:59 |
| tansell | git-rebase tp04 | 22:59 |
| tansell | greywhind_, yeah | 22:59 |
| greywhind_ | errors... let me paste | 22:59 |
| greywhind_ | http://pastebin.com/dda3b558 | 23:00 |
| tpb | Title: pastebin - collaborative debugging tool (at pastebin.com) | 23:00 |
| tansell | greywhind_, so your branch has all your old changes in it? | 23:01 |
| tansell | you'll want to do a | 23:01 |
| greywhind_ | i did a merge | 23:01 |
| tansell | "git rebase --skip" past those | 23:01 |
| tansell | each time you start a new branch, you want to start it from tp04 | 23:03 |
| *** mhilmi has quit IRC | 23:04 | |
| tansell | greywhind_, that working okay? | 23:05 |
| greywhind_ | tansell: seems to have worked, although there doesn't seem to be a distinct commit for my change now, but the changed code is still there | 23:06 |
| tansell | greywhind_, hrm? | 23:06 |
| tansell | you did a 'git rebase --skip' to get past your old commits right? | 23:07 |
| greywhind_ | yeah | 23:07 |
| tansell | so did you skip *all* of them? | 23:07 |
| tansell | or just the old ones? | 23:07 |
| greywhind_ | i am... not entirely sure | 23:07 |
| tansell | okay | 23:07 |
| greywhind_ | but the code does appear to still be working | 23:07 |
| tansell | another option would have been to do a | 23:07 |
| tansell | start a new branch from tp04 | 23:08 |
| tansell | then git-cherry-pick your change accross | 23:08 |
| greywhind_ | yeah, i guess that would also have worked | 23:08 |
| greywhind_ | well, i'm going to try git cl upload now | 23:08 |
| tansell | okay | 23:08 |
| greywhind_ | at least this should still be committed correctly when i squash it | 23:09 |
| greywhind_ | eventually | 23:09 |
| greywhind_ | greywhind (08:08 PM):~/Programming/tp04/tpclient-pywx > git cl upload origin/tp04 | 23:10 |
| greywhind_ | No output from ['git', 'diff', '--full-index', 'origin/tp04'] | 23:10 |
| tansell | greywhind_, that means you have no differences between your current code and origin/tp04 branch | 23:10 |
| tansell | greywhind_, did you commit the code? | 23:10 |
| greywhind_ | yep | 23:10 |
| tansell | so what does | 23:11 |
| tansell | git diff origin/tp04 show? | 23:11 |
| tansell | and what does git-status show? | 23:11 |
| greywhind_ | nothing | 23:11 |
| greywhind_ | greywhind (08:10 PM):~/Programming/tp04/tpclient-pywx > git status | 23:11 |
| greywhind_ | # On branch ship-name-popup-fix | 23:11 |
| greywhind_ | nothing to commit (working directory clean) | 23:11 |
| tansell | so as far as git is concerned you have no changes | 23:11 |
| tansell | are you sure your changes are in? | 23:11 |
| greywhind_ | the code is definitely working to show the new poppups | 23:12 |
| greywhind_ | and that shouldn't have been in tp04 already, since it was only in this branch | 23:12 |
| tansell | hrm | 23:12 |
| tansell | greywhind_, do a | 23:12 |
| tansell | git-branch -a -v | 23:13 |
| greywhind_ | greywhind (08:12 PM):~/Programming/tp04/tpclient-pywx > git branch -a -v | 23:13 |
| greywhind_ | * ship-name-popup-fix 5da9729 Updated libtpproto-py to make use of GenericRS change. | 23:13 |
| greywhind_ | stable 43d255b Update libtpclient-py submodule to latest head. | 23:13 |
| greywhind_ | tp04 5da9729 Updated libtpproto-py to make use of GenericRS change. | 23:13 |
| greywhind_ | remotes/origin/HEAD -> origin/stable | 23:13 |
| greywhind_ | remotes/origin/schemepy 5588eea Added code to check the schemepy requirement and setup the sys.path. | 23:13 |
| greywhind_ | remotes/origin/stable 43d255b Update libtpclient-py submodule to latest head. | 23:13 |
| greywhind_ | remotes/origin/tp04 5da9729 Updated libtpproto-py to make use of GenericRS change. | 23:13 |
| greywhind_ | remotes/origin/tpclient-pywx-0.2.x 0e7e5e3 Don't die on a permission denied for making the file executable. | 23:13 |
| greywhind_ | remotes/origin/tpclient-pywx-0.3.x 43d255b Update libtpclient-py submodule to latest head. | 23:13 |
| tansell | so either you committed you change as part of the previous commit | 23:14 |
| greywhind_ | i must have skipped it, but it still added it to the rebase? | 23:14 |
| tansell | what does the following do | 23:15 |
| tansell | git rebase --abort | 23:15 |
| greywhind_ | No rebase in progress? | 23:15 |
| greywhind_ | one thing i could do is just copy the code file to another location, switch back to the tp04 branch, make a new branch, and put the code file back | 23:16 |
| greywhind_ | then commit that | 23:16 |
| greywhind_ | and ignore this brnach | 23:16 |
| greywhind_ | *branch | 23:16 |
| greywhind_ | do you think that would work? | 23:16 |
| tansell | if git-status shows no change | 23:18 |
| tansell | then you have nothing changed | 23:18 |
| greywhind_ | well, let me try this | 23:18 |
| greywhind_ | huh. it seems to have made the change in tp04 too | 23:19 |
| tansell | http://git.thousandparsec.net/gitweb/gitweb.cgi?p=tpclient-pywx.git;a=commitdiff;h=23922ab9be53c43488138c5df231133b3ece324e;hp=c1a3421ded7637d0c33203d47cad82d2ecf03cff | 23:19 |
| tpb | <http://ln-s.net/3EiH> (at git.thousandparsec.net) | 23:19 |
| greywhind_ | huh. alright. well, i guess it's already there. | 23:20 |
| tansell | http://codereview.appspot.com/67114/diff/23/1022 | 23:20 |
| greywhind_ | look alright to you? | 23:20 |
| tansell | yeah it's okay | 23:21 |
| greywhind_ | ok. well, i'll just move on then | 23:22 |
| tansell | it could use some work - but nothing I would suggest at this moment | 23:22 |
| greywhind_ | on to the next bug, then! | 23:22 |
| tansell | great | 23:24 |
| tansell | cherez, so do we have a blog? | 23:24 |
| cherez | I set one up, I haven't posted yet. | 23:25 |
| cherez | tansell: I appear to need login information for git-cl. | 23:26 |
| tansell | cherez, any google login will work | 23:26 |
| tansell | your gmail one should | 23:27 |
| cherez | Oh, it uses my Google account? | 23:27 |
| cherez | Nifty. | 23:27 |
| tansell | yeah | 23:27 |
| cherez | Then I think it's pushing a commit. Doesn't really need much review; it's basically just some more tests and I ran into the same problem with packing floats as I did with characters. | 23:29 |
| tansell | cherez, well it would be good to get it working | 23:29 |
| cherez | Right. | 23:30 |
| tansell | plus at the moment I would like to review patches a little bit more vigorously | 23:30 |
| cherez | The upload has been going for about 2 minutes now without any output.... | 23:31 |
| tansell | cherez, that sounds wrong | 23:31 |
| tansell | what command did you run? | 23:31 |
| cherez | $ git cl upload | 23:31 |
| cherez | After setting the configuration shown on the wiki. | 23:32 |
| tansell | try ctrl-c it | 23:32 |
| tansell | and do a | 23:32 |
| tansell | git cl upload origin/master | 23:32 |
| cherez | It timed out. | 23:32 |
| cherez | urllib2.URLError: <urlopen error (110, 'Connection timed out')> | 23:33 |
| tansell | cherez, do you need a proxy server? | 23:34 |
| cherez | "git cl upload origin" worked. | 23:34 |
| tansell | hrm - did it give you an issue number? | 23:35 |
| tansell | ahh ha | 23:35 |
| tansell | http://codereview.mithis.com/1001/show | 23:35 |
| tpb | Title: Issue 1001: Fixed floating point numbers and added float and timestamp tests. - Code Review (at codereview.mithis.com) | 23:35 |
| tansell | cherez, comments posted | 23:41 |
| cherez | How did I not notice upnack yet?! | 23:46 |
| tansell | cherez, specially since I' | 23:46 |
| tansell | ve poked you on IRC about it like twice | 23:46 |
| tansell | and sent you an email about it | 23:46 |
| tansell | cherez, did you get my email? | 23:46 |
| *** epyon has quit IRC | 23:46 | |
| cherez | I think I read it as unpack when I read your email. | 23:47 |
| *** jmtan has joined #tp | 23:48 | |
| tansell | Landon, poke? | 23:48 |
| tansell | greywhind_, so if my calander is right - we would have our normal weekly meeting now | 23:57 |
| greywhind_ | tansell: yep. can you give me a sec to get on IRC on my other computer? | 23:57 |
| greywhind_ | i want to give this one back to the rest of my family now :P | 23:57 |
| tansell | okay | 23:57 |
| tansell | it would be good to continue to test on mac too | 23:58 |
| tansell | mac doesn't get enough love (mainly because it sucks -- but anyway :) | 23:58 |
| greywhind_ | i will try to, but i don't want to hog it like i have been | 23:58 |
| greywhind_ | besides, it's slow and annoying to work on all the time | 23:58 |
| greywhind_ | switching over now... brb | 23:59 |
| *** bddebian has quit IRC | 23:59 | |
| *** greywhind_ has quit IRC | 23:59 | |
| *** mhilmi2 has quit IRC | 23:59 | |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!