##// END OF EJS Templates
revert: remove dangerous `parents` argument from `cmdutil.revert()`...
revert: remove dangerous `parents` argument from `cmdutil.revert()` As we found out the hard way (thanks to spectral@ for figuring it out!), `cmdutil.revert()`'s `parents` argument must be `repo.dirstate.parents()` or things may go wrong. We had an extension that passed in the target commit as the first parent. The `hg split` command from the evolve extension seems to have made the same mistake, but I haven't looked carefully. The problem is that `cmdutil._performrevert()` calls `dirstate.normal()` on reverted files if the commit to revert to equals the first parent. So if you pass in `ctx=foo` and `parents=(foo.node(), nullid)`, then `dirstate.normal()` will be called for the revert files, even though they might not be clean in the working copy. There doesn't seem to be any reason, other than a tiny performance benefit, to passing the `parents` around instead of looking them up again in `cmdutil._performrevert()`, so that's what this patch does. Differential Revision: https://phab.mercurial-scm.org/D8925

File last commit:

r45932:77b8588d default
r45935:8c466bcb default
Show More
__init__.py
78 lines | 2.4 KiB | text/x-python | PythonLexer
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 # __init__.py - narrowhg extension
#
# Copyright 2017 Google, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
'''create clones which fetch history data for subset of files (EXPERIMENTAL)'''
from __future__ import absolute_import
from mercurial import (
localrepo,
registrar,
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 requirements,
Pulkit Goyal
interfaces: create a new folder for interfaces and move repository.py in it...
r43078 )
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
from . import (
narrowbundle2,
narrowcommands,
narrowrepo,
narrowtemplates,
narrowwirepeer,
)
Matt Harbison
narrow: move `testedwith` after module imports...
r44418 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = b'ships-with-hg-core'
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 configtable = {}
configitem = registrar.configitem(configtable)
# Narrowhg *has* support for serving ellipsis nodes (which are used at
# least by Google's internal server), but that support is pretty
# fragile and has a lot of problems on real-world repositories that
# have complex graph topologies. This could probably be corrected, but
# absent someone needing the full support for ellipsis nodes in
# repositories with merges, it's unlikely this work will get done. As
# of this writining in late 2017, all repositories large enough for
# ellipsis nodes to be a hard requirement also enforce strictly linear
# history for other scaling reasons.
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'experimental',
b'narrowservebrokenellipses',
Augie Fackler
formatting: blacken the codebase...
r43346 default=False,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 alias=[(b'narrow', b'serveellipses')],
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 )
# Export the commands table for Mercurial to see.
cmdtable = narrowcommands.table
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
narrow: use featuresetupfuncs...
r37154 def featuresetup(ui, features):
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 features.add(requirements.NARROW_REQUIREMENT)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def uisetup(ui):
"""Wraps user-facing mercurial commands with narrow-aware versions."""
Gregory Szorc
narrow: use featuresetupfuncs...
r37154 localrepo.featuresetupfuncs.add(featuresetup)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 narrowbundle2.setup()
narrowcommands.setup()
narrowwirepeer.uisetup()
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 def reposetup(ui, repo):
"""Wraps local repositories with narrow repo support."""
Martin von Zweigbergk
narrow: use repo.local() instead of isinstance()...
r37203 if not repo.local():
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 return
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 repo.ui.setconfig(b'experimental', b'narrow', True, b'narrow-ext')
Pulkit Goyal
requirements: introduce new requirements related module...
r45932 if requirements.NARROW_REQUIREMENT in repo.requirements:
Kyle Lippincott
narrow: only wrap dirstate functions once, instead of per-reposetup...
r38142 narrowrepo.wraprepo(repo)
Augie Fackler
narrow: import experimental extension from narrowhg revision cb51d673e9c5...
r36096 narrowwirepeer.reposetup(repo)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
narrowtemplates: update to use registrar mechanism...
r36108 templatekeyword = narrowtemplates.templatekeyword
revsetpredicate = narrowtemplates.revsetpredicate