equal
deleted
inserted
replaced
1507 |
1507 |
1508 def dirty(self, missing=False, merge=True, branch=True): |
1508 def dirty(self, missing=False, merge=True, branch=True): |
1509 "check whether a working directory is modified" |
1509 "check whether a working directory is modified" |
1510 # check subrepos first |
1510 # check subrepos first |
1511 for s in sorted(self.substate): |
1511 for s in sorted(self.substate): |
1512 if self.sub(s).dirty(): |
1512 if self.sub(s).dirty(missing=missing): |
1513 return True |
1513 return True |
1514 # check current working dir |
1514 # check current working dir |
1515 return ((merge and self.p2()) or |
1515 return ((merge and self.p2()) or |
1516 (branch and self.branch() != self.p1().branch()) or |
1516 (branch and self.branch() != self.p1().branch()) or |
1517 self.modified() or self.added() or self.removed() or |
1517 self.modified() or self.added() or self.removed() or |