bookmarks: improve English for diffbookmarks

mq: expand 'repo' -> 'repository' in error message

mq: mark strings that should not be translated

qrestore: trying to improve the English

pull: silence spurious 'requesting all changes' message When issuing `hg pull -r REV` in a repo with no common ancestor with the remote repo, the message 'requesting all changes' is printed, even though only the changese that are ancestors of REV are actually requested. This can be confusing for users (see http://www.selenic.com/pipermail/mercurial/2010-October/035508.html). This silences the message if (and only if) the '-r' option was passed.

templates: fix inconsistency in 'help' link

test-patchbomb: add test for progress support (1ed2dc9d4368)

keyword: fix regressions introduced in d87f3ff904ba - dirstate of overwritten files must be forced to normal with kwexpand/kwshrink, not commit. - recorded files must be weeded before overwriting. - add test cases.

tests: test/silence win32text deprecation warning

lsprof: remove #!-line from non-executable script It triggered an rpmlint error, reported by Neal Becker.

doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST It is an intermediate file used to produce the hg.1 and .hg.1.html files and is not useful for people who download the tarball. It will be regenerated automatically by the Makefile if users want to rebuild the documentation.

doc/Makefile: cleanup clean target

patchbomb: fix stray backslash in docstring While both '\ ' and '\\ ' parse the same in Python, the difference trips up hggettext so that it cannot find the docstring in the source file and thus cannot write the right line number to i18n/hg.pot. While the line number is not essential, it can be used to lookup the original message.

help: improve wording of internal:merge and internal:fail

win32text: give deprecation warning Users need to migrate to the EOL extension for various reasons. Instructions for disabling the warning will be added to the extension's wiki page.

merge with i18n

i18n-da: synchronize with b814f67d41c0

i18n: merge with main

i18n-da: synchronized with 3d6ba8c2b1b8

synchronized with 3d6ba8c2b1b8

traceback: point to BugTracker on the wiki

wix: add subrepos help text

version: replace email address with url to reduce private mail

Add subrepos help topic Edited by: Martin Geisler <mg@lazybytes.net> Dan Villiom Podlaski Christiansen <danchr@gmail.com>

hgrc: document [subpaths] section

merge-tools.txt: 6 comes after 5

Test applying context diffs

merge-tools.txt: fix typos, simplify, renumber from 1.

hggettext: handle i18nfunctions declaration for docstrings translations

Fix and unify transplant and bookmarks revsets doc registration

revsets: generate predicate help dynamically

help: add topic rewriting hooks They are useful when updating help topics dynamically from extensions.

minirst: ignore comments

help: add "revset" alias for "revsets" help topic

Makefile: var for documentation files

Makefile: remove underscore in var name

revset: add translator comments to i18n strings

gendoc: do not strip 'hg ' from synopsis This was an old left-over from when the synopsis line was used as a header. We now have the command name by itself as the header and the synopsis as a literal block immediately after..

gendoc: support multi-line synopses

gendoc: re-add indentation to global option table The indentation was lost in bdc1cf692447.

test-transplant: test transplanted() revset

backout: add --tool argument for specifying merge tool

help: improve merge-tools topic, describe --tool and clarify details This doesn't make it simpler, but it makes it more correct. With help from erikz, mg and abuehl.

help: use Windows cmd compatible quoting in revset help

color: give hint to translators about untranslated keywords

i18n: extract comments marked for translator hints Comments marked with "i18n:", like: # i18n: do not translate the field names msg = _("Valid entries for the format field are topic, bar, number.") will become available for translators in the .po files: #. i18n: do not translate the field names msgid "Valid entries for the format field are topic, bar, number." msgstr ""

setup/hg: handle hg being a symlink when appending relative libdir to sys.path Resolve symbolic links in the path to hg so that an hg that works when invoked directly will also work when invoked via a symlink to it.

merge-tools: fixed typos Spotted by Patrick Mézard.

commands: mark tip:0 as literal text If left unquoted, this is seen as a link to '0' using protocol 'tip' because of some over-eager link-finding magic in Docutils.

eol: add missing word in module docstring

demandimport: backout fe31f834a9ff Using a keyword argument here breaks zipimporter for at least some versions of Python2.6 on Windows.

dispatch: backout 0c605364373c The parenthesis may need translation too: Laurens Holst pointed out that Japanese uses full-width parentheses: （） (U+FF08 U+FF09).

subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8

subrepo: fix status check on SVN subrepos (issue2445)

hgweb: let HTTPS serve use more compatible and less secure encryption PROTOCOL_SSLv3 on the server side doesn't work everywhere. Sometimes the client reports "EOF occurred in violation of protocol" (for example on Mac and Solaris). The more compatible PROTOCOL_SSLv23 is now used instead. It works but is less "secure" for some OpenSSL versions as it can fall back to weak encryption.

mercurial.el: fix hg-outgoing path when 'default-push' is not defined hg-outgoing path is set as 'default-push' which prevents it from working in repos which only have 'default' defined. Fix provided by Kyujin Shim at http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html

merge default into stable for 1.7 freeze

merge with stable

patchbomb: hide passwords potentially embedded in urls

wix: add vim syntax file for Mercurial unit tests

wix: add new help page templates

wix: add new merge-tools.txt help text

Merge with mpm

merge: implement --tool arguments using new ui.forcemerge configurable ui.forcemerge is set before calling into merge or resolve commands, then unset to prevent ui pollution for further operations. ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the given --tool is not found by the merge-tools machinery. This makes it possible to do: hg resolve --tool="python mymerge.py" FILE With this approach, HGMERGE and ui.merge are not harmed by --tool

tests: fix up changed output

revset: disable subset optimization for parents() and children() (issue2437) For the boolean operators, the subset optimization works by calculating the cheaper argument first, and passing the subset to the second argument to restrict the revision domain. This works well for filtering predicates. But parents() don't work like a filter: it may return revisions outside the specified set. So, combining it with boolean operators may easily yield incorrect results. For instance, for the following revision graph: 0 -- 1 the expression '0 and parents(1)' should evaluate as follows: 0 and parents(1) -> 0 and 0 -> 0 But since [0] is passed to parents() as a subset, we get instead: 0 and parents(1 and 0) -> 0 and parents([]) -> 0 and [] -> [] This also affects children(), p1() and p2(), for the same reasons. Predicates that call these (like heads()) are also affected. We work around this issue by ignoring the subset when propagating the call inside those predicates.

check-code: warning and fixes for whitespace in unified tests

hgweb: use Pythons ssl module for HTTPS serve when using Python 2.6 or later pyOpenSSL apparently doesn't work for Python 2.7 and isn't very actively maintained. The built-in ssl module seems like a long-term winner, so we now use that with Python 2.6 and higher.

hgweb: refactor all pyOpenSSL references into one class

gendoc: added styling for extension TOC Uses CSS3 columns for the list of extensions, so it is not just a long list of extension names.

gendoc: automatically create help for default extensions. Adds a section in the hg.1 manpage and corresponding hg.1.html file. Each extension is listed with its module docstring, followed by the commands defined by that extendsion. Creates help for extensions by extracting doc strings from the extension modules and its commands.

gendoc: dedent documentation from docstrings When getting docstrings from the source they are indented to look good in the code. This indentation interferes with how the text is parsed by rst. Therefore this indentation is removed.

extensions.load: return module Makes extensions.load return the module that it has loaded. This is done so that callers can get information on this module, which e.g. can be used for generating docs.

help: different section separators Changes the characters used as section separators, so different ones are used for module docstring and command docstring. This is done because the section from the docstring will be at different levels in the restructured text output, therefore different symbols have to be used.

gendoc: add subsection for each command

gendoc: move section commands to module scope

mq: mark string for i18n

cmdutil: mark string for i18n

test-ssh: handle very slow ssh transfer rate

bookmarks: add paragraph on pushing and pulling to help Text adapted from http://mercurial.selenic.com/wiki/BookmarksExtension

help: help topic for merge tools I have made a help topic for merge tools. The text in the topic is based on the http://mercurial.selenic.com/wiki/MergeProgram page from the wiki, along with some extra information on the internal merge tools.

check-code: find trailing whitespace

convert: kill trailing whitespace

convert: fix typo in comment

strip: support revision sets

interhg: use uisetup() instead of module-load side effects This fixes an infinite recursion bug caused by visiting a bad subpage of the help handler repeatedly, which caused the wrapper for the templater's escape filter to get installed twice and resulted in infinite recursion.

merge: when --tool is specified, disable HGMERGE by setting to empty string HGMERGE has different semantics than ui.merge. HGMERGE should hold the name on an executable in your path, or an absolute tool path. As such, it's not safe to simply copy the user's specified --tool value into HGMERGE. Instead, we disable HGMERGE by setting it to an empty string.

ui: only fix config if the relevant section has changed In particular, when extensions add hooks, or add non-ui and non-paths configuration items during their setups, we really have no reason to re-"fix" the config dictionaries.

test-tags: use printf instead of echo '...\n'

discovery: findincoming() is no longer used

discovery: use set instead of dict

discovery: remove unused "base" argument from find.*incoming()

discovery: do not use the implicit updating of the "base" arg

tags: do not fail if tags.cache is corrupted (issue2444) This file is not critical for hg, so we can safely swallow the ValueError

merge: make 'diverging renames' diagnostic a more helpful note. See the Hg Book on why we actually want to detect this case: http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290 Before: $ hg up deadbeef warning: detected divergent renames of X to: ... After: $ hg up deadbeef note: possible conflict - X was renamed multiple times to: ... No functionality change.

gendoc: refactor get_cmd Refactors the get_cmd to take the table as argument, instad of just referencing the global table, thereby enabling reuse for extension command tables.

mq: switched to `` around * * * So it can be parsed by rst.

Revert: capitalization doc fix

subrepo: abort instead of pushing/pulling to the repo itself _abssource will now abort (or return None) in the rare cases where no push/pull path can be found.

subrepo: rename relpath to subrelpath and introduce reporelpath

mdiff: carriage return (\r) is also ignorable whitespace

merge: add --tool argument to merge and resolve These arguments are shorthand for --config ui.merge, but they also override HGMERGE if it is found in the user's environment.

patchbomb: move command option help from the extension (patchbomb) to the command (email)

alias: fail gracefully when invalid global options are given (issue2442) This patch modifies the check for shell aliases to prevent crashing when an invalid global option is given. When an invalid global option is given the check will simply return and let the normal error handling for this case happen.

bookmarks: better fix for issue2016 (lookup infinite recursion) 741290486877 partially reverted by Patrick Mézard <pmezard@gmail.com>

merge/progress: marking strings for localization

verify/progress: using gerund to indicate action and adding units

progress: dropping superfluous space from units

check-code: add 'no tab indent' check for unified tests and fix the offending tests accordingly

url: validity (notBefore/notAfter) is checked by OpenSSL (issue2407) Removing the check from our code makes https with cacerts check work with Python < 2.6.

test-https: test web.cacerts functionality

serve: fix https mode and add test The https mode failed in super because BaseRequestHandler is an old-style class. This introduces the first test of https client/server functionality - and "hghave ssl". The test is currently only run on Python 2.6.

hgweb: don't send a body or illegal headers during 304 response Without this fix, mod_wsgi and spawning get in a wedged state after sending a 304 response. Not sending a body fixed that problem. The header change was discovered by using wsgiref.validate.validator to check for other errors.

merge with stable

test-url: skip test when ssl module is unavailable

revset: use 'requires' instead of 'wants' in error message

outgoing: unify common graphlog.outgoing and hg.outgoing code

bundlerepo: unify common code into a new getremotechanges The pattern where we fetch incoming remote changes and return them as a local bundlerepo seems common. It's nicer to have this code unified.

revset id(): fix error text to say "id wants..." instead of "rev wants..."

keyword: only use expensive fctx.cmp when needed Restrict expensive cmp to cases when: - comparing against working directory and - encode filters active or - path is configured for keyword expansion

context: narrow down filter special case in filectx.cmp() cmp via filelog when encode filters are present, but only when actually comparing to the working directory.

incoming: unify code for incoming and graphlog.incoming

incoming: rename variable Groundwork so that incoming and graphlog.incoming code look the same and get easier to unify.

import: only the first hg patch marker should be processed (issue2417) Proper use of the hgpatch state variable had been lost in the final edits of d7452292f9d3 - now it works more like intended.

backout: provide linear backout as a default (without --merge option) This changes backouts changeset to retain linear history, .e. it is committed as a child of the working directory parent, not the reverted changeset parent. The default behavior was previously to just commit a reverted change as a child of the backed out changeset - thus creating a new head. Most of the time, you would use the --merge option, as it does not make sense to keep this dangling head as is. The previous behavior could be obtained by using 'hg update --clean .' after a 'hg backout --merge'. The --merge option itself is not affected by this change. There is also still an autocommit of the backout if a merge is not needed, i.e. in case the backout is the parent of the working directory. Previously we had (pwd = parent of the working directory): pwd older backout auto merge backout --merge auto commit With the new linear approach: pwd older backout auto commit backout --merge auto commit auto: commit done by the backout command merge: backout also already committed but explicit merge and commit needed commit: user need to commit the update/merge

update: use revsingle to enable use of revsets as update targets (issue1993)

test-url: skip test when ssl module is unavailable

test-url: remove trailing whitespace

keyword: code cleanup - move preselection of expansion candidates for rollback and record into helper function - same overwrite order in rollback and record: 1. modified, 2. added - self.wlock() inside kwrepo class instead of repo.wlock()

tests: asciify output of test-encoding-align.t

tests: accept \-escaped test output It changes tsttest to accept expected outputs in python-style \-escapes. It aims to avoid trouble with outputs for non-ascii, color and progress tests.

merge with crew

parentdelta: compress.py extension is no longer necessary Using `hg --config format.parentdelta=True clone --pull src dst` is equivalent.

merge with stable

convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411) This is a followup to 4481f8a93c7a, which only fixed the conversion of patches with UTF-8 metadata. This patch allows a changelog to have any bytes with values 0x7F-0xFF. It parses the XML changelog as Latin-1 and uses converter_source.recode() to decode the data as UTF-8/Latin-1. Caveats: - Since the convert extension doesn't provide any way to specify the source encoding, users are still limited to UTF-8 and Latin-1. - etree will still complain if the changelog has bytes with values 0x00-0x19. XML only allows printable characters.

revset: add id() and rev() to allow explicitly referring to changes by hash or rev

revset: rename tagged() to tag() and allow it to take an optional tag name

bookmarks: add revset for referencing bookmarks

hgweb help: fix double help links

tests: add testcase for --config format.dotencode=false

fetch: fix and document exit codes (issue2356)

doc: add [format] dotencode description

filectx: use ctx.size comparisons to speed up ctx.cmp Comparing sizes is cheaper than comparing file contents, as it does not involve reading the file on disk or from the filelog. It is however not always possible: some extensions, or encode filters, change data when extracting it to the working directory.

localrepo: use propertycaches to access encode/decode filters

localrepo: load filter patterns outside of _filter

localrepo: have _loadfilter return the loaded filter patterns

merge with mpm

wireproto/http: drain the incoming bundle in case of errors

wireproto: introduce pusherr() to deal with "unsynced changes" error The behaviour between http and ssh still differ: - the "unsynced changes" is seen as a remote output in the http cases - but it is correctly seen as a push error for ssh

wireproto: redirect the output earlier

wireproto: return in finally was messing with the return inside the block

tests: use a glob for all of the host, might not be localhost

commands: add move alias for the rename command svn provides move, and it's also a standard tool on Windows.

util: make wrap() require a width argument This keeps hgweb's help engine from poking at file descriptors that don't exist.

showconfig: don't accept multiple sections and one config item Showconfig now behaves as documented and only accepts one section.name argument or a number of section names.

hgweb: another fix for the help termwidth bug

pager: don't run pager if nothing is written to stdout/stderr This decides when to run the pager based on the first call to ui.write() and ui.write_err(). This has the side effect of not the output of subprocesses that write output before hg does.

pager: add global --pager=<auto/boolean> option

color: add global option in extsetup() instead of globally This prevents side effects from occurring when importing the color extension.

hgweb: more ui fiddling

hgweb: fix hgweb_mod as well as hgwebdir_mod

hgwebdir_mod: use fake termwidth to avoid mod_wsgi's wrath

termwidth: move to ui.ui from util

help: improve description of update --check

store: encode first period or space in filenames (issue1713) - Mac OS X has problems with filenames starting with '._' (e.g. '.FOO' -> '._f_o_o' is now encoded as '~2e_f_o_o') - Explorer of Windows Vista and Windows 7 strip leading spaces of path elements of filenames when copying trees Above problems are avoided by encoding the first space (as '~20') or period (as '~2e') of all path elements. This introduces a new entry 'dotencode' in .hg/requires, that is, a new repository filename layout (inside .hg/store). Newly created repositories require 'dotencode' by default. Specifying [format] dotencode = False in a config file will use the old format instead. Prior Mercurial versions will abort with the message abort: requirement 'dotencode' not supported! when trying to access a local repository that requires 'dotencode'. New 'dotencode' repositories can be converted to the previous repository format with hg --config format.dotencode=0 clone --pull repoA repoB

demandimport: fix an obscure corner-case. Python's __import__() function has 'level' as the fourth argument, not the third. The code path in question probably never worked. (This was seen trying to run Mercurial in PyPy. Fixing this made it die somewhere else...)

keyword: enforce subn method via boolean switch There are only 2 patterns to choose, and so far only 1 case where kwtemplater.re_kw.subn is applied on data read from the working directory: when recording added files. With this change the code reflects more closely the boolean character of the switch and underlines the special case.

keyword: fix weeding of expansion candidates when recording Rearrange tests to check this, i.e. that there are changes in other files, not only the recorded one.

copies: don't detect copies as "divergent renames" (For the purposes of this patch copy is defined as a rename where the source continues to exist.)

strip: add --keep flag to avoid modifying wc during strip Fixes issue1564.

update: use higher level wording for "crosses branches" error When using "hg update" to update to a revision on another branch, if the user has uncommitted changes in the working directory, hg aborts with the following message: abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) If the user isn't trying to update to tip and they follow the command examples verbatim, they would end up updating to the wrong revision. This patch removes the command examples in favor of just telling the user to either merge or use --clean: abort: crosses branches (merge branches or use --clean to discard changes) hg also aborts if the user tries to use "hg update" to get to tip (without specifying a revision) and tip is on another branch: abort: crosses branches (use 'hg merge' or use 'hg update -c') This message is changed in the same fashion: abort: crosses branches (merge branches or use --check to force update)

hgweb: add help link to templates missed in ead4e21f49f1

test-convert-svn-encoding.t: ignore that subversion %-encodes $TESTTMP Use a glob instead of expecting $TESTTMP.

run-tests.py: remove support for .bat files

run-tests.py: do not install hg when the tests do no exist

setup.py: write libdir as a python string literal

patch: fails immediately upon malformed hunk patch(1) does silently ignore malformed hunks but this is not something we want to copy.

patch: always raise PatchError with a message, simplify handling

patch: simplify externalpatch() arguments

util: remove needbinary(), no longer used for external patching

patch: remove internal patcher fallback and NoHunk error By now the internal patcher is probably more reliable than anything we might find on the command line.

patch: remove unused patchmeta.lineno

patch: remove unused flags from readgitpatch()

test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP Use a glob instead of expecting $TESTTMP.

revsets: fix stray * in help topic

web: add a help view for getting hg help output

fix indentation error

merge: handle no file parent in backwards merge (issue2364)

merge with crew

ui.paths: expand paths directly in fixconfig (issue2373) var and home expansion should be done first.

setup/hg: always load Mercurial from where it was installed. This provides two new features: - Mercurial may be installed into a non-standard location without having to set PYTHONPATH. - Multiple installations can use Mercurial from different locations.

revsets: add a sample query to the help for getting active branches

revsets: add descriptions for sample queries in the help

mq: silence spurious output. When using a versioned patch repository, you would get a spurious warning when deleting and adding the same patch. Before: $ hg qdelete --keep 3.diff $ hg qimport --existing 3.diff adding 3.diff to series file 3.diff already tracked! After: $ hg qdelete --keep 3.diff $ hg qimport --existing 3.diff adding 3.diff to series file

revsets: clarify in the help that head() returns named branch heads

tests: add testcase for 208fc9ad6a48 to test-alias.t The testsuite lacks a testcase for the bug introduced in 208fc9ad6a48. This patch amends 301d7626e0ff (which fixed 208fc9ad6a48) by adding a testcase for that bug. With 208fc9ad6a48, test-alias.t (as modified by this patch) fails with "hg tglog: invalid arguments".

mq: handle deleting the same patch twice in one command (issue2427)

progress: make sure stderr has isatty before calling (issue2191)

windows: handle spaces in path to Python (issue2074)

minirst: pull admonition titles out formatblock function

minirst: refactor/simplify findblocks

inotify: raise correct error if server is already started in a deep repository When path is too long to be an Unix socket address, we create a socket in a temporary directory and link from the long path to the shorter one. But checks in server code at startup were insufficient in this case, and used to raise an unclear "tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists"

setup: user-friendly error message if Python headers are missing

test-keyword: ignore subject in notify hook mails Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP replacement fail.

test-keyword: fix test glob to ACL/SELinux flag

test-notify: fix fix for line continuation in long mail header lines Continued lines can also start with space. Note that this hack also incorrectly patches the diff output.

import: don't strip '#' lines from patch descriptions (issue 2417) Previously no '# ' lines came through the parser. Now only the first '# ' lines are processed, from '# HG changeset patch' and to the first line not starting with '# '.

test-notify: stabilize output test-notify is made a bit more stable by stripping "all" folders away instead of just 3.

tests: reintroduce ":$HGPORT" in test output This reduces the number of patterns that must be adjusted when writing tests.

tests: remove the last traces of $HGTMP $HGTMP isn't needed - and if we need something like that then $TESTTMP is more appropriate.

tests: remove filtertmp.py and helpers.sh These nice starts ended up being replaced with globs.

tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.

tests: replace test tmp directory with $TESTTMP in test output This reduces the number of patterns that must be adjusted when writing tests.

keyword: fix test glob

dispatch: properly handle relative path aliases used with -R (issue2376) This ensures the repo config is read relative to the repo root during dispatch.

dispatch: remove superfluous try/except when reading local ui config ui.readconfig() already handles IOError in this case.

test-globalopts: test hg -R file:// and hg -R path-alias

hgk: remember main window position

alias: back up and restore commands.norepo before checking for shell aliases

tests: unify test-check-code

keyword: switch kwtemplater.record in kw_dorecord() Obsoletes the need for a global recordcommands variable.

keyword: specific regular expressions depending on read mode More safeguarding against accidental (un)expansion: Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always stored unexpanded. Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only are interested in expanded keywords in this situation. Note: we cannot use ..): [^$\n\r]+? \$ because e.g. the {branch} template might be empty. hg record is a special case as we read from the working directory and need one regex each for modified and added files. Therefore test recording an added file. This way we finally also forbid sequences like $Id: $ being treated as keywords.

test-keyword: remove remaining sed calls

keyword: disable expansion in kwfilelog.read() if file renamed in node Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog. Reorder imports alphabetically.

keyword: make iskwfile() a weeding method in lieu of a boolean Update iskwfile docstring.

keyword: support copy and rename copy/rename destinations being unversioned and possibly ignored by the extension should not contain expanded keywords. Files copied/renamed from an ignored source are not touched. Add tests covering both of the above cases, plus the corner case of cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).

keyword: refactor kwtemplater.overwrite() Make kwexpand, kwshrink restricted commands - i.e. read from filelog without expansion for substition in kwtemplater.overwrite, and set/unset restricted mode for overwrite() in in kwcommitctx and the dorecord wrapper. Preselect candidates when working on changed files (rollback, record) outside kwtemplater class, and remove 6th argument from overwrite(). Avoid duplicate substitution/search in overwrite(): Only go into restricted read mode when reading from filelog. rollback and record read from the working directory, where restricted mode would already shrink keywords before overwrite() either expands or shrinks them again. This ensures that the usual automatic operations on keywords are turned off during overwrite() and only overwrite() itself acts on them. Reduce manifest calculation to the cases where it is needed. Move helper function for expansion removal outside kwtemplater class.

revlog.addgroup(): always use _addrevision() to add new revlog entries This makes parentdelta clone support pulling.

revlog._addrevision(): allow text argument to be None, build it lazily

changegroupsubset: use readdelta() fast path when delta is against a parent

run-tests: handle .tst not ending with an LF

minirst: small code cleanup

cat: fix cat without -r, broken by 0ae35296fbf4 The default revision for revsingle() is now '.' instead of None. This preserves the behavior of cat prior to it using revsingle().

revsets: introduce revsingle helper revsingle returns a context for the last revision of the supplied revspec

revsets: make revpair revsets-aware revpair returns the first and last members of the computed revset(s)

revset: lower precedence of minus infix (issue2361)

merge with stable

revset: fix #branch in urls for outgoing() hg log -r 'outgoing(..)' ignored #branch in some cases. This patch fixes it. The cases where it misbehaved are now covered by the added test-revset-outgoing.t

heads: mention STARTREV in synopsis and help for --rev Before this change, "hg help heads" said hg heads [-ac] [-r REV] [REV]... [...] If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. [...] -r --rev REV show only heads which are descendants of REV [...] which made little sense since there are two things called REV in the synopsis and nothing called STARTREV. A little digging reveals that the "[-r REV]" part of the synopsis was introduced in 8e503fa54d2d, changed to "[-r STARTREV]" in 2bcef677a6c3, and then changed back to "[-r REV]" in 4b02fc71bbba. The last change seems to be based on a patch[1] on our mailinglist that actually *inserted* STARTREV again in the help for the command line option itself. For some reason, the patch was changed to remove STARTREV from the synopsis. This change finally makes the help consistent by putting STARTREV back into the help in all places where it is needed: hg heads [-ac] [-r STARTREV] [REV]... [...] If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. [...] -r --rev STARTREV show only heads which are descendants of STARTREV [...] This was not possible until 40c06bbf58be, which introduced the possibility of naming the meta variables for each option. [1]: http://mercurial.markmail.org/message/qgc55gd4fam4ogvz

merge with stable

Added signature for changeset 93d8bff78c96

Added tag 1.6.4 for changeset 93d8bff78c96

merge with i18n

tests: unify test-rebase*

merge with stable

test-url: refactor with shorter lines

keyword: use workingctx to detect modified and added files after rollback

keyword: rename variable "cfiles" to "changed" for clarity

tests: unify test-casefolding

url: mark certificate error string for translation

i18n-pt_BR: synchronized with f2937d6492c5

merge with i18n stable

i18n-ja: synchronized with e356c5c21b15

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 552e0cfbddbd

merge with stable

test-doctest: test the modules that contains doctests

doc: clarify that https cert verification requires web.cacerts

url: verify correctness of https server certificates (issue2407) Pythons SSL module verifies that certificates received for HTTPS are valid according to the specified cacerts, but it doesn't verify that the certificate is for the host we connect to. We now explicitly verify that the commonName in the received certificate matches the requested hostname and is valid for the time being. This is a minimal patch where we try to fail to the safe side, but we do still rely on Python's SSL functionality and do not try to implement the standards fully and correctly. CRLs and subjectAltName are not handled and proxies haven't been considered. This change might break connections to some sites if cacerts is specified and the certificates (by our definition) isn't correct. The workaround is to disable cacerts which in most cases isn't much worse than it was before with cacerts.

test-subrepo-recursion: remove empty defaults section

mq: Removed extra ... in short help for qdelete Update to 57ad5c4e4213, which left a ... too much, after removing -r [REV]

mq: removed short option in help for deprecated options Removed help for deprecated short option for: -n NAME for qpush -n NAME for qpop -r REV for qdelete|qremove|qrm

test-subrepo-recursion: deleted default arguments Deleted default arguments from test-sub-repo-recursion. Rationale is that it is confusing to read, when the arguments aren't at each command in the test

tests: removed test names in tests The name of the test files is replaced with a glob * expression, thereby the tests does not depend on the filename of the file they are in.

tests: fix 05210e955bef merge error in test-git-import.t

test-convert-cvs-detectmerge: add sleep so cvs notices changes

init: expand destination url as a configured paths Most commands expands configured paths when repositories are specified, just as the urls help says. Clone also expands the destination path. Clone is morally equivalent to init + push/pull, so init should also expand the destination path - and that is what this patch makes it do. There is no really good usecases for this and in most cases it doesn't matter, but consistency is nice, and otherwise we would have to document the exception.

mq: explain qpush -f better

serve: let --web-conf help reference hgweb

transplant: add the transplanted revset predicate This adds support to identify a particular transplanted changeset or set of changesets. The argument is optional. Examples: hg log -r 'transplanted(1234 or 2345)' hg log -r 'transplanted()'

test-convert-cvs-branch: add sleep so cvs notices changes

graphlog: style with header and footer (issue2395) The glog command didn't emit header and footer from the style, as demonstrated by "hg glog --style xml". Asciiart combined with xml markup hardly makes sense, but header and footer might however be useful for adding for example html pre tags around the graph.

test-serve: use service that works on more platforms Follow-up to ba8850911703: echo is ambiguous on OS/X, and Solaris have neither http nor gopher. daytime seems to be available everywhere.

Merge with stable

patch: test and document a bit binary to regular file upgrade

patch: upgrade to git patch when removing binary file Otherwise it may cause data loss when removing binary files in mq with --git=auto.

patch: fix rename text to binary file (issue2400)

tests: show skip reason instead of "irrelevant" with unified tests, too parsehghaveoutput expects just the test output, not the merged test/output, so for skipped unified tests e.g.: Skipped test-convert-darcs.t: missing feature: irrelevant was shown instead of: Skipped test-convert-darcs.t: missing feature: darcs client

merge with stable

merge with iin

Correct Content-Type header values for archive downloads. The content type for both .tar.gz and .tar.bz2 downloads was application/x-tar, which is correct for .tar files when no Content-Encoding is present, but is not correct for .tar.gz and .tar.bz2 files unless Content-Encoding is set to gzip or x-bzip2, respectively. However, setting Content-Encoding causes browsers to undo that encoding during download, when a .gz or .bz2 file is usually the desired artifact. Omitting the Content-Encoding header is preferred to avoid having browsers uncompress non-render-able files. Additionally, the Content-Disposition line indicates a final desired filename with .tar.gz or .tar.bz2 extension which makes providing a Content-Encoding header inappropriate. With the current configuration browsers (Chrome and Firefox thus far) are registering the application/x-tar Content-Type and not .tar extension and appending that extension, yielding filename.tar.gz.tar as a final on-disk artifact. This was originally reported here: http://stackoverflow.com/questions/3753659 I've changed the .tar.gz and .tar.bz2 Content-Type values to application/x-gzip and application/x-bzip2, respectively. Which yields correctly named download artifacts on Firefox, Chrome, and IE.

merge with iin

i18n-pt_BR: update to new Portuguese ortography

i18n-pt_BR: minor rewording

i18n-pt_BR: assorted typo fixes

merge with i18n

i18n-pt_BR: synchronized with 84ceedcfeb6a

merge with i18n stable

i18n-de: parentrevspec extension

i18n-de: pager extension and missing parts of extdiff

i18n-de: added missing strings in acl

i18n-de: minor changes

i18n-de: notify extension

i18n-de: mq extension

i18n-de: deleted outdated messages with msgattrib, allowed language header

merge

i18n-de: keyword extension

i18n-de: interhg extension

i18n-de: more inotify

i18n-de: delete language duplicate, update last-translator

i18n-de: fix formatting

merge stable into default

i18n-de: fix broken translations, 66 defuzzied, 14 new translations

i18n-de: update pot

l10n: sig, glog, cia, hgk, highlight, inotify, interhg New status: 1851 messages complete with 302 fuzzies and 745 untranslated. Transmitted-via: Transifex (www.transifex.net).

merge with i18n

i18n-pt_BR: synchronized with 5be733b20bd1

l10n: churn, color, convert and eol extension done New status: 1793 messages complete with 306 fuzzies and 799 untranslated. Transmitted-via: Transifex (www.transifex.net).

i18n-da: synchronized with 2eadea60ae67

l10n: primarily added separate translations for template markers New status: 1583 messages complete with 423 fuzzies and 892 untranslated. Transmitted-via: Transifex (www.transifex.net).

l10n: based on a fresh pot file New status: 1459 messages complete with 435 fuzzies and 1004 untranslated. Transmitted-via: Transifex (www.transifex.net).

mq: removed return from callers to patchheader.qseries Some callers to patchheader.qseries returned the value further, but pathcheader.qseries does not explicitly return anything. It was confusing this was returned further

mq: added return 0 on success I have added return 0 on success in docstrings of the different not deprecated mq commands.

tests: fix tabs/indentation in test-strip-cross.t

alias: only allow global options before a shell alias, pass later ones through This patch refactors the dispatch code to change how arguments to shell aliases are handled. A separate "pass" to determine whether a command is a shell alias has been added. The rough steps dispatch now performs when a command is given are these: * Parse all arguments up to the command name. * If any arguments such as --repository or --cwd are given (which could change the config file used, and therefore the definition of aliases), they are taken into account. * We determine whether the command is a shell alias. * If so, execute the alias. The --repo and --cwd arguments are still in effect. Any arguments *after* the command name are passed unchanged through to the shell command (and interpolated as normal. * If the command is *not* a shell alias, the dispatching is effectively "reset" and reparsed as normal in its entirety. The net effect of this patch is to make shell alias commands behave as you would expect. Any arguments you give to a shell alias *after* the alias name are passed through unchanged. This lets you do something like the following: [alias] filereleased = !$HG log -r 'descendants(adds("$1")) and tagged()' -l1 $2 $3 $4 $5 $ hg filereleased hgext/bookmarks.py --style compact Previously the `--style compact` part would fail because Mercurial would interpret those arguments as arguments to the alias command itself (which doesn't take any arguments). Also: running something like `hg -R ~/src/hg-crew filereleased hgext/bookmarks.py` when `filereleased` is only defined in that repo's config will now work. These global arguments can *only* be given to a shell alias *before* the alias name. For example, this will *not* work in the above situation: $ hg filereleased -R ~/src/hg-crew hgext/bookmarks.py The reason for this is that you may want to pass arguments like --repository to the alias (or, more likely, their short versions like -R): [alias] own = !chown $@ `$HG root` $ hg own steve $ hg own -R steve

tests: fix test-fetch port number variability

tests: unify test-convert-tagsbranch-topology

tests: unify test-convert-tla

tests: unify test-convert-mtn

tests: unify test-convert-splicemap

tests: unify test-convert-git

tests: unify test-convert-filemap

tests: unify test-convert-datesort

tests: unify test-convert-hg-svn

tests: unify test-convert-hg-source

tests: unify test-convert-hg-sink

tests: unify test-convert-darcs

tests: unify test-convert-cvsnt-mergepoints

tests: unify test-convert-cvs-synthetic

tests: unify test-convert-cvs-detectmerge

tests: unify test-convert-cvs-branch

tests: unify test-convert-cvs

tests: unify test-convert-clonebranches

tests: unify test-convert-bzr-treeroot

tests: unify test-convert-bzr-merges

tests: unify test-convert-bzr-ghosts

tests: unify test-convert-bzr-directories

tests: unify test-convert-bzr-114

tests: unify test-convert-bzr

tests: unify test-convert-authormap

tests: unify test-convert

contrib/vim: add a syntax file for unified tests This syntax file adds: * Highlighting of comments, output, and commands (with sh highlighting in commands). * Folding for output and blocks of commands+output. * Setting tab/indent settings to 2 spaces, because that's what's defined by the unified test file format.

merge with stable

mq: removed -m from qpush help (Issue2401) The -m option became deprecated in changeset bcf90e712dc3, but the option still appeared in the help line for the qpush command

subrepos: add missing self argument to abstractsubrepo.checknested

test-pull: convert regexes to globs

test-ssh: test absolute path that exists

subrepo: improve lookup error messages

run-tests: move build/ directory to HGTMP Before, running a test would give you a build/ directory in the root of your Mercurial source tree. The directory had a full copy of the the source, so a grep in '**/*.py' would find files inside build/.

setup: slight simplification

Makefile: remove the build folder manually Given a system Python version of 2.6, the following won't clean up build: $ make local PYTHON=python2.7 $ make clean Distutils only cleans up build subdirectories for the current Python version. This patch cleans up the build folder even if PYTHON=python2.7 isn't specified to clean.

Makefile: remove all .so files during clean This ensures .so files in hgext are cleaned up.

keyword: support rollback by restoring expansion to previous values Prevent spurious differences in the working directory after a rollback. Add tests for several rollback situations.

keyword: do not expand at all during diff Always shrink and never expand keywords during a diff operation. Avoid user distraction e.g. because of spurious differences appearing in the commit editor.

keyword: restore restricted read mode value after overwriting Even though just enforcing expansion after overwriting files in the working directory caused no problems that we know of, this avoids a potential source of problems (e.g. in collaboration other extensions) at no costs.

test-keyword: fix typo, rephrase

tests: unify test-win32text

tests: unify test-template-engine

tests: unify test-strip-cross

tests: unify test-static-http

tests: unify test-ssh-clone-r

tests: unify test-ssh

tests: unify test-simplemerge-cmd

tests: unify test-share

tests: unify test-schemes

tests: unify test-rollback

tests: unify test-rename-merge2

tests: unify test-push-http

tests: unify test-pull-pull-corruption2

tests: unify test-pull-pull-corruption

tests: unify test-pull-http

tests: unify test-progress

tests: unify test-profile

tests: unify test-patch-offset

tests: unify test-parseindex

tests: unify test-parentrevspec

tests: unify test-notify-changegroup

tests: unify test-notify

tests: unify test-oldcgi

tests: unify test-newercgi

tests: unify test-newcgi

tests: unify test-mv-cp-st-diff

tests: unify test-mq-qrefresh-replace-log-message

tests: unify test-mq-qpush-fail

tests: unify test-mq-qnew

tests: unify test-mq-qimport-fail-cleanup

tests: unify test-mq-qimport

tests: unify test-mq-qclone-http

tests: unify test-mq-header-from

tests: unify test-mq-header-date

tests: unify test-merge-tools

tests: unify test-merge-symlinks

tests: unify test-mactext

tests: unify test-inotify-lookup

tests: unify test-inotify-issue1556

tests: unify test-inotify-issue1542

tests: unify test-inotify-issue1371

tests: unify test-inotify-issue1208

tests: unify test-inotify-dirty-dirstate

tests: unify test-inotify-debuginotify

tests: unify test-inotify

tests: unify test-http-proxy

tests: unify test-http-clone-r

tests: unify test-http-branchmap

tests: unify test-http

tests: unify test-highlight

tests: unify test-hgwebdirsym

tests: unify test-hgwebdir

tests: unify test-hgweb-removed

tests: unify test-hgweb-raw

tests: unify test-hgweb-non-interactive

tests: unify test-hgweb-no-request-uri

tests: unify test-hgweb-no-path-info

tests: unify test-hgweb-filelog

tests: unify test-hgweb-empty

tests: unify test-hgweb-diffs

tests: unify test-hgweb-descend-empties

tests: unify test-hgweb-commands

tests: unify test-hgweb

tests: unify test-hgk

tests: unify test-hghave

tests: unify test-hgcia

tests: unify test-gpg

tests: unify test-gendoc

tests: unify test-fetch

tests: unify test-eolfilename

tests: unify test-eol-update

tests: unify test-eol-hook

tests: unify test-eol-clone

tests: unify test-eol-add

tests: unify test-eol-patch

tests: unify test-eol

tests: unify test-encoding-align

tests: unify test-encoding

tests: unify test-encode

tests: unify test-diff-color

tests: unify test-ssh

tests: unify test-hup

tests: unify test-clone-pull-corruption

tests: unify test-clone-failure

tests: unify test-clone-cgi

test-ssh: test absolute paths in SSH URLs

revset: support raw string literals This adds support for r'...' and r"..." as string literals. Strings with the "r" prefix will not have their escape characters interpreted. This is especially useful for grep(), where, with regular string literals, \number is interpreted as an octal escape code, and \b is interpreted as the backspace character (\x08).

tests: fold darcs test repository into a bundle

tests: avoid checking the exitcode of false Solaris false returns 255 instead of 1, so we remove one unneeded instance and replaces another with (exit 1) as suggested by Brodie Rao.

test-rename: accept solaris diff Solaris diff gives @@ -1,1 +1,1 @@ instead of @@ -1 +1 @@

test-subrepo-svn: restore expr functionality for solaris Cleanup in 22f3353bcc36 removed a syntactically incorrect and apparently unnecessary escape of / for expr - but solaris needs it.

test-serve: fix test for binding to low named port on solaris Solaris do not know the service called http, so we use echo instead. Trying to define KILLQUIETLY when running the hgserve function didn't set the value within the function. Now we set the variable before calling the function.

templater: add a few comments.

backout most of 4f8067c94729

incoming/outgoing: Fix recursion on sub repositories Incoming and outgoing are fixed so they go through the whole three of repositories instead of only visiting first level of sub repositories.

tests: added a short description to issue numbers Many tests already had a short line to describe what IssueXXX is about. I find that quite useful when reading a test.

merge with stable

test-gendoc: mute gendoc stderr Solaris had problems with zh_CN and warned "couldn't set locale correctly" on stderr. We don't care.

test-mq-symlinks: fix symlink handling on solaris It seems like ln -s gets confused if an existing symlink is dangling: $ rm -f a b; ln -s a b; ln -sf b b ln: cannot create b: File exists We now rely on rm instead of on ln -sf.

test-archive: fix touch datestamps Backport 3acd5f7ab9d0 and 9581d5efb6a5 to stable.

Merge with stable

convert/darcs: improve unsupported format detection (issue2172)

bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016) _bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and tags caches initializations also recurse in lookup() and end up trying to access _bookmarks again. Massive confusion ensues. I considered fixing all branches and tags cache loading to avoid recursing in lookup() but it would add complexity to otherwise working code provided lookups are performed on nodes or revnums.

Fix memory leak when using hg commands over http repositories When using hg commands over an http repository in a long running process, a httphandler instance is leaked for each command, because of a loop handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which is not handled by Python's gc. Discussion on #mercurial concluded that removing the __del__ method solved the problem.

Use more note admonitions in help texts

Use note admonition

minirst: Support for admonitions The old asciidoc format supported something like this, this is why there is NOTE: scattered here and there.

cleanup: use x in (a, b) instead of x == a or x == b

merge with stable

grep: only catch re.error when compiling regular expressions

doc: clarify smtp.password usage

merge with stable

log: include unmodified-in-merge files in log diff/stat (issue2383) f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched filenames, but actually it only contains the names of files changed in the relevant changeset. That meant that log diff/stat of merges missed the diff for files only changed in the other branch. This is a minimal fix for making sure we only use fns when we are following and thus will have problems with merges anyway ...

tests: fix unzip -l variability fix 01-01-1980 slipped through the grep.

merge with stable

tests: fix unzip -l variability

mq: always require --force when pushing patches (issue2363) --force was not necessary when passing --rev since 55578a8d7e84, but this behaviour is usually harmful when branch names are passed instead of explicit revisions.

tests: various fixes for new unified test pattern format

tests: add glob matching for unified tests This adds a " (glob)" marker that works like a simpler version of (re): "*" is converted to ".*", and "?" is converted to ".". Both special characters can be escaped using "\", and the backslash itself can be escaped as well. Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't supported.

tests: require regexes in unified tests to be marked with " (re)" Consider this test: $ hg glog --template '{rev}:{node|short} "{desc}"\n' @ 2:20c4f79fd7ac "3" | | o 1:38f24201dcab "2" |/ o 0:2a18120dc1c9 "1" Because each line beginning with "|" can be compiled as a regular expression (equivalent to ".*|"), they will match any output. Similarly: $ echo foo The blank output line can be compiled as a regular expression and will also match any output. With this patch, none of the above output lines will be matched as regular expressions. A line must end in " (re)" in order to be matched as one. Lines are still matched literally first, so the following will pass: $ echo 'foo (re)' foo (re)

tests: ensure regexes match to the end of the string Regular expressions in the test suite are currently written assuming that you need a trailing ".*" to avoid matching to the end. Instead of matching regular expressions using "^pattern", this patch makes matching more restrictive by matching "^pattern$".

tests: don't match blank output lines as regexes in unified tests Currently, the following unified test will pass: $ echo foo A blank output line (a line containing just two spaces) will match any output. The patch modifies the unified test runner to ignore empty strings strings when do regular expression matching.

tests: improve regexes in unified tests