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.