mercurial-scm/hg-stable: hgext/fix.py annotate

annotate hgext/fix.py @ 47793:e69c82bf3a01 stable

fix: use obsolete.isenabled() to check for experimental.allowdivergence Now that obsolete.isenabled() can also check if divergence is allowed, let's use it for consistency. Other experimental.evolution options are already checked via this function. Differential Revision: https://phab.mercurial-scm.org/D11222

author	Anton Shestakov <av6@dwimlabs.net>
date	Wed, 28 Jul 2021 13:47:21 +0300
parents	66ad7e32011f
children	86a60679cf61 155a2ec8a9dc

rev	line source
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	1 # fix - rewrite file content in changesets and working copy
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	2 #
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	3 # Copyright 2018 Google LLC.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	4 #
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	7 """rewrite file content in changesets or working copy (EXPERIMENTAL)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	8
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	9 Provides a command that runs configured tools on the contents of modified files,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	10 writing back any fixes to the working copy or replacing changesets.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	11
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	12 Here is an example configuration that causes :hg:`fix` to apply automatic
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	13 formatting fixes to modified lines in C++ code::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	14
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	15 [fix]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	16 clang-format:command=clang-format --assume-filename={rootpath}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	17 clang-format:linerange=--lines={first}:{last}
40583 2ecf5c24d0cd fix: rename :fileset subconfig to :pattern Danny Hooper <hooper@google.com> parents: 40582 diff changeset	18 clang-format:pattern=set:.cpp or .hpp
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	19
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	20 The :command suboption forms the first part of the shell command that will be
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	21 used to fix a file. The content of the file is passed on standard input, and the
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	22 fixed file content is expected on standard output. Any output on standard error
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	23 will be displayed as a warning. If the exit status is not zero, the file will
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	24 not be affected. A placeholder warning is displayed if there is a non-zero exit
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	25 status but no standard error output. Some values may be substituted into the
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	26 command::
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	27
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	28 {rootpath} The path of the file being fixed, relative to the repo root
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	29 {basename} The name of the file being fixed, without the directory path
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	30
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	31 If the :linerange suboption is set, the tool will only be run if there are
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	32 changed lines in a file. The value of this suboption is appended to the shell
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	33 command once for every range of changed lines in the file. Some values may be
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	34 substituted into the command::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	35
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	36 {first} The 1-based line number of the first line in the modified range
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	37 {last} The 1-based line number of the last line in the modified range
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	38
42772 ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	39 Deleted sections of a file will be ignored by :linerange, because there is no
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	40 corresponding line range in the version being fixed.
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	41
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	42 By default, tools that set :linerange will only be executed if there is at least
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	43 one changed line range. This is meant to prevent accidents like running a code
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	44 formatter in such a way that it unexpectedly reformats the whole file. If such a
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	45 tool needs to operate on unchanged files, it should set the :skipclean suboption
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	46 to false.
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	47
40583 2ecf5c24d0cd fix: rename :fileset subconfig to :pattern Danny Hooper <hooper@google.com> parents: 40582 diff changeset	48 The :pattern suboption determines which files will be passed through each
43227 f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	49 configured tool. See :hg:`help patterns` for possible values. However, all
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	50 patterns are relative to the repo root, even if that text says they are relative
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	51 to the current working directory. If there are file arguments to :hg:`fix`, the
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	52 intersection of these patterns is used.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	53
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	54 There is also a configurable limit for the maximum size of file that will be
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	55 processed by :hg:`fix`::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	56
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	57 [fix]
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	58 maxfilesize = 2MB
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	59
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	60 Normally, execution of configured tools will continue after a failure (indicated
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	61 by a non-zero exit status). It can also be configured to abort after the first
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	62 such failure, so that no files will be affected if any tool fails. This abort
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	63 will also cause :hg:`fix` to exit with a non-zero status::
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	64
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	65 [fix]
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	66 failure = abort
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	67
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	68 When multiple tools are configured to affect a file, they execute in an order
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	69 defined by the :priority suboption. The priority suboption has a default value
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	70 of zero for each tool. Tools are executed in order of descending priority. The
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	71 execution order of tools with equal priority is unspecified. For example, you
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	72 could use the 'sort' and 'head' utilities to keep only the 10 smallest numbers
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	73 in a text file by ensuring that 'sort' runs before 'head'::
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	74
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	75 [fix]
41129 d8f5c615e811 tests: use more portable flags in test-fix.t Danny Hooper <hooper@google.com> parents: 40617 diff changeset	76 sort:command = sort -n
d8f5c615e811 tests: use more portable flags in test-fix.t Danny Hooper <hooper@google.com> parents: 40617 diff changeset	77 head:command = head -n 10
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	78 sort:pattern = numbers.txt
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	79 head:pattern = numbers.txt
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	80 sort:priority = 2
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	81 head:priority = 1
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	82
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	83 To account for changes made by each tool, the line numbers used for incremental
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	84 formatting are recomputed before executing the next tool. So, each tool may see
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	85 different values for the arguments added by the :linerange suboption.
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	86
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	87 Each fixer tool is allowed to return some metadata in addition to the fixed file
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	88 content. The metadata must be placed before the file content on stdout,
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	89 separated from the file content by a zero byte. The metadata is parsed as a JSON
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	90 value (so, it should be UTF-8 encoded and contain no zero bytes). A fixer tool
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	91 is expected to produce this metadata encoding if and only if the :metadata
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	92 suboption is true::
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	93
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	94 [fix]
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	95 tool:command = tool --prepend-json-metadata
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	96 tool:metadata = true
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	97
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	98 The metadata values are passed to hooks, which can be used to print summaries or
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	99 perform other post-fixing work. The supported hooks are::
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	100
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	101 "postfixfile"
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	102 Run once for each file in each revision where any fixer tools made changes
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	103 to the file content. Provides "$HG_REV" and "$HG_PATH" to identify the file,
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	104 and "$HG_METADATA" with a map of fixer names to metadata values from fixer
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	105 tools that affected the file. Fixer tools that didn't affect the file have a
43473 61881b170140 fix: fix grammar/typos in hg help -e fix timeless <timeless@mozdev.org> parents: 43380 diff changeset	106 value of None. Only fixer tools that executed are present in the metadata.
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	107
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	108 "postfix"
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	109 Run once after all files and revisions have been handled. Provides
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	110 "$HG_REPLACEMENTS" with information about what revisions were created and
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	111 made obsolete. Provides a boolean "$HG_WDIRWRITTEN" to indicate whether any
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	112 files in the working copy were updated. Provides a list "$HG_METADATA"
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	113 mapping fixer tool names to lists of metadata values returned from
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	114 executions that modified a file. This aggregates the same metadata
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	115 previously passed to the "postfixfile" hook.
42700 74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	116
43473 61881b170140 fix: fix grammar/typos in hg help -e fix timeless <timeless@mozdev.org> parents: 43380 diff changeset	117 Fixer tools are run in the repository's root directory. This allows them to read
42700 74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	118 configuration files from the working copy, or even write to the working copy.
74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	119 The working copy is not updated to match the revision being fixed. In fact,
74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	120 several revisions may be fixed in parallel. Writes to the working copy are not
74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	121 amended into the revision being fixed; fixer tools should always write fixed
74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	122 file content back to stdout as documented above.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	123 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	124
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	125 from __future__ import absolute_import
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	126
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	127 import collections
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	128 import itertools
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	129 import os
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	130 import re
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	131 import subprocess
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	132
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	133 from mercurial.i18n import _
46839 eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46435 diff changeset	134 from mercurial.node import (
47766 3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	135 nullid,
46839 eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46435 diff changeset	136 nullrev,
eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46435 diff changeset	137 wdirrev,
eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46435 diff changeset	138 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	139
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	140 from mercurial.utils import procutil
39831 c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 39005 diff changeset	141
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	142 from mercurial import (
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	143 cmdutil,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	144 context,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	145 copies,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	146 error,
43227 f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	147 match as matchmod,
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	148 mdiff,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	149 merge,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44584 diff changeset	150 mergestate as mergestatemod,
47793 e69c82bf3a01 fix: use obsolete.isenabled() to check for experimental.allowdivergence Anton Shestakov <av6@dwimlabs.net> parents: 47767 diff changeset	151 obsolete,
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	152 pycompat,
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	153 registrar,
43942 699d6be3820a fix: use rewriteutil.precheck() instead of reimplementing it Martin von Zweigbergk <martinvonz@google.com> parents: 43903 diff changeset	154 rewriteutil,
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	155 scmutil,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	156 util,
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	157 worker,
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	158 )
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	159
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	160 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	161 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	162 # be specifying the version(s) of Mercurial they are tested with, or
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	163 # leave the attribute unspecified.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	164 testedwith = b'ships-with-hg-core'
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	165
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	166 cmdtable = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	167 command = registrar.command(cmdtable)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	168
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	169 configtable = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	170 configitem = registrar.configitem(configtable)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	171
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	172 # Register the suboptions allowed for each configured fixer, and default values.
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	173 FIXER_ATTRS = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	174 b'command': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	175 b'linerange': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	176 b'pattern': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	177 b'priority': 0,
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	178 b'metadata': False,
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	179 b'skipclean': True,
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	180 b'enabled': True,
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	181 }
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	182
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	183 for key, default in FIXER_ATTRS.items():
43217 5cb3e6f4e069 fix: fix registration of config item defaults Martin von Zweigbergk <martinvonz@google.com> parents: 43193 diff changeset	184 configitem(b'fix', b'.*:%s$' % key, default=default, generic=True)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	185
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	186 # A good default size allows most source code files to be fixed, but avoids
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	187 # letting fixer tools choke on huge inputs, which could be surprising to the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	188 # user.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	189 configitem(b'fix', b'maxfilesize', default=b'2MB')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	190
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	191 # Allow fix commands to exit non-zero if an executed fixer tool exits non-zero.
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	192 # This helps users do shell scripts that stop when a fixer tool signals a
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	193 # problem.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	194 configitem(b'fix', b'failure', default=b'continue')
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	195
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	196
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	197 def checktoolfailureaction(ui, message, hint=None):
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	198 """Abort with 'message' if fix.failure=abort"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	199 action = ui.config(b'fix', b'failure')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	200 if action not in (b'continue', b'abort'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	201 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	202 _(b'unknown fix.failure action: %s') % (action,),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	203 hint=_(b'use "continue" or "abort"'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	204 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	205 if action == b'abort':
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	206 raise error.Abort(message, hint=hint)
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	207
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	208
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	209 allopt = (b'', b'all', False, _(b'fix all non-public non-obsolete revisions'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	210 baseopt = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	211 b'',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	212 b'base',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	213 [],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	214 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	215 b'revisions to diff against (overrides automatic '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	216 b'selection, and applies to every revision being '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	217 b'fixed)'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	218 ),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	219 _(b'REV'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	220 )
44584 a6ef1e8e2f6d fix: mark -r as advanced Martin von Zweigbergk <martinvonz@google.com> parents: 44583 diff changeset	221 revopt = (b'r', b'rev', [], _(b'revisions to fix (ADVANCED)'), _(b'REV'))
44583 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	222 sourceopt = (
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	223 b's',
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	224 b'source',
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	225 [],
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	226 _(b'fix the specified revisions and their descendants'),
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	227 _(b'REV'),
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	228 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	229 wdiropt = (b'w', b'working-dir', False, _(b'fix the working directory'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	230 wholeopt = (b'', b'whole', False, _(b'always fix every line of a file'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	231 usage = _(b'[OPTION]... [FILE]...')
38987 b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38899 diff changeset	232
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	233
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	234 @command(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	235 b'fix',
44583 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	236 [allopt, baseopt, revopt, sourceopt, wdiropt, wholeopt],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	237 usage,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	238 helpcategory=command.CATEGORY_FILE_CONTENTS,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	239 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	240 def fix(ui, repo, pats, *opts):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	241 """rewrite file content in changesets or working directory
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	242
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	243 Runs any configured tools to fix the content of files. Only affects files
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	244 with changes, unless file arguments are provided. Only affects changed lines
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	245 of files, unless the --whole flag is used. Some tools may always affect the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	246 whole file regardless of --whole.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	247
45251 3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	248 If --working-dir is used, files with uncommitted changes in the working copy
3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	249 will be fixed. Note that no backup are made.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	250
45251 3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	251 If revisions are specified with --source, those revisions and their
3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	252 descendants will be checked, and they may be replaced with new revisions
3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	253 that have fixed file content. By automatically including the descendants,
3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	254 no merging, rebasing, or evolution will be required. If an ancestor of the
3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	255 working copy is included, then the working copy itself will also be fixed,
3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45075 diff changeset	256 and the working copy will be updated to the fixed parent.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	257
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	258 When determining what lines of each file to fix at each revision, the whole
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	259 set of revisions being fixed is considered, so that fixes to earlier
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	260 revisions are not forgotten in later ones. The --base flag can be used to
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	261 override this default behavior, though it is not usually desirable to do so.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	262 """
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	263 opts = pycompat.byteskwargs(opts)
44583 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	264 cmdutil.check_at_most_one_arg(opts, b'all', b'source', b'rev')
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	265 cmdutil.check_incompatible_arguments(
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	266 opts, b'working_dir', [b'all', b'source']
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	267 )
44582 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	268
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	269 with repo.wlock(), repo.lock(), repo.transaction(b'fix'):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	270 revstofix = getrevstofix(ui, repo, opts)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	271 basectxs = getbasectxs(repo, opts, revstofix)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	272 workqueue, numitems = getworkqueue(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	273 ui, repo, pats, opts, revstofix, basectxs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	274 )
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	275 basepaths = getbasepaths(repo, opts, workqueue, basectxs)
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	276 fixers = getfixers(ui)
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	277
45075 797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	278 # Rather than letting each worker independently fetch the files
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	279 # (which also would add complications for shared/keepalive
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	280 # connections), prefetch them all first.
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	281 _prefetchfiles(repo, workqueue, basepaths)
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	282
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	283 # There are no data dependencies between the workers fixing each file
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	284 # revision, so we can use all available parallelism.
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	285 def getfixes(items):
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	286 for rev, path in items:
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	287 ctx = repo[rev]
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	288 olddata = ctx[path].data()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	289 metadata, newdata = fixfile(
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	290 ui, repo, opts, fixers, ctx, path, basepaths, basectxs[rev]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	291 )
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	292 # Don't waste memory/time passing unchanged content back, but
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	293 # produce one result per item either way.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	294 yield (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	295 rev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	296 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	297 metadata,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	298 newdata if newdata != olddata else None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	299 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	300
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	301 results = worker.worker(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	302 ui, 1.0, getfixes, tuple(), workqueue, threadsafe=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	303 )
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	304
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	305 # We have to hold on to the data for each successor revision in memory
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	306 # until all its parents are committed. We ensure this by committing and
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	307 # freeing memory for the revisions in some topological order. This
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	308 # leaves a little bit of memory efficiency on the table, but also makes
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	309 # the tests deterministic. It might also be considered a feature since
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	310 # it makes the results more easily reproducible.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	311 filedata = collections.defaultdict(dict)
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	312 aggregatemetadata = collections.defaultdict(list)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	313 replacements = {}
38988 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38987 diff changeset	314 wdirwritten = False
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	315 commitorder = sorted(revstofix, reverse=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	316 with ui.makeprogress(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	317 topic=_(b'fixing'), unit=_(b'files'), total=sum(numitems.values())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	318 ) as progress:
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	319 for rev, path, filerevmetadata, newdata in results:
38538 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	320 progress.increment(item=path)
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	321 for fixername, fixermetadata in filerevmetadata.items():
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	322 aggregatemetadata[fixername].append(fixermetadata)
38538 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	323 if newdata is not None:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	324 filedata[rev][path] = newdata
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	325 hookargs = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	326 b'rev': rev,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	327 b'path': path,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	328 b'metadata': filerevmetadata,
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	329 }
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	330 repo.hook(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	331 b'postfixfile',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	332 throw=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	333 **pycompat.strkwargs(hookargs)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	334 )
38538 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	335 numitems[rev] -= 1
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	336 # Apply the fixes for this and any other revisions that are
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	337 # ready and sitting at the front of the queue. Using a loop here
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	338 # prevents the queue from being blocked by the first revision to
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	339 # be ready out of order.
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	340 while commitorder and not numitems[commitorder[-1]]:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	341 rev = commitorder.pop()
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	342 ctx = repo[rev]
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	343 if rev == wdirrev:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	344 writeworkingdir(repo, ctx, filedata[rev], replacements)
38988 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38987 diff changeset	345 wdirwritten = bool(filedata[rev])
38538 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	346 else:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	347 replacerev(ui, repo, ctx, filedata[rev], replacements)
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38537 diff changeset	348 del filedata[rev]
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	349
38988 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38987 diff changeset	350 cleanup(repo, replacements, wdirwritten)
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	351 hookargs = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	352 b'replacements': replacements,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	353 b'wdirwritten': wdirwritten,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	354 b'metadata': aggregatemetadata,
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	355 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	356 repo.hook(b'postfix', throw=True, **pycompat.strkwargs(hookargs))
38851 64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	357
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	358
38851 64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	359 def cleanup(repo, replacements, wdirwritten):
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	360 """Calls scmutil.cleanupnodes() with the given replacements.
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	361
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	362 "replacements" is a dict from nodeid to nodeid, with one key and one value
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	363 for every revision that was affected by fixing. This is slightly different
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	364 from cleanupnodes().
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	365
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	366 "wdirwritten" is a bool which tells whether the working copy was affected by
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	367 fixing, since it has no entry in "replacements".
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	368
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	369 Useful as a hook point for extending "hg fix" with output summarizing the
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	370 effects of the command, though we choose not to output anything here.
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38811 diff changeset	371 """
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	372 replacements = {
649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	373 prec: [succ] for prec, succ in pycompat.iteritems(replacements)
649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	374 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	375 scmutil.cleanupnodes(repo, replacements, b'fix', fixphase=True)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	376
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	377
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	378 def getworkqueue(ui, repo, pats, opts, revstofix, basectxs):
45961 464539c305aa formatting: drop a few extra double quotes in docstrings Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	379 """Constructs the list of files to be fixed at specific revisions
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	380
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	381 It is up to the caller how to consume the work items, and the only
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	382 dependence between them is that replacement revisions must be committed in
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	383 topological order. Each work item represents a file in the working copy or
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	384 in some revision that should be fixed and written back to the working copy
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	385 or into a replacement revision.
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	386
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	387 Work items for the same revision are grouped together, so that a worker
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	388 pool starting with the first N items in parallel is likely to finish the
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	389 first revision's work before other revisions. This can allow us to write
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	390 the result to disk and reduce memory footprint. At time of writing, the
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	391 partition strategy in worker.py seems favorable to this. We also sort the
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	392 items by ascending revision number to match the order in which we commit
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	393 the fixes later.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	394 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	395 workqueue = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	396 numitems = collections.defaultdict(int)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	397 maxfilesize = ui.configbytes(b'fix', b'maxfilesize')
38537 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38429 diff changeset	398 for rev in sorted(revstofix):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	399 fixctx = repo[rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	400 match = scmutil.match(fixctx, pats, opts)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	401 for path in sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	402 pathstofix(ui, repo, pats, opts, match, basectxs[rev], fixctx)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	403 ):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	404 fctx = fixctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	405 if fctx.islink():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	406 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	407 if fctx.size() > maxfilesize:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	408 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	409 _(b'ignoring file larger than %s: %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	410 % (util.bytecount(maxfilesize), path)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	411 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	412 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	413 workqueue.append((rev, path))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	414 numitems[rev] += 1
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	415 return workqueue, numitems
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	416
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	417
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	418 def getrevstofix(ui, repo, opts):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	419 """Returns the set of revision numbers that should be fixed"""
44582 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	420 if opts[b'all']:
9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	421 revs = repo.revs(b'(not public() and not obsolete()) or wdir()')
44583 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	422 elif opts[b'source']:
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	423 source_revs = scmutil.revrange(repo, opts[b'source'])
45828 136a86327316 fix: don't include obsolete descendants with -s Martin von Zweigbergk <martinvonz@google.com> parents: 45826 diff changeset	424 revs = set(repo.revs(b'(%ld::) - obsolete()', source_revs))
44583 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	425 if wdirrev in source_revs:
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	426 # `wdir()::` is currently empty, so manually add wdir
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	427 revs.add(wdirrev)
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	428 if repo[b'.'].rev() in revs:
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44582 diff changeset	429 revs.add(wdirrev)
44582 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	430 else:
9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	431 revs = set(scmutil.revrange(repo, opts[b'rev']))
9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	432 if opts.get(b'working_dir'):
9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44570 diff changeset	433 revs.add(wdirrev)
45829 09914d934cf4 fix: only check for obsolete commits in the --rev case Martin von Zweigbergk <martinvonz@google.com> parents: 45828 diff changeset	434 for rev in revs:
09914d934cf4 fix: only check for obsolete commits in the --rev case Martin von Zweigbergk <martinvonz@google.com> parents: 45828 diff changeset	435 checkfixablectx(ui, repo, repo[rev])
44570 368f85c5dfc0 fix: refactor getrevstofix() to define revisions first, then validate them Martin von Zweigbergk <martinvonz@google.com> parents: 44569 diff changeset	436 # Allow fixing only wdir() even if there's an unfinished operation
368f85c5dfc0 fix: refactor getrevstofix() to define revisions first, then validate them Martin von Zweigbergk <martinvonz@google.com> parents: 44569 diff changeset	437 if not (len(revs) == 1 and wdirrev in revs):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	438 cmdutil.checkunfinished(repo)
43942 699d6be3820a fix: use rewriteutil.precheck() instead of reimplementing it Martin von Zweigbergk <martinvonz@google.com> parents: 43903 diff changeset	439 rewriteutil.precheck(repo, revs, b'fix')
46435 dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45961 diff changeset	440 if (
dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45961 diff changeset	441 wdirrev in revs
dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45961 diff changeset	442 and mergestatemod.mergestate.read(repo).unresolvedcount()
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44584 diff changeset	443 ):
44570 368f85c5dfc0 fix: refactor getrevstofix() to define revisions first, then validate them Martin von Zweigbergk <martinvonz@google.com> parents: 44569 diff changeset	444 raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	445 if not revs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	446 raise error.Abort(
45826 f90943d753ef fix: suggest --source instead of --rev on empty revset Martin von Zweigbergk <martinvonz@google.com> parents: 45713 diff changeset	447 b'no changesets specified', hint=b'use --source or --working-dir'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	448 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	449 return revs
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	450
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	451
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	452 def checkfixablectx(ui, repo, ctx):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	453 """Aborts if the revision shouldn't be replaced with a fixed one."""
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	454 if ctx.obsolete():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	455 # It would be better to actually check if the revision has a successor.
47793 e69c82bf3a01 fix: use obsolete.isenabled() to check for experimental.allowdivergence Anton Shestakov <av6@dwimlabs.net> parents: 47767 diff changeset	456 if not obsolete.isenabled(repo, obsolete.allowdivergenceopt):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	457 raise error.Abort(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	458 b'fixing obsolete revision could cause divergence'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	459 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	460
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	461
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	462 def pathstofix(ui, repo, pats, opts, match, basectxs, fixctx):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	463 """Returns the set of files that should be fixed in a context
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	464
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	465 The result depends on the base contexts; we include any file that has
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	466 changed relative to any of the base contexts. Base contexts should be
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	467 ancestors of the context being fixed.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	468 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	469 files = set()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	470 for basectx in basectxs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	471 stat = basectx.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	472 fixctx, match=match, listclean=bool(pats), listunknown=bool(pats)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	473 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	474 files.update(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	475 set(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	476 itertools.chain(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	477 stat.added, stat.modified, stat.clean, stat.unknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	478 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	479 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	480 )
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	481 return files
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	482
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	483
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	484 def lineranges(opts, path, basepaths, basectxs, fixctx, content2):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	485 """Returns the set of line ranges that should be fixed in a file
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	486
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	487 Of the form [(10, 20), (30, 40)].
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	488
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	489 This depends on the given base contexts; we must consider lines that have
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	490 changed versus any of the base contexts, and whether the file has been
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	491 renamed versus any of them.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	492
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	493 Another way to understand this is that we exclude line ranges that are
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	494 common to the file in all base contexts.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	495 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	496 if opts.get(b'whole'):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	497 # Return a range containing all lines. Rely on the diff implementation's
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	498 # idea of how many lines are in the file, instead of reimplementing it.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	499 return difflineranges(b'', content2)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	500
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	501 rangeslist = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	502 for basectx in basectxs:
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	503 basepath = basepaths.get((basectx.rev(), fixctx.rev(), path), path)
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	504
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	505 if basepath in basectx:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	506 content1 = basectx[basepath].data()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	507 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	508 content1 = b''
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	509 rangeslist.extend(difflineranges(content1, content2))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	510 return unionranges(rangeslist)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	511
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	512
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	513 def getbasepaths(repo, opts, workqueue, basectxs):
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	514 if opts.get(b'whole'):
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	515 # Base paths will never be fetched for line range determination.
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	516 return {}
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	517
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	518 basepaths = {}
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	519 for rev, path in workqueue:
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	520 fixctx = repo[rev]
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	521 for basectx in basectxs[rev]:
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	522 basepath = copies.pathcopies(basectx, fixctx).get(path, path)
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	523 if basepath in basectx:
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	524 basepaths[(basectx.rev(), fixctx.rev(), path)] = basepath
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	525 return basepaths
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	526
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	527
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	528 def unionranges(rangeslist):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	529 """Return the union of some closed intervals
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	530
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	531 >>> unionranges([])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	532 []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	533 >>> unionranges([(1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	534 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	535 >>> unionranges([(1, 100), (1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	536 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	537 >>> unionranges([(1, 100), (2, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	538 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	539 >>> unionranges([(1, 99), (1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	540 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	541 >>> unionranges([(1, 100), (40, 60)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	542 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	543 >>> unionranges([(1, 49), (50, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	544 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	545 >>> unionranges([(1, 48), (50, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	546 [(1, 48), (50, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	547 >>> unionranges([(1, 2), (3, 4), (5, 6)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	548 [(1, 6)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	549 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	550 rangeslist = sorted(set(rangeslist))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	551 unioned = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	552 if rangeslist:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	553 unioned, rangeslist = [rangeslist[0]], rangeslist[1:]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	554 for a, b in rangeslist:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	555 c, d = unioned[-1]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	556 if a > d + 1:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	557 unioned.append((a, b))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	558 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	559 unioned[-1] = (c, max(b, d))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	560 return unioned
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	561
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	562
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	563 def difflineranges(content1, content2):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	564 """Return list of line number ranges in content2 that differ from content1.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	565
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	566 Line numbers are 1-based. The numbers are the first and last line contained
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	567 in the range. Single-line ranges have the same line number for the first and
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	568 last line. Excludes any empty ranges that result from lines that are only
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	569 present in content1. Relies on mdiff's idea of where the line endings are in
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	570 the string.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	571
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	572 >>> from mercurial import pycompat
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	573 >>> lines = lambda s: b'\\n'.join([c for c in pycompat.iterbytestr(s)])
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	574 >>> difflineranges2 = lambda a, b: difflineranges(lines(a), lines(b))
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	575 >>> difflineranges2(b'', b'')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	576 []
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	577 >>> difflineranges2(b'a', b'')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	578 []
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	579 >>> difflineranges2(b'', b'A')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	580 [(1, 1)]
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	581 >>> difflineranges2(b'a', b'a')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	582 []
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	583 >>> difflineranges2(b'a', b'A')
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	584 [(1, 1)]
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	585 >>> difflineranges2(b'ab', b'')
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	586 []
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	587 >>> difflineranges2(b'', b'AB')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	588 [(1, 2)]
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	589 >>> difflineranges2(b'abc', b'ac')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	590 []
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	591 >>> difflineranges2(b'ab', b'aCb')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	592 [(2, 2)]
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	593 >>> difflineranges2(b'abc', b'aBc')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	594 [(2, 2)]
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	595 >>> difflineranges2(b'ab', b'AB')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	596 [(1, 2)]
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	597 >>> difflineranges2(b'abcde', b'aBcDe')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	598 [(2, 2), (4, 4)]
37215 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37209 diff changeset	599 >>> difflineranges2(b'abcde', b'aBCDe')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	600 [(2, 4)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	601 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	602 ranges = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	603 for lines, kind in mdiff.allblocks(content1, content2):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	604 firstline, lastline = lines[2:4]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	605 if kind == b'!' and firstline != lastline:
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	606 ranges.append((firstline + 1, lastline))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	607 return ranges
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	608
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	609
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	610 def getbasectxs(repo, opts, revstofix):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	611 """Returns a map of the base contexts for each revision
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	612
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	613 The base contexts determine which lines are considered modified when we
38591 f068495a1c28 fix: add test case that shows why --whole with --base is useful Danny Hooper <hooper@google.com> parents: 38538 diff changeset	614 attempt to fix just the modified lines in a file. It also determines which
f068495a1c28 fix: add test case that shows why --whole with --base is useful Danny Hooper <hooper@google.com> parents: 38538 diff changeset	615 files we attempt to fix, so it is important to compute this even when
f068495a1c28 fix: add test case that shows why --whole with --base is useful Danny Hooper <hooper@google.com> parents: 38538 diff changeset	616 --whole is used.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	617 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	618 # The --base flag overrides the usual logic, and we give every revision
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	619 # exactly the set of baserevs that the user specified.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	620 if opts.get(b'base'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	621 baserevs = set(scmutil.revrange(repo, opts.get(b'base')))
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	622 if not baserevs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	623 baserevs = {nullrev}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	624 basectxs = {repo[rev] for rev in baserevs}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	625 return {rev: basectxs for rev in revstofix}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	626
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	627 # Proceed in topological order so that we can easily determine each
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	628 # revision's baserevs by looking at its parents and their baserevs.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	629 basectxs = collections.defaultdict(set)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	630 for rev in sorted(revstofix):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	631 ctx = repo[rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	632 for pctx in ctx.parents():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	633 if pctx.rev() in basectxs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	634 basectxs[rev].update(basectxs[pctx.rev()])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	635 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	636 basectxs[rev].add(pctx)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	637 return basectxs
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	638
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	639
45075 797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	640 def _prefetchfiles(repo, workqueue, basepaths):
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	641 toprefetch = set()
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	642
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	643 # Prefetch the files that will be fixed.
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	644 for rev, path in workqueue:
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	645 if rev == wdirrev:
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	646 continue
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	647 toprefetch.add((rev, path))
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	648
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	649 # Prefetch the base contents for lineranges().
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	650 for (baserev, fixrev, path), basepath in basepaths.items():
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	651 toprefetch.add((baserev, basepath))
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	652
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	653 if toprefetch:
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	654 scmutil.prefetchfiles(
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	655 repo,
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	656 [
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	657 (rev, scmutil.matchfiles(repo, [path]))
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	658 for rev, path in toprefetch
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	659 ],
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	660 )
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	661
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45074 diff changeset	662
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	663 def fixfile(ui, repo, opts, fixers, fixctx, path, basepaths, basectxs):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	664 """Run any configured fixers that should affect the file in this context
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	665
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	666 Returns the file content that results from applying the fixers in some order
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	667 starting with the file's content in the fixctx. Fixers that support line
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	668 ranges will affect lines that have changed relative to any of the basectxs
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	669 (i.e. they will only avoid lines that are common to all basectxs).
39005 a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38988 diff changeset	670
a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38988 diff changeset	671 A fixer tool's stdout will become the file's new content if and only if it
42700 74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	672 exits with code zero. The fixer tool's working directory is the repository's
74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42687 diff changeset	673 root.
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	674 """
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	675 metadata = {}
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	676 newdata = fixctx[path].data()
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	677 for fixername, fixer in pycompat.iteritems(fixers):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	678 if fixer.affects(opts, fixctx, path):
45074 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	679 ranges = lineranges(
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	680 opts, path, basepaths, basectxs, fixctx, newdata
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44915 diff changeset	681 )
42774 e9f503074044 fix: pass line ranges as value instead of callback Danny Hooper <hooper@google.com> parents: 42773 diff changeset	682 command = fixer.command(ui, path, ranges)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	683 if command is None:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	684 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	685 ui.debug(b'subprocess: %s\n' % (command,))
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	686 proc = subprocess.Popen(
39841 f1d6021453c2 py3: remove a couple of superfluous calls to pycompat.rapply() Matt Harbison <matt_harbison@yahoo.com> parents: 39831 diff changeset	687 procutil.tonativestr(command),
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	688 shell=True,
43193 2d1f9880af1b py3: convert cwd to native string when running `fix` Matt Harbison <matt_harbison@yahoo.com> parents: 43117 diff changeset	689 cwd=procutil.tonativestr(repo.root),
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	690 stdin=subprocess.PIPE,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	691 stdout=subprocess.PIPE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	692 stderr=subprocess.PIPE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	693 )
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	694 stdout, stderr = proc.communicate(newdata)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	695 if stderr:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	696 showstderr(ui, fixctx.rev(), fixername, stderr)
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	697 newerdata = stdout
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	698 if fixer.shouldoutputmetadata():
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	699 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	700 metadatajson, newerdata = stdout.split(b'\0', 1)
43380 579672b347d2 py3: define and use json.loads polyfill Gregory Szorc <gregory.szorc@gmail.com> parents: 43227 diff changeset	701 metadata[fixername] = pycompat.json_loads(metadatajson)
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	702 except ValueError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	703 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	704 _(b'ignored invalid output from fixer tool: %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	705 % (fixername,)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	706 )
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	707 continue
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	708 else:
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	709 metadata[fixername] = None
39005 a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38988 diff changeset	710 if proc.returncode == 0:
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	711 newdata = newerdata
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	712 else:
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	713 if not stderr:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	714 message = _(b'exited with status %d\n') % (proc.returncode,)
40582 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	715 showstderr(ui, fixctx.rev(), fixername, message)
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40417 diff changeset	716 checktoolfailureaction(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	717 ui,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	718 _(b'no fixes will be applied'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	719 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	720 b'use --config fix.failure=continue to apply any '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	721 b'successful fixes anyway'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	722 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	723 )
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	724 return metadata, newdata
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	725
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	726
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	727 def showstderr(ui, rev, fixername, stderr):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	728 """Writes the lines of the stderr string as warnings on the ui
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	729
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	730 Uses the revision number and fixername to give more context to each line of
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	731 the error message. Doesn't include file names, since those take up a lot of
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	732 space and would tend to be included in the error message if they were
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	733 relevant.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	734 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	735 for line in re.split(b'[\r\n]+', stderr):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	736 if line:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	737 ui.warn(b'[')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	738 if rev is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	739 ui.warn(_(b'wdir'), label=b'evolve.rev')
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	740 else:
43549 b2f95f9d3588 fix: replace str() by b'%d' for formatting integer Martin von Zweigbergk <martinvonz@google.com> parents: 43380 diff changeset	741 ui.warn(b'%d' % rev, label=b'evolve.rev')
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	742 ui.warn(b'] %s: %s\n' % (fixername, line))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	743
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	744
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	745 def writeworkingdir(repo, ctx, filedata, replacements):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	746 """Write new content to the working copy and check out the new p1 if any
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	747
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	748 We check out a new revision if and only if we fixed something in both the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	749 working directory and its parent revision. This avoids the need for a full
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	750 update/merge, and means that the working directory simply isn't affected
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	751 unless the --working-dir flag is given.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	752
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	753 Directly updates the dirstate for the affected files.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	754 """
47766 3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	755 assert repo.dirstate.p2() == nullid
3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	756
43105 649d3ac37a12 py3: define and use pycompat.iteritems() for hgext/ Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	757 for path, data in pycompat.iteritems(filedata):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	758 fctx = ctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	759 fctx.write(data, fctx.flags())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	760
47766 3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	761 oldp1 = repo.dirstate.p1()
3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	762 newp1 = replacements.get(oldp1, oldp1)
3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	763 if newp1 != oldp1:
47767 66ad7e32011f fix: use scmutil.movedirstate() instead of reimplementing Martin von Zweigbergk <martinvonz@google.com> parents: 47766 diff changeset	764 with repo.dirstate.parentchange():
66ad7e32011f fix: use scmutil.movedirstate() instead of reimplementing Martin von Zweigbergk <martinvonz@google.com> parents: 47766 diff changeset	765 scmutil.movedirstate(repo, repo[newp1])
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	766
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	767
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	768 def replacerev(ui, repo, ctx, filedata, replacements):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	769 """Commit a new revision like the given one, but with file content changes
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	770
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	771 "ctx" is the original revision to be replaced by a modified one.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	772
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	773 "filedata" is a dict that maps paths to their new file content. All other
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	774 paths will be recreated from the original revision without changes.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	775 "filedata" may contain paths that didn't exist in the original revision;
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	776 they will be added.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	777
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	778 "replacements" is a dict that maps a single node to a single node, and it is
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	779 updated to indicate the original revision is replaced by the newly created
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	780 one. No entry is added if the replacement's node already exists.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	781
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	782 The new revision has the same parents as the old one, unless those parents
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	783 have already been replaced, in which case those replacements are the parents
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	784 of this new revision. Thus, if revisions are replaced in topological order,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	785 there is no need to rebase them into the original topology later.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	786 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	787
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	788 p1rev, p2rev = repo.changelog.parentrevs(ctx.rev())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	789 p1ctx, p2ctx = repo[p1rev], repo[p2rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	790 newp1node = replacements.get(p1ctx.node(), p1ctx.node())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	791 newp2node = replacements.get(p2ctx.node(), p2ctx.node())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	792
40617 ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	793 # We don't want to create a revision that has no changes from the original,
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	794 # but we should if the original revision's parent has been replaced.
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	795 # Otherwise, we would produce an orphan that needs no actual human
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	796 # intervention to evolve. We can't rely on commit() to avoid creating the
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	797 # un-needed revision because the extra field added below produces a new hash
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	798 # regardless of file content changes.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	799 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	800 not filedata
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	801 and p1ctx.node() not in replacements
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	802 and p2ctx.node() not in replacements
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	803 ):
40617 ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	804 return
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	805
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	806 extra = ctx.extra().copy()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	807 extra[b'fix_source'] = ctx.hex()
40617 ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40613 diff changeset	808
43967 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	809 wctx = context.overlayworkingctx(repo)
44092 833210fbd900 graftcopies: remove `skip` and `repo` arguments Martin von Zweigbergk <martinvonz@google.com> parents: 44090 diff changeset	810 wctx.setbase(repo[newp1node])
44318 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44129 diff changeset	811 merge.revert_to(ctx, wc=wctx)
44092 833210fbd900 graftcopies: remove `skip` and `repo` arguments Martin von Zweigbergk <martinvonz@google.com> parents: 44090 diff changeset	812 copies.graftcopies(wctx, ctx, ctx.p1())
43967 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	813
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	814 for path in filedata.keys():
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	815 fctx = ctx[path]
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	816 copysource = fctx.copysource()
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	817 wctx.write(path, filedata[path], flags=fctx.flags())
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	818 if copysource:
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	819 wctx.markcopied(path, copysource)
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	820
45713 04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	821 desc = rewriteutil.update_hash_refs(
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	822 repo,
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	823 ctx.description(),
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	824 {oldnode: [newnode] for oldnode, newnode in replacements.items()},
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	825 )
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	826
43967 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	827 memctx = wctx.tomemctx(
45713 04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45251 diff changeset	828 text=desc,
43967 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	829 branch=ctx.branch(),
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	830 extra=extra,
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38426 diff changeset	831 date=ctx.date(),
43967 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	832 parents=(newp1node, newp2node),
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	833 user=ctx.user(),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	834 )
43967 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43942 diff changeset	835
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38426 diff changeset	836 sucnode = memctx.commit()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38426 diff changeset	837 prenode = ctx.node()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38426 diff changeset	838 if prenode == sucnode:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	839 ui.debug(b'node %s already existed\n' % (ctx.hex()))
38429 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38426 diff changeset	840 else:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38426 diff changeset	841 replacements[ctx.node()] = sucnode
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	842
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	843
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	844 def getfixers(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	845 """Returns a map of configured fixer tools indexed by their names
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	846
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	847 Each value is a Fixer object with methods that implement the behavior of the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	848 fixer's config suboptions. Does not validate the config values.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	849 """
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	850 fixers = {}
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	851 for name in fixernames(ui):
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	852 enabled = ui.configbool(b'fix', name + b':enabled')
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	853 command = ui.config(b'fix', name + b':command')
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	854 pattern = ui.config(b'fix', name + b':pattern')
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	855 linerange = ui.config(b'fix', name + b':linerange')
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	856 priority = ui.configint(b'fix', name + b':priority')
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	857 metadata = ui.configbool(b'fix', name + b':metadata')
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	858 skipclean = ui.configbool(b'fix', name + b':skipclean')
42687 2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42685 diff changeset	859 # Don't use a fixer if it has no pattern configured. It would be
2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42685 diff changeset	860 # dangerous to let it affect all files. It would be pointless to let it
2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42685 diff changeset	861 # affect no files. There is no reasonable subset of files to use as the
2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42685 diff changeset	862 # default.
43220 d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	863 if command is None:
d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	864 ui.warn(
d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	865 _(b'fixer tool has no command configuration: %s\n') % (name,)
d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	866 )
d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	867 elif pattern is None:
42687 2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42685 diff changeset	868 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	869 _(b'fixer tool has no pattern configuration: %s\n') % (name,)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	870 )
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	871 elif not enabled:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	872 ui.debug(b'ignoring disabled fixer tool: %s\n' % (name,))
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	873 else:
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	874 fixers[name] = Fixer(
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	875 command, pattern, linerange, priority, metadata, skipclean
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	876 )
40613 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40583 diff changeset	877 return collections.OrderedDict(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	878 sorted(fixers.items(), key=lambda item: item[1]._priority, reverse=True)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	879 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	880
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	881
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	882 def fixernames(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	883 """Returns the names of [fix] config options that have suboptions"""
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	884 names = set()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	885 for k, v in ui.configitems(b'fix'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	886 if b':' in k:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	887 names.add(k.split(b':', 1)[0])
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	888 return names
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	889
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	890
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	891 class Fixer(object):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	892 """Wraps the raw config values for a fixer with methods"""
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	893
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	894 def __init__(
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	895 self, command, pattern, linerange, priority, metadata, skipclean
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	896 ):
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	897 self._command = command
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	898 self._pattern = pattern
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	899 self._linerange = linerange
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	900 self._priority = priority
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	901 self._metadata = metadata
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	902 self._skipclean = skipclean
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	903
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	904 def affects(self, opts, fixctx, path):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	905 """Should this fixer run on the file at the given path and context?"""
43227 f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	906 repo = fixctx.repo()
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	907 matcher = matchmod.match(
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	908 repo.root, repo.root, [self._pattern], ctx=fixctx
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	909 )
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	910 return matcher(path)
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	911
42229 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	912 def shouldoutputmetadata(self):
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	913 """Should the stdout of this fixer start with JSON and a null byte?"""
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	914 return self._metadata
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	915
42774 e9f503074044 fix: pass line ranges as value instead of callback Danny Hooper <hooper@google.com> parents: 42773 diff changeset	916 def command(self, ui, path, ranges):
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	917 """A shell command to use to invoke this fixer on the given file/lines
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	918
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	919 May return None if there is no appropriate command to run for the given
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	920 parameters.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	921 """
37774 d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	922 expand = cmdutil.rendercommandtemplate
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	923 parts = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	924 expand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	925 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	926 self._command,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	927 {b'rootpath': path, b'basename': os.path.basename(path)},
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	928 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	929 ]
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	930 if self._linerange:
42772 ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42700 diff changeset	931 if self._skipclean and not ranges:
37185 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	932 # No line ranges to fix, so don't run the fixer.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	933 return None
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	934 for first, last in ranges:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	935 parts.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	936 expand(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	937 ui, self._linerange, {b'first': first, b'last': last}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	938 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	939 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	940 return b' '.join(parts)

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/fix.py @ 47793:e69c82bf3a01 stable