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