Show More
@@ -689,19 +689,15 b' def checkstatus(repo, subset, pat, field' | |||||
689 | if fname not in c.files(): |
|
689 | if fname not in c.files(): | |
690 | return False |
|
690 | return False | |
691 | else: |
|
691 | else: | |
692 | for f in c.files(): |
|
692 | if not any(m(f) for f in c.files()): | |
693 | if m(f): |
|
|||
694 | break |
|
|||
695 | else: |
|
|||
696 | return False |
|
693 | return False | |
697 | files = repo.status(c.p1().node(), c.node())[field] |
|
694 | files = repo.status(c.p1().node(), c.node())[field] | |
698 | if fname is not None: |
|
695 | if fname is not None: | |
699 | if fname in files: |
|
696 | if fname in files: | |
700 | return True |
|
697 | return True | |
701 | else: |
|
698 | else: | |
702 | for f in files: |
|
699 | if any(m(f) for f in files): | |
703 |
|
|
700 | return True | |
704 | return True |
|
|||
705 |
|
701 | |||
706 | return subset.filter(matches, condrepr=(b'<status[%r] %r>', field, pat)) |
|
702 | return subset.filter(matches, condrepr=(b'<status[%r] %r>', field, pat)) | |
707 |
|
703 |
General Comments 0
You need to be logged in to leave comments.
Login now