fix mq test output.

merge patches from brendan cully that did not apply clean against tip.

Add -s option to qseries: display first line of patch header.

Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help <extension> doesn't understand this form without this patch.

Add more verbose help text to mq commands.

Add -m, -l, -e options to qfold.

Add -f option to qdelete, to remove patch file.

mq: add qmv as alias for qrename

New self-explanatory command qrename.

[darcs2hg] Windows compatibilty patct Originally submitted by Daiju Kito 1. single quote didn't work in several cases 2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.

New mq command qfold: Merge patches into the current patch. Patches should be in the series file but not yet applied.

Add command qheader to display the header of a given patch.

Add option -e/--edit to qrefresh, to edit the existing header.

Change patch header as well as commit message with qrefresh -m or -l.

Remove pointless reposetup hook from hgk.py

import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.

mq: correct the use of super The first argument passed to super is supposed to be the class where it's being used, not self.__class__ - the two can be different when there's inheritance involved.

log: add -f/--follow option, to follow rename/copy

clean up hg.py: move repo constructor code into each repo module

merge with mpm.

pull: allow to pull from bundle file without need for bundle: syntax

avoid calling (cd ...) with `nil' as a directory name When (hg-root) cannot determine the current Mercurial root, print an error message instead of trying to evaluate (cd nil).

fix output file format %r

hbisect.py: don't rely on __del__ to write the current state. This is yet another page of the "Thou shalt not do too much inside __del__ methods" book, in the "demandload and __del__ don't go well together" chapter. The bisect extension is broken in 0.9.1: $ hg bisect init $ hg bisect bad Fatal Python error: Interpreter not initialized (version mismatch?) Aborted (yes, I tripled checked my instalation to make sure the problem is not there) It's been broken since revision fe1689273f84 moved the import of the binascii module into a demandload. (In details: the first time that "hg bisect bad" (or good) is called, there are still no revisions saved in .hg/bisect/*, so bisect.__init__ doesn't call hg.bin on anything. So, when we reach __del__, the binascii module still hasn't been imported and we get that "nice" message above.)

hgcommand.vim: cleanup of doc self-install code

import: allow application/x-patch for funny patch from christian ebert

patchbomb: do not write Bcc

Kill ui.setconfig_remoteopts This brought too much knowledge about command line particulars into the ui code. Moved to commands.py.

merge with crew.

mq: add basic tests

mq: allow to apply patches in subdir of repo again i broke it in 35caf437a201.

merge with tah

Add test mq keeping a reference to localrepo which can't remove journal on exit.

mq: update to handle repomap not longer used

mq: replace module-wide repo hash with a repo attribute

mq: do not hold a reference to repo in tags override Instead, replace repo's class object with a subclass.

patchbomb: fix generation of message-id when sending attachments node was set to bin(node) before message-id was created

merge with crew.

mq: add qclone command

hg.py: add islocal() and defaultdest() functions, refactor islocal tells if a repo or url is local. defaultdest returns default path for clone if explicit path not given. clone can now take repo or url as source

makes 'hg diff' diff the file in sorted order

merge with tonfa

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

merge with upstream

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

Fix test permission

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.