hgk: Use $HG instead of hg (see 849f011dbf79)

hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)

Remember path to 'hg' executable and pass to external tools and hooks as $HG.

Merge with main

rollback: update help for issue316

merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.

transplant: fix locking order

git patches: correct handling of filenames with spaces Add a trailing TAB to the "--- filename" lines if there's a space in the file name. This allows patch(1) to work correctly. The same is done for diff --nodates. This was originally suggested by Andrei Vermel, but at the time I thought git was doing something different.

Work around urllib2 digest auth bug with Python < 2.5 This should fix issue570.

dirstate.status: if a file is marked as copied, consider it modified After a "hg copy --force --after somefile cleanfile", cleanfile shouldn't be considered clean anymore.

Merge with Eric Hopper

Change branches to sort 'active' branches first, and add an option to show only active branches.

merge: warn user about divergent renames

Merge with crew

Handle CTRL+C in serve under Windows.

identify: take a path to a remote repo Rather than using -R, we take a path as an argument. This lets us use url#branch syntaxes that may be in hgrc.

dispatch: parse local hgrc for paths

hgweb_mod.archive(): Use 'key' instead of builtin 'id'.

Remove useless variable assignments in util.opener. The original idea might have been to prevent circular references, but as this assignment would have created another reference, this makes no difference.

identify: work with remote repos

identify: add support for output flags

identify: accept a revision argument

identify: use contexts

context: add tags() method

identify: show nullid for empty repo

Backed out changeset cfa477946181824f4c769580ebf59710090ba08a Only printenv was changed, not the actual execution of hooks. And not setting an empty value might cause problems on platforms which can't always remove variables from the environment.

Adjust note about variables not being set for empty values.

Kill trailing spaces

mq: test that qpush cleans things up when it fails

dirstate.invalidate: clear dirty flag

dirstate: fix typo

update the output of test-help and test-globalopts

Fix dispatch error message when not in a repo

archive: test md5 consistency

timestamp of gzip archives taken from changeset context

Test attempt to remove nonexistent tag

tag: abort when trying to remove nonexistent tags

Small fixes for 8e503fa54d2d (hg heads branch)

Add option to heads to show only heads for current branch.

Provide a version independent way to use the set datatype.

Fix read mode when importing patch.

Add tests for ui.patch regression.

patch: fix ui.patch regression introduced by 62019c4427e3. The idea is ui.patch is either empty or wisely filled by user.

printenv: filter empty environment variables for portability.

Merge with crew-stable

Document empty environment variables not being passed to hooks under Windows.

Merge with crew-stable

test-annotate: add a test for issue 589.

Fix issue 589: "undelete" sequence leads to crash.

Add test for debugrename

Fix debugrename --rev option

Updated copyright notices and add "and others" to "hg version"

Use printenv.py for pre/post-command-hooks (fixes tests on Solaris, too)

Cleanup of whitespace, indentation and line continuation.

dispatch: report failed imports nicely

demandimport: fix issue579 and add a test fix suggested by Brendan

dispatch: add generic pre- and post-command hooks

Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer. Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs. Additional changes to remove local DLL flag on uninstall and set privilege level.

Fix for including hgext in Windows compiled version. From Shun-ichi GOTO via Mercurial mailing list.

Merge with crew

Fix for demandimport.py and Windows compiled version. From Shun-ichi Goto in BTS issue 457 http://www.selenic.com/mercurial/bts/msg2780

Work around heisenbug in Popen3.__del__

Merge with mpm

hooks: separate hook code into a separate module

dispatch: fix handling of incorrect number of arguments

dirstate: pull ignore smarts out of ui

encoding: pull fallbackencoding out of localrepo into early parsing

extensions: kill ui readhooks Move .hgrc extension loading into localrepo

extensions: pull extension-aware bits out of ui

dirstate: refactor checkinterfering

dirstate: hide some more internals

dirstate: hide internal vars Add an __iter__ method so commands don't need to poke at _map.

localrepo and dirstate: rename reload to invalidate We want to avoid actually reloading if possible.

dirstate: simplify dirty handling

dirstate: lazify and lambdafy _slash

dirstate: simplify state()

dirstate: move ignore to its own file

dirstate: replace clear()

dirstate: fold parse into read

dirstate: make reload lazy

dirstate: lazify initdirs

dirstate: lazify copymap, _branch, and _pl

dirstate: use getattr rather than lazyread

Make fast-forward merges full merges

Fix up tests for new branch message

Notify the user that hg branch does not create a branch until commit

patchbomb: fix PAGER buglet introduced in 88fc92b0b821

patchbomb: page patchbomb messages only if PAGER is defined. Paging is complicated under win32. It is just better to avoid it by default.

cmdutil: add missing "time" import.

Merge with crew-stable

patchbomb: flush ui before delegating to pager.

test-patchbomb: fix non-existing --date parameter and filtering regexps.

test-patchbomb: sed -e may not work with extended regexps Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD) may not support extended regexps (i.e. including \| branches), or may need a special option to enable it (like -E instead of -e). Expand the sed RE in tests/test-patchbomb to fix running this test on FreeBSD and Solaris.

Make --import-branch option actually work (- is translated to _)

Add --import-branch option to hg import to pull in branch information without --exact

convert: remove pdb call. *blush*

convert: fix various authormap handling bugs

convert extension: Add support for username mapping Allows mapping usernames to new ones during conversion process. - Use -A option for first import - Then at the end of the conversion process and if the destination repo supports authorfile attribute, author map content is copied to the file pointed by the authorfile call. - On incremental conversions w/o any -A option specified, the destination authorfile, if any, gets read automatically. EG: This allows mapping unix system usernames used in CVS accounts to a more typical "Firstname Lastname <address@server.org>" pair.

convert extension: Save a few opens on the map file Save a few opens on the map file adding a class attribute

Merge with stable

Make parents with a file but not a revision use working directory revision.

Merge with crew

Make parents with a file but not a revision use working directory revision.

Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again. Repainted the bikeshed with its original color.

merge with main

extensions: fix lookup of hgext.foo modules

localrepo: demand-load changeset, manifest, and dirstate

Merge with crew

extensions: fix load of module/__init__.py on OS X

localrepo.status: only append stuff to the clean list if list_clean is true This is consistent with dirstate.status.

mq: reduce matcher abuse The match function should match only the files we're interested in.

commands.remove: don't use the unknown list

commands.commit: don't use the unknown list

localrepo.add: avoid some stats There's still an extra lstat done by dirstate.update.

revert: use util.lexists

addremove: use util.lexists

commands.commit: symlinks are supported

mq: grab locks before starting a transaction

Merge with crew

extensions: load modules in module/__init__.py form. For example, convert=/path/to/convert now works.