( )⚙ D855 py3: use pycompat.bytestr instead of str

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D855

py3: use pycompat.bytestr instead of str
ClosedPublic

Authored by pulkit on Sep 30 2017, 8:50 AM.

Download Raw Diff

Tags

None

Subscribers

durin42, mercurial-devel

Details

Reviewers

Group Reviewers

Commits

rHG6f49ea88d984: py3: use pycompat.bytestr instead of str

Summary

Diff Detail

Repository

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Sep 30 2017, 8:50 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 30 2017, 8:50 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit added a child revision: D856: py3: use '%d' instead of '%s' for integers.Sep 30 2017, 8:50 AM

durin42 added a subscriber: durin42.Sep 30 2017, 9:00 AM

durin42 added inline comments.

mercurial/merge.py
993–994	Do we know ancestors is always nodes? if we get a revnum instead of a node id this won't work right on Python 3...

pulkit retitled this revision from py3: use bytes instead of str to py3: use pycompat.bytestr instead of str.Sep 30 2017, 9:19 AM

pulkit updated this revision to Diff 2186.

durin42 accepted this revision.Sep 30 2017, 9:21 AM

This revision is now accepted and ready to land.Sep 30 2017, 9:21 AM

Closed by commit rHG6f49ea88d984: py3: use pycompat.bytestr instead of str (authored by pulkit). · Explain WhySep 30 2017, 9:39 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (3 lines)

Diff 2186

mercurial/merge.py

	actions, diverge, renamedelete = manifestmerge(			actions, diverge, renamedelete = manifestmerge(
	repo, wctx, mctx, ancestors[0], branchmerge, force, matcher,			repo, wctx, mctx, ancestors[0], branchmerge, force, matcher,
	acceptremote, followcopies)			acceptremote, followcopies)
	_checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce)			_checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce)

	else: # only when merge.preferancestor=* - the default			else: # only when merge.preferancestor=* - the default
	repo.ui.note(			repo.ui.note(
	_("note: merging %s and %s using bids from ancestors %s\n") %			_("note: merging %s and %s using bids from ancestors %s\n") %
	(wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))			(wctx, mctx, _(' and ').join(pycompat.bytestr(anc)
				for anc in ancestors)))
				durin42Unsubmitted Not Done Do we know ancestors is always nodes? if we get a revnum instead of a node id this won't work right on Python 3... durin42: Do we know ancestors is always nodes? if we get a revnum instead of a node id this won't work…

	# Call for bids			# Call for bids
	fbids = {} # mapping filename to bids (action method to list af actions)			fbids = {} # mapping filename to bids (action method to list af actions)
	diverge, renamedelete = None, None			diverge, renamedelete = None, None
	for ancestor in ancestors:			for ancestor in ancestors:
	repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor)			repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor)
	actions, diverge1, renamedelete1 = manifestmerge(			actions, diverge1, renamedelete1 = manifestmerge(
	repo, wctx, mctx, ancestor, branchmerge, force, matcher,			repo, wctx, mctx, ancestor, branchmerge, force, matcher,