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.
marked working directory as branch a
adding foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch c
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch æ
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch æ
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch b
created new head
unknown branch and fallback
abort: unknown branch 'z'!
2:f25d57ab0566
abort: unknown branch 'z'!
in rev c branch a
1:dd6e60a716c6
2:f25d57ab0566
1:dd6e60a716c6
2:f25d57ab0566
out branch .
1:b84708d77ab7
4:65511d0e2b55
1:b84708d77ab7
4:65511d0e2b55
out branch . non-ascii
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2:df5a44224d4e
3:4f4a5125ca10
2:df5a44224d4e
3:4f4a5125ca10
clone branch b
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
updating to branch b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2:65511d0e2b55
1:b84708d77ab7
2:65511d0e2b55
clone rev a branch b
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
updating to branch a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2:65511d0e2b55
1:b84708d77ab7
0:5b65ba7c951d