Log for #openttd on 25th January 2018:
Times are UTC Toggle Colours
00:00:02  <LordAro> there's even a tortoisehg answer
00:01:21  <LordAro> (also, just so you get the terminology right, "mercurial" is the name of the VCS ("svn" is a different VCS), "hg" is the command you use to operate on a repo controlled by mercurial, and "tortoisehg" is a gui frontend to "hg")
00:03:51  *** HerzogDeXtEr has quit IRC
00:04:42  <Samu> hg delete commit
00:05:21  <LordAro> irc is not google
00:20:40  <Samu> i have a better way to deal with this
00:20:54  <Samu> send to recycle bin, restart from 0
00:24:19  *** Supercheese has quit IRC
00:26:05  <LordAro> that's decidedly not a better solution
00:26:11  <LordAro> but sure, whatever
00:27:28  <Samu> yeah google results is use strip or whatever extension command line crap, while I installed a gui program... no thx
00:27:40  <LordAro> try harder
00:27:51  <LordAro> like, for more than 30s
00:28:06  <Samu> brb 2 min
00:28:15  <ST2> open a cmd, format C:, yes
00:28:16  *** Samu has quit IRC
00:28:25  <ST2> always works on cleaning stuff ^^
00:28:47  <LordAro> would be ultimately more productive
00:28:50  <LordAro> anyway, bedtime
00:28:58  <ST2> night :)
00:30:35  *** Samu has joined #openttd
01:01:05  *** Gustavo6046 has quit IRC
01:05:14  *** Samu has quit IRC
01:09:39  *** FLHerne has quit IRC
01:34:45  *** ToBeFree has quit IRC
02:13:07  *** sim-al2 has joined #openttd
02:52:10  *** sim-al2 has quit IRC
02:53:27  *** sim-al2 has joined #openttd
03:02:39  *** Feuersalamander has joined #openttd
03:03:30  *** grossing has quit IRC
04:02:13  *** glx has quit IRC
04:04:30  *** Cubey has quit IRC
04:16:40  *** Mahjong has quit IRC
04:18:05  *** Mahjong has joined #openttd
04:47:54  *** Supercheese has joined #openttd
06:19:27  *** Thedarkb has quit IRC
06:28:27  *** sim-al2 is now known as Guest2663
06:28:29  *** sim-al2 has joined #openttd
06:32:29  *** Guest2663 has quit IRC
06:46:24  *** Thedarkb has joined #openttd
06:48:31  *** sla_ro|master has joined #openttd
06:53:05  *** Breckett has joined #openttd
07:18:04  *** Biolunar has joined #openttd
07:21:03  *** sla_ro|master has quit IRC
07:33:31  *** sim-al2 has quit IRC
08:29:11  *** Supercheese has quit IRC
08:33:53  *** Supercheese has joined #openttd
08:38:07  <debdog> is there a way to view game settings for the scenario used in OpenTTD's splash screens? in this case the physics settings of the 1.7.x versions
08:38:50  <debdog> or, ideally, a .sav file of that scenario.
08:39:57  <LordAro> debdog: openttd.dat(?) is just a renamed .sav file
08:40:19  <LordAro> rename it, open it, look at it
08:42:14  <debdog> ahh, neat
08:44:21  <debdog> hum where would I find this file on linux?
08:44:55  <debdog> find /usr -iname openttd.dat returned nothing
08:45:48  <debdog> some for ~/.openttd
08:45:51  <debdog> *same
08:46:12  <debdog> no hit either:
08:46:49  <LordAro> that is a good question
08:47:35  <debdog> hehe
08:48:07  <debdog> mayhap the fille's name changed over time
08:48:12  <LordAro>
08:48:28  <LordAro> nah, openttd hasn't changed significantly in years :p
08:49:04  <LordAro> ah, opntitle.dat
08:49:10  <LordAro> my bad, misremembered
08:49:34  <debdog> opntitle.dat
08:49:36  <debdog> hehe
08:51:26  <debdog> cool, that worked. thanks!
08:55:29  *** Breckett has quit IRC
08:55:44  *** Breckett has joined #openttd
09:14:46  *** rellig has joined #openttd
09:40:37  *** Biolunar has quit IRC
09:53:38  *** FLHerne has joined #openttd
10:07:33  *** tokai|noir has joined #openttd
10:07:33  *** ChanServ sets mode: +v tokai|noir
10:13:57  <Cadmus> Hello, I've started a server for some friends, but haven't played in a very long time. Could someone recommend some GRFs for road, rail, and sea that go to the near future? AV8 (or its successor) already has me covered for air.
10:14:29  *** tokai has quit IRC
10:16:05  *** Samu has joined #openttd
10:16:31  *** john-aj has joined #openttd
10:16:55  <peter1138> NUTS
10:19:15  <Alkel_U3> I'd still recommend eGRVTS for road. SQUID for waterways and either Pineapple / Iron horse for rail if you want something "like original but different/better" or NUTS if you want... to go nuts with it :-)
10:19:54  <Samu> hi
10:21:33  *** funnel has quit IRC
10:22:39  *** FLHerne has quit IRC
10:24:47  <debdog> haha "Features lickable pixels..."
10:25:06  <debdog> FISH ship set 0.9.2 Description
10:25:19  *** funnel has joined #openttd
10:26:24  <debdog> prolly keep some glass cleaner handy
10:27:00  <debdog> *at hand
10:29:59  *** Supercheese has quit IRC
10:34:25  *** iSoSyS has joined #openttd
10:39:09  *** Breckett has quit IRC
10:44:47  <Cadmus> Thanks folks. I'll take a look at them, I guess with a lot of these sets you have a much earlier start (1899?), so a longer game even if you stop at 2020 or 2030
10:50:59  *** Mike has joined #openttd
10:51:04  <Cadmus> I thought SQUID supersed FISH now?
10:51:17  *** Mike has quit IRC
10:51:19  <Samu> i fail at understanding what a repository is for
10:52:41  *** Flygon_ has joined #openttd
10:52:53  <LordAro> Samu: so you get how all the "commits" that are stored on the svn server? with hg/git (and other "distributed" version control systems (DVCS)), this copy of the commits is stored on your computer, as opposed to just a central server
10:53:36  <LordAro> this allows you to make a separate set of commits/changes
10:53:45  <LordAro> which i think was your original goal
10:55:10  *** Flygon has quit IRC
10:57:37  <Samu> what i'm trying to do is, create multiple patches in a sequence. First patch is against last trunk revision, currently r27967
10:57:45  <Samu> Second patch is against my own patch
10:57:57  <LordAro> yes
10:57:59  <Samu> but i only able to patch against r27967
10:58:06  <LordAro> with svn, yes
10:58:26  *** crem2 has joined #openttd
10:58:40  <LordAro> but with hg, you can create your own commit "r27968" (hg doesn't use revision numbers, but it's effectively the same thing)
10:58:45  <LordAro> and then apply another commit to that
11:00:08  *** crem1 has quit IRC
11:00:08  <Samu> kdiff3 looks so ugly in comparison with tortoise diff
11:01:42  <Samu> what happens when the real central openttd updates to r27968? how am i update my own stuff to the new revision?
11:06:05  <LordAro> that's where it gets a bit tricky
11:06:14  <LordAro> but let's cross that bridge when we get to it :)
11:11:21  <Samu> Commit failed (details follow): Authorization failed
11:11:30  <Samu> i fail
11:11:32  *** FLHerne has joined #openttd
11:12:38  <Samu> commit to: svn://
11:12:49  <Samu> hmm this is not where I want to send my commits, or is it?
11:16:25  <LordAro> not that it'll work either way
11:16:43  <LordAro> but you don't want to send your commits anywhere
11:18:02  <LordAro> as in, don't "push"
11:23:17  <Samu> file:///D:/OpenTTD/trunkrepositorysvn/trunk
11:23:25  <Samu> this is my repository, it's emtpy :(
11:24:55  <Samu> file:///D:/OpenTTD/trunkrepositorysvn/branches
11:25:06  <Samu> file:///D:/OpenTTD/trunkrepositorysvn/tags
11:25:09  <Samu> all empty
11:25:10  <Cadmus> SVN *feels nauseous*
11:25:55  <Samu> no idea what I'm doing, really :( t.t
11:28:12  <Samu> "Subversion Repository" is what it says here
11:28:24  <Samu> wasn't is supposed to be mercurial?
11:30:58  <Samu> so confusing, it's "importing" to something that is local
11:31:12  <Samu> sec
11:39:37  <LordAro> i'm not sure why you're doing any importing
11:59:22  *** Breckett has joined #openttd
12:05:47  *** Breckett has quit IRC
12:07:20  <Samu> Commit failed (details follow): Authorization failed
12:07:29  <Samu> i fail... i fail... i fail!
12:07:40  <Samu> kill me!
12:09:39  <Samu> when i press OK, i get commit failed
12:09:49  <Samu> what am i doing wrong :|
12:15:14  <LordAro> Samu: ...that is svn
12:15:19  <LordAro> you can't commit with svn
12:15:43  <Samu> if i can't use svn, then how am I gonna create patches
12:16:35  <Samu> can i create patches with hg?
12:16:52  <LordAro> bingo
12:17:04  <LordAro> it's an alternative, not in addition to
12:17:06  <Samu> kdiff3 is an ugly mofo, btw :(
12:17:21  <Samu> that's what's included with hg
12:17:33  <LordAro> boohoo
12:17:40  <LordAro> it's a diffing tool
12:17:48  <LordAro> what does it matter?
12:18:10  <Samu> doesn't seem to let me edit
12:18:22  <Samu> but ok, i will retry with hg
12:18:57  <Samu> nevermind, i can't use the apply patch approach
12:19:44  <Samu> seems i gotta manually move 'aircraft_cmd.cpp' into the folder
12:21:00  <LordAro> well, it'll work
12:21:43  <Samu> sorry, i'll be lack later, when i'm more calm
12:21:52  <Samu> cya
12:22:28  *** Samu has quit IRC
12:43:04  *** Gustavo6046 has joined #openttd
13:07:15  *** Gja has joined #openttd
13:13:05  *** Samu has joined #openttd
13:16:09  *** iSoSyS has quit IRC
13:37:29  *** Gustavo6046 has quit IRC
13:37:53  *** Gustavo6046 has joined #openttd
13:37:59  <Samu> question, is it ok to ignore the .hgignore file?
13:38:31  <LordAro> for what you're doing, yes
13:39:09  <LordAro> (.hgignore is how the repo knows which files in the directories to not add to the repo)
13:39:17  <LordAro> (svn does it with file metadata instead)
13:40:49  <Samu> i've added a directory to the ignorelist, but then that made .hgignore to be modified
13:41:08  <Samu> ignoring the ignore sounds ... weird
13:41:24  <LordAro> oh, i see
13:41:29  <LordAro> which directory did you add?
13:41:42  <Samu> projects - Cópia
13:41:55  <Samu> a copy of projects, so i can open it on visual studio freely
13:42:05  <Samu> without bothering with changes in the real projects folder
13:42:05  <LordAro> oh, and that's inside your ottd checkout?
13:42:12  <john-aj> well, .hgignore is the file that holds the ignorelist, unless i misunderstand? so it should be modified
13:42:24  *** sim-al2 has joined #openttd
13:42:26  <LordAro> i'd probably want to move it outside the ottd checkout
13:42:53  <LordAro> you shouldn't add IDE/editor related files to ignorelists
13:43:04  <LordAro> they should be added to global/user specific ignore files
13:43:50  <Samu> okay.. wondering how i'm doing that without visual studio complaining
13:45:47  <Samu> global/user specific ignore files... hmmm ahem.. where is that
13:52:03  <LordAro>
13:52:32  *** iSoSyS has joined #openttd
13:55:06  <Samu> oh wow, visual studio did not complain
13:55:22  <Samu> it only closed all my open tabs, but that's not much of a problem
13:56:02  <Samu> i wonder where it's dumping all those obs files now
13:56:13  <Samu> objs
13:56:50  <Samu> nevermind, it cannot build :)
13:57:24  <Samu> cannot open source file because... FU
13:57:28  <Samu> :(
13:57:40  *** Flygon_ has quit IRC
13:57:56  <Samu> so, let me see that username thing
14:00:35  <Samu> rebuilding solution, let's see if it can still do it
14:06:18  <Samu> Rebuild All succeeded
14:18:02  <supermop_work> good morniing
14:35:33  *** Breckett has joined #openttd
14:46:26  *** sim-al2 has quit IRC
14:50:49  *** Mavy has quit IRC
15:12:56  <Samu> i can't work this out LordAro :(
15:13:28  <LordAro> anything in particular, or just generally?
15:13:38  <LordAro> i can't really help you in the general case
15:13:46  <LordAro> you need to learn what you're doing for yourself
15:13:58  <Samu> i have this patch here
15:14:00  <Samu>
15:14:14  <Samu> apparently i need to split it into 3 commits or so I think
15:15:54  <Samu> this would be the first commit
15:16:27  <Samu> in essence, it changes nothing, but it prepares the code for what's to come
15:16:30  <LordAro> i'd question whether such a change should be split further, but do go on
15:17:25  <Samu> the 2nd would be this, but i can't manage to create a patch for it
15:17:44  <Samu> i get rejected hunks
15:18:59  <Samu> only 1 hunk rejected, which is exactly what I want to patch
15:19:03  <LordAro> well, that'd be because it's not a patch file :p
15:19:12  <LordAro> however
15:19:31  <LordAro> can you create an hg commit with that first patch, on top of a "clean" trunk repo?
15:19:53  <Samu> yes, I mean, i think I did that
15:20:26  <Samu> yup, it commited on its own, but yes, it did ithat
15:20:31  <LordAro> excellent :)
15:20:43  <LordAro> now, you can make the second modification
15:20:59  <LordAro> it'll be easier for you to do this manually, since your patch isn't valid
15:21:02  <Samu> hold on, let me show u
15:21:20  <Samu>
15:22:14  <LordAro> aye, that looks like commit 1 ( you can see the Rev value on the left)
15:22:24  <Samu> manually, that means type it in visual studio?
15:22:33  <LordAro> (it's offset from the svn revision number in the commit message for svn related shenanigans)
15:22:36  <LordAro> Samu: yeah
15:29:40  <Samu> ok, visual studio built it
15:29:48  <Samu> on workbench hg
15:29:52  <Samu> i do commit ?
15:30:25  <Samu> uhm,, no,
15:30:28  <Samu> diff to parent?
15:32:39  *** sla_ro|master has joined #openttd
15:33:50  <Samu> ah, i got something
15:34:15  <Samu>
15:34:44  <Samu> that 3rd part shouldn' be there, but at least the first part isn't rejected anymore
15:35:16  <Samu> however, i got this in clipboard, not a patch file, doesn't it create patch files on its own?
15:36:45  <Samu> this feels so archaic, not intuitive at all
15:41:17  <Samu> KDiff3 - i fail to understand this program. It points out the differences between two files, but then doesn't let me save... what's wrong
15:42:58  <LordAro> it's different, not necessarily unintuitive
15:43:05  <LordAro> you should be able to commit again
15:43:10  <LordAro> once you've made the 2nd change
15:49:02  <Samu> ok i edited out the 3rd change from within visual studio, only kept the 2nd change, i clicked commit on workbench hg
15:49:21  <Samu> it forced me to enter a commit message
15:50:07  <Samu>
15:50:46  <Samu> i get that diff at the bottom right, but I don't have a patch file of it :( it's just there in this workbench
15:51:59  <LordAro> i don't know tortoisehg, but there will be a way to pull a patch file out of it
15:52:04  <LordAro> have an explore, or a google
15:52:12  <LordAro> and yes, commits usually need commit messages
15:52:52  <LordAro> if you look, your first patch has the commit message "Index: src/...." - which it took from the top of the svn-style patch
15:54:46  <Samu> when i do Diff to Parent
15:54:53  <Samu> it brings up KDiff3
15:55:00  <Samu> i see the differences side by side
15:55:14  <LordAro> right, there'll likely be some sort of export from there
15:55:44  <Samu> with tortoise i could just save the left part of the right part, or both, or even edit the left part or the right part
15:56:02  <Samu> with kdiff3... i can only look, like it's read only mode... can't save
15:56:05  <Samu> can't edit
15:56:06  *** Mavy has joined #openttd
15:56:08  <Samu> can't do squat
15:56:10  *** Mavy has quit IRC
15:56:11  <LordAro> it'll be somewhere
15:56:13  <LordAro> keep looking
15:56:53  *** Mavy has joined #openttd
15:59:22  <Samu> ah, i have to click "merge"
15:59:26  <Samu> i think
15:59:31  <Samu> let's see what it did
16:01:08  <LordAro> merge? within kdiff3?
16:02:51  <Samu> merge allows me to save, but what it saves is the entire aircraft_cmd.cpp file... not a patch, grrr i fail
16:03:29  *** Mazur has quit IRC
16:03:40  <Samu> "Merge Current File"
16:03:54  <Samu> opens a 3rd panel at the bottom, where I decide which of the sides I want
16:04:39  <Samu> and allows me to save... (the file apparently), not a patch~
16:04:47  <LordAro> ok, i've done some searching
16:04:51  <LordAro> turns out kdiff3 is useless :p
16:05:10  <Samu> ohrly
16:05:14  <Samu> very well
16:05:58  <LordAro> 6.1.1
16:07:01  <Samu> let me look
16:07:28  *** john-aj has quit IRC
16:08:11  <LordAro> Samu: oh hey, this is perfect for you :)
16:08:40  <LordAro> for some reason tortoisehg doesn't come with tortoisemerge, whereas the svn & git variants do
16:08:43  <LordAro> weird
16:10:28  <Samu> oh, nice, nice tortoisemerge was listed
16:10:37  <Samu> along with kdiff3 and other stuff
16:10:41  <Samu> i didn't know this
16:12:09  *** Mazur has joined #openttd
16:12:12  <Samu> yeah, "create patch file"... exactly what I needed
16:12:16  <Samu> thx
16:13:44  <Samu> eww, this doesn't look right though
16:14:23  <Samu> hey
16:14:30  <Samu>
16:14:34  <Samu> does it look right?
16:14:59  <LordAro> doesn't look right, does it?
16:15:10  <LordAro> see if there are some settings
16:16:12  <Samu> Context lines for patches
16:16:13  <Samu> 0
16:16:56  <Samu> how many lines should go here? 3, 4? moar?
16:17:13  <Samu> gonna try 3
16:18:12  <Samu>
16:18:27  <Samu> better, but still, that header, it's comparing temporary files
16:18:45  <Samu> full pathnames
16:18:57  <Samu> something's not quite right
16:19:54  <LordAro> mm
16:27:36  *** roidal has joined #openttd
16:28:29  *** Breckett has quit IRC
16:38:29  *** alluke has joined #openttd
16:51:54  *** Cubey has joined #openttd
16:53:03  <Samu> oh, export patch
16:53:24  <Samu> oh wow... it's dumping too much information though
16:54:34  <Samu> it's using my email address, i do not like this
16:56:16  <Samu> halp
16:56:24  <Samu> too much details...
16:59:42  *** Alberth has joined #openttd
16:59:42  *** ChanServ sets mode: +o Alberth
16:59:58  <Alberth> o/
17:00:21  <Samu> help
17:04:17  <Samu> LordAro: why does it dump my email and that crap into the patch file?
17:04:23  <Samu> :(
17:05:11  <Samu> other than that, it's almost there!
17:05:39  <LordAro> because that's how it works
17:05:44  <LordAro> you can remove it if you like
17:05:48  <LordAro> hgrc file
17:07:49  <Samu>
17:08:02  <Samu> my hgrc file looks like that
17:08:24  <LordAro> Samu: well look at it
17:08:28  <LordAro> what do you think you want to change?
17:08:53  <Samu> i don't want my email to be displayed
17:08:59  <Samu> at least that
17:11:18  <Samu> ah, it's on mercurial.ini
17:13:03  <Samu> nope, my email is still displayed
17:13:10  <Samu> to hell with this program
17:14:22  <LordAro> well it's not going to regenerate it
17:14:24  <Samu> but mercurial.ini no longer has my email
17:14:27  <LordAro> it's embedded into the commit
17:14:36  <Samu> oh, is that it?
17:15:10  <Samu> seriously, these kind of programs are spam magnets
17:16:07  <LordAro> pfft
17:16:20  <LordAro> get a better email (host) if spam's an issue
17:16:23  <LordAro> these days
17:16:49  <Samu> if i knew i didn't have to provide an email, i wouldn't even type it in
17:17:25  <LordAro> well don't put it anywhere then
17:17:32  <LordAro> modify the patch file before you publish it
17:17:36  <Samu> time to recycle bin
17:17:37  <LordAro> it's just a text file
17:17:38  <Samu> brb
17:17:49  *** FLHerne has quit IRC
17:17:51  <LordAro> and the commits themselves aren't going to see the light of day
17:22:59  *** Thedarkb has quit IRC
17:25:22  *** Thedarkb has joined #openttd
17:31:28  <Samu> [tortoisehg] ciexclude = projects - Cópia/*
17:31:58  <Samu> i still see it listed... :( i fail, i don't get it, i hate myself...
17:35:37  <Samu> oh ... oh wow.. list options -> ? uknownk
17:35:48  <Samu> was it that simple? ...
17:35:55  <Samu> i really need to calm down
17:36:57  *** Breckett has joined #openttd
17:37:36  <Samu> does this mean i don't need a ciexclude = projects - Cópia/* for anything?
17:38:32  <Samu> yep... it wasn't needed
17:38:47  <Samu> damn thing made me look so stupid
17:41:11  *** Progman has joined #openttd
17:41:22  <Samu> You must identify yourself to Mercurial
17:42:04  <Alberth> of course, how else would you get authorship of a patch
17:42:43  <Samu> why would I want to?
17:43:12  <Alberth> nobody forces you to use a real email address
17:43:30  <Alberth> although a random new email address is easily made
17:43:44  <Alberth> no need to actually read that email either, in general
17:44:04  <Samu> why do these programs force so many pointless steps to work...
17:44:39  <Alberth> 1. enter credentials; 2. work
17:44:44  <Alberth> how is that many steps?
17:45:28  <Alberth> but version control in general does require a bit of setup, which you do one time at the start of a project
17:45:37  <Alberth> takes less than a minute
17:45:51  <Alberth> gives you years of reliable history
17:46:11  <Alberth> and undo and co-operation with others
17:46:26  <Alberth> seems like a fair deal to me
17:51:20  *** john-aj has joined #openttd
17:54:40  <Samu> before commit:
17:56:12  <Samu> after commit:
17:56:39  <Samu> program is stupid and makes it look like I'm the stupid
17:57:32  <Alberth> how is that wrong?
17:58:20  <Samu> it doesn't need my username to create a patch
17:58:21  <Alberth> ie the output is what I expect, a diff with commit message and the timestamp and author
17:58:25  <Samu> suddenly it needs!
17:58:57  <Alberth> huh, it always needed it
17:59:22  <Alberth> I have been using hg for many years, and supplying a name and email address was the first thing I needed to do
18:00:28  *** glx has joined #openttd
18:00:28  *** ChanServ sets mode: +v glx
18:01:42  <Alberth> the program is designed to be used in a shared repository, so you can make a program together with others
18:02:00  <Alberth> then things need to be labeled properly to avoid confusion
18:02:29  <Alberth> you can also use it all by yourself in a repository that only you can access
18:02:48  <Alberth> in that case supplying a name and email address is a bit useless
18:03:22  <Alberth> but you never know if in the future that code might be useful in a project with others
18:08:04  <Samu> my problem is that I'm using it to create patch sequences, patch chains
18:08:23  <Samu> patch queues
18:09:03  <Alberth> mq !  :)
18:09:07  <Samu> to be able to patch a second time, i need to submit, which then creates an ugly stupid pointless header to the patch file
18:09:14  <Samu> to commit*
18:10:23  *** Wolf01 has joined #openttd
18:10:30  <Alberth> so? let it add headers, they are harmless
18:10:34  <Wolf01> o/
18:10:35  <Alberth> o/ Wolf01
18:11:16  <Wolf01> Yeah soon or later headers will be added anyway (no clue on the current discussion)
18:12:11  <supermop_work> speaking of which, i still need to draw some door header details
18:15:15  <Alberth> start with the front door?
18:17:23  <supermop_work> that door is actually remaining as is
18:17:52  *** Biolunar has joined #openttd
18:21:50  *** sla_ro|master has quit IRC
18:22:15  *** andythenorth has joined #openttd
18:22:33  <andythenorth>
18:22:36  *** andythenorth has left #openttd
18:22:41  <Wolf01> Spammers
18:23:11  *** Wormnest has joined #openttd
18:23:13  <Wolf01> Also old as the game XD
18:37:00  *** HerzogDeXtEr has joined #openttd
18:38:05  *** Thedarkb has quit IRC
18:42:15  *** Thedarkb has joined #openttd
18:43:04  *** smoke_fumus has joined #openttd
18:49:58  *** iSoSySt has joined #openttd
18:51:11  *** frosch123 has joined #openttd
18:55:39  *** iSoSyS has quit IRC
18:56:22  <Alberth> hola
19:01:19  <LordAro> quak
19:03:54  <Samu> Not a head revision! in red
19:03:58  <Samu> should i be scared
19:04:46  <frosch123> moi
19:06:15  *** andythenorth has joined #openttd
19:06:23  <Samu> question, this one is a bit more complicated
19:06:40  <Samu> how many commits should this be sliced into?
19:07:07  <andythenorth> o/
19:08:14  <Samu> in my poor understanding, all of it makes sense together, but when trying to slice it, i can't think of it working without the rest
19:09:10  <frosch123> moo
19:12:34  *** Breckett has quit IRC
19:13:52  <john-aj> Samu: by the way, i'm curious as to what patches are you trying to apply?
19:14:20  <Wolf01> o/, quak
19:14:30  <Samu> i'm slicing my work into small patches
19:14:36  <andythenorth> Wolf01: lo
19:14:47  <Samu> i have the whole thing in 1 single patch :(
19:15:03  <Alberth> "hangar" sounds like the wrong name for the parameter
19:15:20  <john-aj> ah, it's a patch of your own
19:15:22  <Samu>
19:15:29  <Alberth> lines 10 to 17 look independent?
19:15:29  <Samu> i posted it here
19:16:29  <Alberth> cancel order is not remove order, is it?
19:17:06  <Samu> make dummy will cancel the current order if it's heading to hangar (manually sent if I remember)
19:17:33  <john-aj> Samu: nice idea
19:17:56  <Samu> that's code is part of "what to do with aircraft going to an airport i just upgraded"
19:18:23  <Samu> upgrading from a small airport to a heliport while the aircraft is heading to hangar
19:19:06  <Samu> it doesn't remove order
19:19:24  <Alberth> yeah, so it's different, and can be split
19:20:30  <Alberth> you try to do a single small thing each commit
19:21:05  <Alberth> one commit add function, next commit use the new function for its purpose
19:22:51  <LordAro> Alberth: i'd probably argue that adding & using should be one commit
19:23:09  <LordAro> since otherwise you have a commit with dead code
19:24:02  <andythenorth> Wolf01: so what's next?
19:24:03  <Alberth> fair enough
19:24:47  <Wolf01> Sleep, I think
19:24:53  <Alberth> +1
19:25:39  <andythenorth> fair
19:25:44  <andythenorth> ok I refactor some work code :P
19:25:48  <andythenorth> no NRT for me :)
19:25:52  <supermop_work> :(
19:26:06  <supermop_work> push the work code to nrt
19:26:27  <Wolf01> Push NRT to the work code
19:27:03  <supermop_work> refactor tanks code
19:27:39  *** Gustavo6046 has quit IRC
19:30:34  *** Stimrol has joined #openttd
19:33:53  *** Breckett has joined #openttd
19:33:56  *** Stimrol has quit IRC
19:35:44  *** iSoSySt has quit IRC
19:36:11  *** Gustavo6046 has joined #openttd
19:38:34  *** Thedarkb has quit IRC
19:42:00  *** Chrill has joined #openttd
19:48:22  *** Chrill has quit IRC
19:50:33  *** Stimrol has joined #openttd
19:54:07  <andythenorth> refactor all things
19:57:23  *** som89 has joined #openttd
20:02:23  <Eddi|zuHause> refactor 2^77232917-1?
20:03:04  <Wolf01> Not
20:06:38  <Eddi|zuHause> "This bug has existed since before curl 6.0. It existed in the first commit we have recorded in the project."
20:09:22  *** oof has joined #openttd
20:10:58  <peter1138> :-)
20:11:01  <peter1138> Not just us then.
20:12:40  <oof> hi
20:14:33  <Alberth> o/
20:15:27  *** Stimrol has quit IRC
20:16:28  <Wolf01> that's what you get with "building while paused"
20:17:24  <Alberth> building with daylength, as it took 9 hours :)
20:17:48  <Alberth> but still a masterpiece in organizing it
20:18:44  <Wolf01> IIRC they have supercomputers to organize working shifts on subway too
20:26:13  <peter1138> Health and safety would have fun with that.
20:30:33  *** Stimrol has joined #openttd
20:36:53  <oof> sup
20:37:07  <oof> ahem
20:37:58  *** Stimrol has quit IRC
20:38:00  *** oof has quit IRC
20:40:33  *** Stimrol has joined #openttd
20:51:10  *** Supercheese has joined #openttd
20:55:17  *** Alberth has left #openttd
20:56:23  *** roidal has quit IRC
21:02:00  *** frosch123 has quit IRC
21:29:55  *** Stimrol has quit IRC
21:32:03  <Wolf01> 'night
21:32:07  *** Wolf01 has quit IRC
21:42:21  <Samu> this is seriously scary, if I mess up one commit, I can't undo it
21:43:07  <john-aj> there are ways to undo it
21:43:09  <john-aj> it's fine
21:43:10  <Samu> would have to re-do from scratch
21:43:36  *** sim-al2 has joined #openttd
21:44:01  <Samu> they're unelegant from what i've seen
21:45:35  <john-aj> surely more elegant than redoing from scratch ;-)
21:48:54  <Samu> ok, i reached another delicate part... helicopter and service at helipad setting mayhem
21:51:31  <Samu> and moving PendingReplace outside of NeedsAutomaticService
21:51:40  <Samu> mm
21:52:05  <Samu> they're all related to service at helipad
21:52:06  *** chomwitt has joined #openttd
21:53:11  *** FLHerne has joined #openttd
21:55:27  <Samu> i'm not really sure what needs to be done first
21:55:40  <Samu> HasPendingReplace
21:56:21  <Samu> the comment in aircraft_cmd.cpp that says -	/* Send the helicopter to a hangar if needed for replacement */
21:56:26  <Samu> doesn't work
21:56:38  <Samu> i trashed that code part
21:57:41  <Samu> now there's automatic service at helipad without the need for a replace, and a non-need to automatic service, but a replace is pending
21:57:59  <Samu> what do i need to do first :(
21:58:28  <LordAro> Samu: you can check compiling and what not before commiting
22:01:11  <Samu> there's also the case there's a need for both automatic service and a pending replace
22:01:50  <Samu> the automatic service at helipad is done first before doing the pending replace check
22:02:47  <Samu> i think i'm gonna deal with service at helipad first, pending replace can wait
22:05:05  <Samu> there's also the case of heliport (no hangar) vs any other airport (hangar)
22:06:45  <Samu> everything needs to be connected with need automatic servicing and service at helipad to make sense
22:07:07  <Samu> hmm, ok, i got a vague idea of the order this has to be done
22:18:03  *** Progman has quit IRC
22:18:49  *** sim-al2 is now known as Guest2728
22:18:49  *** sim-al2 has joined #openttd
22:22:40  *** Guest2728 has quit IRC
22:30:41  *** andythenorth has quit IRC
22:36:05  *** Breckett has quit IRC
22:36:10  *** Thedarkb has joined #openttd
22:38:21  *** john-aj has quit IRC
22:52:40  *** Gja has quit IRC
23:01:59  *** HerzogDeXtEr has quit IRC
23:16:26  *** Wormnest has quit IRC
23:23:08  *** smoke_fumus has quit IRC
23:26:05  <Samu> another dilema to solve
23:27:08  <Samu>  /* check if the aircraft needs to be replaced or renewed and send it to a hangar if needed */
23:27:13  <Samu> this code is removed
23:27:27  <Samu>  /* Send the helicopter to a hangar if needed for replacement */
23:27:30  <Samu> along with this
23:28:19  <Samu> now I add code somewhere else that will do what these two were intending to do
23:29:01  <Samu> it deals with airplanes and helicopters, with the exception of heliport (no hangar)
23:29:31  <Samu> heliport... hmm heliport hmm
23:30:10  <Samu> how many commits do I need for this
23:31:53  <Samu> check if the aircraft needs bla bla is removed, helicopter to a hangar is removed. code is added inside aircraft leaving terminal
23:32:08  <Samu> with the exception of heliport
23:32:27  <Samu> bah, i hate commits
23:41:18  <Samu> LordAro: halp me slice this
23:42:37  <Samu> lines 23-27 and 46-52 are replaced with the code at lines 8-15
23:42:45  <Samu> deals with both
23:42:53  <Samu> the exception is the heliport
23:43:20  <Samu> which is what lines 28-38 are for
23:44:05  <Samu> my commenting doesn't make it obvious :(
23:45:25  <LordAro> so, what's the end result of this patch?
23:46:29  <Samu> at lines 8-15 it checks if the aircraft needs servicing and if the current airport the aircraft is at got an hangar, it sends it to hangar
23:46:49  <Samu> it won't check on landing
23:46:51  <Samu> for airplanes
23:47:00  <Samu> and won't check on takeoff for heli
23:47:28  <Samu> the take off part is a bit hard to explain
23:47:59  <Samu> so aircraft reaches a terminal, does the loading/unloading stuff
23:48:21  <ST2> sidenote: a good tool for slicing
23:48:22  <ST2> xD
23:48:24  <Samu> when he's done, it decides where to go next, i made the checking of servicing right there
23:48:28  <LordAro> i get the bits and pieces, what's the point of the patch
23:49:11  <LordAro> although the removal of the DoCommand is a bit suspicious
23:49:33  <Samu> i removed it because it was cancelling send to hangar automatic services
23:51:02  <Samu> it is more fitting to check for servicing right after the loading/unloading at a terminal, before the aircraft goes to the runway or the helicopter goes into the air
23:52:17  <Samu> the exception to this is the helidepot which has no hangar, so it had to be done at some time after he's in the air
23:52:43  <Samu> and i had to make it deal with serviceathelipad
23:53:31  <Samu> it has just departed from a helipad, which means the automatic servicing interval is reset
23:54:09  <Samu> NeedsAutomaticServicing will fail there
23:54:51  <Samu> if there is an autoreplace set, HasPendingReplace would kick in, and order the helicopter to a hangar
23:55:14  <LordAro> i'm not sure i would split it any further
23:55:44  <LordAro> maybe ask a dev next time they're online what they think
23:55:58  <Samu> there's some other split before this, which is the creation of HasPendingReplace, separate from NeedsServicing
23:56:30  <Samu> let me copy paste brb
23:57:54  <Samu> separation of HasPendingReplace and NeedsServicing
23:57:55  *** DDR has quit IRC
23:58:21  <Samu> it's the only way I could think of to make it work in tandem with serviceathelipad setting

Powered by YARRSTE version: svn-trunk