This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2143

py3: use bytes() to cast context instances
ClosedPublic

Authored by indygreg on Feb 11 2018, 5:57 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4fe2041007ed: py3: use bytes() to cast context instances
Summary

str and bytes are both implemented on context types. However,
str behaves differently on Python 2 and 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 11 2018, 5:57 PM
Closed by commit rHG4fe2041007ed: py3: use bytes() to cast context instances (authored by indygreg). · Explain WhyFeb 11 2018, 8:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (4 lines)

Diff 5428

mercurial/merge.py

# The file is in a directory which aliases a remote file. # The file is in a directory which aliases a remote file.
# This is an internal inconsistency within the remote # This is an internal inconsistency within the remote
# manifest. # manifest.
invalidconflicts.add(p) invalidconflicts.add(p)
# Rename all local conflicting files that have not been deleted. # Rename all local conflicting files that have not been deleted.
for p in localconflicts: for p in localconflicts:
if p not in deletedfiles: if p not in deletedfiles:
ctxname = str(wctx).rstrip('+') ctxname = bytes(wctx).rstrip('+')
pnew = util.safename(p, ctxname, wctx, set(actions.keys())) pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
actions[pnew] = ('pr', (p,), "local path conflict") actions[pnew] = ('pr', (p,), "local path conflict")
actions[p] = ('p', (pnew, 'l'), "path conflict") actions[p] = ('p', (pnew, 'l'), "path conflict")
if remoteconflicts: if remoteconflicts:
# Check if all files in the conflicting directories have been removed. # Check if all files in the conflicting directories have been removed.
ctxname = str(mctx).rstrip('+') ctxname = bytes(mctx).rstrip('+')
for f, p in _filesindirs(repo, mf, remoteconflicts): for f, p in _filesindirs(repo, mf, remoteconflicts):
if f not in deletedfiles: if f not in deletedfiles:
m, args, msg = actions[p] m, args, msg = actions[p]
pnew = util.safename(p, ctxname, wctx, set(actions.keys())) pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
if m in ('dc', 'm'): if m in ('dc', 'm'):
# Action was merge, just update target. # Action was merge, just update target.
actions[pnew] = (m, args, msg) actions[pnew] = (m, args, msg)
else: else: