Mercurial > hg
view mercurial/diffutil.py @ 48598:a6f16ec07ed7
stream-clone: add a explicit test for format change during stream clone
They are different kind of requirements, the one which impact the data storage
and are relevant to the files being streamed and the one which does not. For
example some requirements are only relevant to the working copy, like sparse, or
dirstate-v2.
Since they are irrelevant to the content being streamed, they do not prevent the
receiving side to use streaming clone and mercurial skip adverting them over
the wire and, ideally, within the bundle.
In addition, this let the client decide to use whichever format it desire for
the part that does not affect the store itself. So the configuration related to
these format are used as normal when doing a streaming clone.
In practice, the feature was not really tested and is badly broken with bundle-2,
since the requirements are not filtered out from the stream bundle.
So we start with adding simple tests as a good base before the fix and adjust
the feature.
Differential Revision: https://phab.mercurial-scm.org/D12029
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 17 Jan 2022 18:51:47 +0100 |
parents | 89a2afe31e82 |
children | 6000f5b25c9b |
line wrap: on
line source
# diffutil.py - utility functions related to diff and patch # # Copyright 2006 Brendan Cully <brendan@kublai.com> # Copyright 2007 Chris Mason <chris.mason@oracle.com> # Copyright 2018 Octobus <octobus@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 from .i18n import _ from . import ( mdiff, pycompat, ) def diffallopts( ui, opts=None, untrusted=False, section=b'diff', configprefix=b'' ): '''return diffopts with all features supported and parsed''' return difffeatureopts( ui, opts=opts, untrusted=untrusted, section=section, git=True, whitespace=True, formatchanging=True, configprefix=configprefix, ) def difffeatureopts( ui, opts=None, untrusted=False, section=b'diff', git=False, whitespace=False, formatchanging=False, configprefix=b'', ): """return diffopts with only opted-in features parsed Features: - git: git-style diffs - whitespace: whitespace options like ignoreblanklines and ignorews - formatchanging: options that will likely break or cause correctness issues with most diff parsers """ def get(key, name=None, getter=ui.configbool, forceplain=None): if opts: v = opts.get(key) # diffopts flags are either None-default (which is passed # through unchanged, so we can identify unset values), or # some other falsey default (eg --unified, which defaults # to an empty string). We only want to override the config # entries from hgrc with command line values if they # appear to have been set, which is any truthy value, # True, or False. if v or isinstance(v, bool): return v if forceplain is not None and ui.plain(): return forceplain return getter( section, configprefix + (name or key), untrusted=untrusted ) # core options, expected to be understood by every diff parser buildopts = { b'nodates': get(b'nodates'), b'showfunc': get(b'show_function', b'showfunc'), b'context': get(b'unified', getter=ui.config), } buildopts[b'xdiff'] = ui.configbool(b'experimental', b'xdiff') if git: buildopts[b'git'] = get(b'git') # since this is in the experimental section, we need to call # ui.configbool directory buildopts[b'showsimilarity'] = ui.configbool( b'experimental', b'extendedheader.similarity' ) # need to inspect the ui object instead of using get() since we want to # test for an int hconf = ui.config(b'experimental', b'extendedheader.index') if hconf is not None: hlen = None try: # the hash config could be an integer (for length of hash) or a # word (e.g. short, full, none) hlen = int(hconf) if hlen < 0 or hlen > 40: msg = _(b"invalid length for extendedheader.index: '%d'\n") ui.warn(msg % hlen) except ValueError: # default value if hconf == b'short' or hconf == b'': hlen = 12 elif hconf == b'full': hlen = 40 elif hconf != b'none': msg = _(b"invalid value for extendedheader.index: '%s'\n") ui.warn(msg % hconf) finally: buildopts[b'index'] = hlen if whitespace: buildopts[b'ignorews'] = get(b'ignore_all_space', b'ignorews') buildopts[b'ignorewsamount'] = get( b'ignore_space_change', b'ignorewsamount' ) buildopts[b'ignoreblanklines'] = get( b'ignore_blank_lines', b'ignoreblanklines' ) buildopts[b'ignorewseol'] = get(b'ignore_space_at_eol', b'ignorewseol') if formatchanging: buildopts[b'text'] = opts and opts.get(b'text') binary = None if opts is None else opts.get(b'binary') buildopts[b'nobinary'] = ( not binary if binary is not None else get(b'nobinary', forceplain=False) ) buildopts[b'noprefix'] = get(b'noprefix', forceplain=False) buildopts[b'worddiff'] = get( b'word_diff', b'word-diff', forceplain=False ) return mdiff.diffopts(**pycompat.strkwargs(buildopts))