symmetricdifference: move back to copies It's too tightly dependent on known revlog ordering to fit well in ancestors

symmetricdifference: change colors to sides

ancestors: simplify symmetric difference - n_wanted/wanted -> interesting - scan colors rather than managing ret

copies: don't double-detect items in the directory copy check

copies: skip directory rename checks when not merging The directory rename checks are not meaningful unless we're moving or copying files across a branch during a merge.

copies: sort old names by depth

backout: reverse changeset belongs on current branch Backing out a changeset that is before a named branch branchpoint was making the reverse changeset the tip of the old branch, which is wrong and very confusing. So instead, we put it on the current named branch.

copies: fix silly precedence bug

churn: allow whitespaces as delimiter in aliases it was exactly on space character before.

merge with crew

hg serve: add clearer message when starting the server with --verbose Explicitly tell the address is the one the process is bound to. Fix the printing of IPv6 addresses.

convert: fix trailing space introduced in 5efd447a9b8d

pager: Add a configuration to enable/disable the pager for certain commands Add the configuration options pager.ignore and pager.attend. You can disable the pager on certain commands by adding them to the pager.ignore setting. To whitelist commands, you can add them to pager.attend. To disable or enable global commands like 'hg version' or 'hg help' you have to use your global .hgrc. (thanks, Matt Mackall)

keyword: regroup monkey patch code, underscore prefix private vars

merge with crew-stable

Fix test-convert-svn-tags on case sensitive filesystems

fix bug introduced by 2540521dc7c1 (thanks pychecker)

merge with -stable

fix error spotted by pychecker

fix bug introduced by 894875eae49b (short not defined)

merge with crew

fix warning from pychecker

fix error spotted by pychecker

Merge with crew-stable

commands: fix shadowed repo module

merge with crew

hgweb: remove dead code

Merge with crew-stable

test-convert-svn-source: remove redundant tests

convert: allow tags detection to be disabled Tags calculation becomes more reliable but slower, measurable on frequent synchronizations.

convert: follow svn tags history (issue953)

Add a test for svn tags conversion

convert: avoid svn log retrieval process cleanup With huge history (like kdelibs), the process termination suddenly consumes a lot of memory (from 700M to 1.3G+). Since the job is done, clean termination is not required, just exit.

test-convert-mtn: test directory deletion

fix const annotation warning

highlight: some small cleanups

hgweb: refactor hgweb code

hgweb: separate out utility functions

Backed out changeset d2bb66a8a435 (temporary template compatibility)

mercurial.el: note new Emacs VC mode support

manifest: improve parsing performance by 8x via a new C extension

Added signature for changeset bae2e9c838e9

Added tag 1.0 for changeset bae2e9c838e9

Tests for issue 1049

commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

Skip older monotone versions for tests. test-convert-mtn is known to work with 0.37 and 0.38, but fails with 0.31 (Debian etch). hghave now skips all versions up to 0.31.

run-tests.py: Only one fail message when output changed and error code. This fixes passing back fail messages mistaken for skip messages when running with parallel jobs because run_children() only expects one message per fail.

mq: use repo.changelog.tip() instead of the "tip" tag

Fix missing space in one of the new update messages.

qclone: do not abort if remote hasn't enabled mq (issue1040)

hgweb: add compatibility code for old templates Up to changeset 3340aa5a64f7, HTTP headers were expected to be embedded in the "headers" template. Since that changeset, the content-type is supposed to be defined as the "mimetype" template in the map file. This changeset makes sure the old templates still work.

Merge with crew

test-convert-mtn: test directory move

convert: record deleted files in monotone source

update: better logic and messages for updates - complain about attempts to merge with ancestor - when updating, differentiate between - crossing named branches with no local changes (jump) - crossing named branches with local changes (complain) - nonlinear update on the same named branch, no changes (complain some more) - nonlinear update on the same named branch, changes (different complaining)

hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486

setup.py: hide compiler error messages while searching for inotify

Add a test for monotone conversion

don't use hasattr in repo.invalidate hasattr ends up calling __getattr__ which will instantiate the very attributes we want to remove.

localrepo.commit: grab locks before getting the list of files to commit Somebody may change the dirstate after we've determined the parents of the working dir and run repo.status, but before we called wlock(). This should also fix issue997, where backout would change a file without changing its size and then call repo.commit without passing the list of files. If this happened in less than one second, we wouldn't detect any file changes - the in-memory dirstate still has the cached stat data for that file. Grabbing the wlock early causes the dirstate to be invalidated and we end up reading the dirstate file again, which has that file marked for lookup (size == -1). A better fix would be for backout to give repo.commit the exact list of files, but that'll require some changes to the revert operation. A significant user-visible change is that the precommit hook is always run with both locks grabbed - previously, hg commit would run it before grabbing any locks, but hg import would run it after grabbing locks.

Avoid calling heads() twice on every hg commit. In an extreme case (merging two revisions with very low revision numbers) this could be slower than the previous code, but it should be much faster in the usual cases (parents are near the tip). It also avoids some races in some uninteresting cases (e.g. two concurrent hg commits).

hgweb: better error messages

Remove unexpected "Alternately" word from tip help.

run-tests.py: Allow environment variables to set jobs/timeout/port.

convertrepo: make it work with refactored convert extension

Make tip help more helpful

test-imerge: test resolve subcommand

imerge: replace "merge" with "internal:merge" when non-interactive

hgk: display orphan revisions content (issue 1041)

test-mq-symlinks: skip if symlinks are not supported

test-notify: make it pass on Mac OS X 10.5

test-remove: make tests really pass Ah, the joys of cross-platform shell scripting...

test-remove: fix for non-gnu find

test-remove: make it pass on Mac OS X 10.5

tests: add highlight extension tests

tests: add tests for hgweb to test-keyword

Merge main and crew.

removed trailing spaces

ui: disallow newlines in usernames (issue1034)

update: no -C needed to switch branches without outstanding changes

coverage: deal with symlinked input paths (MacOSX issue) /tmp is symlinked in MacOSX therefore test scripts as well as python modules are installed in a symlinked location. coverage.py uses abspath() to normalize its inputs which fails if these are referencing real paths. Use realpath() instead.

Make churn an official extension

tiny tab cleanup

improved semantics for remove (issue438) - Added files are never deleted (only removed with --force). - Modified files can only be removed with --force. - With --after, only deleted files are removed. - With --after --force, all files are removed but not deleted.

test: fix mixing exec bit on test-hgwebdirsym

tests: make test-rebuildstate repeatable

tests: teach -i about fails list

tests: make test-convertcvs repeatable

test: Add tests for webdir symlinks and walkrepos.

mq: warn when applying a patch to somewhere other than tip

util: check fileno() validity in win32 set_binary()

clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved

give better error message on non-existent mapfile (issue813)

warn about new heads on commit (issue842)

hgweb: only accept POST requests for unbundle

tab/space cleanup

ui: copy overlay from both direct and indirect parentui

convert: allow missing tools not to stop source type detection

fix test-serve breakage for other hostnames

util: test fileno() availability in win32 set_binary() Fix suggested by Alexander Belchenko <bialix@ukr.net>

tests: fix repeatability for test-filebranch with dirstate granularity

tests: remove some unnecessary sleeps

dirstate: refactor granularity code, add a test - rename option dirstate.granularity - move option reading into .write() - add a simple test

dirstate: ignore stat data for files that were updated too recently This should fix the race where hg commit foo <change foo without changing its size> happens in the same second and status is fooled into thinking foo is clean. A configuration item is used to determine the timeout, since different filesystems may have different requirements (I think VFAT needs 3s, while most Unix filesystems are fine with 1s).

pager: remove pager code from core

pager: further simplify code, clean up comments

Use the pager given by the environment to display long output Unix systems usually have a PAGER environment variable set. If it is set, mercurial will use the pager application to display output. Two configuration variables are available to influence the behaviour of the pager: pager.application sets the application to be used pager.quiet silences Broken Pipe errors that might occur when the user quits the pager before mercurial finished to write the output

hgk: don't exit if mercurial commands only print warnings

tag: allow multiple tags to be added or removed - Example: "hg tag -r 42 build-25 beta-1" will add tags build-25 and beta-1 for rev 42. - The deprecated and undocumented usage "hg tag arg1 arg2" used to emit a warning, then add tag arg1 for rev arg2 (equivalent to "hg tag -r arg2 arg1"). It will now add tags arg1 and arg2 for the current revision. - If one tag triggers an error, no tags are added/removed (all or nothing).

tests: update test-command-template for the new {isodatesec} filter

Add an {isodatesec} template, to show seconds too.

convert: Add convert.cvsps option to set up an alternate cvsps command line.

hgwebdir: Tiny fix for webdir on non-symlink capable platforms.

Add tests for cloning from a all-history bundle

clone: use cancopy

Add ability to directly clone from all-history bundles bundlerepos can be used as clone src, even if CWD is not a repo

remoterepo: no longer needed All users already use repo.local() to test for local, which is false in the repository base class. statichttprepository never derived from this class anyway.

repo classes: remove unused dev() method

Add default local() and cancopy() methods to repository base class

make hgrc man page tell about ~/.hgrc on Windows

ui: make chuild ui feed output to parentui's active buffer

convert: fix test complaint for mtn bits

cleanup monotone conversion and use commandline class

initial version of monotone source for convert extension

notify: print diffstat even if maxline == 0

Make clear that for a changegroup '-r' pulls "up to" a revision If some better wording is found, it can be changed later.

two fixes for the pager stuff - open pipe in binary mode - don't start a pager if stdout is not a tty (this prevents test-ssh from hanging if you set ui.usepager=True in run-tests.py)

Use the pager given by the environment to display long output Unix systems usually have a PAGER environment variable set. If it is set, mercurial will use the pager application to display output. Two configuration variables are available to influence the behaviour of the pager. ui.pager sets the pager application. The pager is only used if ui.usepager is true. By default ui.usepager is disabled.

Fix thinko in test-inherit-mode If we don't change any rwx bit in the last test, hg will skip the calls to chmod since it'll assume they're not needed. This might fix things on BSD systems.

test-serve: replace copy/paste with shell function

revert: update state of files in the "checkout" list This can make a difference when there are filters involved and decode(encode(working-dir-data)) != working-dir-data even though encode(decode(repo-data)) == repo-data An example is a working dir file that uses only \n when you're using the win32text extension.

normallookup: during merges, restore the state saved by remove

dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.

debugstate: add --nodates This can be useful for tests.

patch: fix corner case with update + copy patch handling (issue 937) The self patching of files when diffed with a backup is a bit peculiar to me. It makes sense in mpatch, that's less clear in mercurial patching code. Let's document and preserve it for now.

Merge

Backed out changeset 4b81eecc8aa2

Merge

Backed out changeset 91ac1726730a

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

issue 1003: send all data properly

Remove unneeded "import os.path" again.

Spacing cleanup

filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) _repopath may be different from _path for workingfilectx when there are renames involved.

Change User-agent field in client to have a lot more info.

Allow hgwebdir collections to follow symlinks.

Revert cfebb175704f, fixing the output of 2 tests

test-mv-cp-st-diff: avoid linkrev collisions The copy detection code relies heavily on the linkrevs, so it's better to avoid collisions in this test.

convert: avoid querying log of foreign svn branches Server configuration may prevent access to other branches, so don't even try to get them, instead of ignoring them afterwards.

patch: check filename is /dev/null for creation or deletion (issue 1033) Otherwise, file creation or deletion is ambiguous with file being filled or emptied.

update tests for copy detection changes

copies: add tests for status -C/diff --git This goes through 42 combinations of copy/rename branch/parent/working dir.

copies: deal with symmetric difference for linear relationships choose the minimum of symmetric difference and the two revs in question

status: find copies and renames beyond the working directory

diff: use copy smarts from copies.py

copies: move findcopies code to its own module - pass in contexts - fold symmetricdifference check into copies.copies

merge: move symmetricdifferences to ancestor.py

merge: simplify some helpers

merge: more simplifications to checkcopies

merge: simplify checkcopies

merge: privatize some functions, unnest some others

merge: notice uncommited copies (issue1000) As mentioned in msg5349 in issue988, "hg update" doesn't take into account uncommitted copies. To reproduce: ---------------- hg init repo cd repo touch foo hg ci -Am 'add foo' echo >> foo hg ci -m 'change foo' hg up -C 0 hg mv foo bar HGMERGE=false thg --debug -y update -------------------------- A similar problem happens with hg merge --force. I'm attaching a possible patch.

Check for patches repo with os.path.isdir not os.path.exists

hook.py: fix redirections introduced by 323b9c55b328 The only non-obvious part is the use of sys.{__stderr__,__stdout__}, which is needed because sshserver overrides sys.stdout. This makes a test that I added back in revision 7939c71f3132 ineffective.

Issue937: error messages from hooks not sent over HTTP. Turns out that stderr - where ui.warn would send messages - was not being proxied over the HTTP connection. stdout was, and it seems you need both. (The streams are interleaved for readability.) Tested on Ubuntu 7.10 with lighttpd on hgweb.cgi with HTTP Basic auth, no SSL, using a changeset failing win32text.forbidcrlf.

revlog.py: remove extra close() atomictempfile.rename() already calls close().

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

hgweb: clarify which address and port can/cannot be bound at startup (bug 769) The error message at startup when the address/port could not be bound was confusing: hg serve abort: cannot start server: Address already in use Be more explicit: $ hg serve -a localhost abort: cannot start server at 'localhost:8000': Address already in use Also be more explicit on success, showing hostname and ip address/port: $ hg -v serve -a localhost -p 80 listening at http://localhost/ (127.0.0.1:80) We are careful to handle a missconfigured machine whose hostname does not resolve, falling back to the address given at the command line. Remove a dead-code error message.

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.

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