add debugignore which yields the combined ignore patten of the .hgignore files For GUI clients its sometimes important to know which files will be ignored and which files will be important. This allows the GUI client to skipping redoing a 'hg status' when the files are ignored but have changed. (For instance, a typical case is that the "build" directory inside some project is ignored but files in it frequently change.)

diffstat: fix parsing of filenames with spaces The patch changes the output of "hg diff --stat" when one file whose filename has spaces has changed, making it get the full filename instead of just the substring between the last space and the end of the filename. It also changes the diffstat generated by "hg email -d" when one of the commit messages starts with "diff". Because of the regex used to parse the filename, the diffstat generated by "hg email -d" will still be not correct if a commit message starts with "diff -r ". Before the patch Mercurial has the following behavior: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) After the patch: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Before the patch: $ hg add mercurial/patch.py tests/tests-diffstat.t $ hg commit -m "diffstat: fix parsing of filenames" $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] filenames | 0 mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...] After the patch: $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...]

dispatch: use flag cmdalias.shell for detecting shell aliases

dispatch: debug message for missing arguments in shell alias Shows debug message if alias definition contains substitution variables, but insufficient number of arguments supplied.

dispatch: support for $ escaping in shell-alias definition Sigils in shell-alias can be escaped by doubling them.

fncachestore: defer updating the fncache file to a single file open Defers updating the fncache file with newly added entries to the end of the transaction (on e.g. pull), doing a single open call on the fncache file, instead of opening and closing it each time a new entry is added to the store. Implemented by adding a new abstract write() function on store.basicstore and registering it as a release function on the store lock in localrepo.lock (compare with dirstate.write). store.fncachestore overrides write() from basicstore and calls a new write function on the fncache object, which writes all entries to the fncache file if it's dirty. store.fncache.add() now just marks itself as dirty if a new name is added.

localrepo: acquire lock on stream_in

tests: sort fncache

localrepo: sort hg bookmark output sort bookmarks before we write them to stdout to get a predictable output.

templates: add bookmarks to command line styles

templater: add bookmarks to templates and default output as bookmarks are not dispalyed as tags anymore, we add a bookmark label to the changeset printer.

tags: do not merge bookmarks with tags bookmarks are no tags, therefore they should not be returned as tags.

context: add method to return all bookmarks pointing to a node

contrib: add win32/buildlocal.bat

Make sure bundlerepo doesn't leak temp files (issue2491) Add empty repository.close() and call it in dispatch. Remove bundlerepository.__del__(), merging it into bundlerepository.close(), which overrides repository.close(). http://docs.python.org/reference/datamodel.html says: "It is not guaranteed that __del__() methods are called for objects that still exist when the interpreter exits."

bookmarks: read current bookmark as utf-8 and convert it to local

hgk: gitk->hgk in About... menu

eliminate win32.user_rcpath_win32()

windows: eliminate system_rcpath_win32()

win32: move system_rcpath_win32() to windows.py no code change in system_rcpath_win32 This breaks the dependency from the win32 module on osutil

win32: new function executable_path

port win32.py to using the Python ctypes library The pywin32 package is no longer needed. ctypes is now required for running Mercurial on Windows. ctypes is included in Python since version 2.5. For Python 2.4, ctypes is available as an extra installer package for Windows. Moved spawndetached() from windows.py to win32.py and fixed it, using ctypes as well. spawndetached was defunct with Python 2.6.6 because Python removed their undocumented subprocess.CreateProcess. This fixes 'hg serve -d' on Windows.

win32: optimize parameters for the CreateFile call in _getfileinfo Set dwDesiredAccess to 0 instead of GENERIC_READ. Zero is enough for querying the file metadata. We don't even need to access the -contents- of the file. Set dwShareMode to FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE instead of the overly restrictive FILE_SHARE_READ. There is no need to cause write or delete accesses by other processes to fail while we are querying file metadata. See http://msdn.microsoft.com/en-us/library/aa363858(v=vs.85).aspx

merge with stable

url: return the matched authentication group name from readauthforuri() Internally, the group name is only used in debug statements, but readauthforuri can be also used externally to determine which group will be matched for a given URL.

url: move [auth] parsing out into a utility function No functionality change, but it makes the [auth] section parsing and best match detection usable by third party tools

url: use rsplit to split [auth] keys None of the auth section subkeys include a period, so it makes zero sense to not split from the end. By using rsplit() users can use the hostname as group keys.

mq: catch attempt to qpush to an earlier patch (issue2587) We can't assume that all pushable patches early in the series have already been applied. If a hg qselect is done while you already have patches applied, some patches with guards may now be pushable, even though they come earlier in the series. So instead of checking only applied patches, explicitly check where we are in the series against the position of the patch we want to qpush to.

bookmarks: move push/pull command features to core

bookmarks: merge current tracking on update into core

bookmarks: merge incoming/outgoing into core

bookmarks: merge suspect addchangegroup into core This is marked with FIXME because it's not clear that it makes any sense.

bookmarks: merge low-level push/pull support into core

bookmarks: merge lookup into localrepo

bookmarks: move strip support to repair

bookmarks: move color style to color

bookmarks: merge _findtags method into core

bookmarks: move revset support to core

bookmarks: merge invalidation into core

bookmarks: move commit action into core

bookmarks: merge rollback support into localrepo

bookmarks: move property methods into localrepo

bookmarks: move diff to core

bookmarks: move pushkey functions into core

bookmarks: move update into core

bookmarks: move read methods to core

bookmarks: move basic io to core

extensions: add an ignore list for old extensions

run-tests: only call WIFEXITED on systems it exists not on Windows or in jython

run-tests: loadable as module

hgignore: ignore more bytecode ignore optimized bytecode and jython bytecode

doc: Capitalize the "options" header of mercurial commands

doc: Add back quotes around filenames Filenames starting with a dot (.hg and .hgignore) confuse man when creating the ps documentation with "man -t hg >hg.ps" if they are not enclosed in back quotes.

merge with stable

opener: use posixfile to hold file open when calling nlinks() Mercurial's posixfile is less intrusive on Windows than Python's open

remove pointless os.path.join calls when opening files in .hg/cache Windows deals just fine with '/' in paths and Mercurial on Windows already does file accesses elsewhere with mixed \ and / in file paths anyway. This patch also makes the static-http repo case use proper URLs of the form http://example.com/repo/.hg/cache/branchheads http://example.com/repo/.hg/cache/tags instead of the entirely pointless http://example.com/repo/.hg/cache%5Cbranchheads http://example.com/repo/.hg/cache%5tags (as introduced by 5ccdca7df211)

backout: make help more explicit about what backout does The help for backout explains: The backout command merges the reverse effect of the reverted changeset into the working directory. Unfortunately, that does not make it obvious to a newcomer what the backout command does. Since it performs a 3-way merge, what is the common ancestor? Will the result be automatically committed? What is this reverted changeset --- is it the rev passed with -r on the command line or its inverse? So try to clarify the description, avoiding jargon and being explicit about what happens from the user's perspective. Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for help.

subrepo: fix pruning of subrepo filenames in dirstate (issue2619)

merge with self

merge with stable