This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3193

scmutil: handle full hex nodeids in revsymbol()
ClosedPublic

Authored by martinvonz on Apr 8 2018, 1:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd2b484eed1ec: scmutil: handle full hex nodeids in revsymbol()
Summary

This is a bit unfortunate, but it enables moving other pieces out of
changectx's constructor without affecting the order in which we
look up things (e.g. hex nodeid before bookmark).

We convert nodeid to revnum before calling repo.getitem, even
though that will result in converting back to nodeid later. This is so
we can handle the LookupError and attempt to interpret the string as
something else (e.g. a bookmark).

We also need to start handling WdirUnsupported now, since the full hex
nodeid "ffff..." represents the working directory. The exception is
raised by the revlog layer.

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

martinvonz created this revision.Apr 8 2018, 1:04 PM
Closed by commit rHGd2b484eed1ec: scmutil: handle full hex nodeids in revsymbol() (authored by martinvonz). · Explain WhyApr 11 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (13 lines)

Diff 7974

mercurial/scmutil.py

import os import os
import re import re
import socket import socket
import subprocess import subprocess
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin,
hex, hex,
nullid, nullid,
short, short,
wdirid, wdirid,
wdirrev, wdirrev,
) )
from . import ( from . import (
if r < 0 or r >= l and r != wdirrev: if r < 0 or r >= l and r != wdirrev:
raise ValueError raise ValueError
return repo[r] return repo[r]
except error.FilteredIndexError: except error.FilteredIndexError:
raise raise
except (ValueError, OverflowError, IndexError): except (ValueError, OverflowError, IndexError):
pass pass
if len(symbol) == 40:
try:
node = bin(symbol)
rev = repo.changelog.rev(node)
return repo[rev]
except error.FilteredLookupError:
raise
except (TypeError, LookupError):
pass
return repo[symbol] return repo[symbol]
except error.WdirUnsupported:
return repo[None]
except (error.FilteredIndexError, error.FilteredLookupError, except (error.FilteredIndexError, error.FilteredLookupError,
error.FilteredRepoLookupError): error.FilteredRepoLookupError):
raise _filterederror(repo, symbol) raise _filterederror(repo, symbol)
def _filterederror(repo, changeid): def _filterederror(repo, changeid):
"""build an exception to be raised about a filtered changeid """build an exception to be raised about a filtered changeid
This is extracted in a function to help extensions (eg: evolve) to This is extracted in a function to help extensions (eg: evolve) to