##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

manifest: avoid corruption by dropping removed files with pure (issue5801)...
manifest: avoid corruption by dropping removed files with pure (issue5801) Previously, removed files would simply be marked by overwriting the first byte with NUL and dropping their entry in `self.position`. But no effort was made to ignore them when compacting the dictionary into text form. This allowed them to slip into the manifest revision, since the code seems to be trying to minimize the string operations by copying as large a chunk as possible. As part of this, compact() walks the existing text based on entries in the `positions` list, and consumed everything up to the next position entry. This typically resulted in a ValueError complaining about unsorted manifest entries. Sometimes it seems that files do get dropped in large repos- it seems to correspond to there being a new entry that would take the same slot. A much more trivial problem is that if the only changes were removals, `_compact()` didn't even run because `__delitem__` doesn't add anything to `self.extradata`. Now there's an explicit variable to flag this, both to allow `_compact()` to run, and to avoid searching the manifest in cases where there are no removals. In practice, this behavior was mostly obscured by the check in fastdelta() which takes a different path that explicitly drops removed files if there are fewer than 1000 changes. However, timeless has a repo where after rebasing tens of commits, a totally different path[1] is taken that bypasses the change count check and hits this problem. [1] https://www.mercurial-scm.org/repo/hg/file/2338bdea4474/mercurial/manifest.py#l1511
av6 - - Load All Authors

File last commit:

r40672:8c6329fa default
r42569:0546ead3 stable
Show More
rewriteutil.py
53 lines | 1.6 KiB | text/x-python | PythonLexer
/ mercurial / rewriteutil.py
History | Source | Raw |Copy content |Copy permalink
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
 r35242 # rewriteutil.py - utility functions for rewriting changesets
#
# Copyright 2017 Octobus <contact@octobus.net>
#
# 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
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
 r35243 from .i18n import _
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
 r35242 from . import (
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
 r35243 error,
node,
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
 r35242 obsolete,
revset,
)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
 r35243 def precheck(repo, revs, action='rewrite'):
"""check if revs can be rewritten
action is used to control the error message.
Make sure this function is called after taking the lock.
"""
if node.nullrev in revs:
msg = _("cannot %s null changeset") % (action)
hint = _("no changeset checked out")
raise error.Abort(msg, hint=hint)
if len(repo[None].parents()) > 1:
raise error.Abort(_("cannot %s while merging") % action)
av6
rewriteutil: move publicrevs closer to where it's used
 r40672 publicrevs = repo.revs('%ld and public()', revs)
Pulkit Goyal
rewriteutil: add a precheck function to check if revs can be rewritten...
 r35243 if publicrevs:
msg = _("cannot %s public changesets") % (action)
hint = _("see 'hg help phases' for details")
raise error.Abort(msg, hint=hint)
newunstable = disallowednewunstable(repo, revs)
if newunstable:
raise error.Abort(_("cannot %s changeset with children") % action)
Pulkit Goyal
rewriteutil: add utility function to check if we can create new unstable cset...
 r35242 def disallowednewunstable(repo, revs):
"""Checks whether editing the revs will create new unstable changesets and
are we allowed to create them.
To allow new unstable changesets, set the config:
`experimental.evolution.allowunstable=True`
"""
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
if allowunstable:
return revset.baseset()
return repo.revs("(%ld::) - %ld", revs, revs)