Show More
@@ -398,8 +398,8 b' class hgsubrepo(abstractsubrepo):' | |||||
398 | if r == '' and not ignoreupdate: # no state recorded |
|
398 | if r == '' and not ignoreupdate: # no state recorded | |
399 | return True |
|
399 | return True | |
400 | w = self._repo[None] |
|
400 | w = self._repo[None] | |
401 | # version checked out changed? |
|
|||
402 | if w.p1() != self._repo[r] and not ignoreupdate: |
|
401 | if w.p1() != self._repo[r] and not ignoreupdate: | |
|
402 | # different version checked out | |||
403 | return True |
|
403 | return True | |
404 | return w.dirty() # working directory changed |
|
404 | return w.dirty() # working directory changed | |
405 |
|
405 | |||
@@ -744,8 +744,8 b' class gitsubrepo(abstractsubrepo):' | |||||
744 | (revision, self._relpath)) |
|
744 | (revision, self._relpath)) | |
745 |
|
745 | |||
746 | def dirty(self, ignoreupdate=False): |
|
746 | def dirty(self, ignoreupdate=False): | |
747 | # version checked out changed? |
|
|||
748 | if not ignoreupdate and self._state[1] != self._gitstate(): |
|
747 | if not ignoreupdate and self._state[1] != self._gitstate(): | |
|
748 | # different version checked out | |||
749 | return True |
|
749 | return True | |
750 | # check for staged changes or modified files; ignore untracked files |
|
750 | # check for staged changes or modified files; ignore untracked files | |
751 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) |
|
751 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) |
General Comments 0
You need to be logged in to leave comments.
Login now