Merge with stable

Added signature for changeset 39f725929f0c

Added tag 1.5.2 for changeset 39f725929f0c

merge with i18n stable

i18n-pt_BR: synchronized with ee5b112aa529

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with 3b89899934a6

mq: rewrite strip docstrings This patch is joint work with ilowe.

test-issue2137: don't use $PWD; use `pwd` instead This fixes test failure on Solaris, as described on http://mercurial.selenic.com/wiki/WritingTests

test-mq-merge: quote ^ ^ is magic on Solaris and must be quoted

test-extension: changed environment variables must be exported again This fixes failure on Solaris because HGRCPATH wasn't unset.

subrepo: add test for issue1977

subrepo: update test output for issue1977 fix

subrepo: propagate and catch push failures

static-http: mimic more closely localrepo (issue2164: allow clone -r ) * httprangereader: name, __iter__ and close are needed to mimic file object * static-http opener: - disallow write/append modes - add (unused) atomictemp parameter * static-http repo: - root attribute is needed for localrepo.dirstate() - _branch* attributes are required for commitctx and branchmap calls * tags: force repo.opener.__iter__ call earlier to force httprangereader to try to read the cache early, to avoid raising IOError later.

keyword: cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record

mq: qpush --move, reorder patch series and apply only the patch This makes it less necessary to edit .hg/patches/series manually.

tag: warn users about tag/branch possible name conflicts As reported recently, Mercurial users can easily find confusion when using a common name for a tag and a branch. It seems reasonable to warn them about this potential outcome, to avoid that "surprise". * Explain briefly the issue in "hg help tag" * Warn when tagging a revision

contrib/mercurial.spec: Use DESTDIR variable and 'make install'

log: add --stat for diffstat output log --stat shows diffstat in place of patch output.

findrenames: Optimise "addremove -s100" by matching files by their SHA1 hashes. We speed up 'findrenames' for the usecase when a user specifies they want a similarity of 100% by matching files by their exact SHA1 hash value. This reduces the number of comparisons required to find exact matches from O(n^2) to O(n). While it would be nice if we could just use mercurial's pre-calculated SHA1 hash for existing files, this hash includes the file's ancestor information making it unsuitable for our purposes. Instead, we calculate the hash of old content from scratch. The following benchmarks were taken on the current head of crew: addremove 100% similarity: rm -rf *; hg up -C; mv tests tests.new hg --time addremove -s100 --dry-run before: real 176.350 secs (user 128.890+0.000 sys 47.430+0.000) after: real 2.130 secs (user 1.890+0.000 sys 0.240+0.000) addremove 75% similarity: rm -rf *; hg up -C; mv tests tests.new; \ for i in tests.new/*; do echo x >> $i; done hg --time addremove -s75 --dry-run before: real 264.560 secs (user 215.130+0.000 sys 49.410+0.000) after: real 218.710 secs (user 172.790+0.000 sys 45.870+0.000)

Move 'findrenames' code into its own file. The next few patches will increase the size of the "findrenames" functionality. This patch simply moves the function into its own file to avoid clutter building up in 'cmdutil.py'.

acl: cleanup module docstring - removed implementation detail about how the group information is obtained - fixed some language, better consistency - fixed bad comment in hgrc example

acl: fix ReST syntax in docstring

relink: removed unneeded local variable

test-acl: grep for $HGTMP, not /tmp/

Merge with stable