This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4780

repo: look up nullrev context by revnum, not symbolic name
ClosedPublic

Authored by martinvonz on Sep 27 2018, 12:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd739f423bf06: repo: look up nullrev context by revnum, not symbolic name
rHG1737ab4490e7: repo: look up nullrev context by revnum, not symbolic name
Summary

I think lookup of the 'null' symbol should be done via
scmutil.revsymbol() and repo['null'] is only supported for historical
reasons. However, repo[nullrev] is fine, so we can switch to that
instead of switching to scmutil.revsymbol('null').

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/archival.py (5 lines)
Mmercurial/scmutil.py (3 lines)

Diff 11465

mercurial/archival.py

import os import os
import struct import struct
import tarfile import tarfile
import time import time
import zipfile import zipfile
import zlib import zlib
from .i18n import _ from .i18n import _
from .node import (
nullrev,
)
from . import ( from . import (
error, error,
formatter, formatter,
match as matchmod, match as matchmod,
pycompat, pycompat,
scmutil, scmutil,
util, util,
if any(dest.endswith(ext) for ext in extensions): if any(dest.endswith(ext) for ext in extensions):
return kind return kind
return None return None
def _rootctx(repo): def _rootctx(repo):
# repo[0] may be hidden # repo[0] may be hidden
for rev in repo: for rev in repo:
return repo[rev] return repo[rev]
return repo['null'] return repo[nullrev]
# {tags} on ctx includes local tags and 'tip', with no current way to limit # {tags} on ctx includes local tags and 'tip', with no current way to limit
# that to global tags. Therefore, use {latesttag} as a substitute when # that to global tags. Therefore, use {latesttag} as a substitute when
# the distance is 0, since that will be the list of global tags on ctx. # the distance is 0, since that will be the list of global tags on ctx.
_defaultmetatemplate = br''' _defaultmetatemplate = br'''
repo: {root} repo: {root}
node: {ifcontains(rev, revset("wdir()"), "{p1node}{dirty}", "{node}")} node: {ifcontains(rev, revset("wdir()"), "{p1node}{dirty}", "{node}")}
branch: {branch|utf8} branch: {branch|utf8}

mercurial/scmutil.py

import subprocess import subprocess
import weakref import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullid, nullid,
nullrev,
short, short,
wdirid, wdirid,
wdirrev, wdirrev,
) )
from . import ( from . import (
encoding, encoding,
error, error,
For merges (two non-nullrev revisions) both parents are meaningful. For merges (two non-nullrev revisions) both parents are meaningful.
Otherwise the first parent revision is considered meaningful if it Otherwise the first parent revision is considered meaningful if it
is not the preceding revision. is not the preceding revision.
""" """
parents = ctx.parents() parents = ctx.parents()
if len(parents) > 1: if len(parents) > 1:
return parents return parents
if repo.ui.debugflag: if repo.ui.debugflag:
return [parents[0], repo['null']] return [parents[0], repo[nullrev]]
if parents[0].rev() >= intrev(ctx) - 1: if parents[0].rev() >= intrev(ctx) - 1:
return [] return []
return parents return parents
def expandpats(pats): def expandpats(pats):
'''Expand bare globs when running on windows. '''Expand bare globs when running on windows.
On posix we assume it already has already been done by sh.''' On posix we assume it already has already been done by sh.'''
if not util.expandglobs: if not util.expandglobs: