This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D3167 bookmarks: use isrevsymbol() for detecting collision with existing symbol
Closed	martinvonz	D3166 debugwhyunstable: add support for revsets
Closed	martinvonz	D3161 convert: look up branch only among branches
Closed	martinvonz	D3160 convert: remove unused/unnecessary variable "parentctx"

Diff 7799

	raise error.Abort(_("bookmark '%s' already exists "			raise error.Abort(_("bookmark '%s' already exists "
	"(use -f to force)") % mark)			"(use -f to force)") % mark)
	if ((mark in self._repo.branchmap() or			if ((mark in self._repo.branchmap() or
	mark == self._repo.dirstate.branch()) and not force):			mark == self._repo.dirstate.branch()) and not force):
	raise error.Abort(			raise error.Abort(
	_("a bookmark cannot have the name of an existing branch"))			_("a bookmark cannot have the name of an existing branch"))
	if len(mark) > 3 and not force:			if len(mark) > 3 and not force:
	try:			try:
	shadowhash = (mark in self._repo)			shadowhash = scmutil.isrevsymbol(self._repo, mark)
	except error.LookupError: # ambiguous identifier			except error.LookupError: # ambiguous identifier
	shadowhash = False			shadowhash = False
	if shadowhash:			if shadowhash:
	self._repo.ui.warn(			self._repo.ui.warn(
	_("bookmark %s matches a changeset hash\n"			_("bookmark %s matches a changeset hash\n"
	"(did you leave a -r out of an 'hg bookmark' "			"(did you leave a -r out of an 'hg bookmark' "
	"command?)\n")			"command?)\n")
	% mark)			% mark)