##// END OF EJS Templates
tests: add test-remotefilelog-strip.t to demonstrate an issue with linknodes...
tests: add test-remotefilelog-strip.t to demonstrate an issue with linknodes ### Background Every time a commit is modified, remotefilelog updates the metadata for the file object to point to the new commit (I believe that this is different from non-remotefilelog hg, which leaves the linkrevs pointing to the obsolete commits; doing otherwise would involve changing data in the middle of revlogs). With `hg strip` (or other things that use repair.strip()), when you strip a commit that's not the tip of the revlog, there may be commits after it in revnum order that aren't descended from it and don't need to be (and shouldn't be) stripped. These are "saved" by strip in a bundle, and that bundle is reapplied after truncating the relevant revlogs. ### The problem Remotefilelog generally avoids being involved at all in strip. Currently, that includes even providing file contents to this backup bundle. This can cause the linknode to point to a changeset that is no longer in the repository. Example: ``` @ 3 df91f74b871e | | x 2 70494d7ec5ef |/ | x 1 1e423846dde0 |/ o 0 b292c1e3311f ``` Commits 1, 2, and 3 are related via obsolescence, and are description-only changes. The linknode for the file in these commits changed each time we updated the description, so it's currently df91f7. If I strip commits 1 and 3, however, the linknode *remains* df91f7, which no longer exists in the repository. Commit 70494d was "saved", stripped, and then reapplied, so it is in the repository (as revision 1 instead of 2 now), and was unobsoleted since the obsmarker was stripped as well. The linknode for the file should point to 70494d, the most recent commit that is in the repository that modified the file. Remotefilelog has some logic to handle broken linknodes, but it can be slow. We have actually disabled it internally because it's too slow for our purposes. Differential Revision: https://phab.mercurial-scm.org/D10319

File last commit:

r47575:d4ba4d51 default
r47605:2819df46 default
Show More
resourceutil.py
104 lines | 3.2 KiB | text/x-python | PythonLexer
Martin von Zweigbergk
procutil: move mainfrozen() to new resourceutil.py...
r44067 # resourceutil.py - utility for looking up resources
#
# Copyright 2005 K. Thananchayan <thananck@yahoo.com>
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
Martin von Zweigbergk
procutil: move mainfrozen() to new resourceutil.py...
r44067 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import imp
Martin von Zweigbergk
util: move definition of datapath to resourceutil...
r44068 import os
Martin von Zweigbergk
procutil: move mainfrozen() to new resourceutil.py...
r44067 import sys
from .. import pycompat
def mainfrozen():
"""return True if we are a frozen executable.
The code supports py2exe (most common, Windows only) and tools/freeze
(portable, not much used).
"""
return (
Manuel Jacob
resourceutil: fix location of line comments...
r45476 pycompat.safehasattr(sys, "frozen") # new py2exe
or pycompat.safehasattr(sys, "importers") # old py2exe
or imp.is_frozen("__main__") # tools/freeze
)
Martin von Zweigbergk
util: move definition of datapath to resourceutil...
r44068
# the location of data files matching the source code
Augie Fackler
resourceutil: blacken
r44723 if mainfrozen() and getattr(sys, "frozen", None) != "macosx_app":
Martin von Zweigbergk
util: move definition of datapath to resourceutil...
r44068 # executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(pycompat.sysexecutable)
Matt Harbison
resourceutil: correct the root path for file based lookup under py2exe...
r44678 _rootpath = datapath
Matt Harbison
resourceutil: account for the non-resource-like file hierarchy under py2exe...
r44706
# The installers store the files outside of library.zip, like
# C:\Program Files\Mercurial\defaultrc\*.rc. This strips the
# leading "mercurial." off of the package name, so that these
# pseudo resources are found in their directory next to the
# executable.
def _package_path(package):
Augie Fackler
resourceutil: blacken
r44723 dirs = package.split(b".")
assert dirs[0] == b"mercurial"
Matt Harbison
resourceutil: account for the non-resource-like file hierarchy under py2exe...
r44706 return os.path.join(_rootpath, *dirs[1:])
Augie Fackler
resourceutil: blacken
r44723
Martin von Zweigbergk
util: move definition of datapath to resourceutil...
r44068 else:
datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__)))
Matt Harbison
resourceutil: don't limit resources to the `mercurial` package...
r44479 _rootpath = os.path.dirname(datapath)
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323
Matt Harbison
resourceutil: account for the non-resource-like file hierarchy under py2exe...
r44706 def _package_path(package):
Augie Fackler
resourceutil: blacken
r44723 return os.path.join(_rootpath, *package.split(b"."))
Matt Harbison
resourceutil: account for the non-resource-like file hierarchy under py2exe...
r44706
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323 try:
Martin von Zweigbergk
resourceutil: document when we expect to take the importlib.resouces code path...
r46024 # importlib.resources exists from Python 3.7; see fallback in except clause
# further down
Martin von Zweigbergk
resourceutil: use `from importlib import resources`...
r44407 from importlib import resources
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323
Matt Harbison
resourceutil: implement `is_resource()`...
r44480 from .. import encoding
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323 # Force loading of the resources module
Martin von Zweigbergk
resourceutil: use `from importlib import resources`...
r44407 resources.open_binary # pytype: disable=module-attr
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323
def open_resource(package, name):
Martin von Zweigbergk
resourceutil: use `from importlib import resources`...
r44407 return resources.open_binary( # pytype: disable=module-attr
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323 pycompat.sysstr(package), pycompat.sysstr(name)
)
Matt Harbison
resourceutil: implement `is_resource()`...
r44480 def is_resource(package, name):
Matt Harbison
typing: disable a few errors calling py3.7+ functions in resourceutil.py...
r47541 return resources.is_resource( # pytype: disable=module-attr
Matt Harbison
resourceutil: implement `is_resource()`...
r44480 pycompat.sysstr(package), encoding.strfromlocal(name)
)
Matt Harbison
resourceutil: implement `contents()` to iterate over resources in a package...
r44481 def contents(package):
Matt Harbison
typing: disable a few errors calling py3.7+ functions in resourceutil.py...
r47541 # pytype: disable=module-attr
Matt Harbison
resourceutil: implement `contents()` to iterate over resources in a package...
r44481 for r in resources.contents(pycompat.sysstr(package)):
Matt Harbison
typing: disable a few errors calling py3.7+ functions in resourceutil.py...
r47541 # pytype: enable=module-attr
Matt Harbison
resourceutil: implement `contents()` to iterate over resources in a package...
r44481 yield encoding.strtolocal(r)
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323
Martin von Zweigbergk
resourceutil: use `from importlib import resources`...
r44407 except (ImportError, AttributeError):
Martin von Zweigbergk
resourceutil: document when we expect to take the importlib.resouces code path...
r46024 # importlib.resources was not found (almost definitely because we're on a
# Python version before 3.7)
Martin von Zweigbergk
help: get helptext/ data from `resources` module if available...
r44323
def open_resource(package, name):
path = os.path.join(_package_path(package), name)
Augie Fackler
resourceutil: blacken
r44723 return open(path, "rb")
Matt Harbison
resourceutil: implement `is_resource()`...
r44480
def is_resource(package, name):
path = os.path.join(_package_path(package), name)
try:
return os.path.isfile(pycompat.fsdecode(path))
except (IOError, OSError):
return False
Matt Harbison
resourceutil: implement `contents()` to iterate over resources in a package...
r44481
def contents(package):
path = pycompat.fsdecode(_package_path(package))
for p in os.listdir(path):
yield pycompat.fsencode(p)