hgweb: improve shortlog formatting shorten author with |person don't shrink font (default font is presumed to be preferred reading size) set widths based on font ems rather than page percents.

strip: move strip code to a new repair module

strip: simplify bundle helper

strip: pull core strip logic into its own function

unbundle: accept multiple file arguments update test-bundle for multiple unbundle support

convert: handle new cvsps with Tags: and multiple tags.

cat: return an error on failure

tests: add merge test for changeset 9fe267f77f56 When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.

purge: add the clean alias inspired by git-clean and svn-clean

mercurial.el: ignore errors on hg-after-save-hook() Don't signal an error even if running hg command fails. Otherwise, succeeding hooks won't be called.

mercurial.el: change default log range to tip:0 If the tip revision is smaller than hg-rev-completion-limit (defaults to 100), "hg log -r tip:-100" fails. Since performance does not differ between "hg log -l 50 -r tip:0" and "hg log -l 50 -r tip:-100" even on large repository, default range can be changed from "tip:-100" to "tip:0" without any drawbacks.

Command in doc comment is now on a single line, fixed after previous formatting broke it.

purge: don't delete ignored files if --all is not specified

Enable to select encoding in hgrc web section This patch provides character encoding setting in each repository. After this patch, You can use multi encoding repositories with one mercurial server.

merge with main

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

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