Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Dec 2009 13:55:56 +0900] rev 10105
bookmarks: turn repo._bookmarks into a propertycache
Sune Foldager <cryo@cyanite.org> [Mon, 21 Dec 2009 16:13:20 +0100] rev 10104
Merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 21 Dec 2009 16:12:43 +0100] rev 10103
hook: fix bug (reuse of variable) introduced in 872d49dd577a
For binary installs, the 'name' argument would be reused as a local variable,
destroying its original value. The patch fixes that, and also avoids copying
sys.path when it's not necessary.
Martin Geisler <mg@lazybytes.net> [Sun, 20 Dec 2009 17:18:04 +0100] rev 10102
patch: implement patch.eol=auto mode
EOLs in patched files are restored to their original value after
patching. We use the first EOL found in the file, files with
inconsistent EOLs will thus be normalized during this process.
Martin Geisler <mg@lazybytes.net> [Sun, 20 Dec 2009 17:18:02 +0100] rev 10101
patch: propagate eolmode down to patchfile
The old code mapped the value of eolmode ('strict', 'crlf' or 'lf') to
eol (None, '\r\n' or '\n') at the entry point in internalpatch. The
value of eol was then used directly as the desired EOL in patchfile.
We now delay the mapping and let patchfile do it instead. This allows
for more complicated behavior where it does not make sense to map
eolmode directly to the target EOLs.
Brendan Cully <brendan@kublai.com> [Sat, 19 Dec 2009 22:56:01 -0800] rev 10100
Merge with stable