This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D6997 contrib: fix check-code to be able to detect missing _() with bytestrings
Closed	durin42	D6996 cleanup: mark some ui.(status\|note\|warn\|write) calls as not needing i18n
Closed	indygreg	D6994 ui: define (write\|status\|warn\|note)noi18n aliases
Closed	durin42	D6973 mangler: stop rewriting string constants to be bytes literals
Closed	durin42	D6972 formatting: byteify all mercurial/ and hgext/ string literals
Closed	durin42	D6971 formatting: blacken the codebase
Closed	durin42	D6970 transaction: re-wrap line to avoid a black bug
Closed	durin42	D6969 discovery: re-wrap expression to avoid a black bug
Closed	durin42	D6342 style: run a patched black on a subset of mercurial
Closed	durin42	D6974 examples: include a sample of how to use black with fix
Closed	durin42	D6993 black: add a pyproject.toml that contains our black settings
Closed	durin42	D6979 contrib: stop whining about whitespace around =
Closed	durin42	D6978 contrib: black manages whitespace after Python keywords now
Closed	durin42	D6977 contrib: allow trailing commas in lists
Closed	durin42	D6976 contrib: remove check-code line length limit
Closed	durin42	D6985 statprof: drop python #! and exec bit we don't use
Closed	durin42	D6984 cvsps: switch a file open to a with statement

Diff 16816

	"not known locally: %s\n") % heads)			"not known locally: %s\n") % heads)
	else:			else:
	repo.ui.status(_("remote has heads on branch '%s' that are "			repo.ui.status(_("remote has heads on branch '%s' that are "
	"not known locally: %s\n") % (branch, heads))			"not known locally: %s\n") % (branch, heads))
	if remoteheads is None:			if remoteheads is None:
	if len(newhs) > 1:			if len(newhs) > 1:
	dhs = list(newhs)			dhs = list(newhs)
	if errormsg is None:			if errormsg is None:
	errormsg = (_("push creates new branch '%s' "			errormsg = (
	"with multiple heads") % (branch))			_("push creates new branch '%s' with multiple heads") %
				branch
				)
	hint = _("merge or"			hint = _("merge or"
	" see 'hg help push' for details about"			" see 'hg help push' for details about"
	" pushing new heads")			" pushing new heads")
	elif len(newhs) > len(oldhs):			elif len(newhs) > len(oldhs):
	# remove bookmarked or existing remote heads from the new heads list			# remove bookmarked or existing remote heads from the new heads list
	dhs = sorted(newhs - nowarnheads - oldhs)			dhs = sorted(newhs - nowarnheads - oldhs)
	if dhs:			if dhs:
	if errormsg is None:			if errormsg is None: