hgweb: minor improvements for new web style - make renamelink take a context - pass current node to shortlog page rather than tip - pass user/desc/date/rename to filediff - improve template error reporting for foo%bar

add simple dump and undump scripts to contrib/

Merge with stable

copies: refactor symmetricdifference as _findlimit We only need to track the lowest revision seen, which makes things simpler.

copies: teach symmetric difference about working revisions - use changelog.count() as a pseudo revision number - abort early in copies if revs are the same - eliminate working dir hacks in copies - yield results as they're found

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