Merged r12935 from trunk to 2.4-stable (#16177)

use Python getattr instead of hasattr.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12937 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2014-02-26 16:55:12 +00:00
parent dac4f38eb4
commit 8d7fd10f90

View File

@@ -79,7 +79,7 @@ def _tags(ui, repo):
def _branches(ui, repo):
# see mercurial/commands.py:branches
def iterbranches():
if hasattr(repo, 'branchtags'):
if getattr(repo, 'branchtags', None) is not None:
# Mercurial < 2.9
for t, n in repo.branchtags().iteritems():
yield t, n, repo.changelog.rev(n)