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
#failed qimport of patches from files should cleanup by recording successfully
#imported patches in series file.
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
hg init repo
cd repo
echo a > a
hg ci -Am'add a'
cat >b.patch<<EOF
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
a
+b
EOF
echo
echo '#empty series'
hg qseries
echo
echo '#qimport valid patch followed by invalid patch'
hg qimport b.patch fakepatch
echo
echo '#valid patches before fail added to series'
hg qseries