Fix repo.status() functions

This commit is contained in:
Kim Silkebækken 2013-02-06 08:56:18 +01:00
parent e3ce4adc3d
commit 5cc265affd
2 changed files with 3 additions and 2 deletions

View File

@ -59,7 +59,7 @@ try:
wt_column = ' ' wt_column = ' '
index_column = ' ' index_column = ' '
untracked_column = ' ' untracked_column = ' '
for status in self._repo().status(): for status in self._repo().status().values():
if status & (git.GIT_STATUS_WT_DELETED if status & (git.GIT_STATUS_WT_DELETED
| git.GIT_STATUS_WT_MODIFIED): | git.GIT_STATUS_WT_MODIFIED):
wt_column = 'D' wt_column = 'D'

View File

@ -42,7 +42,8 @@ class Repository(object):
else: else:
resulting_status = 0 resulting_status = 0
for status, paths in zip(self.repo_statuses, repo.status(unknown=True)): for status, paths in zip(self.repo_statuses, repo.status(unknown=True)):
resulting_status |= status if paths:
resulting_status |= status
return self.repo_statuses_str[resulting_status] return self.repo_statuses_str[resulting_status]
def branch(self): def branch(self):