Mercurial > hg
view tests/notcapable @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
parents | 9ff996ba00b4 |
children | 1ac628cd7113 |
line wrap: on
line source
# Disable the $CAP wire protocol capability. if test -z "$CAP" then echo "CAP environment variable not set." fi cat > notcapable-$CAP.py << EOF from mercurial import extensions, repo def extsetup(): extensions.wrapfunction(repo.repository, 'capable', wrapper) def wrapper(orig, self, name, *args, **kwargs): if name in '$CAP'.split(' '): return False return orig(self, name, *args, **kwargs) EOF echo '[extensions]' >> $HGRCPATH echo "notcapable-$CAP = `pwd`/notcapable-$CAP.py" >> $HGRCPATH