##// END OF EJS Templates
obsolete: move marker flags to obsutil...
av6 -
r36971:b9bbcf9f default
parent child Browse files
Show More
@@ -148,38 +148,8 b' def isenabled(repo, option):'
148 148
149 149 return _getoptionvalue(repo, option)
150 150
151 ### obsolescence marker flag
152
153 ## bumpedfix flag
154 #
155 # When a changeset A' succeed to a changeset A which became public, we call A'
156 # "bumped" because it's a successors of a public changesets
157 #
158 # o A' (bumped)
159 # |`:
160 # | o A
161 # |/
162 # o Z
163 #
164 # The way to solve this situation is to create a new changeset Ad as children
165 # of A. This changeset have the same content than A'. So the diff from A to A'
166 # is the same than the diff from A to Ad. Ad is marked as a successors of A'
167 #
168 # o Ad
169 # |`:
170 # | x A'
171 # |'|
172 # o | A
173 # |/
174 # o Z
175 #
176 # But by transitivity Ad is also a successors of A. To avoid having Ad marked
177 # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>.
178 # This flag mean that the successors express the changes between the public and
179 # bumped version and fix the situation, breaking the transitivity of
180 # "bumped" here.
181 bumpedfix = 1
182 usingsha256 = 2
151 bumpedfix = obsutil.bumpedfix
152 usingsha256 = obsutil.usingsha256
183 153
184 154 ## Parsing and writing of version "0"
185 155 #
@@ -17,6 +17,39 b' from . import ('
17 17 )
18 18 from .utils import dateutil
19 19
20 ### obsolescence marker flag
21
22 ## bumpedfix flag
23 #
24 # When a changeset A' succeed to a changeset A which became public, we call A'
25 # "bumped" because it's a successors of a public changesets
26 #
27 # o A' (bumped)
28 # |`:
29 # | o A
30 # |/
31 # o Z
32 #
33 # The way to solve this situation is to create a new changeset Ad as children
34 # of A. This changeset have the same content than A'. So the diff from A to A'
35 # is the same than the diff from A to Ad. Ad is marked as a successors of A'
36 #
37 # o Ad
38 # |`:
39 # | x A'
40 # |'|
41 # o | A
42 # |/
43 # o Z
44 #
45 # But by transitivity Ad is also a successors of A. To avoid having Ad marked
46 # as bumped too, we add the `bumpedfix` flag to the marker. <A', (Ad,)>.
47 # This flag mean that the successors express the changes between the public and
48 # bumped version and fix the situation, breaking the transitivity of
49 # "bumped" here.
50 bumpedfix = 1
51 usingsha256 = 2
52
20 53 class marker(object):
21 54 """Wrap obsolete marker raw data"""
22 55
General Comments 0
You need to be logged in to leave comments. Login now