Show More
@@ -453,7 +453,7 b' class dirstate:' | |||||
453 | unknown.append(x) |
|
453 | unknown.append(x) | |
454 | else: |
|
454 | else: | |
455 | ret[x] = self.map[x] |
|
455 | ret[x] = self.map[x] | |
456 |
|
456 | |||
457 | if not unknown: |
|
457 | if not unknown: | |
458 | return ret |
|
458 | return ret | |
459 |
|
459 | |||
@@ -463,7 +463,7 b' class dirstate:' | |||||
463 |
|
463 | |||
464 | for x in unknown: |
|
464 | for x in unknown: | |
465 | bs = bisect.bisect(b, x) |
|
465 | bs = bisect.bisect(b, x) | |
466 |
if bs != 0 and b[bs-1] == x: |
|
466 | if bs != 0 and b[bs-1] == x: | |
467 | ret[x] = self.map[x] |
|
467 | ret[x] = self.map[x] | |
468 | continue |
|
468 | continue | |
469 | while bs < blen: |
|
469 | while bs < blen: | |
@@ -485,7 +485,7 b' class dirstate:' | |||||
485 | dc = self.map.copy() |
|
485 | dc = self.map.copy() | |
486 | elif not dc: |
|
486 | elif not dc: | |
487 | dc = self.filterfiles(files) |
|
487 | dc = self.filterfiles(files) | |
488 |
|
488 | |||
489 | known = {'.hg': 1} |
|
489 | known = {'.hg': 1} | |
490 | def seen(fn): |
|
490 | def seen(fn): | |
491 | if fn in known: return True |
|
491 | if fn in known: return True | |
@@ -1081,7 +1081,7 b' class localrepository:' | |||||
1081 | # So, for this graph: a->b->c->d->e |
|
1081 | # So, for this graph: a->b->c->d->e | |
1082 | # \ / |
|
1082 | # \ / | |
1083 | # aa -----/ |
|
1083 | # aa -----/ | |
1084 |
# a has tag 2.6.12 |
|
1084 | # a has tag 2.6.12 | |
1085 | # d has tag 2.6.13 |
|
1085 | # d has tag 2.6.13 | |
1086 | # e would have branch tags for 2.6.12 and 2.6.13. Because the node |
|
1086 | # e would have branch tags for 2.6.12 and 2.6.13. Because the node | |
1087 | # for 2.6.12 can be reached from the node 2.6.13, that is eliminated |
|
1087 | # for 2.6.12 can be reached from the node 2.6.13, that is eliminated |
General Comments 0
You need to be logged in to leave comments.
Login now