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.

archive: remove spurious flag_bits setting This makes zip -T on resulting archives work. File permissions are still retained.

convert: sometimes git forgets the author

Merge with main

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.

rollback: update help for issue316

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