##// END OF EJS Templates
obsolete: rename precursor into predecessor in obsolete docstrings...
Boris Feld -
r33700:0c3112f1 default
parent child Browse files
Show More
@@ -20,12 +20,12 b' facilitate conflict resolution, markers '
20 20 besides old and news changeset identifiers, such as creation date or
21 21 author name.
22 22
23 The old obsoleted changeset is called a "precursor" and possible
23 The old obsoleted changeset is called a "predecessor" and possible
24 24 replacements are called "successors". Markers that used changeset X as
25 a precursor are called "successor markers of X" because they hold
25 a predecessor are called "successor markers of X" because they hold
26 26 information about the successors of X. Markers that use changeset Y as
27 a successors are call "precursor markers of Y" because they hold
28 information about the precursors of Y.
27 a successors are call "predecessor markers of Y" because they hold
28 information about the predecessors of Y.
29 29
30 30 Examples:
31 31
@@ -294,11 +294,11 b' def _fm0decodemeta(data):'
294 294 #
295 295 # - uint8: number of metadata entries M
296 296 #
297 # - 20 or 32 bytes: precursor changeset identifier.
297 # - 20 or 32 bytes: predecessor changeset identifier.
298 298 #
299 299 # - N*(20 or 32) bytes: successors changesets identifiers.
300 300 #
301 # - P*(20 or 32) bytes: parents of the precursors changesets.
301 # - P*(20 or 32) bytes: parents of the predecessors changesets.
302 302 #
303 303 # - M*(uint8, uint8): size of all metadata entries (key and value)
304 304 #
@@ -506,18 +506,18 b' class obsstore(object):'
506 506 """Store obsolete markers
507 507
508 508 Markers can be accessed with two mappings:
509 - precursors[x] -> set(markers on precursors edges of x)
509 - predecessors[x] -> set(markers on predecessors edges of x)
510 510 - successors[x] -> set(markers on successors edges of x)
511 - children[x] -> set(markers on precursors edges of children(x)
511 - children[x] -> set(markers on predecessors edges of children(x)
512 512 """
513 513
514 514 fields = ('prec', 'succs', 'flag', 'meta', 'date', 'parents')
515 # prec: nodeid, precursor changesets
515 # prec: nodeid, predecessors changesets
516 516 # succs: tuple of nodeid, successor changesets (0-N length)
517 517 # flag: integer, flag field carrying modifier for the markers (see doc)
518 518 # meta: binary blob, encoded metadata dictionary
519 519 # date: (float, int) tuple, date of marker creation
520 # parents: (tuple of nodeid) or None, parents of precursors
520 # parents: (tuple of nodeid) or None, parents of predecessors
521 521 # None is used when no data has been recorded
522 522
523 523 def __init__(self, svfs, defaultformat=_fm1version, readonly=False):
@@ -707,7 +707,8 b' class obsstore(object):'
707 707
708 708 - marker that use this changeset as successor
709 709 - prune marker of direct children on this changeset
710 - recursive application of the two rules on precursors of these markers
710 - recursive application of the two rules on predecessors of these
711 markers
711 712
712 713 It is a set so you cannot rely on order."""
713 714
@@ -947,12 +948,12 b' def _computebumpedset(repo):'
947 948 rev = ctx.rev()
948 949 # We only evaluate mutable, non-obsolete revision
949 950 node = ctx.node()
950 # (future) A cache of precursors may worth if split is very common
951 # (future) A cache of predecessors may worth if split is very common
951 952 for pnode in obsutil.allprecursors(repo.obsstore, [node],
952 953 ignoreflags=bumpedfix):
953 954 prev = torev(pnode) # unfiltered! but so is phasecache
954 955 if (prev is not None) and (phase(repo, prev) <= public):
955 # we have a public precursor
956 # we have a public predecessor
956 957 bumped.add(rev)
957 958 break # Next draft!
958 959 return bumped
General Comments 0
You need to be logged in to leave comments. Login now