Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 11669:c47cb3193c53
localrepo.status: move fixup concatenation inside if block for clarity
clean += fixup only makes sense if fixup is not empty; it should
be inside the "if fixup" test.
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sun, 25 Jul 2010 10:05:38 +0900 |
| parents | 1f7f8bc45240 |
| children | 9df481f8036d |
comparison
equal
deleted
inserted
replaced
| 11668:f070d284994c | 11669:c47cb3193c53 |
|---|---|
| 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: |