equal
deleted
inserted
replaced
1062 or ctx1[f].cmp(ctx2[f].data())): |
1062 or ctx1[f].cmp(ctx2[f].data())): |
1063 modified.append(f) |
1063 modified.append(f) |
1064 else: |
1064 else: |
1065 fixup.append(f) |
1065 fixup.append(f) |
1066 |
1066 |
1067 if listclean: |
|
1068 clean += fixup |
|
1069 |
|
1070 # update dirstate for files that are actually clean |
1067 # update dirstate for files that are actually clean |
1071 if fixup: |
1068 if fixup: |
|
1069 if listclean: |
|
1070 clean += fixup |
|
1071 |
1072 try: |
1072 try: |
1073 # updating the dirstate is optional |
1073 # updating the dirstate is optional |
1074 # so we don't wait on the lock |
1074 # so we don't wait on the lock |
1075 wlock = self.wlock(False) |
1075 wlock = self.wlock(False) |
1076 try: |
1076 try: |