This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D3089 convert: use repo.lookup() for converting to nodeid
Closed	martinvonz	D3088 extdatasource: use revsymbol() for converting to node
Closed	martinvonz	D3087 bookmarks: calculateupdate() returns a bookmark, not a rev
Closed	martinvonz	D3086 pull: pass rev to check out as integer to postincoming()
Closed	martinvonz	D3085 children: support specifying revision by revset
Closed	martinvonz	D3084 heads: add support for specying branches by revset
Closed	martinvonz	D3083 perf: make perfmanifest and perfnodelookup work with revsets
Closed	martinvonz	D3082 context: use revsymbol() in "merge.preferancestor" code
Closed	martinvonz	D3081 wireproto: use repo.lookup() for lookup command
Closed	martinvonz	D3080 localrepo: use revsymbol in lookupbranch() too
Closed	martinvonz	D3079 localrepo: drop "remote" argument from lookupbranch() (API)
Closed	martinvonz	D3078 revset: use revsymbol() for checking if a symbol is valid

Diff 7718

	name = repo._activebookmark.split('@', 1)[0]			name = repo._activebookmark.split('@', 1)[0]
	heads = []			heads = []
	for mark, n in repo._bookmarks.iteritems():			for mark, n in repo._bookmarks.iteritems():
	if mark.split('@', 1)[0] == name:			if mark.split('@', 1)[0] == name:
	heads.append(n)			heads.append(n)
	return heads			return heads

	def calculateupdate(ui, repo, checkout):			def calculateupdate(ui, repo, checkout):
	'''Return a tuple (targetrev, movemarkfrom) indicating the rev to			'''Return a tuple (activemark, movemarkfrom) indicating the active bookmark
	check out and where to move the active bookmark from, if needed.'''			and where to move the active bookmark from, if needed.'''
				yujaUnsubmitted Not Done That's true only if `checkout` is None. Perhaps we should remove the checkout argument. Can you send a follow up? yuja: That's true only if `checkout` is None. Perhaps we should remove the checkout argument. Can…
	movemarkfrom = None			movemarkfrom = None
	if checkout is None:			if checkout is None:
	activemark = repo._activebookmark			activemark = repo._activebookmark
	if isactivewdirparent(repo):			if isactivewdirparent(repo):
	movemarkfrom = repo['.'].node()			movemarkfrom = repo['.'].node()
	elif activemark:			elif activemark:
	ui.status(_("updating to active bookmark %s\n") % activemark)			ui.status(_("updating to active bookmark %s\n") % activemark)
	checkout = activemark			checkout = activemark

	node = repo.revs('max(%ln)', successors).first()			node = repo.revs('max(%ln)', successors).first()
	if bookmarks.isactivewdirparent(repo):			if bookmarks.isactivewdirparent(repo):
	movemark = repo['.'].node()			movemark = repo['.'].node()
	return node, movemark, None			return node, movemark, None

	def _destupdatebook(repo, clean):			def _destupdatebook(repo, clean):
	"""decide on an update destination from active bookmark"""			"""decide on an update destination from active bookmark"""
	# we also move the active bookmark, if any			# we also move the active bookmark, if any
	activemark = None			node = None
	node, movemark = bookmarks.calculateupdate(repo.ui, repo, None)			activemark, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
	if node is not None:			if activemark is not None:
	activemark = node			node = repo.lookup(activemark)
	return node, movemark, activemark			return node, movemark, activemark

	def _destupdatebranch(repo, clean):			def _destupdatebranch(repo, clean):
	"""decide on an update destination from current branch			"""decide on an update destination from current branch

	This ignores closed branch heads.			This ignores closed branch heads.
	"""			"""
	wc = repo[None]			wc = repo[None]

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7661		Apr 4 2018, 6:53 PM	★	★
Diff 2	7718	rHGe27298bf11dde3a7fe2aecfff8edca36b72f153f	Apr 4 2018, 6:13 PM	★	★