Mercurial > hg
comparison mercurial/context.py @ 21663:8d9449eaaeff
context: fix wrong indentation from renaming method
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Thu, 29 May 2014 16:09:16 -0500 |
| parents | 0a8e7f81e8ae |
| children | 151a992c3874 |
comparison
equal
deleted
inserted
replaced
| 21662:09f19e09f1b4 | 21663:8d9449eaaeff |
|---|---|
| 105 suspect symlinks in the case of FAT32 and NTFS filesytems. | 105 suspect symlinks in the case of FAT32 and NTFS filesytems. |
| 106 """ | 106 """ |
| 107 return s | 107 return s |
| 108 | 108 |
| 109 def _buildstatus(self, other, s, match, listignored, listclean, | 109 def _buildstatus(self, other, s, match, listignored, listclean, |
| 110 listunknown): | 110 listunknown): |
| 111 """build a status with respect to another context""" | 111 """build a status with respect to another context""" |
| 112 mf1 = other._manifestmatches(match, s) | 112 mf1 = other._manifestmatches(match, s) |
| 113 mf2 = self._manifestmatches(match, s) | 113 mf2 = self._manifestmatches(match, s) |
| 114 | 114 |
| 115 modified, added, clean = [], [], [] | 115 modified, added, clean = [], [], [] |
| 301 r = [[], [], [], [], [], [], []] | 301 r = [[], [], [], [], [], [], []] |
| 302 match = ctx2._matchstatus(ctx1, r, match, listignored, listclean, | 302 match = ctx2._matchstatus(ctx1, r, match, listignored, listclean, |
| 303 listunknown) | 303 listunknown) |
| 304 r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown) | 304 r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown) |
| 305 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, | 305 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, |
| 306 listunknown) | 306 listunknown) |
| 307 r = ctx2._poststatus(ctx1, r, match, listignored, listclean, | 307 r = ctx2._poststatus(ctx1, r, match, listignored, listclean, |
| 308 listunknown) | 308 listunknown) |
| 309 | 309 |
| 310 if reversed: | 310 if reversed: |
| 311 r[1], r[2], r[3], r[4] = r[2], r[1], r[4], r[3] | 311 r[1], r[2], r[3], r[4] = r[2], r[1], r[4], r[3] |
| 1400 clean += fixup | 1400 clean += fixup |
| 1401 | 1401 |
| 1402 return [modified, added, removed, deleted, unknown, ignored, clean] | 1402 return [modified, added, removed, deleted, unknown, ignored, clean] |
| 1403 | 1403 |
| 1404 def _buildstatus(self, other, s, match, listignored, listclean, | 1404 def _buildstatus(self, other, s, match, listignored, listclean, |
| 1405 listunknown): | 1405 listunknown): |
| 1406 """build a status with respect to another context | 1406 """build a status with respect to another context |
| 1407 | 1407 |
| 1408 This includes logic for maintaining the fast path of status when | 1408 This includes logic for maintaining the fast path of status when |
| 1409 comparing the working directory against its parent, which is to skip | 1409 comparing the working directory against its parent, which is to skip |
| 1410 building a new manifest if self (working directory) is not comparing | 1410 building a new manifest if self (working directory) is not comparing |