i18n-pt_BR: synchronized with d9f4c182aeca

i18n-pt_BR: synchronized with 708938509732

i18n-pt_BR: synchronized with fccdf5ca5065

merged Greek translation

Add the start of a new translation of Mercurial to Greek (UTF-8)

i18n-da: sync with hg.pot - translated fuzzy strings - removed old unused strings

commands: removed redundant line from push docstring

merged with crew

i18n-da: merged translation with TortoiseHg

i18n-da: translate fuzzy strings

i18n-da: sync with hg.pot

i18n-da: add missing newline

translated a bunch of strings to danish

interhg: escape backslashes in docstring

interhg: remove unnecessary escaping

Fix warning: Seen unexpected token "%"

Add (pre)outgoing hooks for local clones.

contrib/buildrpm: force en_US locale during changelog's creation Running this script using a different locale (i.e., Italian) returns an error: $ ./contrib/buildrpm sto aggiornando la directory di lavoro 1060 file aggiornati, 0 file merge, 0 file rimossi, 0 file non risolti errore: data errata in %changelog: mar giu 23 2009 Stefano Tortarolo <stefano.tortarolo@gmail.com> 1.2.1-1034

contrib/buildrpm: set python requirement to 2.4

mq: no longer mention the deprecated qdelete's --revision option The option will no longer show up in the list, unless --verbose is used. 'qdel -r' has been deprecated in favor of qfinish since the 1.1 release. It is still fully functional, but new users need not learn about it.

help: describe bundle compression methods (issue1523)

Add a forget command for easily untracking files. This command does exactly what 'hg remove -Af [FILES]' does. The reason for creating a new command is that the options for 'hg remove' are confusing (-A removes only deleted files, -f forces deletion, and using both means *the exact opposite of both*). [mpm: simplified help text, code, and updated tests]

test merge-tools internal:dump and internal:prompt

hgrc.5: remove reference to DEFAULT section

hgrc.5: mark more literal strings

hgrc.5: markup compromis compatible with 7.1.2 and 8.4.5

test-grep: fixed comment

extensions: remove import rendered unnecessary by e4e22a310b62

help: fixing non-matching example texts

extensions: improve the consistency of synopses Trying as much as possible to consistently: - use a present tense predicate followed by a direct object - verb referring directly to the functionality provided (ie. not "add command that does this" but simple "do that") - keep simple and to the point, leaving details for the long help (width is tight, possibly even more so for translations) Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom Podlaski Christiansen and others for the helpful suggestions.

acl: help improvements Thanks to timeless for the review.

bookmarks: help improvements - bookmarks are obviously Mercurial's, no need to specify it - more explicit about the behavior without track.current - typos Note: the extension's help is shadowed by that of the command of the same name and as such will never appear to the user. Thanks to timeless for the fixes.

patch: use new style class in linereader

convert: fix builtin cvsps when no branchpoints are present

help: wrap extension descriptions

convert/svn: drop undocumented and untested revision 'blacklist'

convert/svn: test svn tags encoding

convert/svn: stop returning unicode revision identifiers

convert/svn: remove confusing unicode variable

convert/svn: remove dead code from entry deletion code path It was made obsolete when multi-branches commit were split into multiple Mercurial commits.

convert/svn: remove a useless recode() call in deletion path

convert/svn: remove useless encoding/decoding calls (issue1676)

convert/svn: remove dead code and obsolete comments

help: improve grammar/wording of 'extensions' topic

help: more improvements for the extensions topic - improve help text English (thanks to timeless for corrections) - rename and simplify functions a little bit, improved comments

extensions: use _order to determine if an extension is enabled

extensions: check for path existence only when necessary

extensions: remove now-useless pathdirs() function

mq: fix error message for qpush inexistent-patch (issue1702)

highlight: was broken since 580a79dde2a3 (encoding)

help: add/fix docstrings for a bunch of extensions

extensions: simplify by selecting primary hgext

extensions: move extensions listing functions from mercurial.help Includes some small fix-ups to comments in enabled() and disabled().

serve: obey the --encoding option

contrib/buildrpm: Don't require installed hg, use local hg with pure extensions

contrib/buildrpm: Don't use perl

contrib/buildrpm: Support python 2.4 and 2.6

help: remove per-extension paragraph on how to enable it The central place to find this information is the "extensions" help topic.

help: expand the extensions topic

help: refactor extensions listing, and show enabled ones in the dedicated topic

help: adding a new help topic about extensions Currently listing non-enabled extensions and a short introductory text. Thanks to Dan Villiom Podlaski Christiansen for the preliminary proof-of-concept code for listing available extensions.

bookmarks: add appropriate locking (issue1691) - make updates of bookmark state locked and atomic - wrap commit so that commit and bookmarks happen under the same lock

filemerge: fix internal:dump

hgweb: deny cloning a subpath of a repo

hgweb: web.encoding should override encoding.encoding (issue1183)

bdiff: fix compile with GCC -ansi (issue1690)

tags: silence warning about unknown tags This is mostly a nuisance and can happen legitimately with pull -r, etc.

rollback: minor clarification (issue828)

update: add --check option

tags: drop nested function

tags: generate contexts directly

tags: reverse and simplify head-walking

tags: simplify rev handling

tags: fold in _hgtagsnodes

compare grep result between target and its parent I found that typical case is that grep target is added at (*) revision in the tree shown below. +--- 1(*) --- 3 0 +--- 2 ------ 4 Now, I expect 'hg grep --all' to show only rev:1 which is first appearance of target line. But 'hg grep --all' will tell: target line dis-appeared at 3 => 4 target line appeared at 2 => 3 target line dis-appeared at 1 => 2 target line appeared at 0 => 1 because current 'hg grep' implementation compares not between target revision and its parent, but between neighbor revisions in walkthrough order. I checked performance of this patch by "hg grep --follow --all walkchangerevs" on whole Mercurial repo, and patched version could complete as fast as un-patched one.

url: let host port take precedence when connecting to HTTPS Fixes use of HTTPS connections on non-standard ports.

url: support client certificate files over HTTPS (issue643) This extends the httpshandler with the means to utilise the auth section to provide it with a PEM encoded certificate key file and certificate chain file. This works also with sites that both require client certificate authentication and basic or digest password authentication, although the latter situation may require the user to enter the PEM password multiple times.

acl: support for getting authenticated user from web server (issue298) Previously, the acl extension just read the current system user, which is fine for direct file system access and SSH, but will not work for HTTP(S) as that would return the web server process user identity rather than the authenticated user. An empty user is returned if the user is not authenticated.

hgweb: escape REMOTE_HOST when passing url for addchangegroup If DNS lookups are turned off on the web server, REMOTE_HOST may be populated with REMOTE_ADDR, which, if the remote is an IPv6 hosts will contain colons, thus interfering with the separator character. This is solved by URL quoting the REMOTE_HOST string.

tests: fix test for convert detection of p4 repos

kill trailing whitespace

graphmod/webcommands: use generic DAG walks Changes graph() to colorededges(), which operates on the new generic DAG walks and adds color and edge information needed by the web graph. This is in preparation of adding DAG walk filters, like the linear run collapser in the next patch. The idea is to have a bunch of changelog walkers that return basic data. Then we can filter this data. Finally we add edge and formatting info suitable for the output media we want to target (glog, hgweb).

graphmod: rename a bunch of vars in graph()

graphmod/graphlog: make dag walks carry data as type, payload

graphlog: rename grapher to asciiedges

graphlog: move and rename graphabledag to asciiformat

graphmod/graphlog: extract nodelistwalk

graphmod/graphlog: move log walks to graphmod

graphmod: code cleanup and doc fix

merge: rename -S/--show option to -P/--preview

mq: unify code for qdel -r and qfin

mq: warn about finalizing patches without cset message

filemerge: add internal:dump This create foo.{local,other,base} files for people to manually merge files while littering their working directory.

filemerge: add internal:prompt target

convert: Make P4 conversion cope with keywords, binary files and symbolic links. Convert now handles errors from p4 during conversion more gracefully. If keyword expansion is enabled in a P4 file then keywords will be unexpanded in hg. Added testcase for p4 filetypes and keyword (un)expansion. This testcase ignores UTF and Apple files to avoid binary data. Edited by pmezard: fixed collation issue on OSX

i18n-zh_TW: Traditional Chinese translation

patchbomb: update test output to match 2aff285b902f

patchbomb: do not assume the presence of angle brackets around msg-id RFC 5322 states: "Semantically, the angle bracket characters are not part of the msg-id; the msg-id is what is contained between the two angle bracket characters." Hence it should be correct to pass a message Id with no angle brackets to --in-reply-to. Adding them if missing.

keyword: concise help title

interhg: upgrade comments to online help and improve them Some inspiration taken from the wiki page of the extension.

churn: improve description Thanks to Martin Geisler and timeless for the suggested improvements.

doc: fix regexp for determining the man page section Preceding a .* pattern with an other dot serves little purpose, better anchor the regexp to the start of the file name.

Fix test-convert-cvsnt-mergepoints so it works reliably. Specifically, always run 'cvs commit' with -f option to force commit; add one strategic sleep which seems to be necessary for post-merge clobber-and-commit (-f doesn't force a commit there?).

test-convert-cvsnt-mergepoints: make it work on OS X. - don't create file 'cvs' where directory 'CVS' already exists

test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12. - factor out cvsci function (similar to other test-convert-cvs* scripts) - add filterpath function (also similar to other scripts) - generally munge the output of CVS - add lots of output to make it easier to follow when things go wrong This doesn't make the test pass reliably under CVS 1.11; it just makes it behave the same as under CVS 1.12, i.e. sometimes it passes and sometimes it fails. Failure is more frequent with faster hardware.

Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output

Fixed patch.eol bug that truncated all patched lines to one character Also updated the import-eol test to test with lines longer than one character, and also empty lines.

subrepo: add a test

subrepo: basic push support

subrepo: add update/merge logic

commit: recurse into subrepositories

subrepo: introduce basic state parsing

Make mq, record and transplant honor patch.eol

Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.

gpg: add test

gpg: unbreak 02a12835b17e. We need a test.

share: allow dest to default to the basename of source

Merge with crew

bisect: improve --command output - Display tested revisions without --verbose - Display revision number

dirstate: fix typo introduced by 3507f6c7715c