This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1890

branchmap: make error messages consistent between Python 2 and 3
ClosedPublic

Authored by durin42 on Jan 18 2018, 8:38 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa011e4140435: branchmap: make error messages consistent between Python 2 and 3
rHGd9ae54f7eed6: branchmap: make error messages consistent between Python 2 and 3
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jan 18 2018, 8:38 AM
indygreg accepted this revision.Feb 1 2018, 3:34 PM
This revision is now accepted and ready to land.Feb 1 2018, 3:34 PM
Closed by commit rHGd9ae54f7eed6: branchmap: make error messages consistent between Python 2 and 3 (authored by durin42). · Explain WhyFeb 1 2018, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (10 lines)

Diff 5060

mercurial/branchmap.py

bin, bin,
hex, hex,
nullid, nullid,
nullrev, nullrev,
) )
from . import ( from . import (
encoding, encoding,
error, error,
pycompat,
scmutil, scmutil,
util, util,
) )
calcsize = struct.calcsize calcsize = struct.calcsize
pack_into = struct.pack_into pack_into = struct.pack_into
unpack_from = struct.unpack_from unpack_from = struct.unpack_from
last, lrev = bin(last), int(lrev) last, lrev = bin(last), int(lrev)
filteredhash = None filteredhash = None
if len(cachekey) > 2: if len(cachekey) > 2:
filteredhash = bin(cachekey[2]) filteredhash = bin(cachekey[2])
partial = branchcache(tipnode=last, tiprev=lrev, partial = branchcache(tipnode=last, tiprev=lrev,
filteredhash=filteredhash) filteredhash=filteredhash)
if not partial.validfor(repo): if not partial.validfor(repo):
# invalidate the cache # invalidate the cache
raise ValueError('tip differs') raise ValueError(r'tip differs')
cl = repo.changelog cl = repo.changelog
for l in lines: for l in lines:
if not l: if not l:
continue continue
node, state, label = l.split(" ", 2) node, state, label = l.split(" ", 2)
if state not in 'oc': if state not in 'oc':
raise ValueError('invalid branch state') raise ValueError(r'invalid branch state')
label = encoding.tolocal(label.strip()) label = encoding.tolocal(label.strip())
node = bin(node) node = bin(node)
if not cl.hasnode(node): if not cl.hasnode(node):
raise ValueError('node %s does not exist' % hex(node)) raise ValueError(
r'node %s does not exist' % pycompat.sysstr(hex(node)))
partial.setdefault(label, []).append(node) partial.setdefault(label, []).append(node)
if state == 'c': if state == 'c':
partial._closednodes.add(node) partial._closednodes.add(node)
except Exception as inst: except Exception as inst:
if repo.ui.debugflag: if repo.ui.debugflag:
msg = 'invalid branchheads cache' msg = 'invalid branchheads cache'
if repo.filtername is not None: if repo.filtername is not None:
msg += ' (%s)' % repo.filtername msg += ' (%s)' % repo.filtername
msg += ': %s\n' msg += ': %s\n'
repo.ui.debug(msg % inst) repo.ui.debug(msg % pycompat.bytestr(inst))
partial = None partial = None
return partial return partial
### Nearest subset relation ### Nearest subset relation
# Nearest subset of filter X is a filter Y so that: # Nearest subset of filter X is a filter Y so that:
# * Y is included in X, # * Y is included in X,
# * X - Y is as small as possible. # * X - Y is as small as possible.
# This create and ordering used for branchmap purpose. # This create and ordering used for branchmap purpose.