Mercurial > hg
view mercurial/helptext/bundlespec.txt @ 49010:681b25ea579e
contrib: add a partial-merge tool for sorted lists (such as Python imports)
This is a pretty naive tool that uses a regular expression for
matching lines. It is based on a Google-internal tool that worked in a
similar way.
For now, the regular expression is hard-coded to attempt to match
single-line Python imports. The only commit I've found in the hg core
repo where the tool helped was commit 9cd6292abfdf. I think that's
because we often use multiple imports per import statement. I think
this tool is still a decent first step (especially once the regex is
made configurable in the next patch). The merging should ideally use a
proper Python parser and do the merge at the AST (or CST?) level, but
that's significantly harder, especially if you want to preserve
comments and whitespace. It's also less generic.
Differential Revision: https://phab.mercurial-scm.org/D12380
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 04 Mar 2022 16:12:56 -0800 |
parents | 2e017696181f |
children | 23dd636852b8 |
line wrap: on
line source
Mercurial supports generating standalone "bundle" files that hold repository data. These "bundles" are typically saved locally and used later or exchanged between different repositories, possibly on different machines. Example commands using bundles are :hg:`bundle` and :hg:`unbundle`. Generation of bundle files is controlled by a "bundle specification" ("bundlespec") string. This string tells the bundle generation process how to create the bundle. A "bundlespec" string is composed of the following elements: type A string denoting the bundle format to use. compression Denotes the compression engine to use compressing the raw bundle data. parameters Arbitrary key-value parameters to further control bundle generation. A "bundlespec" string has the following formats: <type> The literal bundle format string is used. <compression>-<type> The compression engine and format are delimited by a hyphen (``-``). Optional parameters follow the ``<type>``. Parameters are URI escaped ``key=value`` pairs. Each pair is delimited by a semicolon (``;``). The first parameter begins after a ``;`` immediately following the ``<type>`` value. Available Types =============== The following bundle <type> strings are available: v1 Produces a legacy "changegroup" version 1 bundle. This format is compatible with nearly all Mercurial clients because it is the oldest. However, it has some limitations, which is why it is no longer the default for new repositories. ``v1`` bundles can be used with modern repositories using the "generaldelta" storage format. However, it may take longer to produce the bundle and the resulting bundle may be significantly larger than a ``v2`` bundle. ``v1`` bundles can only use the ``gzip``, ``bzip2``, and ``none`` compression formats. v2 Produces a version 2 bundle. Version 2 bundles are an extensible format that can store additional repository data (such as bookmarks and phases information) and they can store data more efficiently, resulting in smaller bundles. Version 2 bundles can also use modern compression engines, such as ``zstd``, making them faster to compress and often smaller. Available Compression Engines ============================= The following bundle <compression> engines can be used: .. bundlecompressionmarker Examples ======== ``v2`` Produce a ``v2`` bundle using default options, including compression. ``none-v1`` Produce a ``v1`` bundle with no compression. ``zstd-v2`` Produce a ``v2`` bundle with zstandard compression using default settings. ``zstd-v1`` This errors because ``zstd`` is not supported for ``v1`` types.