Alter test to test import --exact to make sure it works with branches.

Add ability to parse branch information to hg import

Add a test for the Branch header being in hg export.

Fix issue 563: error in _hg_commit in the contrib/zsh_completion script.

Fix issue 562: .hgignore requires newline at end. End-of-lines characters where discarded without any check for existence.

Test issue 562: .hgignore requires newline at end

Fix hg import --exact bug that hangs hg on failure.

Make mergepatch save queue now that qpush isn't.

Add branch information to hg export.

Add ui.patch option. ui.patch overrides the default patch/gpatch command and options.

Fix issue483 - mq does not work under windows with gnu-win32 patch. Add --binary option to patch command under win32.

mercurial.el: fix error on hg-read-rev() with small tip, and cleanups * Fix error if tip revision is smaller than hg-rev-completion-limit If tip revision is 10, "hg log -r -100:tip" fails. * Remove dependencies on cl package at runtime Quote from GNU Emacs Lisp Reference Manual, Emacs Lisp Coding Conventions: > * Please don't require the `cl' package of Common Lisp extensions at > run time. Use of this package is optional, and it is not part of > the standard Emacs namespace. If your package loads `cl' at run > time, that could cause name clashes for users who don't use that > package. * Check XEmacs at compile time Since byte-compiled file is not portable between GNU Emacs and XEmacs, checking type of emacs can be done at compile time. This reduces byte-compiler warnings. * Defvar variables binded dynamically and used across functions * Combine status output string to state symbol alist into a variable, and use char instead of string for key of state alist * Make hg-view-mode as minor-mode * Define keymaps as conventions

mq: add qgoto command.

Fix typo in bugzilla extension.

Fix test-patchbomb for crew

mq.el: add mq-signoff, to sign off on a patch

mq.el: don't fill half the screen with a single line of output.

mq.el: add hook to run when finishing the edit of a patch.

imported patch mq-refresh-git.patch

mq.el: allow mq-diff to take a git option.

mq.el: add mq-diff function.

mq.el: add mq-edit-series function.

mq.el: add mq-new function.

Fix up patchbomb test

add test for patchbomb extension.

contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.

MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

Merge with stable

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.

branch.cache: silently ignore I/O and OS errors

context: fix workingfilectx._changectx

mercurial.el: don't raise an error from find-file-hook find-file() shouldn't fail even if unreadable .hg directory is exists. Not enabling hg-mode is sufficient for that senario.

mercurial.el: move defmacro of hg-do-across-repo before use Macros must be defined before use to be byte-compiled properly.

Unconfuse font-lock

Add fast-forward branch merging

Merge with crew-stable. HG: changed hgext/mq.py

simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.

Move win32 find_in_files from util_win32 to util.

mq: fix qtop failure when the series ends with guarded patches.

Test qtop breaking when series ends with guarded patches.

Merge with stable

mq: account for readheaders munging in qrefresh

Merge with crew-stable

Update Windows build instructions.

merge: reorganize some hunks in findcopies

merge: simplify a check in checkcopies

merge: expand and simplify the invalid handling for directory moves

merge: fix a bug detecting directory moves When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.

merge: clarify the findcopies code

verify: hold write lock Verify will report spurious errors if commits or pulls happen during verify.

Also restore old rm -A behavior for inexact patterns

Fix rm -A with no patterns, which I just broke.

Make rm --after simply mark files as removed, unless --force is also given

Add hgwebdir.fcgi to contrib

Flesh out bisect help text

Merge with crew

Fix minor mismerge. The caching of umask ended up being duplicated.

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Add notes about configuring a merge program

Update copyright year and change to range

Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.

Merge with crew

Fix find_in_path not including some file extension logic under win32. Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.

Fix bad reference to RepoError in import command