--- Log opened Sun Jan 09 00:00:54 2011
20110109 00:07:06-!- Shakey [HydraIRC@c-67-184-116-137.hsd1.il.comcast.net] has quit [Quit:  HydraIRC -> http://www.hydrairc.com <- The alternative IRC client]
20110109 00:12:07-!- crimson_ipad [~crimsonip@74.198.164.213] has joined #wesnoth-dev
20110109 00:20:39-!- GNUtoo|laptop [~gnutoo@host19-55-dynamic.180-80-r.retail.telecomitalia.it] has quit [Read error: Operation timed out]
20110109 00:21:38< AI0867> Ivanovic: ping
20110109 00:21:47< Ivanovic> AI0867: pong
20110109 00:21:52< Ivanovic> Grimling: still around?
20110109 00:22:04-!- crimson_ipad [~crimsonip@74.198.164.213] has quit [Quit: Colloquy for iPad - http://colloquy.mobi]
20110109 00:24:07< Grimling> Ivanovic: yes
20110109 00:24:12< Ivanovic> Grimling: i published the task
20110109 00:24:17< Ivanovic> all you got to do is claim it
20110109 00:24:20< Grimling> ok, will claim it immediately
20110109 00:26:06< Grimling> claimed
20110109 00:26:38-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20110109 00:26:42< Ivanovic> accepted the claim
20110109 00:27:05< Grimling> thanks
20110109 00:27:35< Grimling> will work on it tomorrow, this pc is still copying the git...
20110109 00:28:54< CIA-84> ai0867 * r48227 /trunk/po/wesnoth/nl.po: Dutch translation update
20110109 00:29:11< AI0867> Grimling: are you in the credits yet?
20110109 00:29:16-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has joined #wesnoth-dev
20110109 00:29:46< Grimling> AI0867: yes, for the AI code I've written
20110109 00:30:06-!- eoc [~eoc@pD956093F.dip0.t-ipconnect.de] has left #wesnoth-dev ["Leaving"]
20110109 00:31:44< CIA-84> ai0867 * r48228 /trunk/data/core/about.cfg: Update credits
20110109 00:31:45< AI0867> well, now you're listed in the dutch translation team too
20110109 00:32:36< Grimling> AI0867: thank you
20110109 00:33:31< Ivanovic> off to bed now, n8
20110109 00:34:42-!- zookeeper [~l@wesnoth/developer/zookeeper] has quit []
20110109 00:55:13-!- PetePorty [~Pete@pc-59-54-120-200.cm.vtr.net] has quit [Quit: Saliendo]
20110109 01:08:51-!- Grimling [~floris_ki@91.181.39.136] has quit [Ping timeout: 276 seconds]
20110109 01:11:58-!- esr [~chatzilla@static-71-162-243-5.phlapa.fios.verizon.net] has joined #wesnoth-dev
20110109 01:26:38-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20110109 01:32:53< CIA-84> silene * r48229 /trunk/src/lua/luaconf.h: 
20110109 01:32:54< CIA-84> Reverted part of r48216, since it opened a major security breach in Wesnoth.
20110109 01:32:54< CIA-84> Indeed, it caused the Lua engine to skip unwinding of its state in presence of an exception, which opened the way to several attacks.
20110109 01:32:54< CIA-84> For instance, setting gc finalizers and then forcing GUI2 to throw an exception would allow a multiplayer scenario to execute arbitrary code on a remote client.
20110109 01:35:07< CIA-84> silene * r48230 /trunk/src/lua/SConscript: Reverted r48226: "Ensure that lua files are built with -Isrc since it's required now.", as it is no longer needed.
20110109 01:37:08-!- un214 [~un214@adsl-75-45-20-202.dsl.scrm01.sbcglobal.net] has joined #wesnoth-dev
20110109 01:38:17-!- un214 [~un214@adsl-75-45-20-202.dsl.scrm01.sbcglobal.net] has quit [Remote host closed the connection]
20110109 01:45:44-!- fendrin [~fabi@wesnoth/developer/fendrin] has quit [Remote host closed the connection]
20110109 01:55:39-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has quit [Ping timeout: 260 seconds]
20110109 02:10:04-!- un214 [~un214@adsl-75-45-20-202.dsl.scrm01.sbcglobal.net] has joined #wesnoth-dev
20110109 02:15:25-!- ancestral [~ancestral@mobile-166-137-143-137.mycingular.net] has joined #wesnoth-dev
20110109 02:29:45-!- loonycyborg [~sergey@wesnoth/developer/loonycyborg] has quit [Quit: Zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz]
20110109 02:30:30-!- loonybot [~loonybot@wesnoth/bot/loonybot] has quit [Remote host closed the connection]
20110109 02:32:54-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20110109 02:38:23-!- ancestral [~ancestral@mobile-166-137-143-137.mycingular.net] has quit [Quit: Smell ya later!]
20110109 02:42:10-!- mjs-de [~mjs-de@vpw.wh.Uni-Dortmund.DE] has joined #wesnoth-dev
20110109 02:47:36-!- mjs-de [~mjs-de@vpw.wh.Uni-Dortmund.DE] has quit [Remote host closed the connection]
20110109 02:58:29-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20110109 03:08:06-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has joined #wesnoth-dev
20110109 03:11:21-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has joined #wesnoth-dev
20110109 03:27:39-!- un214 [~un214@adsl-75-45-20-202.dsl.scrm01.sbcglobal.net] has quit [Remote host closed the connection]
20110109 03:36:41-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has quit [Ping timeout: 264 seconds]
20110109 03:42:46-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has joined #wesnoth-dev
20110109 04:50:59-!- Ivanovic_ [~ivanovic@dtmd-4db23e89.pool.mediaWays.net] has joined #wesnoth-dev
20110109 04:54:40-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 276 seconds]
20110109 04:54:55-!- Ivanovic_ is now known as Ivanovic
20110109 05:20:04-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 240 seconds]
20110109 05:20:27-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110109 05:22:57-!- jpi80 [~juanpi@adsl-84-226-0-115.adslplus.ch] has quit [Quit: Leaving.]
20110109 05:42:12-!- Cookiee [~quassel@unaffiliated/cookiee] has joined #wesnoth-dev
20110109 05:59:12-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 240 seconds]
20110109 05:59:24-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has quit [Quit: ...]
20110109 06:00:55-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20110109 06:00:55-!- Gambit [~Gambit@wesnoth/developer/grickit] has quit [Read error: Connection reset by peer]
20110109 06:08:49-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has quit [Ping timeout: 260 seconds]
20110109 06:24:39-!- fendrin [~fabi@88-134-129-62-dynip.superkabel.de] has joined #wesnoth-dev
20110109 06:24:39-!- fendrin [~fabi@88-134-129-62-dynip.superkabel.de] has quit [Changing host]
20110109 06:24:39-!- fendrin [~fabi@wesnoth/developer/fendrin] has joined #wesnoth-dev
20110109 06:37:23-!- Espreon [~espreon@wesnoth/developer/espreon] has quit [Quit: leaving]
20110109 06:42:25-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110109 06:47:41-!- dtiger [~dtiger@dynamic-vpdn-93-125-12-46.telecom.by] has joined #wesnoth-dev
20110109 06:51:19-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Disconnected by services]
20110109 06:51:39-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110109 07:04:05-!- GNUtoo|laptop [~gnutoo@host19-55-dynamic.180-80-r.retail.telecomitalia.it] has joined #wesnoth-dev
20110109 07:04:37-!- shadowmaster [~ignacio@wesnoth/developer/shadowmaster] has quit [Quit: you are doing it right!]
20110109 07:05:11-!- shadowmaster [~ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110109 07:06:42-!- shikadibot [~shikadi@wesnoth/umc-dev/bot/shikadibot] has quit [Quit: manual override]
20110109 07:07:01-!- shikadibot [~shikadi@wesnoth/umc-dev/bot/shikadibot] has joined #wesnoth-dev
20110109 07:22:01-!- fendrin [~fabi@wesnoth/developer/fendrin] has quit [Remote host closed the connection]
20110109 07:25:45-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 07:54:21-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 07:54:39-!- iwaim_vs [~iwaim@p3033-ipbf6706marunouchi.tokyo.ocn.ne.jp] has joined #wesnoth-dev
20110109 08:15:59-!- Elvish_Pillager [~eli@dhip-164.foss.residences.colby.edu] has quit [Ping timeout: 260 seconds]
20110109 08:23:27-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has joined #wesnoth-dev
20110109 08:35:07-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 09:01:47-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20110109 09:08:25< ancestral> Wow: http://forums.wesnoth.org/viewtopic.php?f=12&t=32765&start=30 - what started as an interesting idea with good intentions suddenly turns into this
20110109 09:09:29< boucman> morning all
20110109 09:12:30-!- hannes__ [b2743317@gateway/web/freenode/ip.178.116.51.23] has joined #wesnoth-dev
20110109 09:12:46< shadowmaster> ancestral: no shit, Sherlock.
20110109 09:13:28< ancestral> Fair enough
20110109 09:14:44-!- hannes__ [b2743317@gateway/web/freenode/ip.178.116.51.23] has quit [Client Quit]
20110109 09:29:49-!- Grimling [~Grimling@91.181.57.51] has joined #wesnoth-dev
20110109 09:37:37-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has quit [Quit: crimson_penguin]
20110109 09:39:07-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 09:39:46-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 255 seconds]
20110109 09:45:01-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 10:00:27-!- johndh [~johndh@adsl-85-41-2.mco.bellsouth.net] has quit [Quit: Leaving]
20110109 10:10:15-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 10:11:57-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 10:14:36-!- stikonas [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 10:14:36-!- stikonas [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 10:14:36-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 10:32:36-!- Ivanovic [~ivanovic@dtmd-4db23e89.pool.mediaWays.net] has quit [Changing host]
20110109 10:32:36-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20110109 10:33:00< Ivanovic> moin
20110109 10:37:13-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Ping timeout: 276 seconds]
20110109 10:40:19-!- GNUtoo|laptop [~gnutoo@host19-55-dynamic.180-80-r.retail.telecomitalia.it] has quit [Ping timeout: 246 seconds]
20110109 10:44:31-!- EdB [~edb@tss37-1-89-84-18-220.dsl.club-internet.fr] has joined #wesnoth-dev
20110109 10:47:18-!- eoc [~eoc@pD9560321.dip0.t-ipconnect.de] has joined #wesnoth-dev
20110109 10:47:46< CIA-84> ivanovic * r48231 /trunk/po/ (wesnoth-multiplayer/gl.po wesnoth-units/gl.po): updated Galician translation
20110109 10:53:48-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 10:57:14-!- beetlenaut [~dan@70-41-198-155.cust.wildblue.net] has quit [Read error: Connection reset by peer]
20110109 10:57:36-!- cz1stf [~cz1stf@78.24.12.198] has joined #wesnoth-dev
20110109 10:58:01-!- cz1stf [~cz1stf@78.24.12.198] has left #wesnoth-dev []
20110109 11:00:04-!- Johannes13 [~Johannes@p5DF723C6.dip0.t-ipconnect.de] has joined #wesnoth-dev
20110109 11:00:04-!- Johannes13 [~Johannes@p5DF723C6.dip0.t-ipconnect.de] has quit [Changing host]
20110109 11:00:04-!- Johannes13 [~Johannes@unaffiliated/johannes13] has joined #wesnoth-dev
20110109 11:03:17-!- negusnyul [~negusnyul@dsl4E5CD110.pool.t-online.hu] has joined #wesnoth-dev
20110109 11:07:20-!- zookeeper [~l@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20110109 11:09:51-!- MeccaGod [~majs@h14n4fls31o279.telia.com] has joined #wesnoth-dev
20110109 11:10:04-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 11:10:04-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 11:10:04-!- stikonas_ [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 11:14:14-!- stikonas_ is now known as stikonas
20110109 11:30:20-!- mordante [~mordante@roadie.xs4all.nl] has joined #wesnoth-dev
20110109 11:30:20-!- mordante [~mordante@roadie.xs4all.nl] has quit [Changing host]
20110109 11:30:20-!- mordante [~mordante@wesnoth/developer/mordante] has joined #wesnoth-dev
20110109 11:30:30< mordante> servus
20110109 11:32:06< mordante> iwontbecreative, the problem with the patch is that the patchfile itself is damaged, so doesn't apply at all
20110109 11:32:28< mordante> I probably can fix it, but I prefer not to since I'm not sure whether the patch is complete
20110109 11:33:50< mordante> wesbot seen silene
20110109 11:33:51< wesbot> mordante: The person with the nick silene last spoke 27d 23h ago.  27d 2h ago they left with the message: Quit: Leaving.
20110109 11:34:17< mordante> any lua expert around?
20110109 11:45:36< Grimling> about git-svn, to commit something to Wesnoth SVN, do you first need to 'git commit' to your local repository and then 'git svn dcommit' ?
20110109 11:46:34< mordante> yes and you can also do git commit several times before doing git svn dcommit
20110109 11:47:06< mordante> that's also why you see several commits directly after eachother from developers using git-svn
20110109 11:47:59< Grimling> so everything passes to a local repository
20110109 11:48:06< Grimling> not directly from the clone?
20110109 11:50:00< mordante> yes
20110109 11:50:12< Grimling> ok
20110109 11:50:30< mordante> the idea behind a distributed system like git is that you have the entire history and can do everything locally
20110109 11:50:46< mordante> even committing
20110109 11:51:14< mordante> with normal git you use push or pull to publish your changes
20110109 12:02:11< Grimling> the normal git push/pull, is that to the remote repository?
20110109 12:05:50< EdB> mordante: lua in wesnoth context on just lua ?
20110109 12:06:41< mordante> EdB, lua
20110109 12:07:16< mordante> Grimling, push is pushing to a remote repo and pulling is asking somebody to pull your changes
20110109 12:07:23-!- koan_ [~koan@unaffiliated/koan] has quit [Ping timeout: 272 seconds]
20110109 12:09:55< EdB> mordante: may be I can help you so
20110109 12:09:55< Grimling> mordante: ok, thanks
20110109 12:10:02-!- Netsplit *.net <-> *.split quits: shadowmaster, clanehin, CIA-84
20110109 12:10:11-!- Netsplit *.net <-> *.split quits: ettin
20110109 12:10:40-!- koan [~koan@unaffiliated/koan] has joined #wesnoth-dev
20110109 12:11:03< mordante> wesbot, log 48229
20110109 12:11:05< wesbot> silene * r48229 : Reverted part of r48216, since it opened a major security breach in Wesnoth.Indeed, it caused the Lua engine to skip unwinding of its state in presence of an exception, which opened the way to several attacks.For instance, setting gc finalizers and then forcing GUI2 to throw an exception would allow a multiplayer scenario to execute arbitrary code on a remote client.
20110109 12:11:10< wesbot> URL: http://svn.gna.org/viewcvs/wesnoth?view=rev&rev=48229
20110109 12:11:25< mordante> EdB, ^ that commit message leaves with some questions
20110109 12:11:35< mordante> - how to install a gc finalizer?
20110109 12:11:57< mordante> - isn't the finalizer called when Wesnoth is terminated normally?
20110109 12:12:01-!- Netsplit over, joins: ettin
20110109 12:12:23-!- Netsplit over, joins: shadowmaster, clanehin, CIA-84
20110109 12:12:30-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has quit [Ping timeout: 260 seconds]
20110109 12:15:53< Ivanovic> esr: i need some "archaic" term for the 4th scenario of two brothers
20110109 12:16:14< Ivanovic> esr: currently there is "Councilor Hoban" which is rather wrong, since we just talk about some smaller village
20110109 12:16:21< Ivanovic> does "Caretaker Hoban" work?
20110109 12:18:08-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has joined #wesnoth-dev
20110109 12:22:03< EdB> mordante: I'm sorry that I can help you in that case :/
20110109 12:22:05< EdB> can't
20110109 12:22:37< mordante> ok, thanks anyway
20110109 12:23:37< Grimling> mordante: what information should be in the wiki about branches?
20110109 12:24:31< mordante> git branches or svn branches?
20110109 12:25:23< Grimling> i think svn branches, (using trunk and 1.8)
20110109 12:26:02< mordante> I only use git for trunk haven't used it for svn branches yet
20110109 12:27:02< Grimling> will try to get the 1.8 working
20110109 12:29:05-!- GNUtoo|laptop [~gnutoo@host19-55-dynamic.180-80-r.retail.telecomitalia.it] has joined #wesnoth-dev
20110109 12:30:11< Grimling> mordante: the 1.8 is not in the tarball's config file, should i add it?
20110109 12:32:08< Ivanovic> Grimling: mentioning 1.8 in there was one example
20110109 12:32:20< Ivanovic> Grimling: if it is not easy to do, then leave it out for the moment
20110109 12:32:53< Ivanovic> the idea behind the branches part was to give an idea how branches are supposed to work in the context of git (where branches are by far more common, local ones that is, than with svn)
20110109 12:33:31< Ivanovic> if you find a nice and easy way to add svn branches in there (like eg being able to commit to branches/1.8) this would be a neat bonus
20110109 12:33:47< Grimling> ok, will first do other things, and then look at it
20110109 12:36:56< Ivanovic> esr: how is the YW stuff supposed to work?
20110109 12:36:57< Ivanovic> esr: that is: in two brothers there are diary entries, the scenarios themselves are all placed in 363YW
20110109 12:36:58< Ivanovic> in the epiloge there is 355YW combined with "Maghre is looking much better than the last time I saw it. Bjarn has done wonders in two years."
20110109 12:38:58< Ivanovic> sounds like a case of "ups, change the time in parts but not everywhere", will change the epiloge to 365
20110109 12:41:48< mordante> Grimling, not sure how to add the branches, but I think some other devs use them
20110109 12:42:07< mordante> I think svn-branches are more important to know as git branches
20110109 12:42:26< mordante> you can use the full power of git but don't need to
20110109 12:43:13< mordante> the main reason to add the stash is to allow 'svn up' with not committed stuff, which fails with git svn rebase
20110109 12:43:20< mordante> afk
20110109 12:57:47-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 13:10:53-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 13:16:36-!- grzywacz [~grzywacz@89-78-180-180.dynamic.chello.pl] has joined #wesnoth-dev
20110109 13:16:36-!- grzywacz [~grzywacz@89-78-180-180.dynamic.chello.pl] has quit [Changing host]
20110109 13:16:36-!- grzywacz [~grzywacz@wesnoth/developer/grzywacz] has joined #wesnoth-dev
20110109 13:18:34< Ivanovic> Grimling: please don't forget to submit the wikipage in the next 12h, otherwise i likely won't be able to mark the task "done" in time (problem is that GCI is over at "January 10, 2011, 12:00 AM Pacific Time / 08:00 UTC: All work stops"
20110109 13:19:09< Grimling> Ivanovic: ok
20110109 13:19:31< Ivanovic> i don't know exactly how the system works, but likely i have to hit "it is all okay" before 8am utc tomorrow
20110109 13:19:49< Ivanovic> and around 1am i am likely heading off to bed, not sure if i'll be up in time to do so
20110109 13:23:59-!- EdB [~edb@tss37-1-89-84-18-220.dsl.club-internet.fr] has quit [Remote host closed the connection]
20110109 13:36:01-!- Antonius_yonatha [~Antonius_@125.160.88.217] has joined #wesnoth-dev
20110109 13:36:21< Grimling> is there a git svn command similar to svn diff?
20110109 13:36:51-!- Antonius_yonatha [~Antonius_@125.160.88.217] has quit [Client Quit]
20110109 13:39:22-!- Antonius_yonatha [~Antonius_@125.160.88.217] has joined #wesnoth-dev
20110109 13:40:31< Ivanovic> i'd guess some "git diff" or the likes exists
20110109 13:42:06-!- Antonius_yonatha [~Antonius_@125.160.88.217] has quit [Client Quit]
20110109 13:42:26-!- Antonius_yonatha [~Antonius_@125.160.88.217] has joined #wesnoth-dev
20110109 13:42:51< Ivanovic> Grimling: this page sounds promising: http://mojodna.net/2009/02/24/my-work-git-workflow.html
20110109 13:43:17< Grimling> Ivanovic: thanks
20110109 13:46:37-!- Antonius_yonatha [~Antonius_@125.160.88.217] has left #wesnoth-dev []
20110109 13:47:17-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 13:48:19-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20110109 13:50:06-!- Octalot [~noct@host86-145-88-89.range86-145.btcentralplus.com] has quit [Remote host closed the connection]
20110109 13:54:14-!- grzywacz [~grzywacz@wesnoth/developer/grzywacz] has quit [Remote host closed the connection]
20110109 13:54:26-!- Unnheulu [~ieuan@cpc1-pnth2-2-0-cust788.5-2.cable.virginmedia.com] has joined #wesnoth-dev
20110109 13:54:38< mordante> git diff is indeed the equivalent of svn diff
20110109 13:55:30-!- Unnheulu [~ieuan@cpc1-pnth2-2-0-cust788.5-2.cable.virginmedia.com] has left #wesnoth-dev []
20110109 13:55:37-!- iwontbecreative [~Thibault_@89.181.24.80] has joined #wesnoth-dev
20110109 13:56:17< mordante> btw you also don't need branches for everything, I normally only use them for larger parts
20110109 13:56:33< iwontbecreative> Hi mordante
20110109 13:56:45< mordante> and I like them for the pot stuff, my version gives a different result from Ivanovic's so I commit it locally in a branch 
20110109 13:57:11< CIA-84> ivanovic * r48232 /trunk/data/campaigns/Two_Brothers/scenarios/ (3 files): 
20110109 13:57:11< CIA-84> several smaller fixes to Two Brothers:
20110109 13:57:11< CIA-84> * removed some double spaces
20110109 13:57:11< CIA-84> * make "Counselor Hoban" a "Caretaker Hoban", since it is a small village that likely has no huge council
20110109 13:57:11< CIA-84> * fix the year in the epilogue, it has to be two years after the other events, so 365YW is correct, not 355YW
20110109 13:57:14< mordante> and never commit the pot-update upstream, but I do commit the cmake patches
20110109 13:57:20< mordante> hi iwontbecreative 
20110109 13:57:35< iwontbecreative> I looked at my code once more and i can't find why it bugs
20110109 13:58:01< mordante> iwontbecreative, can you post a new patch in a pastebin 
20110109 13:58:21< iwontbecreative> The patch is the same
20110109 13:58:29< iwontbecreative> Couldn't find the bug with the little time I have
20110109 13:58:38< iwontbecreative> Also still unsure about what you want
20110109 14:00:19-!- Gambit [~Gambit@wesnoth/developer/grickit] has joined #wesnoth-dev
20110109 14:00:45-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20110109 14:01:59-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 14:02:46< mordante> iwontbecreative, as I said before the patchfile itself seems to be broken, I get a malformed patch error when I try to apply it
20110109 14:02:59< iwontbecreative> Ah
20110109 14:05:40< iwontbecreative> http://wesnoth.pastebin.com/L7qpBvDX
20110109 14:06:55< CIA-84> ivanovic * r48233 /trunk/ (4 files in 3 dirs): updated German translation
20110109 14:07:53-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 14:09:17-!- loonybot [~loonybot@wesnoth/bot/loonybot] has joined #wesnoth-dev
20110109 14:10:11< mordante> iwontbecreative, still some warnings about the patch, but it applies
20110109 14:10:19-!- loonycyborg [~sergey@wesnoth/developer/loonycyborg] has joined #wesnoth-dev
20110109 14:10:52< iwontbecreative> Yes, I have to remove sections because I made changes to other python tools
20110109 14:11:32< mordante> ah ok, that's then also probably what caused the issue with the google patch
20110109 14:12:08< mordante> when I run it normally (one src/gui) it fails at line 382 and nest_levels = []
20110109 14:12:14< mordante> s/one/on/
20110109 14:12:52< iwontbecreative> Ah :/
20110109 14:12:53< mordante> I get output when I run it on src/editor
20110109 14:13:02< iwontbecreative> Yes
20110109 14:13:08< iwontbecreative> They're debug statements
20110109 14:13:11< iwontbecreative> 2
20110109 14:13:20< iwontbecreative> It helps debugging
20110109 14:13:32< iwontbecreative> Since the tool doesn't work yet, better to keep them
20110109 14:14:20< mordante> I noticed it was a debug statement, mentioned it since it explains the error on line 382 ;-)
20110109 14:16:43< mordante> what is the exact problem you still have?
20110109 14:17:08< iwontbecreative> It fails to match the second time
20110109 14:17:20< iwontbecreative> And I don't know why
20110109 14:17:20< mordante> and as said before I can accept the nest_level to make your life easier
20110109 14:17:55< mordante> you mean "@begin{description}{wml_reference}{2}" ?
20110109 14:19:04< iwontbecreative> No
20110109 14:19:31< iwontbecreative> Currently it parses @begin{description}{type}{2} before parsing {1}
20110109 14:20:07< iwontbecreative> Because else {1} parses until the end without taking care of {2}
20110109 14:20:36< iwontbecreative> I also tried to handle this stuff later but it didn't seemed better
20110109 14:24:26< mordante> if you match "@begin{description}{wml_reference}{2}...@end{description}" which "@end{description}" do you match the inner or the outer?
20110109 14:26:47< iwontbecreative> Last one
20110109 14:27:06< iwontbecreative> I tried with non-gredy searches but it didn't seemed to ork better
20110109 14:28:40-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20110109 14:30:42< mordante> the greedy version is wrong, it must match non-greedy, there might be other issues as well
20110109 14:33:35< iwontbecreative> Maybe this works with one flaw that I found
20110109 14:33:53< iwontbecreative> I found it while writing this new solution and didn't tested it with the old
20110109 14:34:13< iwontbecreative> Basically it bugged because of whitespaces
20110109 14:34:56< iwontbecreative> I'll try this, but I'm still unsure about how well this will work
20110109 14:39:02< mordante> I guess another problem is caused by the fact that you put the processed string back in the input stream
20110109 14:39:45< Grimling> mordante, Ivanovic : http://wiki.wesnoth.org/GIT-SVN is what i've written good? i'll add the svn commands and then i'll look for the branches
20110109 14:40:22< mordante> reading
20110109 14:40:29< Grimling> thanks
20110109 14:40:30< iwontbecreative> mordante: yes, it's probably that, but I don't find why it should be a problem
20110109 14:42:32< mordante> also not sure, but it feels a bit fragile
20110109 14:42:45< iwontbecreative> Probably
20110109 14:42:57< iwontbecreative> I guess the only 'real' solution would be a parser
20110109 14:43:17< mordante> iwontbecreative, since the time is short maybe we should focus on getting the non-nested version working first
20110109 14:43:32< iwontbecreative> Non-nested version already works
20110109 14:43:42< iwontbecreative> Want a new patch for it ?
20110109 14:44:04< mordante> the real question is do you think you manage to get the nested version working today?
20110109 14:44:10< iwontbecreative> No
20110109 14:44:25< iwontbecreative> I have too much work to have time to really work on it
20110109 14:45:04< mordante> that's what I expected, and the dead-line is today (I won't be able to do anything tomorrow morning)
20110109 14:45:09< iwontbecreative> I'll have much time for it in ~15 days
20110109 14:45:22< iwontbecreative> Oh...
20110109 14:45:22< mordante> so I rather reduce the scope for GCI so we can complete the task
20110109 14:45:32< iwontbecreative> Ok, thanks
20110109 14:45:47< iwontbecreative> I'll get a working patch for non-nested results
20110109 14:46:34< mordante> I'll update the GCI task after I read Grimling's work
20110109 14:48:48< mordante> Grimling, "git svn -h" only works in a git checkout else it gives an error (also an indication it's installed of course)
20110109 14:49:48< mordante> apt-get is very Debian specific and the clean and update seem to be a bit overkill (and Debian prefers aptitude nowadays)
20110109 14:50:07< Grimling> so if i say: if you get the "Not a git repository", it's installed?
20110109 14:50:24< Grimling> will look at the aptitude syntax
20110109 14:50:45< mordante> maybe better to list the name of the package on several distros and let the user figure out how to install it him/herself
20110109 14:51:02< mordante> we can assume developers to be able to install a package
20110109 14:51:12< Grimling> ok :p
20110109 14:51:51< mordante> yes the error also means it's installed "./adfasd" gives a different error 
20110109 14:52:06< iwontbecreative> I guess mordante is right, I had this problem when working with Getting Things Gnome, and we couldn't find a way to handle all distros.
20110109 14:52:11-!- mjs-de [~mjs-de@vpw.wh.Uni-Dortmund.DE] has joined #wesnoth-dev
20110109 14:52:36< iwontbecreative> So we focused on getting names for most important distros and never had complains
20110109 14:52:59< iwontbecreative> With users, so with devs it should be even less problematic
20110109 14:53:22< Grimling> it seems like it's everywhere svn-git 
20110109 14:54:03< mordante> yup I think these things should only be explained in a document for newbies
20110109 14:54:34< Grimling> ok
20110109 14:54:37< mordante> is "git add . (Note the dot!)" required?
20110109 14:54:54< mordante> git reset --hard git svn fetch should be two lines
20110109 14:55:10< Grimling> i will test it once without the add command
20110109 14:55:58< mordante> "    *  checkout/update from local repository: git checkout [filename] " that equals svn revert [filename]
20110109 14:56:01< iwontbecreative> mordante: Non-nested version working
20110109 14:56:17< Grimling> (if it's not needed to explain how to install the package, can i remove the "check if you have the package" part too?
20110109 14:56:49< mordante> maybe keep the hint since it's not installed by default with git, just a helpful hint
20110109 14:56:55< iwontbecreative> And quite quick ~1.5s here for the whole /src/ dir
20110109 14:57:27< iwontbecreative> Was 2-3s on /src/gui before cleanups and syntax change, so at least that is nice 
20110109 14:58:39< mordante> Grimling, maybe list the main commands with their equivalent svn command
20110109 14:59:02< Grimling> yes, was planning to do so
20110109 14:59:22< mordante> also "git svn rebase" doesn't work with local changes, then the sequence becomes git stash; git svn rebase ; git stash pop
20110109 15:02:22< mordante> Grimling, maybe also explain why we don't publish the link to the file in the wiki
20110109 15:02:33< mordante> iwontbecreative, reopened the task
20110109 15:02:40< Grimling> mordante: ok
20110109 15:02:40< mordante> iwontbecreative, nice speedup 
20110109 15:04:50< Grimling> mordante: the reason why we don't give the link: because it's our own server and it needs to handle the multiplayer too?
20110109 15:05:52< mordante> yes the tarball requires quite a bit of bandwidth
20110109 15:06:16< mordante> not sure whether we pay for the amount of data downloaded as well
20110109 15:09:18-!- grzywacz [~grzywacz@wesnoth/developer/grzywacz] has joined #wesnoth-dev
20110109 15:11:23< iwontbecreative> mordante: Done
20110109 15:11:55< iwontbecreative> Also attached an url to show the formatting in wiki
20110109 15:12:29< Grimling> mordante: how should i add the svn equivalents of the commands? a new list, or added to the remote commands?
20110109 15:16:34< mordante> "*  local diff \ngit diff" [filename] I would say "*  svn diff\ngit diff" or make a table with commands that match one on one
20110109 15:16:41< Ivanovic> mordante: we do pay for the bandwidth and got some 5000GB per month included
20110109 15:17:08< mordante> maybe also explain the workflow with git commit ; git svn dcommit
20110109 15:17:31< mordante> Ivanovic, ok just curious how much bandwidth do we use?
20110109 15:17:45< Ivanovic> no idea
20110109 15:19:26-!- Elvish_Pillager [~eli@dhip-164.foss.residences.colby.edu] has joined #wesnoth-dev
20110109 15:22:54< esr> Ivanovic: Fotr a smaller vo;;age, "Elder Hoban".
20110109 15:23:11< Ivanovic> esr: found a better version
20110109 15:23:19< Ivanovic> Bailiff Hoban
20110109 15:23:24< esr> No.
20110109 15:23:33< Ivanovic> why not?
20110109 15:24:02< esr> "Bailiff" is a very specialized term, not really appropriate here - a minor court ooficial.
20110109 15:24:27< Ivanovic> what about Reeve?
20110109 15:24:37< esr> That could do.
20110109 15:24:42< esr> Though...
20110109 15:25:22< esr> "Reeve" has pretty styrong connotations of an official appointed by e King, rather than locally elected.
20110109 15:25:34< Ivanovic> noone said that this dude was elected!
20110109 15:25:48< esr> Depends on what you want.
20110109 15:25:54< Ivanovic> we are talking about some smaller village and someone there "knowing what should be up"
20110109 15:26:09< Ivanovic> the next "real" court is some way away
20110109 15:26:26< Ivanovic> so i'd assume that the liege lord would have someone appointed to take care of the village locally
20110109 15:26:39< mordante> iwontbecreative, funny to see it kind of handles the nested items :-)
20110109 15:26:57< esr> Yes.
20110109 15:27:19< Ivanovic> and for this i'd say that a Reeve could/should fit
20110109 15:27:30< esr> Another title that oould work is "Alderman"/
20110109 15:28:34< Ivanovic> nah, it sounds wrong and personally i'd assume something else with this
20110109 15:28:42< Ivanovic> i'll go for reeve
20110109 15:28:54< Grimling> mordante: one thing, i've changed a file, committed it to my local repository, but how can i reverse it?
20110109 15:29:17< mordante> Grimling, only one change?
20110109 15:29:36< mordante> iwontbecreative, sys.stderr.write("Empty table/description:\n%s\n" % data) better find a generic name, we might add other elements later
20110109 15:29:49< Grimling> yes (but i'd like to know how to do it for multiple changes too)
20110109 15:30:33< mordante> with git reset --hard commit_id you can remove the last or last few commits
20110109 15:30:33< Ivanovic> esr: in text, should it be "We should find Reeve Hoban." or better "We should find reeve Hoban."
20110109 15:30:50< mordante> with git commit --amend you can make modifications only to the last commit
20110109 15:30:55< esr> Definitely capitalize.
20110109 15:31:17< mordante> and with this you probably can rewrite history http://www.gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
20110109 15:31:33< mordante> note you should only do that on not yet committed changes
20110109 15:31:55< Grimling> ok
20110109 15:32:06< esr> But I still think "Elder" is better. "Reeve" suggests a more direct connnection to the government than you're likely yop find in a remote, half-forgotten village.
20110109 15:32:42< Ivanovic> esr: the village will still have to pay a tithe
20110109 15:32:50< Ivanovic> so some form of governing *does* exist
20110109 15:33:33< mordante> iwontbecreative, the change also doesn't strip the leading spaces before the x and y (seems to work properly but looks odd)
20110109 15:33:34< Ivanovic> Grimling: some comments on your formatting (wiki syntax):
20110109 15:33:44< Ivanovic> internel links are in [[Reference]]
20110109 15:33:56< Ivanovic> don't use some <code> syntax
20110109 15:34:04< Ivanovic> better place a space at the beginning of the line
20110109 15:34:43< CIA-84> ivanovic * r48234 /trunk/data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg: "Caretaker" -> "Reeve"
20110109 15:35:10< iwontbecreative> mordante: I could strip it, but this hack allows to take care of nested levels if they are indented.
20110109 15:35:47< iwontbecreative> about the error message: Empty container maybe ?
20110109 15:35:51< Grimling> Ivanovic: ok
20110109 15:36:18< mordante> iwontbecreative, ok then please document it in the code, hacks should be documented in the code
20110109 15:36:30< mordante> empty container sounds fine to me
20110109 15:36:58< mordante> I'm afk now, so reopened the task with the comment (just before you replied)
20110109 15:37:24< mordante> if you make these small modifications I'll consider that task finished
20110109 15:37:41< iwontbecreative> mordante: I implement the hack then
20110109 15:38:13< iwontbecreative> Had demoved it from this version since you asked for a non-nested thing
20110109 15:38:23< mordante> I know
20110109 15:38:31< iwontbecreative> So I add it or not ?
20110109 15:39:07< mordante> yes please leave the hack in, just document why you don't strip the leading spaces
20110109 15:39:28< Grimling> does svn have a rebase?
20110109 15:39:31< mordante> its just if there's a hack in the code which looks like a bug, somebody might fix it
20110109 15:39:52< mordante> Grimling, no, since you can only rebase not yet committed stuff
20110109 15:40:01< Grimling> mordante: ok, thanks
20110109 15:40:10< mordante> Grimling, maybe also mention that rebasing is a kind of evil, if you use pure git
20110109 15:40:35< mordante> with git-svn you must rebase, but I wouldn't recommend it for pure git
20110109 15:40:58-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Ping timeout: 250 seconds]
20110109 15:42:54< CIA-84> ivanovic * r48235 /trunk/po/wesnoth-tb/de.po: updated German translation
20110109 15:46:28< iwontbecreative> mordante: Patch updated
20110109 15:49:02< mordante> iwontbecreative, I skimmed over the patch and looks good, I'm afk for a while will test the patch later
20110109 15:49:23< mordante> iwontbecreative, but since the previous version worked, I don't expect any surprised
20110109 15:49:31< mordante> suprises*
20110109 15:49:52-!- grzywacz [~grzywacz@wesnoth/developer/grzywacz] has quit [Remote host closed the connection]
20110109 15:50:27-!- stikonas [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 15:50:27-!- stikonas [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 15:50:27-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 15:50:56< iwontbecreative> Indeed, just an update with what you wanted me to change
20110109 15:56:20-!- cz1stf [~cz1stf@78.24.12.198] has joined #wesnoth-dev
20110109 15:56:52-!- cz1stf [~cz1stf@78.24.12.198] has left #wesnoth-dev []
20110109 15:57:52-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Ping timeout: 250 seconds]
20110109 15:58:11-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 15:58:11-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 15:58:11-!- stikonas_ [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 16:01:35< iwontbecreative> Hmmm...
20110109 16:01:39< iwontbecreative> Looks like a bug:
20110109 16:02:08< iwontbecreative> Multiplayer > Host Networked Game
20110109 16:02:13< iwontbecreative> Then cancel
20110109 16:02:58< iwontbecreative> And I have the following warning: Error while starting server: Mp server error: No path given for mp server programm
20110109 16:03:02< Ivanovic> AI0867, boucman, esr, loonycyborg, mordante, Soliton, Upthorn, zookeeper, everyone else who cares: what do you think of 1.9.4 next weekend? 
20110109 16:03:18< iwontbecreative> And in terminal: sh: .//wesnothd: not found
20110109 16:03:18< iwontbecreative> 20110109 15:02:48 warning general: Failed to run server start script
20110109 16:03:18< iwontbecreative> 20110109 15:02:49 error general: Error while starting server: MP server error: No path given for mp server program.
20110109 16:03:31< esr> No blockers here. I should run the sanity checks, though.
20110109 16:03:31< iwontbecreative> Should I report it or is it a quick fix ?
20110109 16:03:53-!- Appleman1234 [~Appleman1@CPE-60-226-179-130.qld.bigpond.net.au] has quit [Remote host closed the connection]
20110109 16:05:02< Grimling> Ivanovic: is the wiki ok now?
20110109 16:06:56< Ivanovic> looks okay
20110109 16:07:08< Ivanovic> that is: some comment what stuff in normal workflow means
20110109 16:07:17< Ivanovic> eg svn users got no idea what "rebase" means
20110109 16:07:47< Grimling> ok
20110109 16:08:02< Ivanovic> and feel free to add some explaining links with "more information"
20110109 16:08:14< Grimling> good idea
20110109 16:08:15< Ivanovic> eg the page i gave you might be nice where some workflow is described in detail
20110109 16:09:30< Ivanovic> Grimling: and your headers are strange
20110109 16:09:37< Ivanovic> have a look at the table of content
20110109 16:09:53< Ivanovic> i'd say that splitting it up differently might make sense
20110109 16:10:11< Grimling> oh, commands should be 4
20110109 16:10:15< Ivanovic> something like a short explaination what the page is about, then "setting up the git-svn repository"
20110109 16:10:18-!- stikonas_ [~and@wesnoth/translator/stikonas] has quit [Ping timeout: 240 seconds]
20110109 16:10:24-!- PetePorty [~Pete@pc-59-54-120-200.cm.vtr.net] has joined #wesnoth-dev
20110109 16:10:27< Ivanovic> and "using the git-svn repository"
20110109 16:10:33< Grimling> ok
20110109 16:10:34< Ivanovic> with appropriate sub categoried
20110109 16:11:32< Ivanovic> (getting the tarball as part of setting up git-svn as well as "make sure to install git-svn first since it is not part of the normal package" and "change the repo to allow commit" and "configuring")
20110109 16:12:04< iwontbecreative> Ivanovic: 8Not sure I have to ask to you). I think the "README" file really needs to be updated
20110109 16:12:20< Ivanovic> really?
20110109 16:12:28< Ivanovic> never had a look at it to be honest
20110109 16:12:30< iwontbecreative> The freshmeat page is inactive
20110109 16:12:52< iwontbecreative> So it looks like they're no wesnoth releases for more than one year...
20110109 16:13:08< Ivanovic> IIRC there is some rss feed on the wesnoth frontpage so that would be the better solution
20110109 16:13:15< iwontbecreative> Also we've nearly 400,000 forum posts and 17 000 users now
20110109 16:13:27< Ivanovic> like i said, never had a look at this file
20110109 16:14:09< iwontbecreative> I asked you because I tought you were managing releases. So as it was a release-related issue...
20110109 16:14:27< iwontbecreative> And if I'm not mistaken sirp isn't anymore very active in this project
20110109 16:15:32< iwontbecreative> Also INSTALL may also need an update
20110109 16:15:44< Ivanovic> ahhh, so much stuff to do...
20110109 16:15:46< Ivanovic> ;)
20110109 16:15:49< iwontbecreative> autotools supoport is now removed
20110109 16:16:06< iwontbecreative> And I think they're new dependencies like FriDiBi
20110109 16:16:06-!- knotwork [~markm@142.177.234.223] has quit [Read error: Connection reset by peer]
20110109 16:17:43-!- Cookiee [~quassel@unaffiliated/cookiee] has quit [Read error: Connection reset by peer]
20110109 16:20:15< Grimling> Ivanovic: better?
20110109 16:20:23< Ivanovic> fribidi has been there for ages as *optional* dep
20110109 16:21:47< iwontbecreative> Ivanovic: You must be right, I don't really know what exact dependencies are required, was just sayng that these files are a bit outdated
20110109 16:24:56< Ivanovic> Grimling: since you often write about "local repository" and "remote repository" you should write two or three sentences about this concept, since it does not exist this way with svn
20110109 16:25:08< Ivanovic> beside this the stuff looks okay
20110109 16:28:57< Grimling> Ivanovic: done
20110109 16:29:35< Ivanovic> Grimling: sounds good to me
20110109 16:29:35-!- Blueblaze [~Blueblaze@99.182.54.220] has quit [Quit: Blueblaze]
20110109 16:29:49< Grimling> :)
20110109 16:29:56< Ivanovic> mordante: can you have a look at it to check if it is sane and nothing missing?
20110109 16:30:07-!- eoc` [~eoc@pD9560538.dip0.t-ipconnect.de] has joined #wesnoth-dev
20110109 16:30:10< Ivanovic> Grimling: i'd say you can already commit the stuff so far via the gci interface
20110109 16:30:21< Grimling> k
20110109 16:30:34< Ivanovic> once mordante had a look (since he knows something about git while i know nothing) i'd say it is ready and the work is done
20110109 16:32:12< Grimling> k
20110109 16:33:18-!- knotwork [~markm@142.177.234.223] has joined #wesnoth-dev
20110109 16:34:01-!- eoc [~eoc@pD9560321.dip0.t-ipconnect.de] has quit [Ping timeout: 272 seconds]
20110109 16:35:04< CIA-84> ivanovic * r48236 /trunk/po/wesnoth-tsg/de.po: updated German translation
20110109 16:35:24-!- eoc` is now known as eoc
20110109 16:58:34< Ivanovic> Grimling, mordante: am afk for a while, cu in some two to three hours
20110109 16:58:42< Grimling> k
20110109 16:59:30< CIA-84> ivanovic * r48237 /trunk/po/ (wesnoth-anl/de.po wesnoth-did/de.po): updated German translation
20110109 17:01:40< Soliton> Grimling: fetch gets you the remote changes but it does not synchronize your local repository with them. you have to rebase to do that.
20110109 17:02:12< Grimling> so first git svn fetch, then git rebase?
20110109 17:02:35< Soliton> just git svn rebase
20110109 17:03:27< Soliton> you can add --fetch-all to get changes from other branches but you will have to rebase those branches to actually apply them.
20110109 17:03:32< Grimling> Soliton: in which part? checkout/update/revert from local repository?
20110109 17:03:59< Soliton> both parts.
20110109 17:04:15< Soliton> also git svn fetch or rebase will not revert anything.
20110109 17:06:14< Grimling> Soliton: with what command is it possible to revert?
20110109 17:06:21< Soliton> for git commit i suggest to mention the -a variant since that what svn users expect.
20110109 17:06:39< Soliton> Grimling: there are only local reverts which you already mention.
20110109 17:06:59< Grimling> ok
20110109 17:08:21< Grimling> Soliton: better?
20110109 17:08:51< Grimling> Soliton: or is the fetch not needed for configuring?
20110109 17:09:25< Soliton> git svn rebase will also fetch.
20110109 17:09:48< Soliton> no need to talk about git rebase at all.
20110109 17:10:41< mordante> Ivanovic, I've a few minor patches I'd like to get in next week, no real blocker but to deprecate some old stuff
20110109 17:12:12< Grimling> Soliton: is it good now?
20110109 17:13:07< Soliton> Grimling: for syntax specifications usually [] means optional and <> not literal but to be replaced by something apropriate.
20110109 17:13:20< Soliton> you use it the other way around as far as i can tell.
20110109 17:13:50< Grimling> Soliton: oh, i will change it
20110109 17:14:32< Soliton> i would not make the -a for git commit optional or you also need to explain the index/staging.
20110109 17:15:26< Soliton> you can mention that instead of -a you can also give a path to the changes though (like git commit src).
20110109 17:16:54< Grimling> edited
20110109 17:17:19< Soliton> the local/remot distinction you make with git svn commands is wrong the git svn commands like log and blame just have a more svn like look and use svn revision numbers instead of commit hashes.
20110109 17:20:23< mordante> iwontbecreative, the x still has extra spaces in the output '''''    x'''''
20110109 17:20:38< Grimling> Soliton: what should i do with it? remove the pure git ones?
20110109 17:21:11< Grimling> Soliton: or mentioning them both, but saying it's more svn-like?
20110109 17:21:20< mordante> iwontbecreative, these were the spaces I meant before
20110109 17:21:23< Soliton> yeah, the latter.
20110109 17:21:38< Grimling> k
20110109 17:21:41< Soliton> really the pure git versions are almost always superior.
20110109 17:22:00< Soliton> you get the svn revision in the commit message there also.
20110109 17:22:35< mordante> and the pure git ones work without network I often do git blame and then git log for the revision I blame for something
20110109 17:23:06< mordante> that gives me the svn number and the commit message
20110109 17:23:54< Soliton> the git-svn ones use the network?
20110109 17:24:29< Soliton> the no network part can be mention as superior to pure svn though. :-)
20110109 17:24:57< iwontbecreative> mordante: Oh
20110109 17:25:08< iwontbecreative> These doesn't change anything on the output
20110109 17:25:17< iwontbecreative>  But more bytes downloaded by the user I guess
20110109 17:26:11< mordante> Soliton, not 100% sure but at least it's more picky about the path
20110109 17:26:37< Grimling> i've edited it
20110109 17:26:48< iwontbecreative> mordante: Line 348, replace i[0]) by i[0].strip())
20110109 17:26:50< mordante> git blame game.cpp works in src and git svn blame game.cpp fails
20110109 17:27:12< mordante> for git svn I need to be in the checkout root and do git svn blame game.cpp
20110109 17:27:44< Grimling> will mention it
20110109 17:28:37< mordante> iwontbecreative, I'm only a little bit confused, I thought those spaces were needed in the previous patch
20110109 17:28:54< mordante> to get the nested part to get some output
20110109 17:29:02< iwontbecreative> They are needed when getting via regex, not when formatting
20110109 17:29:12< Grimling> Soliton: other things to edit??
20110109 17:29:39< iwontbecreative> Well they're needed when formatting, but you don't have to display them
20110109 17:29:42< Grimling> Soliton: and do you know how to use different branches with git-svn? 
20110109 17:30:09< mordante> iwontbecreative, also needed if we ommit the »result += "%s '''''%s''''' " % ("*" * (i[0].rstrip().count(' ') / 4 + 1), i[0])«
20110109 17:30:41< mordante> to get the extra »*« chars in the output?
20110109 17:31:09< iwontbecreative> You can't ommit that line
20110109 17:32:26< iwontbecreative> You can change uit to. result += "* ''''%s'''' " % i[0].strip()       if you don't care about indent 
20110109 17:32:37< iwontbecreative> *to:
20110109 17:32:38< Soliton> Grimling: with the tarball from wesnoth.org just "git checkout -b l1.6" for example should be needed.
20110109 17:34:09< Soliton> Grimling: if you want several checkouts in parallel like in svn you can use git svn new-work-dir. (comes in the contrib dir with git or git-svn)
20110109 17:35:09< Soliton> i'll update the tarball with a configured local tracking branch for 1.8 in a bit.
20110109 17:36:13< Grimling> Soliton: i don't understand that new-work-dir
20110109 17:39:13< mordante> iwontbecreative, I'll ponder about it a bit more (more what I want the behaviour to be as to what you should do)
20110109 17:39:56< mordante> iwontbecreative, so you can consider the task finised
20110109 17:40:38< iwontbecreative> Ok, thanks
20110109 17:40:58< Soliton> Grimling: sorry, it's just git new-work-dir, not svn specific.
20110109 17:40:59< iwontbecreative> Once my exams are finished I'll implement the nesting
20110109 17:41:39< Soliton> Grimling: usually with git you switch branches in your one checkout unlike in svn where you have several checkouts for each branch.
20110109 17:41:45< Grimling> iwontbecreative: success with your exams
20110109 17:42:23< mordante> iwontbecreative, well thank you for your work
20110109 17:42:49< Soliton> Grimling: with new-work-dir you can link two checkouts so you can have several checkouts at the same time but still using the same repository.
20110109 17:43:00< mordante> iwontbecreative, and nice to hear you want to keep improving the tool :-)
20110109 17:44:22< Soliton> Grimling: s/new-work-dir/new-workdir/g
20110109 17:44:40< iwontbecreative> mordante: I wanted to get involved in wesnoth a long time ago, I just found with the cgi that i could help without any graphism/music/c++ skill :)
20110109 17:46:12< mordante> :-)
20110109 17:47:11< iwontbecreative> Grimling: Thanks
20110109 17:47:27< Grimling> Soliton: i can't find the command
20110109 17:47:58< Soliton> Grimling: ubuntu, right?
20110109 17:48:03< Grimling> Soliton: yes
20110109 17:48:09< Grimling> 10.10
20110109 17:48:15< mordante> Grimling, regarding "git commit -a -m <message> (-a: commits everything (default in SVN); instead of -a, you can also give a path to the changes)"
20110109 17:48:29< mordante> you can also first add your changes with git add and then commit
20110109 17:48:40-!- jpi80 [~juanpi@adsl-84-226-0-115.adslplus.ch] has joined #wesnoth-dev
20110109 17:48:45< Soliton> Grimling: should be here: /usr/share/doc/git-core/contrib/workdir/git-new-workdir
20110109 17:48:50< jpi80> Hail!
20110109 17:49:03-!- Octalot [~noct@host86-145-88-89.range86-145.btcentralplus.com] has joined #wesnoth-dev
20110109 17:49:13< mordante> that even means you can change a line in a file add that change more lines and then commit the one line change
20110109 17:49:22< mordante> hi jpi80 
20110109 17:49:37< jpi80> I am getting an idea of the structure of the code. A couple of weeks ago I started this thread http://forums.wesnoth.org/viewtopic.php?f=12&t=32689
20110109 17:50:08< jpi80> I cannot decide whether something like that would go into a WML level or lower... 
20110109 17:50:15< Soliton> mordante: i told him to leave the index/staging out for now but we can explain that as well of course.
20110109 17:50:15< Grimling> Soliton: it's in doc/git/ instead of git-core
20110109 17:51:15< Soliton> mordante: i'd explain git add -p then.
20110109 17:51:18< mordante> Soliton, agreed, just wanted to give Grimling more information
20110109 17:52:48< mordante> but probably we should keep it simple
20110109 17:53:10< mordante> git has way too many cool features to explain them all and will overwhelm new users
20110109 17:54:42< iwontbecreative> Hmm looks like I'll have to report a bug for my last issue
20110109 17:55:27< mordante> ?
20110109 17:56:15< iwontbecreative> It's in the logs
20110109 17:56:44< iwontbecreative> When canceling after you go in Host networked game, it shows a warning about not having the good path for wesnothd
20110109 17:56:55< iwontbecreative> But you cancelled, so there shouldn't be any warning
20110109 17:57:07< Soliton> i'm too slow to try to reproduce but yeah sounds like a bug.
20110109 17:57:07< iwontbecreative> Also warning in terminal
20110109 17:57:31< mordante> ah ok I thought you referred to the GCI task
20110109 17:57:38< iwontbecreative> Nope
20110109 17:57:43< iwontbecreative> Should go in which category ?
20110109 17:57:54< iwontbecreative> Networking, UI ?
20110109 17:58:05< iwontbecreative> Maybe multiplayer ?
20110109 17:58:32< Soliton> ui
20110109 17:58:37< iwontbecreative> ok
20110109 17:58:44< Soliton> really doesn't matter much though. :-)
20110109 17:59:02< iwontbecreative> mordante: [Keep in mind that that patch has still issues with the '*' thing.]
20110109 17:59:21< Grimling> Soliton: ok, by copying the file to my personal folder, it works :p
20110109 17:59:41< Grimling> ~/Bureaublad/git-new-workdir 1.6 1.6 :Not a git repository: "1.6"
20110109 18:00:06< Grimling> so, it doesn't work, but at leas, it recognizes the command
20110109 18:00:33< Grimling> s/leas/least
20110109 18:00:35< Soliton> run it without arguments to see the syntax.
20110109 18:01:02< Soliton> 1.6 is not the dir where your repository is, is it?
20110109 18:01:09< mordante> iwontbecreative, ok
20110109 18:02:18< Grimling> Soliton: ok, now it works, (arguments: . my-1.6 1.6)
20110109 18:02:48< Grimling> should i add this to the wiki page? 
20110109 18:03:45< Soliton> maybe. as a seperate paragraph though.
20110109 18:04:20< Grimling> ok
20110109 18:07:29< Grimling> afk now
20110109 18:08:09< Soliton> i'll rename the branch names for the tarball to l<version> so it's easier to see that there is a difference between a local tracking branch (you can commit to) and a svn branch.
20110109 18:09:08< Soliton> and it'll remove warnings about ambiguous refnames.
20110109 18:09:45< CIA-84> mordante * r48238 /trunk/ (changelog src/editor/brush.cpp utils/wiki_grabber.py): 
20110109 18:09:45< CIA-84> Add the new wml_reference description.
20110109 18:09:45< CIA-84> This will allow to document the WML reference in the source code. The
20110109 18:09:45< CIA-84> nesting works a bit hacky but will be improved later. (Patch by
20110109 18:09:45< CIA-84> iwontbecreative for the GCI project.)
20110109 18:10:24< mordante> iwontbecreative, marked the task as done
20110109 18:11:08< iwontbecreative> Thanks
20110109 18:23:30-!- fendrin [~fabi@88-134-117-27-dynip.superkabel.de] has joined #wesnoth-dev
20110109 18:23:33-!- fendrin [~fabi@88-134-117-27-dynip.superkabel.de] has quit [Changing host]
20110109 18:23:33-!- fendrin [~fabi@wesnoth/developer/fendrin] has joined #wesnoth-dev
20110109 18:23:35< AI0867> iwontbecreative: thanks, I needed that
20110109 18:26:48-!- Mussious [~kamil@dgl8.neoplus.adsl.tpnet.pl] has joined #wesnoth-dev
20110109 18:27:44-!- chinu [~sofichinu@115.69.138.28] has joined #wesnoth-dev
20110109 18:30:59-!- chinu [~sofichinu@115.69.138.28] has left #wesnoth-dev []
20110109 18:36:44-!- iwaim_vs [~iwaim@p3033-ipbf6706marunouchi.tokyo.ocn.ne.jp] has quit [Quit: Loqui]
20110109 18:47:57< Grimling> Soliton: after your changes, is the command: "git-new-workdir . ../branch1.8 l1.8" ?
20110109 18:48:00-!- skyfalle_ [~skyfaller@cpe-66-65-172-151.nyc.res.rr.com] has joined #wesnoth-dev
20110109 18:48:56-!- skyfalle_ [~skyfaller@cpe-66-65-172-151.nyc.res.rr.com] has quit [Remote host closed the connection]
20110109 18:49:07< Soliton> Grimling: yes.
20110109 18:49:15< Grimling> Soliton: thanks
20110109 18:50:13-!- skyfalle_ [~skyfaller@cpe-66-65-172-175.nyc.res.rr.com] has joined #wesnoth-dev
20110109 18:50:24-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has quit [Read error: Connection reset by peer]
20110109 18:51:58< Grimling> Soliton, mordante : is the wikipage ok now?
20110109 18:52:09< boucman> Ivanovic: fine by me (wrt 1.9.4)
20110109 18:54:52-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 18:54:52-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 18:54:52-!- stikonas_ [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 18:55:49-!- stikonas_ is now known as stikonas
20110109 19:00:51< Soliton> Grimling: before explaingin new-workdir you should mention that changing to another branch is done by "git checkout <branchname>". new-workdir is only needed if you want checkouts of several branches at the same time.
20110109 19:02:19< Soliton> and we should probably add a link to an online version of git-new-workdir since i have no idea if other distros will come with it at all.
20110109 19:03:35< Grimling> Soliton: http://git-scm.com/download ?
20110109 19:04:25< Soliton> no, a more direct link to that specific script.
20110109 19:06:24< Grimling> Soliton: http://git.kernel.org/?p=git/git.git;a=blob;f=contrib/workdir/git-new-workdir;h=75e8b258177f7f04dadcac125f2bf7ebea4d0f81;hb=HEAD?
20110109 19:06:32< Grimling> (without the last ? )
20110109 19:07:45< Grimling> Soliton: this is maybe better: http://git.kernel.org/?p=git/git.git;a=blob_plain;f=contrib/workdir/git-new-workdir;hb=HEAD
20110109 19:10:50< Soliton> yeah. though for me only a=blob works.
20110109 19:13:21-!- Espreon [~espreon@wesnoth/developer/espreon] has joined #wesnoth-dev
20110109 19:15:17-!- EdB [~edb@tss37-1-89-84-18-220.dsl.club-internet.fr] has joined #wesnoth-dev
20110109 19:15:58< Grimling> ok now?
20110109 19:18:51-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has joined #wesnoth-dev
20110109 19:18:58< Soliton> i think so. there is some smaller stuff that i'll just edit myself later.
20110109 19:19:17< Grimling> ok, thanks
20110109 19:24:41-!- Blueblaze [~Blueblaze@99.182.54.220] has joined #wesnoth-dev
20110109 19:39:15 * iwontbecreative is away TGT.
20110109 19:56:30-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20110109 19:57:47-!- eoc` [~eoc@pD9561704.dip0.t-ipconnect.de] has joined #wesnoth-dev
20110109 20:00:58-!- eoc [~eoc@pD9560538.dip0.t-ipconnect.de] has quit [Ping timeout: 250 seconds]
20110109 20:03:39-!- zookeeper [~l@wesnoth/developer/zookeeper] has quit [Read error: Connection reset by peer]
20110109 20:04:20< mordante> Grimling, I'm somewhat afk at the moment will look in about two hours
20110109 20:04:49< Grimling> ok
20110109 20:06:43< mordante> but skimming over it it looks really nice
20110109 20:06:51< CIA-84> ivanovic * r48239 /trunk/po/ (4 files in 4 dirs): updated Galician translation
20110109 20:09:04-!- ancestral [~ancestral@174-30-237-85.mpls.qwest.net] has joined #wesnoth-dev
20110109 20:09:46-!- zookeeper [~l@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20110109 20:11:21-!- eoc` is now known as eoc
20110109 20:17:09-!- grzywacz [~grzywacz@89-78-180-180.dynamic.chello.pl] has joined #wesnoth-dev
20110109 20:17:09-!- grzywacz [~grzywacz@89-78-180-180.dynamic.chello.pl] has quit [Changing host]
20110109 20:17:09-!- grzywacz [~grzywacz@wesnoth/developer/grzywacz] has joined #wesnoth-dev
20110109 20:20:26-!- Mussious [~kamil@dgl8.neoplus.adsl.tpnet.pl] has quit [Quit: Ex-Chat]
20110109 20:21:56< Grimling> mordante: i'm off now, will be back in about an hour i think
20110109 20:23:40-!- Unnheulu [~ieuan@cpc1-pnth2-2-0-cust788.5-2.cable.virginmedia.com] has joined #wesnoth-dev
20110109 20:24:28-!- Grimling [~Grimling@91.181.57.51] has quit [Quit: Grimling]
20110109 20:25:14-!- Unnheulu [~ieuan@cpc1-pnth2-2-0-cust788.5-2.cable.virginmedia.com] has left #wesnoth-dev []
20110109 20:29:22-!- Blueblaze [~Blueblaze@99.182.54.220] has quit [Quit: Blueblaze]
20110109 20:42:14-!- elias [~allefant@allefant.com] has quit [Changing host]
20110109 20:42:15-!- elias [~allefant@allegro/developer/allefant] has joined #wesnoth-dev
20110109 21:02:33-!- endofgci [endofgci@f79-118-255-67.pitesti.rdsnet.ro] has joined #wesnoth-dev
20110109 21:03:22-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Ping timeout: 250 seconds]
20110109 21:03:38-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110109 21:05:53-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 21:05:53-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 21:05:53-!- stikonas_ [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 21:05:54< endofgci> hello!
20110109 21:06:08< endofgci> do you have some easy-to-do tasks?
20110109 21:06:11< endofgci> fast?
20110109 21:09:28< Ivanovic> no
20110109 21:13:07-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev
20110109 21:20:21-!- PetePorty [~Pete@pc-59-54-120-200.cm.vtr.net] has quit [Quit: Saliendo]
20110109 21:21:38-!- stikonas_ is now known as stikonas
20110109 21:22:32-!- jpi80 [~juanpi@adsl-84-226-0-115.adslplus.ch] has quit [Quit: Leaving.]
20110109 21:29:32-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has joined #wesnoth-dev
20110109 21:29:32-!- stikonas_ [~and@ctv-213-164-101-67.vinita.lt] has quit [Changing host]
20110109 21:29:32-!- stikonas_ [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20110109 21:33:15-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Ping timeout: 265 seconds]
20110109 21:33:25-!- negusnyul [~negusnyul@dsl4E5CD110.pool.t-online.hu] has quit [Remote host closed the connection]
20110109 21:33:42-!- Grimling [~floris_ki@91.181.161.226] has joined #wesnoth-dev
20110109 21:33:52-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20110109 21:33:54-!- stikonas_ [~and@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20110109 21:42:35-!- Crab_ [~Crab_@wesnoth/developer/crab] has joined #wesnoth-dev
20110109 21:53:23< Grimling> Crab_: hi
20110109 21:54:05< ancestral> JSON output of everything is a 3.5 MB file :)
20110109 21:54:16< ancestral> All WML that is
20110109 21:55:11< ancestral> The trouble is most validators get hung up on such large amounts of data
20110109 21:56:38< Crab_> hi, Grimling
20110109 21:57:26< ancestral> Well I'll be tickled <insert your favorite color>
20110109 21:57:36< Grimling> Crab_: i will send you what i have, but i'm waiting for mordante's review of my current task, he said he would do that in about half an hour
20110109 21:57:39< ancestral> Valid JSON, eh?
20110109 21:57:47< Grimling> Crab_: i have some trouble with the path
20110109 21:58:17< Crab_> Grimling: ok
20110109 21:58:21< mordante> Grimling, I did not say in half an hour, I said about now :-P
20110109 21:59:13< mordante> Grimling, do you have a link to your task in GCI?
20110109 21:59:20< Grimling> mordante: sorry ;) wanted to give you some more time
20110109 21:59:27< Grimling> mordante: yes, a second please
20110109 21:59:37< Grimling> mordante: http://www.google-melange.com/gci/task/show/google/gci2010/wesnoth/t129450321713#c2002
20110109 22:01:14< mordante> really wonder why it didn't show in my list of tasks before (I missed a closed one before as well :-/)
20110109 22:02:00< Grimling> Crab_: it's a diff from the src directory
20110109 22:02:08< Grimling> Crab_: because it took less time to make
20110109 22:02:52< Crab_> Grimling: one diff is actually easier to read
20110109 22:03:19< Grimling> isn't it one diff?
20110109 22:03:40< Crab_> (I'm about the previous patches where you sent files separately)
20110109 22:03:45< mordante> Grimling, to minor things, the git stash ; git svn rebase; git stash pop is only needed when you have local modifications
20110109 22:04:02< Grimling> Crab_: ah, ok, will remember it for the next time
20110109 22:04:05< mordante> and with commit -m is optional when omitted it shows an editor like svn
20110109 22:04:27< mordante> if you want I can also update the wiki, I think you did a great job with the page
20110109 22:05:41< Grimling> mordante: if you want me to do it myself, i will
20110109 22:05:48< Ivanovic> yeah, you have done by far more than i ever expected for the task!
20110109 22:05:52< Ivanovic> well done, Grimling!
20110109 22:06:04< Grimling> thanks, but it was only possible with your help
20110109 22:06:09< mordante> Grimling, not really needed, just want to avoid editing it together
20110109 22:06:44< Grimling> you have helped me with everything i've done during the gci, thanks to you all guys :) i've learned much
20110109 22:07:04< Grimling> especially Crab_ and AI0867
20110109 22:07:39< mordante> good to know you enjoyed it
20110109 22:07:42< Crab_> Grimling: big thanks to you, too :)
20110109 22:07:47-!- dtiger [~dtiger@dynamic-vpdn-93-125-12-46.telecom.by] has quit [Remote host closed the connection]
20110109 22:07:54< mordante> and thanks for the work you did
20110109 22:08:15< mordante> Grimling, Crab_ I just marked the git-svn wiki task as done
20110109 22:08:40< Grimling> mordante: thanks
20110109 22:09:37< mordante> Grimling, shall I edit the wiki?
20110109 22:09:49< Grimling> mordante: if you want to
20110109 22:09:58< mordante> ok I will
20110109 22:10:15< Grimling> :)
20110109 22:11:33-!- MeccaGod [~majs@h14n4fls31o279.telia.com] has quit []
20110109 22:13:05< Crab_> Grimling: (reading the diff)
20110109 22:13:18< Grimling> Crab_: ok
20110109 22:13:31< Grimling> the problem is marked with something like : // error
20110109 22:13:40< Grimling> it's in the ca_combat_fallback.cpp
20110109 22:14:00< Grimling> i've made two methods, because i didn't know which one would be the best
20110109 22:16:01-!- Johannes13 [~Johannes@unaffiliated/johannes13] has quit [Ping timeout: 272 seconds]
20110109 22:16:09< Crab_> Grimling: you can't use your check_move_action() to check the validity of enemy move -it'll return an error because you're not allowed to move enemy units (by game rules :) )
20110109 22:16:40< Crab_> Grimling: instead, we can just assume that enemy_srcdst contains all valid enemy moves
20110109 22:17:09< Crab_> if we change them more-or-less correctly after we do a dummy enemy move.
20110109 22:17:42< Grimling> Crab_: ok, but for the arrow (whiteboard), we need a path
20110109 22:17:50< Crab_> yes, I see
20110109 22:17:51< Grimling> Crab_: how can we create one
20110109 22:18:04< Grimling> check_move_action was the only way i could find
20110109 22:18:10< Crab_> look at enemy_possible_moves
20110109 22:18:27< Crab_> src/ai/contexts.cpp
20110109 22:19:23< Crab_> look at http://wesnoth.pastebin.com/Wmz4dKeK
20110109 22:19:43< Crab_> when the game calculates the moves of the enemies, it calculates 3 structures, srcdst and dstsrc and possible moves
20110109 22:20:28< Crab_> in src/ai/game_info.hpp, we see  typedef std::map<map_location,pathfind::paths> moves_map;
20110109 22:20:43< Crab_> so, possible moves = std::map<map_location,pathfind::paths>
20110109 22:21:15< Grimling> Crab_: great
20110109 22:21:59< Grimling> Crab_: is one call in the beginning enough?
20110109 22:23:15< Grimling> Crab_: or is that done automatically?
20110109 22:23:37< Crab_> note the '  move_maps_enemy_valid_ = true; ' flag
20110109 22:23:51< Crab_> after each actual move/attack/recruit/recall/turn change, it's set to false 
20110109 22:24:09< Crab_> and, if it's false, the maps will be recalculated on first access
20110109 22:24:31< Crab_> so, just use get_enemy_possible_moves()
20110109 22:25:15< Crab_> check src/ai/contexts.cpp, readonly_context_impl::calculate_moves for the relationship between enemy_srcdst, enemy_dstsrc, and enemy_possible_moves
20110109 22:26:24< Crab_> you can also use the paths:: constructor directly in your code for each arrow, but, there is no reason to recalculate the information
20110109 22:26:32< Crab_> (and pathfinding is slow)
20110109 22:27:09< EdB> Grimling: hello. I just read http://wiki.wesnoth.org/GIT-SVN and I read that I need the git tarball.  Do you mean a copy of a git rep that came from the svn ? Is it not possible too checkout from the svn using git ?
20110109 22:27:51< Crab_> Grimling: note http://wesnoth.pastebin.com/9RhSNkg3 - it shows that relationship
20110109 22:27:59< Grimling> EdB: you need the url of the tarball (Soliton ^)
20110109 22:28:00< mordante> EdB, it's possible to check it out yourself, but might take a few days
20110109 22:28:06< Ivanovic> EdB: it is somehow possible to create it yourself IIRC, but it is *ugh*
20110109 22:29:23< Crab_> mordante, grimling: it's also nice to cover svn:ignore handling for git-svn on that wiki page
20110109 22:29:49< EdB> ok, that the reason you. It feel strange other wise :)
20110109 22:29:58< mordante> Crab_, good point
20110109 22:30:00< EdB> thank you for the clarification
20110109 22:30:10< Crab_> mordante: I used ' git svn show-ignore >> .git/info/exclude ' , don't know if it's the best way.
20110109 22:30:22< Grimling> Crab_: ok, so i should replace the check_move_action part by a get_enemy_possible_moves() en pick the right path for the arrow?
20110109 22:30:35< mordante> Crab_, I do the same
20110109 22:30:48< Crab_> yes, the path you seek is inside the map returned by get_enemy_possible_moves()
20110109 22:31:03< Crab_> Grimling: so, just get it from there by looking up by src and by dst
20110109 22:31:10< Soliton> Ivanovic: so can we put the link on the wiki page? afair we put it in that place so random browsers won't get to it which won't change with a link from a specific wiki page.
20110109 22:31:19-!- endofgci [endofgci@f79-118-255-67.pitesti.rdsnet.ro] has left #wesnoth-dev []
20110109 22:31:45< Grimling> Crab_: ok, will edit the code
20110109 22:31:49< Ivanovic> Soliton: hmm, i don't know how much bandwidth we really can spare
20110109 22:32:37< Crab_> Grimling: we'll need too temporarily move units inside the code (applying temporary modifications to unit map); so, we should get a reference to get_enemy_possible_moves() at the start of the function. but, as our modifications are temporary, we won't need to recompute it.
20110109 22:32:43< Soliton> Ivanovic: well, how many people will read that wiki page and download the tarball without actually wanting to do just that?
20110109 22:33:00-!- OpenGL [OpenGL@f79-118-255-67.pitesti.rdsnet.ro] has joined #wesnoth-dev
20110109 22:33:12-!- happygrue [~George@wesnoth/developer/wintermute] has quit [Read error: Connection reset by peer]
20110109 22:35:26< Soliton> at some point we should setup a proper git repo that automatically syncs with svn though.
20110109 22:35:30< Ivanovic> Soliton: is the folder covered by a robots.txt?
20110109 22:35:55< Soliton> yes.
20110109 22:36:05< Ivanovic> okay, then it should probably be fine
20110109 22:36:24< Soliton> anything under files/ is disallowed.
20110109 22:36:32< shadowmaster> that's only assuming *all* search engines honor the robots.txt convention
20110109 22:36:49< shadowmaster> I've heard that Yandex's doesn't, for instance.
20110109 22:36:50< Soliton> ..and are not parsing relevant irc logs!
20110109 22:37:35< Soliton> nor trying random paths they can't list!
20110109 22:41:26-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Quit: you are doing it right!]
20110109 22:43:25< Crab_> Grimling: also, about attacked_units
20110109 22:44:17< Crab_> Grimling: I don't know for sure, but maybe it's better to create a set of unit pointers for 'friendly units which were not yet attacked this turn' and just remove units from that set once you attack a unit ?
20110109 22:45:03< Crab_> Grimling: no need to touch own srcdst and dstsrc, as we're playing for the enemy for a while, and we assume no units die atm.
20110109 22:45:26-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev
20110109 22:45:34< Crab_> Grimling: we might need to do something with them later on, however
20110109 22:46:11< Crab_> Grimling: also note that the arrow code is supposed to work in a fire&forget way 
20110109 22:46:44< Crab_> Grimling: so, it looks like there's no reason to do sleep(1000) - register all the arrows, they should be drawn automatically, even for the enemy.
20110109 22:47:09< Grimling> yes, that was before i noticed the check_move_action didn't work
20110109 22:47:12< Crab_> Grimling: if they disappear, we should check, why - boucman said they can work in fire&forget way if propertly registered.
20110109 22:47:23< Crab_> ok
20110109 22:47:26< boucman> what's the pb ?
20110109 22:47:58< boucman> arrows should have the same lifetime as the arrow object, and should appear as long as their path is not empty once registered
20110109 22:48:37< Crab_> boucman: just doing code review, was referring to your earlier comment, sorry if distracted you now
20110109 22:48:44< boucman> np
20110109 22:49:50-!- happygrue [~George@wesnoth/developer/wintermute] has joined #wesnoth-dev
20110109 22:50:24-!- un214 [~un214@adsl-75-45-20-202.dsl.scrm01.sbcglobal.net] has joined #wesnoth-dev
20110109 22:52:08< Grimling> Crab_: how can i get the needed steps? if i have a paths, i can call destinations, but then?
20110109 22:52:38< un214> is this one of those [move_through] things?
20110109 22:55:26< Crab_> Grimling: virtual void set_path(arrow_path_t const& path); , typedef std::vector<map_location> arrow_path_t;
20110109 22:55:33< Crab_> Grimling: so, we need a std::vector< map_location >
20110109 22:55:49< Crab_> let's check src/pathfind/pathfind.hpp
20110109 22:56:05< Crab_> there's 'struct paths' in there
20110109 22:56:22< Crab_> there's destinations in there
20110109 22:56:33< Crab_> it has  std::vector<map_location> get_path(const const_iterator &) const; method
20110109 22:57:03< Grimling> Crab_: ok, i thought it was an array of step, must have checked it
20110109 22:57:05< Crab_> let's open src/pathfind/pathfind.cpp and see the docs /** * Returns the path going from the source point (included) to the  * destination point @a j (excluded).  */
20110109 22:57:15< Grimling> i see
20110109 22:57:38< Crab_> so, std::vector<map_location> pathfind::paths::dest_vect::get_path(const const_iterator &j) const is the function to call on the 'destinations'
20110109 22:57:54-!- OpenGL [OpenGL@f79-118-255-67.pitesti.rdsnet.ro] has quit []
20110109 22:58:26-!- foobar [foobar@f79-118-255-67.pitesti.rdsnet.ro] has joined #wesnoth-dev
20110109 22:58:26< Crab_> there's a pathfind::paths::dest_vect::const_iterator pathfind::paths::dest_vect::find(const map_location &loc) const  to convert from map location to path element
20110109 23:00:03< boucman> hmm, is there an easy way to get the path from A to B in "straight line" i.e not taking into account any unit movement ? it's pretty trivial to write, but would be better done once and for all
20110109 23:00:05< Crab_> so, if you know that enemy unit can move from A to B ( #1 ), then we can get enemy_possible_moves, get pathfind::paths for A, then get destinations, then look up B [by virtue of assumtion ( #1 ), we know there's B in destinations ], then d.get_path ( d.find(B))
20110109 23:00:15-!- un214 [~un214@adsl-75-45-20-202.dsl.scrm01.sbcglobal.net] has left #wesnoth-dev ["tesseracted"]
20110109 23:00:33< Crab_> boucman: yes, there's; 
20110109 23:00:38< boucman> good
20110109 23:00:56< Crab_> check move_unit_fake 
20110109 23:01:14< Crab_> it has a fallback to such things
20110109 23:01:43< Crab_> but, of course it's not the fastest implementation
20110109 23:02:12< Crab_> ( pathfind::emergency_path_calculator calc(fake_unit, *game_map);  route = pathfind::a_star_search(src, dst, 10000, &calc,  game_map->w(), game_map->h()); )
20110109 23:03:16< Crab_> and there's also a dummy_path_calculator, even more dumb thing
20110109 23:03:50< Crab_> it doesn't use a unit actually, returning 1.0 for the cost
20110109 23:04:48< Crab_> so, the answer probably is '   pathfind::dummy_path_calculator calc(fake_unit, *game_map);    route = a_star_search(src, dst, 10000, &calc, game_map->w(), game_map->h());    ' where fake_unit is any unit (or we can make a 2nd constructor which doesn't take unit)
20110109 23:05:00< mordante> I'm off night
20110109 23:05:44-!- mordante [~mordante@wesnoth/developer/mordante] has quit [Quit: Leaving]
20110109 23:09:19< Crab_> Grimling: I'll create a task for the work you've done. I'd ask you to accept\submit work since I don't know exactly when GCI deadline is, and, looking at the code, you've done enough good things for this task to make it an additional 'done' task.
20110109 23:09:46< Crab_> (in ~10 minutes)
20110109 23:10:21< Grimling> thank you, i'm now looking to get a good paths, but still get some errors
20110109 23:13:05< Grimling> Crab_: it seems like i can't get the paths using enemy_possible_moves[pair.first] enemy_possible_moves = const moves_map &enemy_possible_moves
20110109 23:16:55< Crab_> Grimling: can you pastebin the code ?
20110109 23:17:01< Grimling> ok
20110109 23:17:04< Crab_> those several lines involved
20110109 23:19:31< Grimling> Crab_: i get a time-out when trying to connect to pastebin.org
20110109 23:19:43< Crab_> pastebin.mozilla.org
20110109 23:20:00< Grimling> Crab_: thanks, that works
20110109 23:20:01< Crab_> or wesnoth.pastebin.com
20110109 23:21:18< Grimling> http://pastebin.mozilla.org/918684
20110109 23:21:31< shadowmaster> pastebin.com and pastebin.org are whole different services, btw
20110109 23:21:55< eoc> both fail though :)
20110109 23:22:57< Crab_> Grimling: what happens when you use this code ?
20110109 23:23:54< Grimling> error: passing 'const ai::moves_map' as 'this' argument of _Tp... discards qualifiers
20110109 23:24:21< Crab_> compile error, you're calling a non-const function of a const object
20110109 23:24:29< Crab_> which function ?
20110109 23:24:38< Crab_> (it can be seen from the line and error message)
20110109 23:24:57< Grimling> the [] i think
20110109 23:25:57< Grimling> will try to do it with a non-const enemy_possible_moves
20110109 23:26:26< Crab_> you can; but, actually, you're not trying to modify the object..
20110109 23:26:34< Crab_> so, using 'const' will be fine
20110109 23:26:47< Crab_> let's see what's in that moves_map
20110109 23:26:49< Grimling> (non-const works)
20110109 23:27:31< Crab_> http://www.cplusplus.com/reference/stl/map/operator%5B%5D/
20110109 23:27:46< Crab_> it's non-const
20110109 23:27:54< Crab_> using http://www.cplusplus.com/reference/stl/map/find/ instead will work
20110109 23:28:10< Crab_> because there's const_iterator find ( const key_type& x ) const;
20110109 23:28:28< Crab_> so, it can be used on a const possible_moves map
20110109 23:28:32-!- iwontbecreative [~Thibault_@89.181.24.80] has quit [Quit: Going to sleep]
20110109 23:28:52< Grimling> ok
20110109 23:28:58-!- wesbot changed the topic of #wesnoth-dev to: FOSDEM2011: http://wiki.wesnoth.org/Fosdem2011 | 184 bugs, 306 feature requests, 21 patches | logs: http://irclogs.wesnoth.org | Don't paste on IRC! Use a pastebin: http://wesnoth.pastebin.com | http://imagebin.org
20110109 23:39:23< Crab_> Grimling: http://www.google-melange.com/gci/task/show/google/gci2010/wesnoth/t129461244402
20110109 23:42:42< Grimling> Crab_: ok, it compiles now, will upload the work
20110109 23:42:52< Crab_> ok, great
20110109 23:43:44< Crab_> I'll mark the task as done; please send a PM with the code once it more-or-less works (gives 'arrows for the attacks'). As usual, ask questions, if any.
20110109 23:44:01< Grimling> ok
20110109 23:44:54< Grimling> uploaded
20110109 23:48:07< Grimling> Crab_: how much times can the callback_phase.execute() be called in one turn?
20110109 23:48:54< Grimling> ca_global_fallback*
20110109 23:49:08< Crab_> theoretically, many;
20110109 23:49:30< Crab_> but, practically, 1
20110109 23:49:41< Crab_> since we'll want to fall back with all our units, globally
20110109 23:49:49< Crab_> so, there'll be nothing left to move
20110109 23:50:16< Grimling> so the arrows_ won't be cleared?
20110109 23:55:10< Grimling> Crab_: but i should leave, school restarts tomorrow :/
20110109 23:55:17< Grimling> Crab_: will work on it tomorrow evening
20110109 23:55:25< Crab_> ok
20110109 23:55:34< Crab_> the arrows will remain
20110109 23:55:50< Crab_> usually, we'll test once, then load game again (the arrows will be cleared on load)
20110109 23:56:37< Crab_> I'd even remove the 'arrows_.clear();' call
20110109 23:57:03< Crab_> since, if evaluate returns true >1 times, the arrows might be cleaned in the 2nd evaluation
20110109 23:57:06< Grimling> I just did that, but it gave a segmentation fault
20110109 23:57:08-!- Blueblaze [~Blueblaze@adsl-99-182-54-220.dsl.hstntx.sbcglobal.net] has joined #wesnoth-dev
20110109 23:57:22< Grimling> but i will try to solve that tomorrow
20110109 23:57:31< Crab_> ok
20110109 23:57:37< Crab_> if needed, show stack trace
20110109 23:57:53< Grimling> how can you do that?
20110109 23:58:51-!- EdB [~edb@tss37-1-89-84-18-220.dsl.club-internet.fr] has quit [Remote host closed the connection]
20110109 23:59:48-!- zookeeper [~l@wesnoth/developer/zookeeper] has quit []
--- Log closed Mon Jan 10 00:00:03 2011