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