Fri, 16 Dec 2011 21:09:40 +0900 pathauditor: use normcase()-ed path for audit result cache stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 16 Dec 2011 21:09:40 +0900] rev 15664
pathauditor: use normcase()-ed path for audit result cache in current pathauditor implementation, un-normcase()-ed path is stored into and compared with audit result cache. this is not efficiency on case insensitive filesystem.
Fri, 09 Dec 2011 17:35:00 +0100 largefiles: handle merges between normal files and largefiles (issue3084) stable
Martin Geisler <mg@aragost.com> [Fri, 09 Dec 2011 17:35:00 +0100] rev 15663
largefiles: handle merges between normal files and largefiles (issue3084) The largefiles extension prevents users from adding a normal file named 'foo' if there is already a largefile with the same name. However, there was a loop-hole: when merging, it was possible to bring in a normal file named 'foo' while also having a '.hglf/foo' file. This patch fixes this by extending the manifest merge to deal with these kinds of conflicts. If there is a normal file 'foo' in the working copy, and the other parent brings in a '.hglf/foo' file, then the user will be prompted to keep the normal file or the largefile. Likewise for the symmetric case where a normal file is brought in via the second parent. The prompt looks like this: $ hg merge foo has been turned into a largefile use (l)argefile or keep as (n)ormal file? After the merge, either the '.hglf/foo' file or the 'foo' file will have been deleted. This would cause status to return output like: $ hg status M foo R foo To fix this, the lfiles_repo.status method is changed so that a removed normal file isn't shown if there is largefile with the same name, and vice versa for largefiles.
Wed, 14 Dec 2011 15:41:08 +0100 progress: check for ui.quiet and ui.debugflag before we write stable
David Soria Parra <dsp@php.net> [Wed, 14 Dec 2011 15:41:08 +0100] rev 15662
progress: check for ui.quiet and ui.debugflag before we write ui.quiet and ui.debugflag are not initialized during uisetup and reposetup. progressui is always initialized, therefore we have to check during write() if ui.quiet is set or not.
Fri, 16 Dec 2011 18:23:15 -0600 changelog: handle decoding of NULs in extra more carefully (issue3156) stable
Matt Mackall <mpm@selenic.com> [Fri, 16 Dec 2011 18:23:15 -0600] rev 15661
changelog: handle decoding of NULs in extra more carefully (issue3156) Escaped NULs adjacent to [0-7] could be decoded as octal. This hits about 0.24% of changesets with transplant, which stores binary nodes.
Thu, 15 Dec 2011 16:50:21 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 15 Dec 2011 16:50:21 -0600] rev 15660
merge with stable
Thu, 15 Dec 2011 23:08:09 +0100 phases: change publish behavior to only alter behavior when server.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 15 Dec 2011 23:08:09 +0100] rev 15659
phases: change publish behavior to only alter behavior when server. Older publish=True was: 1) Content of Publishing server are seen as public by client. 2) Any changegroup *added* to a publish=True server is public. New definition are: 1) Content of Publishing server are seen as public by client. 2) Any changegroup *pushed* to a publish=True server is public. See mercurial/phase.py documentation for exact final behavior
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip