Fixed bash completion for filenames containing spaces.

merge with main

dates: Fix bare times to be relative to "today"

dates: improve timezone handling datestr: - add format specifiers %1 and %2 for timezone hours and minutes - remove timezone and timezone format options - correctly find timezone hours and minutes for fractional and negative timezones - update users strdate: - correctly find timezone hours and minutes for fractional and negative timezones

revlog: report node and file when lookup fails

Merge with crew

fetch: don't proceed if working directory is missing files (issue988)

fetch: rename --force-editor option to --edit, for consistency

dates: fix fractional timezone display rounding bug

churn: show comitter email addresses unclipped (bug 1023) Email addresses were being clipped at a hard-coded 20 chars. Measure the length of all email addresses and accommodate the longest.

gitweb: use {url} as entrypoint in notfound.tmpl instead of /

Support web.baseurl in hgwebdir, overriding SCRIPT_NAME

Fixed typo in tag help, found by John Coomes

hgweb: fix test results missed by 6218:345a23eca8f6

gitweb: remove some line breaks in archive and rss columns. Clean up archive formatting a little in the index page.

Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg

Add missing import of sys

convert: Remove unused clone method

convert: Fix unbound name error in the subversion backend

imerge: Fix unbound name error and add a test case

Remove unused imports

Expand import * to allow Pyflakes to find problems

Removed trailing spaces from everything except test output

Replaced tab in run-tests.py

tests: add --keep-tmp to run-tests.py to debug test environment When set, you can find the working dir of the test run as a uniquely named subdirectory of --tmpdir so you can inspect it.

fetch: make test reproducible, tiny code cleanup

fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

mq: test for qclone of http repo+queue tests f857eac30cd5 and 0c2b443fb3c3

When failing to load an extension, show where Hg tried to load it from.

hgweb/annotate: handle binary files like hgweb/file

test-status: Make assert function definition sh compatible.

Extend/correct acc40572da5b regarding -qA and ignored files. hg status -qA will now hide untracked files as described in the doc string.

'hg status -q' output skips non-tracked files. The '-q' flag was ignored in status command. But this flag can be used to hide non-tracked files in hg status output. This small correction makes status command more general, similar to 'svn status', where '-q' flag has the same effect. The '-u' and '-A' flags have priority over '-q'. A testcase and doc-string for status was extended to cover '-q' flag.

highlight: forgot import

highlight: guess by text when path name is ambiguous Although the docs claim that guess_lexer_for_filename will fall back to using file data, my ubuntu 7.10 pygments library seems to ignore the text argument. So call guess_lexer explicitly on failure.

highlight: make div trimmer work when lexer fails to identify text. In this case, there is no initial <span> tag.

highlight: use iter() instead of generator comprehension

mq: remove unimplemented option -f for strip

highlight: bail out if file is binary

highlight: support annotate, and reduce layering violations.

Introduce templateopts and logopts to reduce duplicate option definitions.

Add option -l/--limit to hg incoming and hg outgoing.

Move finding/checking the log limit to cmdutil

Make hg debugancestor accept -R by making it an optionalrepo command.

debugancestor: use *args instead of *opts, to not confuse with option dicts.

mq: Cleanup: update outdated file header.

convert: Clean up authormap key=value splitting. Introduces a subtle parsing difference: dstauthor can now contain '=' characters.

convert: Avoid redundant newline on authormap errors. The extra rstrip is necessary in case the file has uses different line terminators (i.e. CRLF).

convert: Ignore empty lines in authormap file.

Add config option to disable putting .hg_archival.txt inside archives.

add a blame alias for annotate The original cvs command was called blame. SVN has both, and other VC systems typically also have this as an alias. Makes things easier for converts.

warning on push should mention heads, not branches This makes the concept easier to relate to similar messages given on pull, and allows for a distinction between heads and (named) branches.

commands: lock() the repo while unbundling (issue1004)

patch: fix iterhunks() with trailing binary file removal Like some renames or copy operations, binary file removal does not generate any "file" or "hunk" action, but was not tagged as such and let iterhunk() assume no hunk was applied for the deleted file.

debugancestor: make the index argument optional, defaulting to 00changelog.i

Renamed "manifest" to "files" in web templates. manifest.tmpl is still used, so people having their own templates don't have to change them. "cmd=manifest" still works, new style URLs are not affected, because they already used "/file/".

Removed old-style hgweb templates

add explicit extension disabling syntax to hgrc.5

Permit XML entities to be escaped in template output. Useful for creating XML documents directly from Hg logging. Can also be used for HTML. For use in content, will escape '&', '<', and for completeness '>' (although it is not strictly necessary). For use in attributes, will also escape ' and ". Will also replace nonprinting (ASCII) control characters with spaces, since these are illegal in XML.

convert: add shallow, single branch svn conversions via svn.startrev