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

dispatch: don't mangle ImportError abort messages Previously, Mercurial assumed that the last word of the string representation was the name of the moduled that was imported. This assmption is incorrect, despite being true for the common case of an exception raised by the Python VM. For example, hgsubversion raises an ImportError with a helpful message if the Subversion bindings were not found. The final word of this message is not meaningful on its own, and is never the name of a module. This patch changes the output printed to be a simple stringification of the exception instance. In most cases, this will be `abort: No module named X!' rather than `abort: could not import module X!'. No functionality change; all tests pass.

relink/progress: correctly handle the no file to relink case

Merge with stable

commands: refactor diff --stat and qdiff --stat `opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.

mq: fix opts['unified'] = '0' to take effect when qdiff --stat `opts['unified'] = '0'` tries to reduce the number of lines to be processed by patch.diffstat, but here it does not affect diffopts, thus it does not make sense. Instead, we can change `diffopts.context` directly. Added test case for qdiff --stat.

showconfig: show rc paths with --debug

tags: return tags in sorted order This makes log and summary have less arbitrary tag ordering and also groups similar tags together, such as the mq tags.

keyword: test recording

keyword: support (q)record Monkeypatch hgext.dorecord to trigger keyword expansion. Read data from working directory, not from filelog. Prevent keyword expansion from within record's commitfunc, thereby fixing a bug/inconsistency where files which are clean after recording were overwritten twice.

keyword: remove mq commands from restricted list Monkeypatching patch.diff takes care of this since 911f5be5d159. Test mq more thoroughly by loosening [keywordmaps] and comparing the output of hg cat with keyword expansion enabled and disabled.

acl: add tests for asterisk and for OS-level groups

acl: updated doc string to reflect recent changes

acl: add support for OS-level groups using @group syntax

run-tests: add --view switch to use external diff viewer

run-tests: sort options

run-tests: add -l short option for --local

Merge with main

ui: fix check-code error

schemes: fix // breakage with Python 2.6.5 (issue2111) Recent Pythons (e.g. 2.6.5 and 3.1) introduce a change that causes urlparse.urlunparse(urlparse.urlparse('x://')) to return 'x:' instead of 'x://'i and urlparse.urlunparse(urlparse.urlparse('x:///y')) to return 'x:/y' instead of 'x:///y'. Fix url.hidepassword() and url.removeauth() to handle these cases.

log: document the new xml style

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable

merge with i18n

i18n-pt_BR: synchronized with ede19417c3c4

merge with i18n stable

i18n-sv: synchronized with latest development code

Merge with stable

i18n-sv: translated a few messages

i18n-sv: syncronized with e3396b218e10

patch: strip paths in leaked git patchmeta objects

patch: minor cleanup of _applydiff

patch: git delete mode shouldn't be used at all

patch: make "unable to strip away" message less confusing

patch: descriptive patchmeta.__repr__ to help debugging

log: remove useless condition for "copied" to be not None, it requires follow=True

help config: update windows documentation to match implementation This shows how confusing the current implementation is on Windows.

wix: new GUID for contrib.guid to comply with the component GUID rules of Windows Installer, applied to the change 6d9ff3374a81

contrib/mercurial.spec: drop git-viz Follow-up to 9258228639ad

tags: delete unnecessary close() of atomictempfile cachefile.rename() implies cachefile.close().

win32: detect console width on Windows Original version by anatoly techtonik <techtonik@gmail.com> Following advices from similar bzr code.

Merge with crew-stable