subrepo: lazily update git's local tracking branches This continues the strategy of separation between hg pull and hg update in git subrepos by only dealing with git's branches on an update. This behavior tries to cover the bare essentials of the semantics of git pull in the subrepo when the parent repo does hg pull and hg update.

subrepo: return both mapping directions from gitbranchmap

subrepo: strip gitcommand output

sshrepo: don't use readline() on the stderr pipe For some reason, the stat/readline dance suppressed lines following the first in PyPy 1.4.

test-demandimport.py: PyPy support The stringification of sys.stderr is different in PyPy: $ pypy -c 'import sys; print sys.stderr' <open file '<fdopen>', mode 'w' at 0x00a42080> $ python -c 'import sys; print sys.stderr' <open file '<stderr>', mode 'w' at 0x10025a270> The test will now ignore the exact value between the angle brackets.

demandimport: change default for level from None to -1 The Python default for this function is -1, indicating both relative and absolute imports should be used.[1] Previously, we relied on the Python VM not passing level when such semantics were requisted. This is not the case for PyPy, however, where a level of -1 is always passed to __import__. [1] <http://docs.python.org/library/functions.html#__import__>

export: flush the file pointer between patches

test-clone-failure.t: fix unification oversight Prior to unification, the test contained an 'echo $?' line. This line was removed during unification, but the 'echo 255' line that faked it when FIFO support is absent was not.

keyword: make kwfiles show deleted files configured for expansion

keyword: colorize hg kwfiles output