diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -556,7 +556,7 @@ class Project(object): | |||
556 | '--unmerged', | 556 | '--unmerged', |
557 | '--ignore-missing', | 557 | '--ignore-missing', |
558 | '--refresh') | 558 | '--refresh') |
559 | if self.work_git.DiffZ('diff-index','-M','--cached',HEAD): | 559 | if self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD): |
560 | return True | 560 | return True |
561 | if self.work_git.DiffZ('diff-files'): | 561 | if self.work_git.DiffZ('diff-files'): |
562 | return True | 562 | return True |
@@ -585,14 +585,14 @@ class Project(object): | |||
585 | return self._userident_email | 585 | return self._userident_email |
586 | 586 | ||
587 | def _LoadUserIdentity(self): | 587 | def _LoadUserIdentity(self): |
588 | u = self.bare_git.var('GIT_COMMITTER_IDENT') | 588 | u = self.bare_git.var('GIT_COMMITTER_IDENT') |
589 | m = re.compile("^(.*) <([^>]*)> ").match(u) | 589 | m = re.compile("^(.*) <([^>]*)> ").match(u) |
590 | if m: | 590 | if m: |
591 | self._userident_name = m.group(1) | 591 | self._userident_name = m.group(1) |
592 | self._userident_email = m.group(2) | 592 | self._userident_email = m.group(2) |
593 | else: | 593 | else: |
594 | self._userident_name = '' | 594 | self._userident_name = '' |
595 | self._userident_email = '' | 595 | self._userident_email = '' |
596 | 596 | ||
597 | def GetRemote(self, name): | 597 | def GetRemote(self, name): |
598 | """Get the configuration for a single remote. | 598 | """Get the configuration for a single remote. |
@@ -1381,14 +1381,14 @@ class Project(object): | |||
1381 | tag_name = None | 1381 | tag_name = None |
1382 | 1382 | ||
1383 | def CheckForSha1(): | 1383 | def CheckForSha1(): |
1384 | try: | 1384 | try: |
1385 | # if revision (sha or tag) is not present then following function | 1385 | # if revision (sha or tag) is not present then following function |
1386 | # throws an error. | 1386 | # throws an error. |
1387 | self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr) | 1387 | self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr) |
1388 | return True | 1388 | return True |
1389 | except GitError: | 1389 | except GitError: |
1390 | # There is no such persistent revision. We have to fetch it. | 1390 | # There is no such persistent revision. We have to fetch it. |
1391 | return False | 1391 | return False |
1392 | 1392 | ||
1393 | if current_branch_only: | 1393 | if current_branch_only: |
1394 | if ID_RE.match(self.revisionExpr) is not None: | 1394 | if ID_RE.match(self.revisionExpr) is not None: |
@@ -1880,7 +1880,7 @@ class Project(object): | |||
1880 | self.level = self.level[1:] | 1880 | self.level = self.level[1:] |
1881 | 1881 | ||
1882 | info = info[1:].split(' ') | 1882 | info = info[1:].split(' ') |
1883 | info =_Info(path, *info) | 1883 | info = _Info(path, *info) |
1884 | if info.status in ('R', 'C'): | 1884 | if info.status in ('R', 'C'): |
1885 | info.src_path = info.path | 1885 | info.src_path = info.path |
1886 | info.path = out.next() | 1886 | info.path = out.next() |