--- Log opened Sat Feb 17 00:00:11 2018
20180217 00:46:46-!- sigurdfd [sigurdfd@dynamic-acs-72-23-110-196.zoominternet.net] has quit []
20180217 01:10:05-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 01:10:13-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 01:15:18-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20180217 01:15:24-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20180217 01:24:06< irker512> wesnoth: Charles Dang wesnoth:master 29f0486596bf / src/font/text.cpp: Text: removed extra width "hack" added in e683bf0fb9e54fe9 https://github.com/wesnoth/wesnoth/commit/29f0486596bf808e806356d617377d1579b23963
20180217 01:24:09< irker512> wesnoth: Charles Dang wesnoth:master 5c570841d3ff / CMakeLists.txt INSTALL.md SConstruct src/font/text.cpp: Bump required Pango version from 1.21.3 to 1.22.0 https://github.com/wesnoth/wesnoth/commit/5c570841d3ff813ba0c74a2b591304c08fd22601
20180217 01:24:12< irker512> wesnoth: Charles Dang wesnoth:master 6b52d16faeda / src/gui/dialogs/unit_create.cpp: Unit Create: made Race the default sorting option, as was in 1.12 https://github.com/wesnoth/wesnoth/commit/6b52d16faedaf6499f4777ed8156b1eaa09ab554
20180217 01:31:21-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev
20180217 01:31:45< vultraz> celticminstrel: yes
20180217 01:32:18< celticminstrel> Heh.
20180217 01:32:31< vultraz> can you add them
20180217 01:32:39< celticminstrel> Prolly
20180217 01:33:15 * celticminstrel wonders if prolly is in dictionaries yet...
20180217 01:33:26< vultraz> prolly
20180217 01:42:27-!- Bonobo [~Bonobo@61.68.156.44] has joined #wesnoth-dev
20180217 01:45:11< TadCarlucci> prolly not
20180217 01:49:33< celticminstrel> Oh! https://en.oxforddictionaries.com/definition/prolly
20180217 01:49:51 * celticminstrel checked wiktionary first, but Oxford having it is more notable.
20180217 01:50:37< celticminstrel> Also in Collins, MacMillan... I don't see Webster on the first page of results though.
20180217 02:01:12< vultraz> celticminstrel: does it count as adding a translatable string if the text is already in a translatable string
20180217 02:01:22< celticminstrel> Elaborate?
20180217 02:01:32< celticminstrel> I mean, please elaborate.
20180217 02:01:58< vultraz> if I have this:
20180217 02:01:59< vultraz> status = formatter() << _n("Vacant Slot:", "Vacant Slots:", vacant_slots) << " " << vacant_slots << "/" << s["max"];
20180217 02:02:07< vultraz> but want to add a message for 0 vacant slots
20180217 02:02:09< vultraz> something like
20180217 02:02:24< vultraz> status = _("Vacat SLots:") << " " << unicode_em_dash
20180217 02:02:28< vultraz> Vacant Slots:
20180217 02:02:46< celticminstrel> Eh, this is one of the shortcomings of the gettext translation system, where number forms are dictated by the language alone...
20180217 02:03:16< vultraz> though I should probably remove the singular form her
20180217 02:03:17< vultraz> e
20180217 02:03:23< vultraz> Vacant Slot: 1/2 doesn't sound right
20180217 02:03:33< celticminstrel> I think that would in fact not work?
20180217 02:03:43< vultraz> I mean just remove _n
20180217 02:03:45< vultraz> and use _
20180217 02:04:08< celticminstrel> You can use _("Vacant Slot:") elsewhere but not _("Vacant Slots:"), though why you want to remove the plural is beyond me.
20180217 02:04:13< vultraz> no no
20180217 02:04:16< vultraz> remove the singular
20180217 02:04:23< celticminstrel> Yeah, you can't.
20180217 02:04:26< vultraz> why?
20180217 02:04:32< celticminstrel> Because that would be a new string.
20180217 02:04:51< vultraz> but it's right here
20180217 02:05:08< celticminstrel> I think if you used _("Vacant Slot:") it would pick that up as the same string as _n("Vacant Slot:", "Vacant Slots:", n). I don't think that's true if you used _("Vacant Slots:").
20180217 02:05:37< vultraz> t'is makes no sense
20180217 02:06:17< celticminstrel> You could do some gettext research (or even just basic testing) to confirm/deny my theory, but assuming I'm correct, the best option is probably just to remove the "/max" part to make it sound better.
20180217 02:07:00< celticminstrel> I have to agree that that's a place where plurals really shouldn't've been used though...
20180217 02:07:03< vultraz> 🤔
20180217 02:07:12< celticminstrel> I don't have that emoji in my font.
20180217 02:07:25< celticminstrel> (ie it just shows up as a box)
20180217 02:07:36< vultraz> oh jesus hell please god disable the deprecation errors
20180217 02:07:44< celticminstrel> (...which is a little weird in itself...)
20180217 02:07:48< vultraz> i can't stand 10,000 lines of MAGENTA_IS_THE_TEAM_COLOR is deprecated
20180217 02:07:58< celticminstrel> If the deprecation errors are only in the console, there's no real reason to disable them.
20180217 02:08:06< celticminstrel> That said, I do want to divert them all to a separate logdomain.
20180217 02:08:18< vultraz> there's a delay while they scroll by
20180217 02:08:24< vultraz> (the stream is flushed?)
20180217 02:08:27< celticminstrel> The only thing is, that implies adding a logdomain parameter to wesnoth.log()
20180217 02:08:40< celticminstrel> And I'm not sure that's a good idea.
20180217 02:08:53< celticminstrel> Since it'd mean addon devs can basically log to any channel they want.
20180217 02:09:21< vultraz> it takes like 5 seconds for allthe messages to print
20180217 02:09:53< celticminstrel> My thought is "maybe you shouldn't have so many addons installed on your development copy".
20180217 02:10:15< celticminstrel> (IOW, if you're getting MAGENTA_IS_THE_TEAM_COLOR spam, it's coming from addons.)
20180217 02:10:20< vultraz> anyway, the new vacant slots message isn't that necessary I guess
20180217 02:10:26< vultraz> i thought the current version displayed something
20180217 02:10:27< vultraz> it doesn't
20180217 02:10:37< celticminstrel> Yeah, it's a little weird but does get the idea across.
20180217 02:11:14< vultraz> maybe il just dsplqwoijoa an emp dis
20180217 02:11:22< celticminstrel> ?
20180217 02:12:52< vultraz> maybe ll just display an emd dahs
20180217 02:13:02< celticminstrel> ???
20180217 02:13:05< celticminstrel> Oh em dash?
20180217 02:13:37< vultraz> si
20180217 02:15:34< wedge009> Did vultraz steal gt's keyboard?
20180217 02:15:46< celticminstrel> Probably.
20180217 02:15:46< vultraz> nah im just typing fast
20180217 02:16:10< vultraz> i can type quickly but not that accurately 
20180217 02:16:16< vultraz> hey, that was pretty good
20180217 02:16:26< wedge009> This is what i get when I try to type qwuivkly
20180217 02:16:32< wedge009> Oops.
20180217 02:16:40-!- travis-ci [~travis-ci@ec2-54-161-208-108.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 02:16:41< travis-ci> wesnoth/wesnoth#16507 (master - 6b52d16 : Charles Dang): The build passed.
20180217 02:16:41< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/342615589
20180217 02:16:41-!- travis-ci [~travis-ci@ec2-54-161-208-108.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 02:18:37< vultraz> celticminstrel: is there a command line grep thingy that can delete whole lines
20180217 02:19:01< celticminstrel> I imagine grep alone could do that actually...
20180217 02:19:14< vultraz> i mean
20180217 02:19:16< celticminstrel> But why do you want it?
20180217 02:19:32< vultraz> i want to grep for MITTC and remove all lines of it
20180217 02:20:02< vultraz> VSCode can do it, but i don't know how to make it remove the line too
20180217 02:20:25 * celticminstrel is pretty sure you can get grep to print out just the matched lines with no extra info such as line number etc. However, that means it needs to be run individually on each file, so you'd need a shell loop.
20180217 02:20:52< celticminstrel> VSCode can probably do the removal too.
20180217 02:20:57< vultraz> how
20180217 02:21:05< celticminstrel> There's probably a "find and replace" thing somewhere?
20180217 02:21:26< vultraz> yes
20180217 02:21:28< vultraz> there is
20180217 02:21:34< vultraz> I can replace with ""
20180217 02:21:35< vultraz> ie nothing
20180217 02:21:38< vultraz> but that just empties the line
20180217 02:21:41< vultraz> i want to remove the line
20180217 02:22:03< celticminstrel> Well, emptying the line is actually enough in this case, isn't it? Since you just want to silence the spam, and it's just coming from addons, not core.
20180217 02:22:07< celticminstrel> That said...
20180217 02:22:34< celticminstrel> You should be able to match the entire line (including the newline) with a regex, in which case replacing with "" means the line is deleted.
20180217 02:22:46< vultraz> what would the regex for that be?
20180217 02:22:50< celticminstrel> \s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n
20180217 02:22:53< celticminstrel> ^ should work
20180217 02:23:07< celticminstrel> (I'd test it in just "find" on a single instance first to be sure.)
20180217 02:23:14< vultraz> vs doesn't like it
20180217 02:23:19< celticminstrel> Which part?
20180217 02:23:27< vultraz> i mean it doesn't find anything
20180217 02:23:34< vultraz> it uses java-flavor regex IIRC
20180217 02:23:36< vultraz> or whatever it is
20180217 02:23:44< celticminstrel> So descriptive. :P
20180217 02:25:46< celticminstrel> It works in TextWrangler with Perl-style regex...
20180217 02:25:57< celticminstrel> Though the \n is actually superfluous there.
20180217 02:26:12< celticminstrel> The {} probably don't need to be escaped but it shouldn't hurt to do it anyway.
20180217 02:28:27< celticminstrel> (Note, when I say the \n is superfluous it's because the \s* actually matches the preceding newline.)
20180217 02:29:16< vultraz> without the \n it finds stuff
20180217 02:29:23< vultraz> removes everything in the line
20180217 02:29:31< vultraz> inc preceding spaces
20180217 02:29:35< vultraz> but not the line itself
20180217 02:29:47< celticminstrel> Is there something like a "multi-line mode"?
20180217 02:30:01< celticminstrel> I figure it's matching the regex against each line, rather than the document as a whole.
20180217 02:30:18< vultraz> i don't think there is
20180217 02:30:22< celticminstrel> Hmm.
20180217 02:30:28< vultraz> https://github.com/Microsoft/vscode/issues/13155
20180217 02:30:35< celticminstrel> Maybe if you put (?m) in front of the regex?
20180217 02:31:58< celticminstrel> Hmm, maybe it just doesn't support full-document matches. That's pretty unfortunate.
20180217 02:32:14< celticminstrel> Still... for your purposes I'd think merely emptying the line is sufficient.
20180217 02:33:10< vn971> // `find` (the OS thing) can be made working on multi-line text via it's "perl" style regexp support.
20180217 02:33:17< vn971> not sure if that's what you were discussing.
20180217 02:33:26< celticminstrel> No idea what that's about.
20180217 02:33:41< celticminstrel> (?m) is the "set options mid-pattern) syntax.
20180217 02:33:46< celticminstrel> m is the multi-line mode option.
20180217 02:34:05< celticminstrel> Replace that paren after pattern with a quote.
20180217 02:34:29< vultraz> find /path/to/files -type f -exec sed -i 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:34:35< vultraz> would this work
20180217 02:34:52< celticminstrel> ...you have UNIX commands?
20180217 02:35:02< vultraz> Git Bash allows me to use them
20180217 02:35:19< celticminstrel> Just remove everything before "sed" and that should work, I think. Or wait...
20180217 02:35:30< celticminstrel> I think you need -i ''
20180217 02:35:40< celticminstrel> ie, an extra bit after th -i that isn't there.
20180217 02:35:40< vultraz> is that recursive?
20180217 02:35:57< celticminstrel> Oh and replace {} with the directory.
20180217 02:36:06< vultraz> i thought that was path/to/files..
20180217 02:36:10< celticminstrel> Hmm. sed definitely can be recursive, but that might be an extra flag.
20180217 02:36:34< celticminstrel> Yes, that is indeed path/to/files, but what I'm saying is you don't need find for this - sed alone is sufficient.
20180217 02:36:35< vn971> vultraz: seems OK visually, but needs testing ofc. Well, luckily, we have git diff for that.
20180217 02:36:37< vultraz> sed: -e expression #1, char 39: Invalid preceding regular expression
20180217 02:37:08< celticminstrel> So remove the bit before "sed", but then that {} at the end is part of the find syntax, so move path/to/files there instead. And drop the \;
20180217 02:37:24< vultraz> can you just give me the line :(
20180217 02:37:26< vn971> celticminstrel: man sed | grep recur  doesn't find anything.
20180217 02:37:28< celticminstrel> And probably a few other tweaks, lemme pull up sed's man quickly.
20180217 02:39:03< celticminstrel> Hmm, well, I still don't think the find is needed, but it shouldn't hurt to do it that way, so let's stick with that for insurance...
20180217 02:39:08< celticminstrel> -type f, yes...
20180217 02:39:41< vn971> I probably wouldn't include preceding AND subsequent whitespace matching though. Needs to be thought about a little.
20180217 02:39:43< celticminstrel> Actually you could do even better and go -name '*.cfg'
20180217 02:39:45< vultraz> this is why windows users don't use linux
20180217 02:39:47< celticminstrel> Instead of -type f
20180217 02:40:13< celticminstrel> For sed, you need -i '' -E 
20180217 02:40:33< celticminstrel> The "-i ''" means "change these files in-place" as opposed to making a copy.
20180217 02:40:37< vn971> vultraz: well, windows users don't use linux by definition xD
20180217 02:40:55< vultraz> :P
20180217 02:40:57< celticminstrel> The -E means "use a real regular expression instead of the so-called basic regular expressions with just the bare minimum of features"
20180217 02:41:11< vn971> celticminstrel: send in your version so we can check.)
20180217 02:41:20< celticminstrel> vn971: Hmm?
20180217 02:41:26< celticminstrel> So the final line comes out to...
20180217 02:41:41< vultraz> find units/ -name '*.cfg' -exec sed -i -E 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:41:42< vultraz> ?
20180217 02:41:54< celticminstrel> find path/to/files -name '*.cfg' -exec sed -i '' -E 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:41:59< celticminstrel> You just missed the ''
20180217 02:42:15< vn971> celticminstrel: I don't think vultraz will be astounded by all explanations so much as to following in love with Linux immediately, so better give smth working first.) Will check now.))
20180217 02:42:19< celticminstrel> -i can also be used as eg -i~ to create a backup.
20180217 02:42:26< vultraz> sed: can't read s/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g: No such file or directory
20180217 02:42:41< celticminstrel> Maybe the order of arguments is wrong.
20180217 02:42:53< celticminstrel> Ohh, you need -e too, okay.
20180217 02:42:58< celticminstrel> So put a -e after the -E
20180217 02:43:15< vultraz> sed: can't read : No such file or directory
20180217 02:43:33< celticminstrel> Uhhh.
20180217 02:43:42< vultraz> find units/ -name '*.cfg' -exec sed -i '' -E -e 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:44:17< celticminstrel> Sounds like it thinks you want a file with an empty name...
20180217 02:44:50< celticminstrel> My man sed does imply that -E needs to come at the start though (sed -E other-stuff), maybe that's the problem?
20180217 02:45:00< celticminstrel> Worth a try at least.
20180217 02:45:36< vultraz> truly this is black magic
20180217 02:46:22 * celticminstrel is a little confused at why you're doing this on a units directory though.
20180217 02:46:23< vn971> vultraz: if you wanna make something working and this is your only way... Better that than writing in C.) That being said, sometimes it _does_ make sense to write in python/whatever.
20180217 02:46:30< vn971> not in this case.
20180217 02:46:57< vultraz> i suppose i should run it on my entire userdata dir
20180217 02:47:03< shadowm> vultraz: Reusing existing strings character-for-character as long as they are in the same textdomain does not count as violating the string freeze, and neither does dropping strings (as long as you are aware that this is more or less a permanent decision).
20180217 02:47:05< vultraz> but first it needs to be right
20180217 02:47:07< celticminstrel> Yeah, pretty much vultraz 
20180217 02:47:24< shadowm> I'm skipping over the rest since it sounds convoluted and reeks of mistakes being made.
20180217 02:49:38< shadowm> Also it doesn't hurt to actually test it but I believe plurals are considered for what I just said above.
20180217 02:49:52< celticminstrel> Yeah, I'd test it first.
20180217 02:50:30< shadowm> The textdomain part is really important, though. Y'all got really sloppy with the textdomains after people decided to refactor loads of code in 1.11.x.
20180217 02:50:55< shadowm> I even suggested merging wesnoth-lib and wesnoth to Ivanovic at some point but nothing ever came of that.
20180217 02:51:32< shadowm> (Though that suggestion would be invalidated by the potential possibility of wesnothd or campaignd gaining client-side translations in the future.)
20180217 02:52:00< vultraz> celticminstrel: even when i try `find units/ -type f -exec sed -i "" 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;` it says sed: can't read s/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g: No such file or directory
20180217 02:52:19< shadowm> (Then again, in that case I'd advocate for giving both their own textdomains to avoid any confusion.)
20180217 02:52:31< vn971> This seems to bind sed and find correctly, but the pattern is empty as you see:  find . -name '*.cfg' -exec sed -i -e 's///g' {} \;
20180217 02:52:38< celticminstrel> vultraz: You need an -e before the pattern.
20180217 02:52:44< vn971> I guess you need to fill in a pattern that actually works.
20180217 02:52:53< vultraz> celticminstrel: the -e gives the other error
20180217 02:52:55< shadowm> Okay, hang on for a moment there.
20180217 02:53:02< shadowm> sed takes the pattern first and the file path second.
20180217 02:53:23< celticminstrel> Oh wait, -e is actually optional.
20180217 02:53:34< celticminstrel> Ah, but it's required when using -i?
20180217 02:53:37< vultraz> with -e it gives sed: -e expression #1, char 39: Invalid preceding regular expression
20180217 02:53:44< shadowm> find units/ -type f -exec sed -i 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:54:07< celticminstrel> Well I guess you could do -exec sed 's///g' {} \> {} \;
20180217 02:54:08< vn971> vultraz: celticminstrel c'mon, just use my command above with an actual correct regexp.:P
20180217 02:54:09< celticminstrel> Maybe
20180217 02:54:53< celticminstrel> It's also possible that my sed and vultraz's sed do not agree on arguments. I dunno if git bash comes with man, but I'd suggest at least trying "man sed".
20180217 02:54:54< vultraz> still "sed: -e expression #1, char 39: Invalid preceding regular expression"
20180217 02:55:03< vultraz> bash: man: command not found
20180217 02:55:15< celticminstrel> That last sed error is likely a missing -E
20180217 02:55:45< vn971> so that is the line that works:
20180217 02:55:45< vn971> find . -type f -exec sed -E -i 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:55:50 * celticminstrel wonders if sed also supports -P for Perl-style expressions, as grep does.
20180217 02:56:05< celticminstrel> I thought -i needed an argument though...
20180217 02:56:18< vultraz> find units/ -type f -exec sed -i -E 's/\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\n//g' {} \;
20180217 02:56:19< shadowm> No it does not.
20180217 02:56:19< vultraz> works
20180217 02:56:24< vultraz> but it doesn't drop the line
20180217 02:56:25< celticminstrel> Well, it does on my sed.
20180217 02:56:27< shadowm> The argument to -i is a suffix for backups.
20180217 02:56:27< vultraz> it just empties it
20180217 02:56:31< vn971> celticminstrel: perl people probably use `awk`, but I'm not sure.)
20180217 02:56:32< celticminstrel> Yeah, exactly.
20180217 02:57:56< shadowm> find units/ -type f -exec sed -i -E 's/^\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\s*$//gm' {} \;
20180217 02:58:43< shadowm> If that merges both lines you can do away with the ^.
20180217 02:58:50< vn971> shadowm: maybe write \n in replacement text?
20180217 02:59:03< celticminstrel> Writing \n would cause the $ to fail though.
20180217 02:59:18< celticminstrel> (Unless the next line happened to be entirely blank.)
20180217 02:59:47< vn971> why deal with goddamn newlines at all? Can't just replace the {} macro itself and forget about it?)
20180217 03:00:20< celticminstrel> I'm not quite sure what you're saying, but I do know that {} in the command is a placeholder for the find command.
20180217 03:00:35-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 255 seconds]
20180217 03:00:42< celticminstrel> But yeah, I don't understand why you care about the difference between deleting the line and leaving it blank.
20180217 03:00:50< vn971> celticminstrel: I mean the {MAGENTA_WHATEVER} macro
20180217 03:00:56< celticminstrel> Ah.
20180217 03:01:13< celticminstrel> As far as the WML parser is concerned, both are equivalent.
20180217 03:01:43< shadowm> I believe you'll find that vultraz wants things to be pretty and tidy first and foremost.
20180217 03:01:48< shadowm> Functionality comes second.
20180217 03:02:48< celticminstrel> If this was to be applied to the Wesnoth core folder, I might understand, but AFAICT its only purpose is to silence the warnings coming from addons.
20180217 03:03:20< celticminstrel> (FTR, you could also silence them by completely disabling all logging on the wml logdomain.)
20180217 03:04:50< celticminstrel> (Actually, is that possible? The --log-{level}={domain} syntax doesn't have a clear way to do it.)
20180217 03:07:18< shadowm> sed -E '/^\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\s*$/d'
20180217 03:07:33< shadowm> Rather
20180217 03:07:46< shadowm> find units/ -type f -exec sed -i -E '/^\s*\{MAGENTA_IS_THE_TEAM_COLOR\}\s*$/d' {} \;
20180217 03:08:10< shadowm> vultraz: ^
20180217 03:08:47< shadowm> To clarify, that's not a pattern substitution. That's a match and then a delete on the match.
20180217 03:09:35< celticminstrel> Ooh, using sed for things other than s/// :O
20180217 03:09:49< shadowm> You match the whole line and then tell sed to forget about it (i.e. not write it to the output stream) and carry onto the next one.
20180217 03:19:42< vn971> celticminstrel: I use those kind of patterns too sometimes. 1. google/searx for them 2. understand which few symbols I should change in the SO pattern 3. wonder how people can really understand sed 4. problem solved, on to the next one.  ~9 years on Linux...
20180217 03:20:12< celticminstrel> Heh.
20180217 03:20:45< vn971> you may find yourself understanding stuff you never expected to understand in, say, 5 years, though. Luckily it can be gradually.
20180217 03:21:52< shadowm> Apparently non-GNU versions of sed do need -i to have a parameter even if it's empty.
20180217 03:21:57< shadowm> argument
20180217 03:21:59< shadowm> not parameter
20180217 03:22:36< shadowm> I believe vultraz used GNU sed by virtue of using Mingw anyway.
20180217 03:22:41< shadowm> uses OMG I CAN'T TYPE
20180217 03:23:12< celticminstrel> Yeah, mine wouldn't be GNU.
20180217 03:23:21< celticminstrel> It's the system sed, so probably BSD-derived or something.
20180217 03:23:38< shadowm> I think macOS uses FreeBSD userland components, yes.
20180217 03:34:57-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 03:35:03-!- janebot_ [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 03:35:08-!- janebot_ is now known as janebot
20180217 03:40:09-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 03:40:43-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 03:47:35-!- Bonobo [~Bonobo@61.68.156.44] has quit [Ping timeout: 240 seconds]
20180217 03:48:52-!- Bonobo [~Bonobo@61.68.156.44] has joined #wesnoth-dev
20180217 04:05:10-!- celticminstrel is now known as celmin|sleep
20180217 04:15:30-!- Bonobo [~Bonobo@61.68.156.44] has quit [Ping timeout: 256 seconds]
20180217 04:22:19< vultraz> celmin|sleep: why you do this
20180217 04:22:29< vultraz> "I agree with @gfgtdf on restoring the old behaviour (where attempting to assign to a defeated side has no effect)."
20180217 04:22:29< vultraz> just
20180217 04:22:31< vultraz> WHY
20180217 04:32:57< celmin|sleep> Because breaking stuff for no reason is bad.
20180217 04:33:16< vultraz> it's not breaking
20180217 04:34:01< vultraz> but fine
20180217 04:34:02< vultraz> FINE
20180217 04:34:03< vultraz> I'll do it
20180217 04:39:14 * shadowm blinks.
20180217 04:40:55< vultraz> the logic is impossible
20180217 04:42:07< vultraz> it's circular
20180217 04:51:45< irker512> wesnoth/wesnoth:master pentarctagon d08f290752 Use ccache with cmake on travis. AppVeyor: All builds passed
20180217 04:55:03< vultraz> alright, I think i got it
20180217 04:55:05< vultraz> HOPEFULLY
20180217 05:15:03< irker512> wesnoth: Charles Dang wesnoth:master 119622501795 / src/scripting/game_lua_kernel.cpp: Fix my fix to my fix to my fix to the wesnoth.set_village_owner impl https://github.com/wesnoth/wesnoth/commit/119622501795cfb8382dc5908107fc09258d8764
20180217 05:15:12< vultraz> celmin|sleep: happy ^
20180217 05:36:38< celmin|sleep> "it's not breaking" --> "changing how things work" == "breaking things"
20180217 05:37:03< irker512> wesnoth/wesnoth:master Iris Morelle 8549e93a13 Copyright/attribution update AppVeyor: All builds passed
20180217 05:37:45< celmin|sleep> Looks okay, but you're still using arg 4 when arg 3 doesn't exist?
20180217 05:38:05< celmin|sleep> IOW line 1181 should be (L, 3) instead of (L, 4) I think
20180217 05:38:29< celmin|sleep> (Would also be good to add a note about the new argument at line 1133.)
20180217 05:38:46< celmin|sleep> (Just by looking at it I don't understand what it does.)
20180217 05:47:29< vultraz> I don’t know
20180217 05:47:33< vultraz> It was like that before
20180217 05:47:37< celmin|sleep> Ah.
20180217 05:47:49< vultraz> Someone figure it out
20180217 06:10:06-!- Bonobo [~Bonobo@61.68.156.44] has joined #wesnoth-dev
20180217 06:18:00< vultraz>  celmin|sleep wesnoth.set_village_owner(loc[1], loc[2], side, fire_event)
20180217 06:19:23< celmin|sleep> So that's technically three arguments, and you should be using the location function...
20180217 06:19:58< celmin|sleep> Oh wait, it is using it.
20180217 06:23:51< irker512> wesnoth: Celtic Minstrel wesnoth:master 0dfb390a844f / src/scripting/game_lua_kernel.cpp: Fix wesnoth.set_village_owner ignoring the fire_event parameter https://github.com/wesnoth/wesnoth/commit/0dfb390a844f80ce898c5c641fa6ec45bab7add2
20180217 06:24:22< celmin|sleep> Should also test it at some point but whatever
20180217 06:28:16< vultraz>  Changelog entry?
20180217 06:28:29< celmin|sleep> I dunno.
20180217 06:32:28< vultraz> celmin|sleep: i think the other half might actually be fixed
20180217 06:32:33< vultraz> or at least it should be
20180217 06:32:43< vultraz> t_string::str is supposed to return the translated value
20180217 06:32:51< celmin|sleep> Check it then?
20180217 06:32:54< vultraz> though is it possible the < comparison does't use the right locale?
20180217 06:32:59< celmin|sleep> Switch to French or German or something and take a look.
20180217 06:33:21< celmin|sleep> You'd want to use translations::icompare instead of straight operator< probably... unless t_string::operator< does that already.
20180217 06:33:35< vultraz> it doesn't
20180217 06:33:37< vultraz> i do't think
20180217 06:33:38< celmin|sleep> Or wait, you were using .str(), so t_string::operator< is irrelevant.
20180217 06:33:45< vultraz> oh, true
20180217 06:33:49< vultraz> i can implement < for t_string though
20180217 06:34:16< vultraz> though
20180217 06:34:20< vultraz> how do you implement it?
20180217 06:34:31< vultraz> I mean, don't you also need to implement >
20180217 06:34:31< celmin|sleep> It'd make sense to have it implemented, but I feel like it might make it easier to accidentally sort by translation instead of whatever ...
20180217 06:34:44< celmin|sleep> You implement < and ==
20180217 06:34:49< celmin|sleep> All the others simply call those two.
20180217 06:34:54< celmin|sleep> I think it already has ==
20180217 06:35:11< irker512> wesnoth: Charles Dang wesnoth:master 72a80fed5b46 / data/gui/ (16 files in 2 dirs): Removed GUI_NORMAL__RESOLUTION macro https://github.com/wesnoth/wesnoth/commit/72a80fed5b464617ad843f257f144402ded7b759
20180217 06:35:11< celmin|sleep> a < b <=> b > a
20180217 06:35:26< celmin|sleep> a <= b = !(a > b)
20180217 06:35:37< celmin|sleep> Or I guess !(b < a)
20180217 06:35:49< celmin|sleep> a >= b <=> !(a < b)
20180217 06:35:50< vultraz> I need to implement a better sorting option register function if we're gonna use icompare though
20180217 06:36:08< celmin|sleep> So basically > <= >= are all implemented in terms of <
20180217 06:36:13< celmin|sleep> And != in terms of ==
20180217 06:36:25< vultraz> just a random question
20180217 06:36:30< vultraz> I dont think it's possible
20180217 06:36:37< celmin|sleep> While you can do <= as (a < b) || (a == b) it's probably less efficient.
20180217 06:36:37< vultraz> i'd be very surprised if it were so
20180217 06:36:49< vultraz> but does bind allow placeholder use for anything except direct argument passage
20180217 06:36:49< vultraz> ie
20180217 06:37:00< vultraz> you can't do bind(foo, this, vec[_1])
20180217 06:37:16< celmin|sleep> boost::bind doesn't support that.
20180217 06:38:02< celmin|sleep> ISTR boost::phoenix did though?
20180217 06:38:11< vultraz> we're speaking of std bind here
20180217 06:38:21< celmin|sleep> std::bind is boost::bind pretty much
20180217 06:38:26< vultraz> ad we don't use phoenix
20180217 06:38:57< celmin|sleep> boost::phoenix was tucked into Boost.Spirit for some reason but was really more of a lambdas library, from before lambdas were natively supported.
20180217 06:39:21< celmin|sleep> And IIRC it did (does?) support stuff like what you said.
20180217 06:39:29< celmin|sleep> So it's possible. :P
20180217 06:39:31< vultraz> also idon't really know the difference between boost::phoenix, boost::spirit, boost::mpl, and boost::mp1
20180217 06:39:45< celmin|sleep> Spirit is a generic parsing library.
20180217 06:39:55< vultraz> mp11*
20180217 06:39:55< celmin|sleep> In a way, the inverse of iostreams.
20180217 06:40:36< vultraz> anyway, I'm pondering
20180217 06:40:54< vultraz> listbox::register_sorting_option
20180217 06:40:55< celmin|sleep> Phoenix is, as I mentioned, a lambdas library - an alternative to Boost.Lambda, basically.
20180217 06:41:30< vultraz> 		set_column_order(col, {{
20180217 06:41:30< vultraz> 			[f](int lhs, int rhs) { return f(lhs) < f(rhs); },
20180217 06:41:30< vultraz> 			[f](int lhs, int rhs) { return f(lhs) > f(rhs); }
20180217 06:41:30< vultraz> 		}});
20180217 06:41:37< celmin|sleep> MPL is something like "Meta-programming library" - it has all sorts of templates and stuff that are useful for things like type traits.
20180217 06:41:51< vultraz> ah, wait
20180217 06:41:58< vultraz> I think I see the answer to my problem right now
20180217 06:42:04< celmin|sleep> I guess MP11 is an updated version of MPL? I hadn't heard of it before now.
20180217 06:42:15< vultraz> celmin|sleep: mp11 is new in 1.66
20180217 06:43:05< celmin|sleep> I don't know what Boost accepted two different libraries that basically do the same thing though (Lambda and Phoenix).
20180217 06:43:08< celmin|sleep> ^why
20180217 06:43:18< celmin|sleep> Maybe Phoenix was kinda smuggled in with Spirit or something.
20180217 06:43:23< vultraz> we should update our use of MPL to MP11
20180217 06:43:38< celmin|sleep> (I think it's documentation was originally subsidiary to the Spirit documentation.)
20180217 06:43:47< celmin|sleep> I wouldn't bother updating the MPL until after the release.
20180217 06:43:54< vultraz> yes
20180217 06:44:00< celmin|sleep> ^its
20180217 06:44:03< vultraz> bool can't be sorted with < can it?
20180217 06:44:10< vultraz> ie, < is meaningless for bool?
20180217 06:44:14< celmin|sleep> You'd think I'm tired or something. >_>
20180217 06:44:21< celmin|sleep> Huh, that's a good question...
20180217 06:45:12< celmin|sleep> $ clang++ -x c++ -
20180217 06:45:13< celmin|sleep> bool a = true, b = false;
20180217 06:45:14< celmin|sleep> bool c = a < b;
20180217 06:45:16< celmin|sleep> Undefined symbols for architecture x86_64:
20180217 06:45:17< celmin|sleep>   "_main", referenced from:
20180217 06:45:19< celmin|sleep>       start in crt1.10.6.o
20180217 06:45:20< celmin|sleep> ld: symbol(s) not found for architecture x86_64
20180217 06:45:21< celmin|sleep> clang: error: linker command failed with exit code 1 (use -v to see invocation)
20180217 06:45:39< celmin|sleep> (That appears to be a "yes it's allowed".)
20180217 06:45:55< vultraz> I guess it doesn't matter for this case
20180217 06:46:02< vultraz> i'll specify the template for bool
20180217 06:46:40< celmin|sleep> I'd guess that false < true and !(true < false) hold, but I really don't know. I'm not even sure the behaviour is actually specified.
20180217 06:49:32< vultraz> celmin|sleep: when are you supposed to give a default template argument?
20180217 06:49:41< celmin|sleep> Uhhh. What?
20180217 06:49:55< vultraz> ie
20180217 06:50:00< celmin|sleep> The only possible place you can give a default template argument is in the template declaration.
20180217 06:50:10< vultraz> when are you supposed to do template<typename T = some_type>
20180217 06:50:18< celmin|sleep> eg, template<int = 3>
20180217 06:50:20< vultraz> vs template<> some_type()
20180217 06:50:30< celmin|sleep> template<> is a full specialization.
20180217 06:50:35< vultraz> ah
20180217 06:50:55< celmin|sleep> ...template<> some_type()? Specializing a constructor are we?
20180217 06:51:10< vultraz> nah
20180217 06:51:20< celmin|sleep> Well that's what that specific exact syntax would mean.
20180217 06:51:25< vultraz> celmin|sleep: is this correct, then? https://pastebin.com/pNTx5bcw
20180217 06:51:46< celmin|sleep> IIRC, it's not.
20180217 06:51:50< vultraz> (not sure if lhs should come first in first call in the latter overload)
20180217 06:52:05< celmin|sleep> When specializing a function you need to specify template parameters after the function name.
20180217 06:52:26< celmin|sleep> Assuming you're even allowed to specialize a function.
20180217 06:52:52< celmin|sleep> (A partial specialization occurs when you have both template parameters in the template<> and template arguments specified after the name.)
20180217 06:53:03< vultraz> what?
20180217 06:53:22< celmin|sleep> In this case I think you don't need the second one to be a template at all; just let function overload resolution take care of it.
20180217 06:53:24< vultraz> ah..
20180217 06:53:32< vultraz> ok
20180217 06:54:11< celmin|sleep> Worst-case you might have to enable_if the template to exclude bool, but... that shouldn't be necessary from what I understand of the standard (which admittedly might be a little outdated now, but we are on C++11 still so not too much).
20180217 06:55:07< celmin|sleep> IIRC you're not allowed to specialize function templates, but I can't quite remember; maybe one of the two specialization types is allowed.
20180217 06:55:28< celmin|sleep> (If specializations are allowed the syntax would be template<> void register_sorting_option<bool>(...))
20180217 06:55:32< vultraz> just remembered i needed the first func to only have 1 argument
20180217 06:56:11< celmin|sleep> Why does the bool one have the the same functor twice
20180217 06:56:22< vultraz> different parameter order
20180217 06:56:27< celmin|sleep> Oh, huh.
20180217 06:56:56< vultraz> dunno of lhs, rhs should come first though
20180217 06:56:57< celmin|sleep> Also they can only sort integers?
20180217 06:57:19< vultraz> there's a usecase here that has rhs first https://github.com/wesnoth/wesnoth/blob/master/src/gui/dialogs/unit_recall.cpp#L240-L243
20180217 06:57:22< vultraz> so i copied that
20180217 06:57:23< celmin|sleep> I'd assume you want the order to be the same as for the template case, which would mean swapping them in the bool case.
20180217 06:57:36< vultraz> celmin|sleep: the ints are the row indices 
20180217 06:57:53< celmin|sleep> Ooookay then?
20180217 06:58:02< celmin|sleep> Hmm, I see what you mean there.
20180217 06:58:43< vultraz> so with my new method, this should be allowed
20180217 06:58:44< vultraz> list.register_sorting_option(1, [this](const int i1, const int i2) { return unit_recall_default_compare(recall_list_[i1], recall_list_[i2]); });
20180217 06:59:10< celmin|sleep> But maybe swap i1 and i2 if that's the desired behaviour.
20180217 06:59:28< vultraz> hm?
20180217 06:59:32< celmin|sleep> Because I really thing that, for consistency, the bool function should do f(lhs, rhs) and then f(rhs, lhs).
20180217 06:59:38< vultraz> ok
20180217 07:00:01< celmin|sleep> Because the non-bool function is doing less(f(lhs), f(rhs)) and then less(f(rhs), f(lhs))
20180217 07:00:08< celmin|sleep> ^think
20180217 07:00:30< vultraz> blah
20180217 07:00:32< vultraz> Severity	Code	Description	Project	File	Line	Suppression State
20180217 07:00:32< vultraz> Error	C2664	'void gui2::listbox::register_sorting_option(const int,std::function<bool (int,int)>)': cannot convert argument 2 from 'gui2::dialogs::game_load::pre_show::<lambda_d8818faa224c41a9e8a1187bf72383b8>' to 'std::function<bool (int,int)>'	wesnoth	C:\Users\exodi\Documents\wesnoth\src\gui\dialogs\game_load.cpp	143	
20180217 07:00:41< celmin|sleep> Fun!
20180217 07:00:54< celmin|sleep> What was the lambda again
20180217 07:01:07< vultraz> [this](const int i) { return games_[i].name(); }
20180217 07:01:55< vultraz> and the second parameter is std::function<Ret(const int)>
20180217 07:01:57< celmin|sleep> I really think there's no point in making int parameters const, but anyway... uhh... obviously that can't be converted to bool(int,int)?
20180217 07:02:14< vultraz> it's not supposed to be
20180217 07:02:18< celmin|sleep> I mean it's a string(int) or something.
20180217 07:02:38< vultraz> this is an error with registering an option that should go to overload 1
20180217 07:02:47< celmin|sleep> Right.
20180217 07:03:04< vultraz> the const is to clarify it's an index
20180217 07:03:58< celmin|sleep> Did you remember to change function<Ret(int,int)> to function<Ret(int)>?
20180217 07:04:20< celmin|sleep> You had that error in the first overload in the paste.
20180217 07:04:24< vultraz> https://pastebin.com/F7QnaBYy
20180217 07:04:52< vultraz> for some reason it keeps trying to resolve it with the second overload..
20180217 07:04:58< celmin|sleep> I think instead of template<typename Ret> void regblabla(int col, function<Ret(int)> f)
20180217 07:05:20< celmin|sleep> It might be better for overload resolution to do template<typename Fcn> void foo(int col, const Fcn& f)
20180217 07:05:40< vultraz> like before?
20180217 07:05:47< celmin|sleep> I suspect that with the std::function it can't tell that the template could potentially accept the lambda and thus overlooks it.
20180217 07:06:13< celmin|sleep> The constraint of needing to take an int and return something comparable is encoded into the body of the function already.
20180217 07:06:19< celmin|sleep> Well okay, it's not quite.
20180217 07:06:43< celmin|sleep> With typename Fcn it could take something other than an int, too, theoretically.
20180217 07:06:55< celmin|sleep> Unless of course that conflicts with the definition of set_column_order.
20180217 07:06:56< vultraz> I suppose
20180217 07:06:59< celmin|sleep> So maybe it is encoded in.
20180217 07:07:01< celmin|sleep> ANYWAY
20180217 07:07:30< celmin|sleep> My point is that template resolution can be kinda picky, so making the type parameter the full function type might fix this.
20180217 07:07:51< vultraz> it does! \o]
20180217 07:08:17< vultraz> oh wait
20180217 07:08:20< celmin|sleep> I guess the second could also be templated as a slight optimization, but meh, probably not much point really.
20180217 07:08:31< celmin|sleep> Oh wait what now
20180217 07:09:31< vultraz> 1>C:\Users\exodi\Documents\wesnoth\src\gui/widgets/listbox.hpp(264): error C2064: term does not evaluate to a function taking 1 arguments (compiling source file ..\..\src\gui\dialogs\unit_recall.cpp)
20180217 07:10:00< celmin|sleep> Is that the registration line or inside the template
20180217 07:10:16< vultraz> it's pointing inside the template
20180217 07:10:30< celmin|sleep> So the term that doesn't evaluate is... f?
20180217 07:10:58< celmin|sleep> Okay, so next is... which registration does the template backtrace point to?
20180217 07:10:59< vultraz> yes
20180217 07:11:14< vultraz> it tries to register the special case
20180217 07:11:22< vultraz> 	list.register_sorting_option(1, [this](const int i1, const int i2) { return unit_recall_default_compare(recall_list_[i1], recall_list_[i2]); });
20180217 07:11:25< celmin|sleep> So basically it's the opposite of the previous problem?
20180217 07:11:26< vultraz> with the templated function
20180217 07:12:05< celmin|sleep> I dunno, my experience with MSVC and templates has been that it's even pickier about them than other compilers... but maybe it'll work if both functions are templated?
20180217 08:01:02-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has joined #wesnoth-dev
20180217 09:01:51-!- Oebele [~quassel@143.177.58.202] has joined #wesnoth-dev
20180217 09:09:03-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 09:09:09-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 09:16:34< irker512> wesnoth: pentarctagon wesnoth:master ee1a56a04a50 / .travis.yml cmake_mtime_crc.py docker/Dockerfile-travis docker_run.sh: Use ccache with cmake on travis. https://github.com/wesnoth/wesnoth/commit/ee1a56a04a50ad858f3af412ab2d868228a707e6
20180217 09:16:36< irker512> wesnoth: pentarctagon wesnoth:master c2bc40fbf942 / docker/ (Dockerfile-base Dockerfile-travis): Add ccache to the base dockerfile. https://github.com/wesnoth/wesnoth/commit/c2bc40fbf942decb392a582b1f8d31ef7092131f
20180217 09:22:24< matthiaskrgr> oh nice 
20180217 09:41:27-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 09:41:33-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 09:51:28< irker512> wesnoth: Jyrki Vesterinen wesnoth:master 551508b9c992 / changelog src/game_events/action_wml.cpp: Fix #1516: units created with [move_units_fake] disappear between steps https://github.com/wesnoth/wesnoth/commit/551508b9c992a4fbbfa2b7336195d54bce732c25
20180217 10:00:20< irker512> wesnoth: Charles Dang wesnoth:master 0ef8ee70ed46 / src/gui/widgets/ (listbox.cpp listbox.hpp): GUI2/Listbox: added sorting option register helper for translatable string sorti https://github.com/wesnoth/wesnoth/commit/0ef8ee70ed46a2752f0c48e86da3c236f93e2b02
20180217 10:00:23< irker512> wesnoth: Charles Dang wesnoth:master 3101b9cfbdbb / src/gui/ (5 files in 2 dirs): Switched various relevant dialog sorting options to respect translations. https://github.com/wesnoth/wesnoth/commit/3101b9cfbdbbc3a1e9943b6053dd56f860fc92da
20180217 10:21:05-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20180217 10:21:25-!- travis-ci [~travis-ci@ec2-54-224-67-202.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 10:21:26< travis-ci> wesnoth/wesnoth#16512 (master - c2bc40f : pentarctagon): The build passed.
20180217 10:21:26< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/342688623
20180217 10:21:26-!- travis-ci [~travis-ci@ec2-54-224-67-202.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 10:38:35-!- travis-ci [~travis-ci@ec2-50-19-53-96.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 10:38:36< travis-ci> wesnoth/wesnoth#16513 (master - 551508b : Jyrki Vesterinen): The build passed.
20180217 10:38:36< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/342694803
20180217 10:38:36-!- travis-ci [~travis-ci@ec2-50-19-53-96.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 10:49:47-!- travis-ci [~travis-ci@ec2-54-224-67-202.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 10:49:48< travis-ci> wesnoth/wesnoth#16514 (master - 3101b9c : Charles Dang): The build passed.
20180217 10:49:48< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/342696424
20180217 10:49:48-!- travis-ci [~travis-ci@ec2-54-224-67-202.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 11:23:35< irker512> wesnoth/wesnoth:master Charles Dang 1196225017 Fix my fix to my fix to my fix to the we AppVeyor: All builds passed
20180217 11:26:10-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has quit [Quit: .]
20180217 11:27:02-!- travis-ci [~travis-ci@ec2-54-224-67-202.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 11:27:03< travis-ci> Pentarctagon/wesnoth#162 (master - c2bc40f : pentarctagon): The build passed.
20180217 11:27:03< travis-ci> Build details : https://travis-ci.org/Pentarctagon/wesnoth/builds/342700542
20180217 11:27:03-!- travis-ci [~travis-ci@ec2-54-224-67-202.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 11:45:40-!- heirecka [~heirecka@exherbo/developer/heirecka] has quit [Excess Flood]
20180217 11:45:52-!- heirecka [~heirecka@exherbo/developer/heirecka] has joined #wesnoth-dev
20180217 11:56:00-!- lobby_ [~wesnoth@wesnoth/bot/lobby] has joined #wesnoth-dev
20180217 11:56:00-!- Topic for #wesnoth-dev: 1.13.11 tagged, releasing “soon” | String freeze in effect on master | 1.13.12 (1.14 RC 1) scheduled for Sunday, March 11th 00:01 UTC | Wesnoth Developers Channel | >>> Want to help? Go here: https://r.wesnoth.org/t42911 (and thanks!) <<< | Discord Server: https://discord.gg/battleforwesnoth | Logs: http://irclogs.wesnoth.org | Bug tracker: https://bugs.wesnoth.org
20180217 11:56:00-!- Topic set by vultraz [uid24821@wesnoth/developer/vultraz] [Tue Feb 13 00:33:25 2018]
20180217 11:56:00[Users #wesnoth-dev]
20180217 11:56:00[ aeth        ] [ Coffee_irc     ] [ higgins    ] [ matthiaskrgr] [ pydsigner  ] [ TheJJ      ] 
20180217 11:56:00[ AI0867      ] [ commavir       ] [ irker512   ] [ midzer      ] [ Ravana_    ] [ timotei_   ] 
20180217 11:56:00[ aidanhs     ] [ crimson_penguin] [ Ivanovic   ] [ minzbonbon  ] [ Rhonda     ] [ vincent_c  ] 
20180217 11:56:00[ APic        ] [ DDR            ] [ iwaim___   ] [ new_one     ] [ shadowm    ] [ vn971      ] 
20180217 11:56:00[ Appleman1234] [ elias          ] [ janebot    ] [ nore        ] [ Soliton    ] [ vultraz    ] 
20180217 11:56:00[ atarocch    ] [ EliDupree      ] [ Jetrel_bot ] [ nurupo      ] [ stikonas   ] [ wedge009   ] 
20180217 11:56:00[ Bonobo      ] [ esr            ] [ lobby_     ] [ Oebele      ] [ syrma[m]   ] [ Yaiyan     ] 
20180217 11:56:00[ celmin|sleep] [ Gambit         ] [ loonycyborg] [ oldlaptop   ] [ TadCarlucci] [ zacklocx[m]] 
20180217 11:56:00[ ChipmunkV[m]] [ heirecka       ] [ madmax28   ] [ Polsaker    ] [ TC01       ] [ zookeeper  ] 
20180217 11:56:00-!- Irssi: #wesnoth-dev: Total of 54 nicks [0 ops, 0 halfops, 0 voices, 54 normal]
20180217 11:56:00-!- Home page for #wesnoth-dev: https://www.wesnoth.org
20180217 11:56:04-!- Channel #wesnoth-dev created Tue Jan 27 05:28:41 2009
20180217 11:57:01-!- Irssi: Join to #wesnoth-dev was synced in 75 secs
20180217 12:00:13-!- Netsplit *.net <-> *.split quits: Coffee_irc
20180217 12:00:31-!- Netsplit *.net <-> *.split quits: AI0867
20180217 12:01:27-!- Netsplit over, joins: Coffee_irc
20180217 12:31:55-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has joined #wesnoth-dev
20180217 12:40:59-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 12:41:06-!- janebot_ [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 12:41:10-!- janebot_ is now known as janebot
20180217 13:03:38-!- vultraz [uid24821@wesnoth/developer/vultraz] has quit [Quit: Connection closed for inactivity]
20180217 13:20:04< irker512> wesnoth/wesnoth:master Charles Dang 72a80fed5b Removed GUI_NORMAL__RESOLUTION macro AppVeyor: All builds passed
20180217 13:32:33-!- vultraz [uid24821@wesnoth/developer/vultraz] has joined #wesnoth-dev
20180217 13:55:57-!- octalot [~steve@178.165.131.48.wireless.dyn.drei.com] has joined #wesnoth-dev
20180217 14:04:57-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 14:05:03-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 14:29:24< irker512> wesnoth/wesnoth:master Charles Dang 3101b9cfbd Switched various relevant dialog sorting AppVeyor: vs2017/Debug Failed
20180217 14:29:25< irker512> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-1179
20180217 14:57:26-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 14:57:32-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 14:58:59-!- Bonobo [~Bonobo@61.68.156.44] has quit [Ping timeout: 260 seconds]
20180217 15:01:08-!- Oebele [~quassel@143.177.58.202] has quit [Remote host closed the connection]
20180217 15:31:48< irker512> wesnoth/wesnoth:master V N 6f817f3b18 addon_manager: allow uploading . dir AppVeyor: All builds passed
20180217 16:33:37-!- vultraz [uid24821@wesnoth/developer/vultraz] has quit [Quit: Connection closed for inactivity]
20180217 16:35:39-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has joined #wesnoth-dev
20180217 16:46:24< irker512> wesnoth/wesnoth:master Charles Dang 3101b9cfbd Switched various relevant dialog sorting AppVeyor: 1/6 builds failed
20180217 16:46:25< irker512> Details vs2017/Debug: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-1179
20180217 16:54:29-!- DeFender1031 [~DeFender1@dsl217-132-38-129.bb.netvision.net.il] has joined #wesnoth-dev
20180217 17:14:30-!- celmin|sleep is now known as celticminstrel
20180217 17:28:10< celticminstrel> Gonna try an Xcode build just to see if it works. If I get any compile errors I'll give up immediately.
20180217 17:28:22< celticminstrel> (If I get link errors only, I'll probably try to solve them.)
20180217 17:30:59< celticminstrel> Apparently I last pulled sometime around 1.13.8.
20180217 17:32:21< celticminstrel> Does anyone know what's the difference between A..B and A...B in git?
20180217 17:32:27< celticminstrel> And swapping A and B in both.
20180217 17:32:33< celticminstrel> (Two dots vs three dots.)
20180217 17:33:02< celticminstrel> "git log FETCH_HEAD..master" shows only one commit, does that mean that's the only commit I have that was never pushed to master?
20180217 17:36:18< celticminstrel> Looks like its parent commit is up on github, so I guess that's indeed what it means.
20180217 17:37:39< celticminstrel> It's a commit fixing some typos in the changelog... kinda hope someone else spotted and fixed them...
20180217 17:37:52< celticminstrel> The 1.13.9 changelog, to be clear.
20180217 17:41:36< shadowm> I wasn't even aware that there was a three dots syntax so no idea.
20180217 17:44:57< irker512> wesnoth/wesnoth:master V N 44266615f4 addon_manager: allow uploading . dir AppVeyor: All builds passed
20180217 17:46:13< pydsigner> Double dots (A..B) is the commits in B but not in A
20180217 17:47:24< pydsigner> I wasn't aware of the triple-dot syntax either, but apparently it's a symmetric version of the double-dots; A...B selects both the commits in B but not in A, and the commits in A but not in B.
20180217 17:47:31< pydsigner> So basically XOR.
20180217 17:47:44< pydsigner> celticminstrel: ^
20180217 17:48:11< pydsigner> https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#_double_dot
20180217 17:48:33< pydsigner> https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#_triple_dot
20180217 17:49:42 * shadowm suddenly understands everything.
20180217 17:50:10< shadowm> Not really, but I think I get the gist of it but don't see exactly where it would come in handy.
20180217 17:51:41< pydsigner> And that's why neither of knew about it ¯\_(ツ)_/¯
20180217 17:51:45< pydsigner> * of us
20180217 17:52:40< celticminstrel> Okay, so A...B = B...A = A..B+B..A, apart from + not being an existing syntax.
20180217 18:05:26< DeFender1031> ↑...↑...↓...↓...←...→...←...→...B...A...start?
20180217 18:05:27< celticminstrel> ...okay so it can't find any of the Boost headers.
20180217 18:05:45< celticminstrel> Not a very good start.
20180217 18:07:38< celticminstrel> Oh, maybe because Xcode 4 doesn't have the built-in system headers setting.
20180217 18:14:04< celticminstrel> Getting some bizarre errors about IO read failure because an intermediate file it's expecting apparently doesn't exist...
20180217 18:14:45< celticminstrel> Ohhh, I have no space left on disk.
20180217 18:14:56< celticminstrel> Haha, zero bytes available. XD Wow.
20180217 18:15:23< celticminstrel> Okay, I actually have two copies of the repo (a 1.13 copy and a 1.12 copy), so I can delete one of them to free up space.
20180217 18:16:50< vn971> celticminstrel: note that if you want separate copies, you can `git clone` one of them to produce the other, which will automatically create hardlinks for immutable data if dirs are on the same partition. (Automatically by git.)
20180217 18:17:01< celticminstrel> ...really?
20180217 18:17:12< DeFender1031> that doesn't sound correct to me.
20180217 18:17:15< vn971> celticminstrel: sure.
20180217 18:17:27< celticminstrel> I think I used some kinda git work tree thing or something to make the copy.
20180217 18:17:36< DeFender1031> if that's the case, it's not a clone. Editing one will edit the other, defeating the purpose of HAVING a clone.
20180217 18:17:51< celticminstrel> DeFender1031: Maybe he means for the actual commit data.
20180217 18:18:03< celticminstrel> Which is kinda imutable.
20180217 18:18:06< DeFender1031> ohhhh
20180217 18:18:11< DeFender1031> that might be.
20180217 18:18:33< vn971> DeFender1031: celticminstrel: check out `man git-clone`. It has --no-hardlinks  key for example.
20180217 18:19:42< DeFender1031> yeah, just checked, it only hard-links git config, db, and metadata files, not source files.
20180217 18:20:21< vn971> DeFender1031: which is basically everything in .git directory. So in practical terms you avoid copying the .git dir, and that's it.
20180217 18:20:28< DeFender1031> right
20180217 18:20:30< DeFender1031> that makes sense
20180217 18:35:14< celticminstrel> But the .git dirs are probably the majority of the size.
20180217 18:35:16-!- tomreyn_ [~tomreyn@200116b842df5500e55635a962165fa9.dip.versatel-1u1.de] has joined #wesnoth-dev
20180217 18:37:04< octalot> instead of two clones and messing with hard links, there's now 'git worktree', which lets you have one repo and two separate branches checked out in different directories
20180217 18:37:35< octalot> that also means that both branches are visible in one instance of gitk, without having to pull or push between them
20180217 18:41:11< octalot> if celticminstrel used that, one of the worktrees will have a .git directory, and the other will have a text file called .git that contains "gitdir: path/to/other/dir"
20180217 18:41:42< octalot> And deleting the one that's a directory will delete all the data of both repos
20180217 18:44:24-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has quit [Quit: Connection closed for inactivity]
20180217 19:22:40-!- travis-ci [~travis-ci@ec2-54-205-233-71.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 19:22:41< travis-ci> Pentarctagon/wesnoth#163 (docker-rm-unneeded - 3101b9c : Charles Dang): The build passed.
20180217 19:22:41< travis-ci> Build details : https://travis-ci.org/Pentarctagon/wesnoth/builds/342812827
20180217 19:22:41-!- travis-ci [~travis-ci@ec2-54-205-233-71.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 19:26:40< vn971> octalot: there's no "messing with hardlinks", just a `git clone` command, which does everything by itself by default.
20180217 19:31:40-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 19:31:50-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 20:03:11-!- vn971 [~vasya@94.158.103.15] has quit [Ping timeout: 248 seconds]
20180217 20:21:56< celticminstrel> Yeah, I think I used that worktree command.
20180217 20:22:55< celticminstrel> Still, in the case of Wesnoth the actual contents of the working directory are also fairly large, so it was indeed worth it to delete the 1.12 copy.
20180217 20:23:10< celticminstrel> Looks like I have 12 compile errors. Not bad, all things considered.
20180217 20:24:04< celticminstrel> Some of those compile errors are deprecated OpenSSL functions.
20180217 20:24:21< celticminstrel> Some are in SDLMain where someone used something that doesn't exist in the 10.8 SDK.
20180217 20:24:33< celticminstrel> And two are mysterious missing assignment operators in <memory> or something.
20180217 20:25:46< celticminstrel> Oh interesting, the deprecations are errors in wesnothd, but the exact same deprecations also appear as warnings in wesnoth.
20180217 20:28:17< celticminstrel> ...hmm.
20180217 20:32:37< celticminstrel> (I forget, does hrubymar come around IRC?)
20180217 20:33:45< celticminstrel> (Oh wow my libcrypto was 0.9.8, not evne 1.0.)
20180217 20:33:48< celticminstrel> ^even
20180217 20:35:00< celticminstrel> Okay now I've got link errors for ever SDL function and every boost function.
20180217 20:35:24< celticminstrel> I think I'll try a scons build, see if I have more luck with it.
20180217 20:36:29< celticminstrel> Well.
20180217 20:36:44< celticminstrel> I guess something's broken in my setup, because it can't even find <type_traits>.
20180217 20:39:10< celticminstrel> Trying to find where the scons options are saved because editing the file is easier than setting them on the commandline...
20180217 20:39:35< JyrkiVesterinen> IIRC, it's .scons-option-cache
20180217 20:40:02< celticminstrel> Ah, the dot was what I was missing.
20180217 20:40:55< celticminstrel> Uhh. Ths miiiight be a problem. >_>
20180217 20:40:56< celticminstrel> Checking whether C++ compiler works (g++ version >= 4.8 required)... no
20180217 20:42:13< celticminstrel> ...though bizarrely it then goes on to actually compile things.
20180217 20:42:49< celticminstrel> Currently working. Will probably take awhile to complete.
20180217 20:45:20-!- irker512 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout]
20180217 20:52:14< celticminstrel> Okay, that didn't work either. I give up. I'll just go ahead and merge the PR, I guess.
20180217 20:52:32-!- irker382 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20180217 20:52:32< irker382> wesnoth: Sofartin wesnoth:master 24d113d47317 / projectfiles/Xcode/ (Fix_Xcode_Dependencies Wesnoth.xcodeproj/project.pbxproj): Add missing files to Xcode project and include systeml libraries as absolute pat https://github.com/wesnoth/wesnoth/commit/24d113d47317334e9ad6380b2aa000c17fd5e8cd
20180217 20:52:32< irker382> wesnoth: Celtic Minstrel wesnoth:master cafb650a126f / projectfiles/Xcode/ (Fix_Xcode_Dependencies Wesnoth.xcodeproj/project.pbxproj): Merge pull request #2504 from hrubymar10/Update_Xcode_project https://github.com/wesnoth/wesnoth/commit/cafb650a126f909ed6e48a7706e1c6aa4d0164c7
20180217 20:52:58< celticminstrel> Pretty sure there should be one more commit? Well whatever.
20180217 20:54:21-!- hrubymar10 [~textual@ip-86-49-9-122.net.upcbroadband.cz] has joined #wesnoth-dev
20180217 21:12:47-!- travis-ci [~travis-ci@ec2-54-205-233-71.compute-1.amazonaws.com] has joined #wesnoth-dev
20180217 21:12:48< travis-ci> wesnoth/wesnoth#16515 (master - cafb650 : Celtic Minstrel): The build was broken.
20180217 21:12:48< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/342838899
20180217 21:12:48-!- travis-ci [~travis-ci@ec2-54-205-233-71.compute-1.amazonaws.com] has left #wesnoth-dev []
20180217 21:15:03-!- vultraz [uid24821@wesnoth/developer/vultraz] has joined #wesnoth-dev
20180217 21:22:45< celticminstrel> ...
20180217 21:23:31< vultraz> nani?
20180217 21:24:01< celticminstrel> Just merged the Xcode PR and suddenly the build is broken. :/
20180217 21:25:02< vultraz> c'est la vie
20180217 21:30:55-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has quit [Quit: .]
20180217 21:34:10< hrubymar10> This travis error is not related to updated Xcode project
20180217 21:34:16< hrubymar10> Linux build failed
20180217 21:37:43< vultraz> build not failing for me
20180217 21:39:16< hrubymar10> to be exact, travis build dodn't failed. Tests failed for one of the linux
20180217 21:39:35< celticminstrel> Ah.
20180217 21:40:04< celticminstrel> Well, it's actually impossible for an Xcode change to cause Travis to fail, since its Mac build runs scons.
20180217 21:41:22< hrubymar10> yes :D
20180217 21:41:46< hrubymar10> can travis do xcodebuild btw?
20180217 21:42:58< celticminstrel> I think it can actually.
20180217 21:44:38< hrubymar10> do you know how scons' travis obtain headers and dylibs?
20180217 21:45:23< celticminstrel> https://github.com/wesnoth/wesnoth/blob/master/utils/travis/install_deps.sh#L5
20180217 21:47:16< hrubymar10> homebrew? wow... like mine fix_xcode_script :D
20180217 21:47:35< celticminstrel> Yup.
20180217 21:48:21< hrubymar10> Who is responsible for travis? Can we have Xcode travis? Is it problem?
20180217 21:49:01< celticminstrel> I had considered making an Xcode travis. Can't remember why I didn't, maybe just because I didn't want to do the work.
20180217 21:49:16< celticminstrel> There is also the fact that the Mac builds seem to have a tendency to be slower.
20180217 21:49:33< hrubymar10> work like updating Xcode project?
20180217 21:49:37< hrubymar10> slower to build?
20180217 21:49:52< celticminstrel> Like, I've often seen builds where all the Linux builds are completed but the Mac build is still going (or possibly hasn't even started in some cases).
20180217 21:50:19< celticminstrel> Oh yeah, updating the Xcode project is a big thing; if we don't have regular, timely Xcode updates, the Xcode build on Travis would have to be marked as "can fail" or whatever.
20180217 21:51:05< hrubymar10> I get it but btw last time was osx the fastest 😃 https://travis-ci.org/wesnoth/wesnoth
20180217 21:51:09< celticminstrel> Anyone who wants to put in the work could add a build, since it just amounts to commiting stuff to travis.yml and possibly scripts under utls/travis
20180217 21:51:18< celticminstrel> I dunno, maybe they fixed something and now it's not slow.
20180217 21:52:43< hrubymar10> so travis build target can bbe added just using PR to https://github.com/wesnoth/wesnoth/blob/master/.travis.yml ?
20180217 21:55:59< celticminstrel> Pretty much.
20180217 22:01:53< hrubymar10> Well, thank you celticminstrel . I'll try dig around it
20180217 22:08:05-!- octalot [~steve@178.165.131.48.wireless.dyn.drei.com] has quit [Ping timeout: 240 seconds]
20180217 22:08:57-!- octalot [~steve@77.119.128.116.wireless.dyn.drei.com] has joined #wesnoth-dev
20180217 22:46:03-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20180217 22:47:23-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20180217 23:02:33-!- Oebele [~quassel@143.177.58.202] has joined #wesnoth-dev
20180217 23:09:45-!- hrubymar10 [~textual@ip-86-49-9-122.net.upcbroadband.cz] has quit [Quit: hrubymar10]
20180217 23:12:41< irker382> wesnoth/wesnoth:master Celtic Minstrel cafb650a12 Merge pull request #2504 from hrubymar10 AppVeyor: vs2017/Debug Failed
20180217 23:12:42< irker382> Details: https://ci.appveyor.com/project/wesnoth/wesnoth-605wt/build/Wesnoth-VS2017-master-1180
20180217 23:25:21-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20180217 23:25:28-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20180217 23:36:20< vultraz> celticminstrel: 
20180217 23:36:30< vultraz> celticminstrel: is a prompt before F5 reloading in the editor enough?
20180217 23:36:46< vultraz> though... it might need Additional Strings :|
20180217 23:37:54< celticminstrel> vultraz: It's sufficient, but obviously only if you can scrounge it together from existing strings.
20180217 23:38:22< celticminstrel> Just FTR, if you have to hack in a "#textdomain wesnoth" in the GUI definition file for that to work, that's fine.
20180217 23:38:41< vultraz> it's Not Possible
20180217 23:38:52< celticminstrel> I say this because some of the quit confirmation messages (which IIRC in C++, thus in wesnoth-lib) could work.
20180217 23:39:15< celticminstrel> (I mean not wesnoth-lib, just wesnoth. Whoops.)
20180217 23:39:22< celticminstrel> (Also missed "are".(
20180217 23:39:23< celticminstrel> )
20180217 23:39:54< vultraz> I wish i had thought of this before 1.13.11
20180217 23:40:02< vultraz> oh well, it will have to wait
20180217 23:41:29< celticminstrel> TBH the other type of solution would be preferable - don't actually close the editor just to reload the data.
20180217 23:41:45< vultraz> also impossible
20180217 23:41:53< celticminstrel> Not impossible.
20180217 23:53:03< celticminstrel> Probably going to unassign myself from some issues at some point.
--- Log closed Sun Feb 18 00:00:12 2018