Mon, 09 Aug 2010 16:55:53 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 09 Aug 2010 16:55:53 -0500] rev 11773
merge with stable
Mon, 09 Aug 2010 21:43:39 +0200 test-dispatch: Make test of removed working directory work on AIX (issue2315) stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 09 Aug 2010 21:43:39 +0200] rev 11772
test-dispatch: Make test of removed working directory work on AIX (issue2315) AIX sh won't delete its own working directory. Removing it from another process works. Also hide the actual OS error message - operating systems returns different errors when getcwd fails.
Mon, 09 Aug 2010 12:25:01 -0500 tests: only run check-code on tracked files
Matt Mackall <mpm@selenic.com> [Mon, 09 Aug 2010 12:25:01 -0500] rev 11771
tests: only run check-code on tracked files
Mon, 09 Aug 2010 16:08:33 +0200 Merge with stable
Martin Geisler <mg@aragost.com> [Mon, 09 Aug 2010 16:08:33 +0200] rev 11770
Merge with stable
Mon, 09 Aug 2010 15:31:56 +0200 dirstate: ignore symlinks when fs cannot handle them (issue1888) stable
Martin Geisler <mg@aragost.com> [Mon, 09 Aug 2010 15:31:56 +0200] rev 11769
dirstate: ignore symlinks when fs cannot handle them (issue1888) When the filesystem cannot handle the executable bit, we currently ignore it completely when looking for modified files. Similarly, it is impossible to set or clear the bit when the filesystem ignores it. This patch makes Mercurial treat symbolic links the same way. Symlinks are a little different since they manifest themselves as small files containing a filename (the symlink target). On Windows, these files show up as regular files, and on Linux and Mac they show up as real symlinks. Issue1888 presents a case where the symlink files are better ignored from the Windows side. A Linux client creates symlinks in a working copy which is shared over a network between Linux and Windows clients. The Samba server is helpful and defererences the symlink when the Windows client looks at it. This means that Mercurial on the Windows side sees file content instead of a file name in the symlink, and hence flags the link as modified. Ignoring the change would be much more helpful, similarly to how Mercurial does not report any changes when executable bits are ignored in a checkout on Windows. An initial checkout of a symbolic link on a file system that cannot handle symbolic links will still result in a regular file containing the target file name as its content. Sharing such a checkout with a Linux client will not turn the file into a symlink automatically, but 'hg revert' can fix that. After the revert, the Windows client will see the correct file content (provided by the Samba server when it follows the link on the Linux side) and otherwise ignore the change. Running 'hg perfstatus' 10 times gives these results: Before: After: min: 0.544703 min: 0.546549 med: 0.547592 med: 0.548881 avg: 0.549146 avg: 0.548549 max: 0.564112 max: 0.551504 The median time is increased about 0.24%.
Sun, 08 Aug 2010 23:10:08 +0200 mq/qqueue: enable bash completion
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Sun, 08 Aug 2010 23:10:08 +0200] rev 11768
mq/qqueue: enable bash completion Return the list of available queues when completion is attempted on qqueue.
Sun, 08 Aug 2010 22:49:01 +0200 mq/qqueue: --list does not print (active) with --quiet
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Sun, 08 Aug 2010 22:49:01 +0200] rev 11767
mq/qqueue: --list does not print (active) with --quiet For scripting purposes, it can be convenient to get a simple listing of available queues, without indication of the active one. --quiet documentation change removed by Patrick Mézard.
Sun, 08 Aug 2010 22:29:39 +0200 Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 08 Aug 2010 22:29:39 +0200] rev 11766
Merge with stable
Sat, 07 Aug 2010 16:27:16 +0900 templatefilters: make json filter handle multibyte characters correctly stable
Yuya Nishihara <yuya@tcha.org> [Sat, 07 Aug 2010 16:27:16 +0900] rev 11765
templatefilters: make json filter handle multibyte characters correctly It aims to fix javascript error of hgweb's graph view in Japanese 'cp932' encoding. 'cp932' contains multibyte characters ending with '\x5c' (backslash), e.g. '\x94\x5c' for Japanese Kanji 'Noh'. Due to json filter escapes '\' to '\\', multibyte string ending with '\x5c' is translated to "xxx\", resulting javascript parse error on a web browser. This patch changes json() to pass unicode to jsonescape(). Unicode decoding error handler changed to 'replace' by Patrick Mézard.
Sat, 07 Aug 2010 16:13:53 -0300 check-code: added a check for calls to the builtin cmp function
Renato Cunha <renatoc@gmail.com> [Sat, 07 Aug 2010 16:13:53 -0300] rev 11764
check-code: added a check for calls to the builtin cmp function
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip