with: use context manager in subrepo storeclean

with: use context manager in subrepo _cachestorehash

with: use context manager in largefiles commit

with: use context manager in unshelveabort

with: use context manager for wlock in transplant

with: use context manager for wlock in shelve stripcmd

with: use context manager for lock in continue

with: use context manager for wlock in unshelve

with: use context manager for wlock in shelve deletecmd

with: use context manager for wlock in shelve cleanupcmd

with: use context manager for wlock in shelve createcmd

with: use context manager for lock in histedit cleanupnode

with: use context manager for lock in qimport

with: use context manager for wlock in qfold

with: use context manager for wlock in qrefresh

with: use context manager for wlock in qpop

with: use context manager for wlock in qpush

with: use context manager for wlock in qnew

with: use context manager for wlock in mergeupdate

with: use context manager for wlock in overridepurge

with: use context manager for wlock in cmdutilforget

with: use context manager for wlock in overriderevert

with: use context manager for wlock in removelargefiles

with: use context manager for wlock in addlargefiles

with: use context manager for wlock in updatelfiles

with: use context manager for wlock in kw_dorecord

with: use context manager for wlock in kw_copy

with: use context manager for wlock in kw_amend

with: use context manager for wlock in keyword demo

with: use context manager for wlock in _kwfwrite

with: use context manager for wlock in sign

with: use context manager for wlock in checklookup

with: use context manager for wlock in copy

with: use context manager for wlock in workingctx.undelete

with: use context manager for wlock in workingctx.forget

with: use context manager for wlock in workingctx.add

with: use context manager for wlock in graft

with: use context manager for wlock in debugsetparents

with: use context manager for wlock in debugrebuilddirstate

with: use context manager for wlock in copy

with: use context manager for wlock in branch

with: use context manager for wlock in revert

with: use context manager for wlock in remove

with: use context manager for wlock in recordinwlock

with: use context manager for wlock in _writeactive

with: use context manager for wlock in _writerepo

sshpeer: make remotelock a context manager

lock: turn a lock into a Python context manager This lets us greatly simply acquire/release cycles. Code pattern before: try: lock = repo.lock() # zillions of lines of code finally: lock.release() And after: with repo.lock(): # ...

with: use context manager for I/O in changedfiles in patch

with: use context manager for file I/O in memusage

i18n: don't translate a transaction name

chgserver: mark as a built-in extension

chgserver: import background server extension from cHg This extension is copied from https://bitbucket.org/yuja/chg/ -r 86feb5f2e971 It could be imported as mercurial/chgserver.py, but in that case, we would have to resolve circular import between chgserver and commandserver. So I decided to keep it as an extension. chgserver.chgcmdserver -> commandserver.server commandserver._servicemap -> chgserver.chgunixservice

check-code: export needs a space to avoid false positives

rebase: small refactoring to allow better extensibility from extensions Inhibit, one of evolve's extension, would like to change the way rebase works with obsolete changesets. During a rebase with inhibit, the inhibition of the obsolescence markers should be lifted for the rebase. With this small refactoring, inhibit and can wrap the _filterobsoleterevs function to lift inhibition cleanly and at the same time this change makes rebases' code more legible.

tests: non-GNU mv can't move a file onto a hardlink of itself On Solaris, when you try to mv a file to another path that is a hardlink to the original, it complains that they're identical. GNU mv doesn't complain, but it's simpler to just remove the original file instead.

buildrpm: move creation of RPM directories from dockerrpm Handling the creation of the RPM directories in buildrpm is more consistent and takes care of non-docker builds as well.

i18n: fix a test-gendoc.t failure

test-ctxmanager: fix Python 2.6 compatibility problem

util: rename ctxmanager's __call__ method to enter

obsolete: make _computeobsoleteset much faster This patch makes _computeobsoleteset much faster by looping over the draft and secrets as opposed to looping over the successors. This works because "number of draft and secret" is typically way smaller(<100) than the number of successor in the repo (~90k in my checkout of core mercurial as of today). And also because it is very fast to compute "not public()". I timed the code with the following setup: """ from mercurial import hg, ui, obsolete ui = ui.ui() repo = hg.repository(ui, "~/hg") l = repo.obsstore.successors # This caches the result """ With about 90k successors. k=obsolete._computeobsoleteset(repo) before this patch: 10 loops, best of 3: 33.9 ms per loop k=obsolete._computeobsoleteset(repo) after this patch: 10000 loops, best of 3: 83.3 µs per loop

check-commit: sort errors by line number

check-commit: try to fix multiline handling The old code did not understand the difference between the first line of the summary, and a random line in the summary that happened to include a #, or a random line in the changes that happened to include it. 965788d9ae09 is an example where it fails

check-commit: support REVs as commandline arguments usage: * HG_NODE=REV check-commit * hg export REV | check-commit * check-commit REV ...

check-commit: modularize

check-commit: fix summary length regexp

util: simplify file I/O functions using context managers

run-tests: use a context manager for file I/O in TextTestRunner

bundlerepo: use context manager for file I/O in _writetempbundle

shelve: use a context manager for file I/O in listcmd

largefiles: use util.readfile in lfconvert

run-tests: use a context manager for file I/O

largefiles: use util.readfile in overrides

commands: use a context manager for file I/O in debugdiscovery

check-seclevel: use a context manager for file I/O

largefiles: use a context manager in _getfile

util: replace file I/O with readfile

patchbomb: replace file I/O with util.readfile

util: adjust hgcmd() to handle frozen Mercurial on OS X Previously, 'hg serve -d' was trying to exec the bundled python executable, which failed with: Unknown option: -- usage: python [option] ... Try 'python -h'... abort: child process failed to start See the previous patch for details about the content of the various command variables. Note that unlike the previous patch here an application bundling Mercurial could set $HG in the environment to get the correct result, there isn't anything that a bundling application could do to get the correct result here. 'hg serve -d' now launches under TortoiseHg, and there is a process listed in the background, but a client process cannot connect to it for some reason, so more investigation is needed.

util: adjust hgexecutable() to handle frozen Mercurial on OS X sys.executable is "$appbundle/Contents/MacOS/python" when Mercurial is bundled in a frozen app bundle on OS X, so that isn't appropriate. It appears that this was only visible for things launched via util.system(), like external hooks, where $HG was set wrong. It appears that Mercurial also uses 'sys.modules['__main__'].__file__' (here) and 'sys.argv[0]' (in platform.gethgcmd()) to figure out the command to spawn. In both cases, this points to "$appbundle/Contents/Resources/hg", which invokes the system python since "/usr/bin/env python" is on the shebang line. On my system with a screwed up python install, I get an error importing the os module if this script is invoked. We could take the dirname of sys.executable and join 'hg' instead of this if we want to be paranoid, but py2app boostrap is setting the environment variable since 0.1.6 (current version is 0.9), so it seems safe and we might as well use it.

util: adjust 'datapath' to be correct in a frozen OS X package Apparently unlike py2exe, py2app copies the Mercurial source tree as-is to a Contents/Resources subdirectory of an app bundle, and places its binary stub in Contents/MacOS. (The Windows install has the 'hgext' and 'mercurial' modules in 'lib/library.zip', while the help and templates subdirectories have been moved out of the mercurial directory to the root of the installation. I assume that the python code living in a zip file is why "py2exe doesn't support __file__".) Therefore, prior to this change, Mercurial in a frozen app bundle on OS X would go looking for help *.txt, templates and locale info in Contents/MacOS, where they don't exist. There are only a handful of places that test for frozen, and not all of them are wrong for OS X, so it seems wiser to handle them on a case by case basis, rather that try to change mainfrozen(). The remaining cases are: 1) util.hgexecutable() wrongly points to the bundled python executable, and affects $HG in util.system() launched processes (e.g. external hooks) 2) util.hgcmd() wrongly points to the bundled python executable, but it seems to only affect 'hg serve -d' 3) hook._pythonhook() may be OK, since I didn't see anything outrageous when printing sys.path from an internal hook. I'm not sure if this special case is needed on OS X though. 4) sslutil._plainapplepython() is OK, because sys.executable is not /usr/bin/python, nor is it in /System/Library/Frameworks

help: add --system flag to get help for various platform(s)

help: split config user settings file by platform

help: label windows config help

help: split out unix/plan9 config help

help: move config default marking to its own line

help: split config ui.portablefilenames

test-hgignore: add globs for Windows

tests: run check-commit on secret changes too

util: don't capture exception with a name since we don't use it Spotted by pyflakes.

changegroup3: move treemanifest support into _unpackmanifests() By putting the treemanifest code in _unpackmanifests(), _addchangegroupfiles() will only be about files again, and we get a nice symmetry between _packmanifests() and _unpackmanifest(). The immediate benefit to me is that remotefilelog should not need to be updated to work with treemanifests. It should also make server.validate and progress output easier to get right. Probably bundlerepo too.

changegroup3: add empty chunk separating directories and files Remotefilelog overrides changegroup._addchangegroupfiles(), assuming it is about files, which seems like a natural assumption. However, in changegroup3, directory manifests are sent in the files section of the changegroup. These naturally make remotefilelog unhappy. The fact that the directories are not separated from the files (although they do come before the files) also makes server.validate harder to implement. Since we read one chunk at a time from the steam, once we have found a file (non-directory) entry in the stream, we would have to push the read data back into the stream, or otherwise refactor the code. It will be easier if we add an empty chunk after all directory manifests. This change adds that empty chunk, although we don't yet take advantage of it on the reading side. We will soon move the tree manifest stuff out of _addchangegroupfiles() and into _unpackmanifests().

changegroup3: introduce experimental.changegroup3 boolean config In order to give us the freedom to change the changegroup3 format, let's hide it behind an experimental config. Since it is required by treemanifests, that will override the cg3 config.

changegroup: hide packermap behind methods This is to prepare for hiding changegroup3 behind a config option.

merge with stable

context: check for differing flags a little earlier This makes it clearer that a unchanged file whose flags have changed will be reported as a modification. Also test this.