equal
deleted
inserted
replaced
179 |
179 |
180 descendants = set(cl.descendants(revs)) |
180 descendants = set(cl.descendants(revs)) |
181 strippedrevs = revs.union(descendants) |
181 strippedrevs = revs.union(descendants) |
182 roots = revs.difference(descendants) |
182 roots = revs.difference(descendants) |
183 |
183 |
184 update = False |
|
185 # if one of the wdir parent is stripped we'll need |
184 # if one of the wdir parent is stripped we'll need |
186 # to update away to an earlier revision |
185 # to update away to an earlier revision |
187 for p in repo.dirstate.parents(): |
186 update = any(p != nullid and cl.rev(p) in strippedrevs |
188 if p != nullid and cl.rev(p) in strippedrevs: |
187 for p in repo.dirstate.parents()) |
189 update = True |
|
190 break |
|
191 |
188 |
192 rootnodes = set(cl.node(r) for r in roots) |
189 rootnodes = set(cl.node(r) for r in roots) |
193 |
190 |
194 q = getattr(repo, 'mq', None) |
191 q = getattr(repo, 'mq', None) |
195 if q is not None and q.applied: |
192 if q is not None and q.applied: |