Matt Mackall <mpm@selenic.com> [Tue, 20 Jul 2010 15:07:10 -0500] rev 11630
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 13 Jul 2010 03:04:14 +0200] rev 11629
revert: rename original to .orig instead of copying (issue2282)
By renaming before reverting the content of the file we ensure that we handle
and break hardlinks properly.
Handling of other hardlinks to .orig is somebody elses problem.
Greg Ward <greg-hg@gerg.ca> [Tue, 20 Jul 2010 14:00:47 -0400] rev 11628
inotify: make inotifydirstate.status() returns a tuple of lists.
This makes it consistent with dirstate.status(), which is important if
there are other extensions messing with the output of status(). Those
extensions can safely assume that dirstate.status() returns a tuple of
lists, because its docstring says it does. But
inotifystatus.dirstate() returns a list of lists, which can break
those other extensions.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 20 Jul 2010 20:52:23 +0200] rev 11627
protocol: move the streamclone implementation into wireproto
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 20 Jul 2010 09:56:37 +0200] rev 11626
protocol: use generators instead of req.write() for hgweb stream responses
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 20 Jul 2010 20:53:33 +0200] rev 11625
protocol: wrap non-string protocol responses in classes