[Monotone-devel] invalid author and committer values produced by git export
http://savannah.nongnu.org/bugs/?28372 Apparently author names that don't match the "Name " format are imported ok by git but the resulting repo has some sort of problems, although I don't have any details on the nature of the problems. Currently we grab both the value of the author cert and the key that signed the author cert. The value is to be used as the git author and the key name is to be used as the git committer. Both of these are looked up in the author map to see if the user has specified replacement values that should be used in the exported data. If no replacements have been specified both the author and committer are checked to see if they contain '<' and '>' characters and if neither are present they are wrapped in these characters. This produces names that lack the "Name " before the "" and apparently causes problems. If I remember right, there was once some interest in an option to require these values to exist in the author map file avoiding any automated doctoring of the author and committer values or failing if unmapped values exist. Having this might be one way to deal with the above problem. Reasonable suggestions for what to call such an option are welcome. I can't think of anything catchy. Another solution is to do more comprehensive checks on the author and committer values if they don't exist in the author map file, such as the following: If the value doesn't contain < and > characters - replace "foo" with "foo " if no "@" character exists - replace "f...@bar" with "foo " If the value begins with '<' and ends with '>' - replace "" with "foo " if no "@" character exists - replace "" with "foo " Maybe these adjustments should be done in a lua hook that can be customized if needed. Finally, ensure that the resulting values match a valid git name regex, something like "^[^<]* <[^>]*>$" and fail if they don't. This could check values coming from the author map in addition to values constructed by the replacements above or could apply only to the automated replacements. Again, maybe this regex should come from a lua hook or perhaps the entire validity check should be done by a lua hook, either of which can be customized. Comments? Cheers, Derek ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Stalled server
On 1/6/2010 8:17 AM, Timothy Brownawell wrote: On 1/6/2010 7:21 AM, Richard Levitte wrote: Since about a week, I've run a debug variant of the server on monotone.ca... It stalled today with the following backtrace: When we get a new connection, it does get set non-blocking but we also tell netxx to give it a long timeout, which it does by select()ing on it. So apparently we get a spurious 'writeable' from the main select() loop, and then the select() when trying to write times out. This should be fixed in 8af10f7c168459e83c2076fedcf5bd2a582143a3, don't know a good way to test. ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Time for a release
*ahem* I have ficed the problem in 5a498d0437f0da74ae49380ef561b948db1a056a The next upgrade will contain the change. Now, all that's needed is for the Debian installer to update /etc/monotone/hooks.lua properly. In message on Wed, 6 Jan 2010 11:46:49 -0800, Zack Weinberg said: zackw> I'd like to draw people's attention to Debian bug 559893: zackw> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559893 zackw> zackw> This is, at root, a problem with contrib/get_passphrase_from_file.lua, zackw> which was never updated for the keys-by-hash changes. I doubt I will zackw> have time to look at this before your proposed release [my time to zackw> work on monotone is extremely limited these days] but it would be zackw> really nice if it could get fixed. zackw> zackw> It doesn't appear to me that the hook documentation was properly zackw> updated for keys-by-hash either. zackw> zackw> zw zackw> zackw> On Wed, Jan 6, 2010 at 5:20 AM, Thomas Keller wrote: zackw> > zackw> > Hey there! zackw> > zackw> > As I have announced earlier on IRC I plan to release monotone 0.46 in a zackw> > few weeks, before February to be more precise. I'd like to get my zackw> > nvm.automate-netsync branch in a mergable state until then (docs and zackw> > tests are still missing) and I think we then have quite a sounding zackw> > release with enough features and fixes. zackw> > zackw> > I'd like you to already check the latest head and report build problems zackw> > since we do not have many functional build bots right now. (It would be zackw> > even better to fix the bots, but apparently all the people who still zackw> > manage one have disappeared since I've made this call for 0.45...) zackw> > zackw> > Also, translators, please already start and translate the strings, so zackw> > we're safe in this area as well. The nvm.automate-netsync branch will zackw> > not introduce many new ones, so translating these before 0.46 is zackw> > released shouldn't then take so long. zackw> > zackw> > Thanks for your work! zackw> > zackw> > Thomas. zackw> > zackw> > -- zackw> > GPG-Key 0x160D1092 | tommyd3...@jabber.ccc.de | http://thomaskeller.biz zackw> > Please note that according to the EU law on data retention, information zackw> > on every electronic information exchange might be retained for a period zackw> > of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en zackw> > zackw> > zackw> > zackw> > ___ zackw> > Monotone-devel mailing list zackw> > Monotone-devel@nongnu.org zackw> > http://lists.nongnu.org/mailman/listinfo/monotone-devel zackw> > zackw> > zackw> zackw> zackw> ___ zackw> Monotone-devel mailing list zackw> Monotone-devel@nongnu.org zackw> http://lists.nongnu.org/mailman/listinfo/monotone-devel -- Richard Levitte rich...@levitte.org http://richard.levitte.org/ "Life is a tremendous celebration - and I'm invited!" -- from a friend's blog, translated from Swedish ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Time for a release
I'd like to draw people's attention to Debian bug 559893: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559893 This is, at root, a problem with contrib/get_passphrase_from_file.lua, which was never updated for the keys-by-hash changes. I doubt I will have time to look at this before your proposed release [my time to work on monotone is extremely limited these days] but it would be really nice if it could get fixed. It doesn't appear to me that the hook documentation was properly updated for keys-by-hash either. zw On Wed, Jan 6, 2010 at 5:20 AM, Thomas Keller wrote: > > Hey there! > > As I have announced earlier on IRC I plan to release monotone 0.46 in a > few weeks, before February to be more precise. I'd like to get my > nvm.automate-netsync branch in a mergable state until then (docs and > tests are still missing) and I think we then have quite a sounding > release with enough features and fixes. > > I'd like you to already check the latest head and report build problems > since we do not have many functional build bots right now. (It would be > even better to fix the bots, but apparently all the people who still > manage one have disappeared since I've made this call for 0.45...) > > Also, translators, please already start and translate the strings, so > we're safe in this area as well. The nvm.automate-netsync branch will > not introduce many new ones, so translating these before 0.46 is > released shouldn't then take so long. > > Thanks for your work! > > Thomas. > > -- > GPG-Key 0x160D1092 | tommyd3...@jabber.ccc.de | http://thomaskeller.biz > Please note that according to the EU law on data retention, information > on every electronic information exchange might be retained for a period > of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en > > > > ___ > Monotone-devel mailing list > Monotone-devel@nongnu.org > http://lists.nongnu.org/mailman/listinfo/monotone-devel > > ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Stalled server
On 1/6/2010 7:21 AM, Richard Levitte wrote: Since about a week, I've run a debug variant of the server on monotone.ca... It stalled today with the following backtrace: (gdb) bt #0 0xb7fe1424 in __kernel_vsyscall () #1 0xb7a055b1 in select () from /lib/i686/cmov/libc.so.6 #2 0x08396185 in Netxx::Probe_impl::probe (this=0xac85c50, timeout=..., rt=2) at netxx/probe_select.cxx:221 #3 0x0839df72 in Netxx::Socket::writable (this=0xac85c48, timeout=...) at netxx/socket.cxx:301 #4 0x0839e282 in Netxx::Socket::write (this=0xac85c48, buffer=0xcbd799c, length=451, timeout=...) at netxx/socket.cxx:178 #5 0x08398e4f in Netxx::Stream::write (this=0xb4bf720, buffer=0xcbd799c, length=451) at netxx/stream.cxx:132 When we get a new connection, it does get set non-blocking but we also tell netxx to give it a long timeout, which it does by select()ing on it. So apparently we get a spurious 'writeable' from the main select() loop, and then the select() when trying to write times out. I think it just needs something other than 'timeout' below, but I need to run to work right now. $ grep -n -A1 -B6 "new Netxx::Stream" network/listener.cc 65- // 'false' here means not to revert changes when the SockOpt 66- // goes out of scope. 67- Netxx::SockOpt socket_options(client.get_socketfd(), false); 68- socket_options.set_non_blocking(); 69- 70- shared_ptr str = 71:shared_ptr(new Netxx::Stream(client.get_socketfd(), 72-timeout)); ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Stalled server
Since about a week, I've run a debug variant of the server on monotone.ca... It stalled today with the following backtrace: (gdb) bt #0 0xb7fe1424 in __kernel_vsyscall () #1 0xb7a055b1 in select () from /lib/i686/cmov/libc.so.6 #2 0x08396185 in Netxx::Probe_impl::probe (this=0xac85c50, timeout=..., rt=2) at netxx/probe_select.cxx:221 #3 0x0839df72 in Netxx::Socket::writable (this=0xac85c48, timeout=...) at netxx/socket.cxx:301 #4 0x0839e282 in Netxx::Socket::write (this=0xac85c48, buffer=0xcbd799c, length=451, timeout=...) at netxx/socket.cxx:178 #5 0x08398e4f in Netxx::Stream::write (this=0xb4bf720, buffer=0xcbd799c, length=451) at netxx/stream.cxx:132 #6 0x08233a17 in session_base::write_some (this=0xb526040) at netsync.cc:551 #7 0x08249178 in session_base::do_io (this=0xb526040, what=3) at netsync.cc:595 #8 0x08257a0b in reactor::do_io() () #9 0x082460ee in serve_connections (opts=..., lua=..., project=..., keys=..., role=source_and_sink_role, addresses=...) at netsync.cc:3429 #10 0x082473ac in run_netsync_protocol (opts=..., lua=..., project=..., keys=..., voice=server_voice, role=source_and_sink_role, info=...) at netsync.cc:3671 #11 0x080d30df in commands::cmd_serve::exec (this=0x84b0620, app=..., execid=..., args=...) at cmd_netsync.cc:562 #12 0x080ca663 in commands::process (app=..., ident=..., args=...) at cmd.cc:118 #13 0x0838bda5 in cpp_main (argc=8, argv=0xbcb4) at monotone.cc:285 #14 0x0838c5fe in main (argc=8, argv=0xbcb4) at unix/main.cc:175 Unfortunately, I have no time to dig through this right now, but will the next time. Restarting the server now. Cheers, Richard -- Richard Levitte rich...@levitte.org http://richard.levitte.org/ "Life is a tremendous celebration - and I'm invited!" -- from a friend's blog, translated from Swedish ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Time for a release
Hey there! As I have announced earlier on IRC I plan to release monotone 0.46 in a few weeks, before February to be more precise. I'd like to get my nvm.automate-netsync branch in a mergable state until then (docs and tests are still missing) and I think we then have quite a sounding release with enough features and fixes. I'd like you to already check the latest head and report build problems since we do not have many functional build bots right now. (It would be even better to fix the bots, but apparently all the people who still manage one have disappeared since I've made this call for 0.45...) Also, translators, please already start and translate the strings, so we're safe in this area as well. The nvm.automate-netsync branch will not introduce many new ones, so translating these before 0.46 is released shouldn't then take so long. Thanks for your work! Thomas. -- GPG-Key 0x160D1092 | tommyd3...@jabber.ccc.de | http://thomaskeller.biz Please note that according to the EU law on data retention, information on every electronic information exchange might be retained for a period of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
