Mercurial > hg
comparison mercurial/subrepo.py @ 24210:99362821b25b
subrepo: always return scmutil.status() from gitsubrepo.status()
This was accidentally left out of c95db3208a33.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 03 Mar 2015 21:24:16 -0500 |
| parents | 6944b64cc28d |
| children | 1e3e064c16a1 |
comparison
equal
deleted
inserted
replaced
| 24209:6944b64cc28d | 24210:99362821b25b |
|---|---|
| 1638 @annotatesubrepoerror | 1638 @annotatesubrepoerror |
| 1639 def status(self, rev2, **opts): | 1639 def status(self, rev2, **opts): |
| 1640 rev1 = self._state[1] | 1640 rev1 = self._state[1] |
| 1641 if self._gitmissing() or not rev1: | 1641 if self._gitmissing() or not rev1: |
| 1642 # if the repo is missing, return no results | 1642 # if the repo is missing, return no results |
| 1643 return [], [], [], [], [], [], [] | 1643 return scmutil.status([], [], [], [], [], [], []) |
| 1644 modified, added, removed = [], [], [] | 1644 modified, added, removed = [], [], [] |
| 1645 self._gitupdatestat() | 1645 self._gitupdatestat() |
| 1646 if rev2: | 1646 if rev2: |
| 1647 command = ['diff-tree', rev1, rev2] | 1647 command = ['diff-tree', rev1, rev2] |
| 1648 else: | 1648 else: |