comparison mercurial/repair.py @ 42246:e10b8058da84

repair: reword comment about bookmarks logic Again, this will help auto-formatting shortly. Differential Revision: https://phab.mercurial-scm.org/D6340
author Augie Fackler <augie@google.com>
date Fri, 03 May 2019 15:46:09 -0400
parents 8c42b4a3d447
children d811f17090a3
comparison
equal deleted inserted replaced
42245:d26bfbf419f9 42246:e10b8058da84
277 for m in bm: 277 for m in bm:
278 rev = repo[bm[m]].rev() 278 rev = repo[bm[m]].rev()
279 if rev in tostrip: 279 if rev in tostrip:
280 updatebm.append(m) 280 updatebm.append(m)
281 newbmtarget = None 281 newbmtarget = None
282 if updatebm: # don't compute anything is there is no bookmark to move anyway 282 # If we need to move bookmarks, compute bookmark
283 # targets. Otherwise we can skip doing this logic.
284 if updatebm:
283 # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)), 285 # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)),
284 # but is much faster 286 # but is much faster
285 newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip) 287 newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip)
286 if newbmtarget: 288 if newbmtarget:
287 newbmtarget = repo[newbmtarget.first()].node() 289 newbmtarget = repo[newbmtarget.first()].node()