revlog: make sure the files are closed after an exception happens This prevents a corruption when the writes happen after the truncate initiated by the transaction rollback.

merge with crew

make sure not to reuse an existing append-file from a previous failed pull

Fix issue995 (copy --after and symlinks pointing to a directory) I haven't looked at other places that call os.path.isdir to make sure they're OK.

dirstate: ignore mode changes if the fs does not supports the exec bit This can make a difference when e.g. the repo is exported through NFS (which support exec bits) and CIFS (which does not).

merge: require --force when there are deleted files

add a test for a375ffc2aa1b

localrepo.commit: normalize commit message even for rawcommit. This normalization consists of: - stripping trailing whitespace - always using "\n" as the line separator I think the main reason rawcommit was skipping this normalization was an attempt to preserve hashes during an hg->hg conversion. While this is a nice goal, it's not particularly interesting in practice. Since SHA-1 is so strong, the only safe way to do it is to have absolutely identical revisions. But: - if the original revision was created with a recent version of hg, the commit message will be the same, with or without that normalization - if it was created with an ancient version of hg that didn't do any normalization, even if the commit message is identical, the file list in the changelog is likely to be different (e.g. no removed files), and there were some old issues with e.g. extra file merging, which will end up changing the hash anyway - in any case, if one *really* has to preserve hashes, it's easier (and faster) to fake a partial conversion using something like: hg clone -U -r rev orig-repo new-repo hg -R new-repo log --template '#node# #node#\n' > new-repo/.hg/shamap Additionally, we've had some reports of problems arising from this lack of normalization - e.g. issue871, and a user that was wondering why hg export/hg import was not preserving hashes when there was nothing unusual going on (it was just import doing the normalization that had been skipped). This also means that it's even more unlikely to get identical revisions when going $VCS->hg->$VCS.

debugancestor: use repo.lookup when no revlog was specified

update output of test-hgweb

setup.py: use a simplified custom version of CCompiler.has_function The original one doesn't remove its temporary files and even creates a temporary file in the CWD.

gitweb: show branches in most of the templates

hgweb_mod: add branch helper functions to use in templates

Automated merge with http://hg.intevation.org/mercurial/crew

win32text: use util.binary to detect \0

adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j

setup.py: skip inotify if there's no inotify_add_watch Debian Etch doesn't include a sys/inotify.h header, which makes it impossible to compile _inotify.c, making hg uninstallable. The cc.has_function() method is implemented by trying to compile a simple C program. Since there's no redirection involved all error messages are sent to the terminal. This is not particularly pretty but at least it allows the installation to complete.

run-tests.py: add a summary of failed tests at the end

fix incorrect date when committing a tag regression introduced by 989467e8e3a9

merge: fix handling of deleted files

setup.py: os.uname is not available on Windows

Automated merge with http://hg.intevation.org/mercurial/crew

Add inotify extension

convert: rename MAPFILE into REVMAP to disambiguate with filemap

Make mercurial easy installable

Add tests for the fixes to issue1014 (fractional timezones)

test-fetch failed due to non-zero exit code

Hide URL passwords in hg paths output.

Merge with main

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.