Mercurial > hg
comparison mercurial/obsolete.py @ 18644:3e92772d5383
spelling: fix some minor issues found by spell checker
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 10 Feb 2013 18:24:29 +0100 |
parents | 4148414da120 |
children | e9331e979d7a |
comparison
equal
deleted
inserted
replaced
18643:cc28a84db8c9 | 18644:3e92772d5383 |
---|---|
44 - When changeset A is split into B and C, a single marker are used: | 44 - When changeset A is split into B and C, a single marker are used: |
45 | 45 |
46 (A, (C, C)) | 46 (A, (C, C)) |
47 | 47 |
48 We use a single marker to distinct the "split" case from the "divergence" | 48 We use a single marker to distinct the "split" case from the "divergence" |
49 case. If two independants operation rewrite the same changeset A in to A' and | 49 case. If two independents operation rewrite the same changeset A in to A' and |
50 A'' when have an error case: divergent rewriting. We can detect it because | 50 A'' when have an error case: divergent rewriting. We can detect it because |
51 two markers will be created independently: | 51 two markers will be created independently: |
52 | 52 |
53 (A, (B,)) and (A, (C,)) | 53 (A, (B,)) and (A, (C,)) |
54 | 54 |
127 # |/ | 127 # |/ |
128 # o Z | 128 # o Z |
129 # | 129 # |
130 # But by transitivity Ad is also a successors of A. To avoid having Ad marked | 130 # But by transitivity Ad is also a successors of A. To avoid having Ad marked |
131 # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>. | 131 # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>. |
132 # This flag mean that the successors are an interdiff that fix the bumped | 132 # This flag mean that the successors express the changes between the public and |
133 # situation, breaking the transitivity of "bumped" here. | 133 # bumped version and fix the situation, breaking the transitivity of |
134 # "bumped" here. | |
134 bumpedfix = 1 | 135 bumpedfix = 1 |
135 | 136 |
136 def _readmarkers(data): | 137 def _readmarkers(data): |
137 """Read and enumerate markers from raw data""" | 138 """Read and enumerate markers from raw data""" |
138 off = 0 | 139 off = 0 |
508 # During this step, we may detect obsolescence cycles: a node | 509 # During this step, we may detect obsolescence cycles: a node |
509 # with unknown successors sets but already in the call stack. | 510 # with unknown successors sets but already in the call stack. |
510 # In such a situation, we arbitrary set the successors sets of | 511 # In such a situation, we arbitrary set the successors sets of |
511 # the node to nothing (node pruned) to break the cycle. | 512 # the node to nothing (node pruned) to break the cycle. |
512 # | 513 # |
513 # If no break was encountered we proceeed to phase 2. | 514 # If no break was encountered we proceed to phase 2. |
514 # | 515 # |
515 # Phase 2 computes successors sets of CURRENT (case 4); see details | 516 # Phase 2 computes successors sets of CURRENT (case 4); see details |
516 # in phase 2 itself. | 517 # in phase 2 itself. |
517 # | 518 # |
518 # Note the two levels of iteration in each phase. | 519 # Note the two levels of iteration in each phase. |
549 # | 550 # |
550 # Successors set contributed by each marker depends on the | 551 # Successors set contributed by each marker depends on the |
551 # successors sets of all its "successors" node. | 552 # successors sets of all its "successors" node. |
552 # | 553 # |
553 # Each different marker is a divergence in the obsolescence | 554 # Each different marker is a divergence in the obsolescence |
554 # history. It contributes successors sets dictinct from other | 555 # history. It contributes successors sets distinct from other |
555 # markers. | 556 # markers. |
556 # | 557 # |
557 # Within a marker, a successor may have divergent successors | 558 # Within a marker, a successor may have divergent successors |
558 # sets. In such a case, the marker will contribute multiple | 559 # sets. In such a case, the marker will contribute multiple |
559 # divergent successors sets. If multiple successors have | 560 # divergent successors sets. If multiple successors have |
560 # divergents successors sets, a cartesian product is used. | 561 # divergent successors sets, a cartesian product is used. |
561 # | 562 # |
562 # At the end we post-process successors sets to remove | 563 # At the end we post-process successors sets to remove |
563 # duplicated entry and successors set that are strict subset of | 564 # duplicated entry and successors set that are strict subset of |
564 # another one. | 565 # another one. |
565 succssets = [] | 566 succssets = [] |