util: improved the check for the existence of the 'buffer' builtin
2to3 is unable to translate '__builtin__' calls to 'builtins' when
hasattr is used (as in hasattr(__builtin__, buffer)). Translating the
check to the format
try:
whatever
except NameError
# define whatever
__builtin__.whatever = whatever
is a correct way of checking for the name and has the benefit of being
translated by 2to3. This patch implements the same idea for the
aforementioned example.
#!/bin/sh
hg init repo
cd repo
echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar'
echo foo2 >> foo
echo bleh > bar
hg ci -m 'change foo bar'
hg up -qC 0
hg mv foo foo1
echo foo1 > foo1
hg cat foo >> foo1
hg ci -m 'mv foo foo1'
hg merge
hg debugstate --nodates
hg st -q
echo '% removing foo1 and bar'
cp foo1 F
cp bar B
hg rm -f foo1 bar
hg debugstate --nodates
hg st -qC
echo '% readding foo1 and bar'
cp F foo1
cp B bar
hg add -v foo1 bar
hg debugstate --nodates
hg st -qC
echo '% reverting foo1 and bar'
hg revert -vr . foo1 bar
hg debugstate --nodates
hg st -qC
hg diff