Mercurial > hg
view tests/bundles/test-revlog-diff-relative-to-nullrev.sh @ 49779:7d6c8943353a stable
hg: show the correct message when cloning an LFS repo with extension disabled
The `extensions._disabledpaths()` doesn't handle fetching help from `__index__`,
so it returns an empty dictionary of paths. That means None is always returned
from `extensions.disabled_help()` when embedding resources inside the pyoxidizer
or py2exe binary, regardless of the arg or if is an external extension stored in
the filesystem. And that means wrongly telling the user with an explicitly
disabled LFS extension that it will be enabled locally upon cloning from an LFS
remote. That causes test-lfs-serve.t:295 to fail.
This effectively reverts most of the rest of 843418dc0b1b, while keeping the
help text change in place (which was specifically identified as a problem).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 05 Dec 2022 15:14:33 -0500 |
parents | a94f28be2e6e |
children | f636103c4d67 |
line wrap: on
line source
#!/bin/bash # # Make sure to patch mercurial to create the delta against nullrev # # # Parent cdb85d0512b81031d4a7b30d6a5ddbe69ef1a876 # # diff --git a/mercurial/revlogutils/deltas.py b/mercurial/revlogutils/deltas.py # --- a/mercurial/revlogutils/deltas.py # +++ b/mercurial/revlogutils/deltas.py # @@ -1117,7 +1117,10 @@ class deltacomputer: # candidaterevs = next(groups) # # if deltainfo is None: # - deltainfo = self._fullsnapshotinfo(fh, revinfo, target_rev) # + if revlog._generaldelta: # + deltainfo = self._builddeltainfo(revinfo, nullrev, fh) # + else: # + deltainfo = self._fullsnapshotinfo(fh, revinfo, target_rev) cd "`dirname \"$0\"`" export HGRCPATH= export HGMODULEPOLICY=py rm -rf nullrev-diff ../../hg init nullrev-diff --config format.revlog-compression=zlib cd nullrev-diff echo hi > a ../../../hg commit -Am root-B echo ho > a ../../../hg commit -Am child-A hg up null echo ha > a ../../../hg commit -Am root-A ../../../hg debugdeltachain a rm -rf .hg/cache/ .hg/wcache/ cd .. tar cf test-revlog-diff-relative-to-nullrev.tar nullrev-diff rm -rf nullrev-diff