reupdate the options after loading the repo local .hgrc could possibly override them, command line take priority

merge with upstream

Fix test permission

Fix test-mq-qnew-twice exit code and output.

mq: fix queue.apply to not call os.chdir() call to os.chdir broke "hg -R dirname qpush". instead pass -d (change directory) option to patch command.

mq: move many error messages to util.Abort

mq: do not allow to qnew a patch twice

run-tests.py: skip tests that should not run. print message when any test is skipped. count skipped tests.

make mq test more portable.

patchbomb: add content-disposition to make display inline and add filename if rev being emailed has tag that ends in .patch or .diff then use that as filename. else make up filename from name of repo.

patchbomb: optionally send patches as inline attachments

merge with crew.

make introductory message of patch series text/plain

run-tests.py: fix diff output when test-foo.out doesn't exist. Previously, if test-foo.out doesn't exist and test-foo outputs something, the first line of the diff will look like this: -+changeset: 0:0acdaf898367 (note the leading "-")

Allow tests that end in .py and .bat Revision 6ed46bad9530 disallowed tests that have a '.' in the name, but that also disallows tests that end in .py and .bat, even though run-tests.py has some code to special case them.

Merged backout head.

Backed out changeset 2ab464771b7d15c60014996d2853efc92cdb8465 - it always runs chmod - uses chmod in an unsafe way - if somebody does a clone of a repo, runs 'make tests', everything is fine, so he can assume the original repo is fine, too, but it is not.

mq: strip should not blow away local changes This changes the mq strip command to abort if there are any changes in the working directory.

mq: fix qnew and qimport to deal with series file comments qnew and qimport did not take comments into account when deciding where to place new patches in the series file.

mq: qpop should act like quilt pop qpop patchname would pop the named patch off the stack. This is slightly different from how quilt pop works. quilt pop pops everything up to the named patch.

mq: patch naming shortcuts This adds some more options to the mq lookup routine. It allows you to use shortcuts in naming patches to push or pop. You can now use: 1) a full patch name 2) a number to indicate an offset in the series file 3) a unique substring of the patch name 4) patchname[-+]num to indicate an offset from a given patch. For case #3 substrings are allowed. qtip and qbase are aliases for the top and bottom of the applied patch queue, unless they are already in the series file as patch names.

Improve bash_completion for patches in MQ

MQ: uniformise message and logfile option. Possibility to change message in qrefresh option

merge with crew.

Makefile do a chmod +x on test sceanrios

email: reflect that recipients are specified as comma-separated list

merge with crew

MANIFEST.in fixes

merge with gitweb

[hgweb] links to shortlog for the default templates

[hgweb] Shortlog template for default theme

merge gitweb with crew

[hgweb] Implemented shortlog (gitweb templates only)

[hgweb] Fixed up gitweb templates Now the gitweb templates have archive links

Add mq patch names to tagscache instead of overriding lookup. This makes mq patch names visible in hg log and hg tags. It also resolves the names only once, rather than on every lookup.

Update Windows and Mac installers to 0.9.1 release

added documentation for to, cc, and bcc addressing

optionally send blind carbon copies Bcc recipients may be set via long `--bcc' or hgrc only, no prompt.

fix reference to "smtp" section documentation for "method" has reference to "mail" section. "mail" section doesn't exist, changed to "smtp".

mq: uniform verbose display of patche[s]. In verbose mode, display: "index patchname" for unapplied patches "index cset:patchnames" for applied patches "index status patchname" in the serie listing.

Fixed confused directory changing in test-http.

extdiff : add comment on how to use vim for doing directoy diff

merge.

hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks all repository classes now have url() method that returns url of repo.

Provide a relevant description for --timeout.

self.root == '/': prefix length computation out of the loop - put the computation out of the loop - change the variable to a more meaningful name

Fix dirstate.walkhelper removing first char of nd when self.root == '/'.

Include all tests/*.py files in the MANIFEST so tests won't fail on tarballs. This fixes failing test-http-proxy and test-webraw.

Emacs: apply "expand-filename" on "default-directory". "default-directory" may has home directory("~") relative path in some runtime environment(or emacs revision ?), so expand-filename is required.

Emacs: apply kill-local-variable instead of make-local-variable to FORGET

hgweb: Configurable zebra stripes With this change, you can set [web] stripes=3 to get stripes every three lines (a-la fanfold paper), instead of every line on source and directory listings. The default behaviour is stripes=1 which generates output similar to current, and you can also turn stripes off by setting it to 0.

prune unwanted files from MANIFEST (backups, object files, etc)

Add qtip and qbase to mq qlookup.

Mq: modify repo.lookup to resolve applied patches too.

merge with crew.

status: add -c (clean) and -A (all files) options also add new localrepo.status what is more uniform than localrepo.changes. localrepo.changes is deprecated and will go away soon.

Added signature for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

Merge with crew

Merge with crew