This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D6341 contrib: have byteify-strings explode if run in Python 2
Closed	durin42	D6340 repair: reword comment about bookmarks logic
Closed	durin42	D6339 repair: reword comments that I noticed while working on source formatting
Closed	durin42	D6338 monotone: fix a bogus _() wrapper that was caught when formatting code

Diff 15003

	# compute necessary bookmark movement			# compute necessary bookmark movement
	bm = repo._bookmarks			bm = repo._bookmarks
	updatebm = []			updatebm = []
	for m in bm:			for m in bm:
	rev = repo[bm[m]].rev()			rev = repo[bm[m]].rev()
	if rev in tostrip:			if rev in tostrip:
	updatebm.append(m)			updatebm.append(m)
	newbmtarget = None			newbmtarget = None
	if updatebm: # don't compute anything is there is no bookmark to move anyway			# If we need to move bookmarks, compute bookmark
				# targets. Otherwise we can skip doing this logic.
				if updatebm:
	# For a set s, max(parents(s) - s) is the same as max(heads(::s - s)),			# For a set s, max(parents(s) - s) is the same as max(heads(::s - s)),
	# but is much faster			# but is much faster
	newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip)			newbmtarget = repo.revs('max(parents(%ld) - (%ld))', tostrip, tostrip)
	if newbmtarget:			if newbmtarget:
	newbmtarget = repo[newbmtarget.first()].node()			newbmtarget = repo[newbmtarget.first()].node()
	else:			else:
	newbmtarget = '.'			newbmtarget = '.'
	return newbmtarget, updatebm			return newbmtarget, updatebm