Mon, 06 Dec 2010 16:03:00 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 06 Dec 2010 16:03:00 -0600] rev 13088
merge with stable
Sun, 28 Nov 2010 17:19:23 -0500 subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu> [Sun, 28 Nov 2010 17:19:23 -0500] rev 13087
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.
Sun, 28 Nov 2010 15:21:23 -0500 subrepo: return both mapping directions from gitbranchmap
Eric Eisner <ede@mit.edu> [Sun, 28 Nov 2010 15:21:23 -0500] rev 13086
subrepo: return both mapping directions from gitbranchmap
Sun, 28 Nov 2010 15:03:48 -0500 subrepo: strip gitcommand output
Eric Eisner <ede@mit.edu> [Sun, 28 Nov 2010 15:03:48 -0500] rev 13085
subrepo: strip gitcommand output
Wed, 01 Dec 2010 21:46:08 +0100 sshrepo: don't use readline() on the stderr pipe
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 01 Dec 2010 21:46:08 +0100] rev 13084
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.
Wed, 01 Dec 2010 21:46:08 +0100 test-demandimport.py: PyPy support
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 01 Dec 2010 21:46:08 +0100] rev 13083
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.
Wed, 01 Dec 2010 21:46:08 +0100 demandimport: change default for level from None to -1
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 01 Dec 2010 21:46:08 +0100] rev 13082
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__>
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip