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

annotate hgext/fix.py @ 52995:1330278b9029

fix: add a `extra-bin-paths` option See inline document for details.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Wed, 19 Feb 2025 23:15:43 +0100
parents	f4733654f144
children

rev	line source
37183 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
50359 f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	12 Fixer tools are run in the repository's root directory. This allows them to read
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	13 configuration files from the working copy, or even write to the working copy.
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	14 The working copy is not updated to match the revision being fixed. In fact,
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	15 several revisions may be fixed in parallel. Writes to the working copy are not
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	16 amended into the revision being fixed; fixer tools MUST always read content to
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	17 be fixed from stdin, and write fixed file content back to stdout.
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	18
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	19 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	20 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	21
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	22 [fix]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	23 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	24 clang-format:linerange=--lines={first}:{last}
40533 2ecf5c24d0cd fix: rename :fileset subconfig to :pattern Danny Hooper <hooper@google.com> parents: 40532 diff changeset	25 clang-format:pattern=set:.cpp or .hpp
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	26
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	27 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	28 used to fix a file. The content of the file is passed on standard input, and the
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	29 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: 40431 diff changeset	30 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: 40431 diff changeset	31 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: 40431 diff changeset	32 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: 40431 diff changeset	33 command::
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	34
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	35 {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	36 {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	37
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	38 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	39 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	40 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	41 substituted into the command::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	42
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	43 {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	44 {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	45
42756 ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42673 diff changeset	46 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: 42673 diff changeset	47 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: 42673 diff changeset	48
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42673 diff changeset	49 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: 42673 diff changeset	50 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: 42673 diff changeset	51 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: 42673 diff changeset	52 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: 42673 diff changeset	53 to false.
ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42673 diff changeset	54
40533 2ecf5c24d0cd fix: rename :fileset subconfig to :pattern Danny Hooper <hooper@google.com> parents: 40532 diff changeset	55 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	56 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	57 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	58 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	59 intersection of these patterns is used.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	60
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	61 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	62 processed by :hg:`fix`::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	63
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	64 [fix]
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	65 maxfilesize = 2MB
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	66
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	67 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: 40431 diff changeset	68 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: 40431 diff changeset	69 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: 40431 diff changeset	70 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: 40431 diff changeset	71
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	72 [fix]
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	73 failure = abort
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	74
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	75 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: 40533 diff changeset	76 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: 40533 diff changeset	77 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: 40533 diff changeset	78 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: 40533 diff changeset	79 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: 40533 diff changeset	80 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: 40533 diff changeset	81
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	82 [fix]
41126 d8f5c615e811 tests: use more portable flags in test-fix.t Danny Hooper <hooper@google.com> parents: 40570 diff changeset	83 sort:command = sort -n
d8f5c615e811 tests: use more portable flags in test-fix.t Danny Hooper <hooper@google.com> parents: 40570 diff changeset	84 head:command = head -n 10
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	85 sort:pattern = numbers.txt
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	86 head:pattern = numbers.txt
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	87 sort:priority = 2
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	88 head:priority = 1
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	89
b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	90 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: 40533 diff changeset	91 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: 40533 diff changeset	92 different values for the arguments added by the :linerange suboption.
42194 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 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	95 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	96 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	97 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	98 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	99 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	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 [fix]
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	102 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	103 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	104
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	105 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	106 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	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 "postfixfile"
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 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	110 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	111 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	112 tools that affected the file. Fixer tools that didn't affect the file have a
44048 61881b170140 fix: fix grammar/typos in hg help -e fix timeless <timeless@mozdev.org> parents: 43380 diff changeset	113 value of None. Only fixer tools that executed are present in the metadata.
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	114
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	115 "postfix"
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	116 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	117 "$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	118 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	119 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	120 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	121 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	122 previously passed to the "postfixfile" hook.
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	123
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	124 You can specify a list of directories to search the tool command in using the
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	125 `fix.extra-bin-paths` configuration.
37183 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
51859 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 51858 diff changeset	128 from __future__ import annotations
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	129
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	130 import collections
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	131 import itertools
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	132 import os
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	133 import re
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	134 import subprocess
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	135 import sys
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	136
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	137 from mercurial.i18n import _
46839 eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46361 diff changeset	138 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	139 nullid,
46839 eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46361 diff changeset	140 nullrev,
eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46361 diff changeset	141 wdirrev,
eb2a6f66c463 fix: merge imports Joerg Sonnenberger <joerg@bec.de> parents: 46361 diff changeset	142 )
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	143
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	144 from mercurial.utils import procutil
39826 c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 38967 diff changeset	145
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	146 from mercurial import (
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	147 cmdutil,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	148 context,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	149 copies,
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	150 encoding,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	151 error,
48116 5ced12cfa41b errors: raise InputError on bad revset to revrange() iff provided by the user Martin von Zweigbergk <martinvonz@google.com> parents: 47924 diff changeset	152 logcmdutil,
43227 f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	153 match as matchmod,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	154 mdiff,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	155 merge,
44856 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44575 diff changeset	156 mergestate as mergestatemod,
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	157 pycompat,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	158 registrar,
43936 699d6be3820a fix: use rewriteutil.precheck() instead of reimplementing it Martin von Zweigbergk <martinvonz@google.com> parents: 43897 diff changeset	159 rewriteutil,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	160 scmutil,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	161 util,
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	162 worker,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	163 )
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	164
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	165 # 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	166 # 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	167 # 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	168 # leave the attribute unspecified.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	169 testedwith = b'ships-with-hg-core'
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	170
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	171 cmdtable = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	172 command = registrar.command(cmdtable)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	173
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	174 configtable = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	175 configitem = registrar.configitem(configtable)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	176
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	177 # Register the suboptions allowed for each configured fixer, and default values.
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	178 FIXER_ATTRS = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	179 b'command': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	180 b'linerange': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	181 b'pattern': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	182 b'priority': 0,
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	183 b'metadata': False,
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	184 b'skipclean': True,
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	185 b'enabled': True,
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	186 }
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	187
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	188 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	189 configitem(b'fix', b'.*:%s$' % key, default=default, generic=True)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	190
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	191 # 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	192 # 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	193 # user.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	194 configitem(b'fix', b'maxfilesize', default=b'2MB')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	195
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	196 # 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: 40431 diff changeset	197 # 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: 40431 diff changeset	198 # problem.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	199 configitem(b'fix', b'failure', default=b'continue')
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	200
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	201 configitem(b'fix', b'extra-bin-paths', default=list)
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	202
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	203
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	204 def checktoolfailureaction(ui, message, hint=None):
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	205 """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	206 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	207 if action not in (b'continue', b'abort'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	208 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	209 _(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	210 hint=_(b'use "continue" or "abort"'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	211 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	212 if action == b'abort':
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	213 raise error.Abort(message, hint=hint)
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	214
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	215
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	216 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	217 baseopt = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	218 b'',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	219 b'base',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	220 [],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	221 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 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	223 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	224 b'fixed)'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	225 ),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	226 _(b'REV'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	227 )
44575 a6ef1e8e2f6d fix: mark -r as advanced Martin von Zweigbergk <martinvonz@google.com> parents: 44574 diff changeset	228 revopt = (b'r', b'rev', [], _(b'revisions to fix (ADVANCED)'), _(b'REV'))
44574 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	229 sourceopt = (
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	230 b's',
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	231 b'source',
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	232 [],
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	233 _(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: 44573 diff changeset	234 _(b'REV'),
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	235 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	236 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	237 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	238 usage = _(b'[OPTION]... [FILE]...')
38949 b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	239
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	240
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	241 @command(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	242 b'fix',
44574 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	243 [allopt, baseopt, revopt, sourceopt, wdiropt, wholeopt],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	244 usage,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	245 helpcategory=command.CATEGORY_FILE_CONTENTS,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	246 )
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	247 def fix(ui, repo, pats, *opts):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	248 """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	249
50359 f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	250 Runs any configured tools to fix the content of files. (See
f4ff55583dec fix: highlight the required configuration and behavior of the fixer tools Matt Harbison <matt_harbison@yahoo.com> parents: 50090 diff changeset	251 :hg:`help -e fix` for details about configuring tools.) Only affects files
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	252 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	253 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	254 whole file regardless of --whole.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	255
45218 3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45074 diff changeset	256 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: 45074 diff changeset	257 will be fixed. Note that no backup are made.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	258
45218 3ea3b85df03f fix: update documentation to reflect preference for --source over --rev Martin von Zweigbergk <martinvonz@google.com> parents: 45074 diff changeset	259 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: 45074 diff changeset	260 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: 45074 diff changeset	261 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: 45074 diff changeset	262 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: 45074 diff changeset	263 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: 45074 diff changeset	264 and the working copy will be updated to the fixed parent.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	265
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	266 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	267 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	268 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	269 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	270 """
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	271 opts = pycompat.byteskwargs(opts)
44574 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	272 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: 44573 diff changeset	273 cmdutil.check_incompatible_arguments(
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	274 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: 44573 diff changeset	275 )
44573 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44561 diff changeset	276
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	277 with repo.wlock(), repo.lock(), repo.transaction(b'fix'):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	278 revstofix = getrevstofix(ui, repo, opts)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	279 basectxs = getbasectxs(repo, opts, revstofix)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	280 workqueue, numitems = getworkqueue(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	281 ui, repo, pats, opts, revstofix, basectxs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	282 )
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	283 basepaths = getbasepaths(repo, opts, workqueue, basectxs)
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	284 fixers = getfixers(ui)
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	285
45074 797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	286 # Rather than letting each worker independently fetch the files
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	287 # (which also would add complications for shared/keepalive
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	288 # connections), prefetch them all first.
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	289 _prefetchfiles(repo, workqueue, basepaths)
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	290
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	291 # 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: 38423 diff changeset	292 # revision, so we can use all available parallelism.
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	293 def getfixes(items):
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	294 for srcrev, path, dstrevs in items:
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	295 ctx = repo[srcrev]
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	296 olddata = ctx[path].data()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	297 metadata, newdata = fixfile(
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	298 ui,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	299 repo,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	300 opts,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	301 fixers,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	302 ctx,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	303 path,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	304 basepaths,
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	305 basectxs[srcrev],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	306 )
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	307 # We ungroup the work items now, because the code that consumes
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	308 # these results has to handle each dstrev separately, and in
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	309 # topological order. Because these are handled in topological
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	310 # order, it's important that we pass around references to
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	311 # "newdata" instead of copying it. Otherwise, we would be
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	312 # keeping more copies of file content in memory at a time than
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	313 # if we hadn't bothered to group/deduplicate the work items.
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	314 data = newdata if newdata != olddata else None
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	315 for dstrev in dstrevs:
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	316 yield (dstrev, path, metadata, data)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	317
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	318 results = worker.worker(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	319 ui, 1.0, getfixes, tuple(), workqueue, threadsafe=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	320 )
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	321
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	322 # 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: 38423 diff changeset	323 # 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: 38423 diff changeset	324 # 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: 38423 diff changeset	325 # 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: 38423 diff changeset	326 # 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: 38423 diff changeset	327 # it makes the results more easily reproducible.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	328 filedata = collections.defaultdict(dict)
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	329 aggregatemetadata = collections.defaultdict(list)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	330 replacements = {}
38950 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38949 diff changeset	331 wdirwritten = False
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	332 commitorder = sorted(revstofix, reverse=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	333 with ui.makeprogress(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	334 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	335 ) as progress:
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	336 for rev, path, filerevmetadata, newdata in results:
38537 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	337 progress.increment(item=path)
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	338 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	339 aggregatemetadata[fixername].append(fixermetadata)
38537 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	340 if newdata is not None:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	341 filedata[rev][path] = newdata
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	342 hookargs = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	343 b'rev': rev,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	344 b'path': path,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	345 b'metadata': filerevmetadata,
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	346 }
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	347 repo.hook(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	348 b'postfixfile',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	349 throw=False,
51858 607e94e01851 format: add many "missing" comma Matt Harbison <matt_harbison@yahoo.com> parents: 50359 diff changeset	350 **pycompat.strkwargs(hookargs),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	351 )
38537 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	352 numitems[rev] -= 1
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	353 # 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: 38536 diff changeset	354 # 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: 38536 diff changeset	355 # 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: 38536 diff changeset	356 # be ready out of order.
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	357 while commitorder and not numitems[commitorder[-1]]:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	358 rev = commitorder.pop()
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	359 ctx = repo[rev]
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	360 if rev == wdirrev:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	361 writeworkingdir(repo, ctx, filedata[rev], replacements)
38950 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38949 diff changeset	362 wdirwritten = bool(filedata[rev])
38537 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	363 else:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	364 replacerev(ui, repo, ctx, filedata[rev], replacements)
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	365 del filedata[rev]
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	366
38950 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38949 diff changeset	367 cleanup(repo, replacements, wdirwritten)
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	368 hookargs = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	369 b'replacements': replacements,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	370 b'wdirwritten': wdirwritten,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	371 b'metadata': aggregatemetadata,
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	372 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	373 repo.hook(b'postfix', throw=True, **pycompat.strkwargs(hookargs))
38811 64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	374
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	375
38811 64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	376 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: 38770 diff changeset	377 """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: 38770 diff changeset	378
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	379 "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: 38770 diff changeset	380 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: 38770 diff changeset	381 from cleanupnodes().
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	382
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	383 "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: 38770 diff changeset	384 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: 38770 diff changeset	385
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	386 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: 38770 diff changeset	387 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: 38770 diff changeset	388 """
48913 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48875 diff changeset	389 replacements = {prec: [succ] for prec, succ in replacements.items()}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	390 scmutil.cleanupnodes(repo, replacements, b'fix', fixphase=True)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	391
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	392
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	393 def getworkqueue(ui, repo, pats, opts, revstofix, basectxs):
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	394 """Constructs a list of files to fix and which revisions each fix applies to
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	395
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	396 To avoid duplicating work, there is usually only one work item for each file
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	397 revision that might need to be fixed. There can be multiple work items per
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	398 file revision if the same file needs to be fixed in multiple changesets with
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	399 different baserevs. Each work item also contains a list of changesets where
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	400 the file's data should be replaced with the fixed data. The work items for
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	401 earlier changesets come earlier in the work queue, to improve pipelining by
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	402 allowing the first changeset to be replaced while fixes are still being
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	403 computed for later changesets.
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	404
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	405 Also returned is a map from changesets to the count of work items that might
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	406 affect each changeset. This is used later to count when all of a changeset's
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	407 work items have been finished, without having to inspect the remaining work
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	408 queue in each worker subprocess.
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	409
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	410 The example work item (1, "foo/bar.txt", (1, 2, 3)) means that the data of
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	411 bar.txt should be read from revision 1, then fixed, and written back to
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	412 revisions 1, 2 and 3. Revision 1 is called the "srcrev" and the list of
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	413 revisions is called the "dstrevs". In practice the srcrev is always one of
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	414 the dstrevs, and we make that choice when constructing the work item so that
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	415 the choice can't be made inconsistently later on. The dstrevs should all
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	416 have the same file revision for the given path, so the choice of srcrev is
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	417 arbitrary. The wdirrev can be a dstrev and a srcrev.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	418 """
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	419 dstrevmap = collections.defaultdict(list)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	420 numitems = collections.defaultdict(int)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	421 maxfilesize = ui.configbytes(b'fix', b'maxfilesize')
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	422 for rev in sorted(revstofix):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	423 fixctx = repo[rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	424 match = scmutil.match(fixctx, pats, opts)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	425 for path in sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	426 pathstofix(ui, repo, pats, opts, match, basectxs[rev], fixctx)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	427 ):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	428 fctx = fixctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	429 if fctx.islink():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	430 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	431 if fctx.size() > maxfilesize:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	432 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	433 _(b'ignoring file larger than %s: %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	434 % (util.bytecount(maxfilesize), path)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	435 )
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	436 continue
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	437 baserevs = tuple(ctx.rev() for ctx in basectxs[rev])
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	438 dstrevmap[(fctx.filerev(), baserevs, path)].append(rev)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	439 numitems[rev] += 1
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	440 workqueue = [
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	441 (min(dstrevs), path, dstrevs)
48246 2f7caef017d9 fix: appease pyflakes and make unused variables more obvious Rapha?l Gom?s <rgomes@octobus.net> parents: 48178 diff changeset	442 for (_filerev, _baserevs, path), dstrevs in dstrevmap.items()
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	443 ]
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	444 # Move work items for earlier changesets to the front of the queue, so we
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	445 # might be able to replace those changesets (in topological order) while
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	446 # we're still processing later work items. Note the min() in the previous
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	447 # expression, which means we don't need a custom comparator here. The path
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	448 # is also important in the sort order to make the output order stable. There
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	449 # are some situations where this doesn't help much, but some situations
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	450 # where it lets us buffer O(1) files instead of O(n) files.
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	451 workqueue.sort()
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	452 return workqueue, numitems
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	453
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	454
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	455 def getrevstofix(ui, repo, opts):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	456 """Returns the set of revision numbers that should be fixed"""
44573 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44561 diff changeset	457 if opts[b'all']:
9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44561 diff changeset	458 revs = repo.revs(b'(not public() and not obsolete()) or wdir()')
44574 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	459 elif opts[b'source']:
48116 5ced12cfa41b errors: raise InputError on bad revset to revrange() iff provided by the user Martin von Zweigbergk <martinvonz@google.com> parents: 47924 diff changeset	460 source_revs = logcmdutil.revrange(repo, opts[b'source'])
45809 136a86327316 fix: don't include obsolete descendants with -s Martin von Zweigbergk <martinvonz@google.com> parents: 45807 diff changeset	461 revs = set(repo.revs(b'(%ld::) - obsolete()', source_revs))
44574 5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	462 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: 44573 diff changeset	463 # `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: 44573 diff changeset	464 revs.add(wdirrev)
5205b46bd887 fix: add a -s option to format a revision and its descendants Martin von Zweigbergk <martinvonz@google.com> parents: 44573 diff changeset	465 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: 44573 diff changeset	466 revs.add(wdirrev)
44573 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44561 diff changeset	467 else:
48116 5ced12cfa41b errors: raise InputError on bad revset to revrange() iff provided by the user Martin von Zweigbergk <martinvonz@google.com> parents: 47924 diff changeset	468 revs = set(logcmdutil.revrange(repo, opts[b'rev']))
44573 9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44561 diff changeset	469 if opts.get(b'working_dir'):
9f5e94bbc606 fix: move handling of --all into getrevstofix() for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 44561 diff changeset	470 revs.add(wdirrev)
44561 368f85c5dfc0 fix: refactor getrevstofix() to define revisions first, then validate them Martin von Zweigbergk <martinvonz@google.com> parents: 44560 diff changeset	471 # 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: 44560 diff changeset	472 if not (len(revs) == 1 and wdirrev in revs):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	473 cmdutil.checkunfinished(repo)
43936 699d6be3820a fix: use rewriteutil.precheck() instead of reimplementing it Martin von Zweigbergk <martinvonz@google.com> parents: 43897 diff changeset	474 rewriteutil.precheck(repo, revs, b'fix')
46361 dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45946 diff changeset	475 if (
dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45946 diff changeset	476 wdirrev in revs
dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45946 diff changeset	477 and mergestatemod.mergestate.read(repo).unresolvedcount()
44856 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44575 diff changeset	478 ):
44561 368f85c5dfc0 fix: refactor getrevstofix() to define revisions first, then validate them Martin von Zweigbergk <martinvonz@google.com> parents: 44560 diff changeset	479 raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	480 if not revs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	481 raise error.Abort(
45807 f90943d753ef fix: suggest --source instead of --rev on empty revset Martin von Zweigbergk <martinvonz@google.com> parents: 45713 diff changeset	482 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	483 )
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	484 return revs
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	485
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	486
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	487 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	488 """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	489
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	490 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	491 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	492 ancestors of the context being fixed.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	493 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	494 files = set()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	495 for basectx in basectxs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	496 stat = basectx.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	497 fixctx, match=match, listclean=bool(pats), listunknown=bool(pats)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	498 )
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	499 files.update(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	500 set(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	501 itertools.chain(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	502 stat.added, stat.modified, stat.clean, stat.unknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	503 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	504 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	505 )
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	506 return files
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	507
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	508
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	509 def lineranges(opts, path, basepaths, basectxs, fixctx, content2):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	510 """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	511
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	512 Of the form [(10, 20), (30, 40)].
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	513
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	514 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	515 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	516 renamed versus any of them.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	517
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	518 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	519 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	520 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	521 if opts.get(b'whole'):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	522 # 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	523 # 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	524 return difflineranges(b'', content2)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	525
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	526 rangeslist = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	527 for basectx in basectxs:
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	528 basepath = basepaths.get((basectx.rev(), fixctx.rev(), path), path)
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	529
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	530 if basepath in basectx:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	531 content1 = basectx[basepath].data()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	532 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	533 content1 = b''
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	534 rangeslist.extend(difflineranges(content1, content2))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	535 return unionranges(rangeslist)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	536
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	537
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	538 def getbasepaths(repo, opts, workqueue, basectxs):
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	539 if opts.get(b'whole'):
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	540 # 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: 44856 diff changeset	541 return {}
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	542
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	543 basepaths = {}
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	544 for srcrev, path, _dstrevs in workqueue:
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	545 fixctx = repo[srcrev]
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	546 for basectx in basectxs[srcrev]:
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	547 basepath = copies.pathcopies(basectx, fixctx).get(path, path)
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	548 if basepath in basectx:
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	549 basepaths[(basectx.rev(), fixctx.rev(), path)] = basepath
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	550 return basepaths
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	551
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	552
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	553 def unionranges(rangeslist):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	554 """Return the union of some closed intervals
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	555
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	556 >>> unionranges([])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	557 []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	558 >>> unionranges([(1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	559 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	560 >>> unionranges([(1, 100), (1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	561 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	562 >>> unionranges([(1, 100), (2, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	563 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	564 >>> unionranges([(1, 99), (1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	565 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	566 >>> unionranges([(1, 100), (40, 60)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	567 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	568 >>> unionranges([(1, 49), (50, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	569 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	570 >>> unionranges([(1, 48), (50, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	571 [(1, 48), (50, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	572 >>> unionranges([(1, 2), (3, 4), (5, 6)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	573 [(1, 6)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	574 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	575 rangeslist = sorted(set(rangeslist))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	576 unioned = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	577 if rangeslist:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	578 unioned, rangeslist = [rangeslist[0]], rangeslist[1:]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	579 for a, b in rangeslist:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	580 c, d = unioned[-1]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	581 if a > d + 1:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	582 unioned.append((a, b))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	583 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	584 unioned[-1] = (c, max(b, d))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	585 return unioned
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	586
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	587
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	588 def difflineranges(content1, content2):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	589 """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	590
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	591 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	592 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	593 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	594 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	595 the string.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	596
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	597 >>> from mercurial import pycompat
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	598 >>> lines = lambda s: b'\\n'.join([c for c in pycompat.iterbytestr(s)])
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	599 >>> difflineranges2 = lambda a, b: difflineranges(lines(a), lines(b))
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	600 >>> difflineranges2(b'', b'')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	601 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	602 >>> difflineranges2(b'a', b'')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	603 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	604 >>> difflineranges2(b'', b'A')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	605 [(1, 1)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	606 >>> difflineranges2(b'a', b'a')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	607 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	608 >>> difflineranges2(b'a', b'A')
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	609 [(1, 1)]
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	610 >>> difflineranges2(b'ab', b'')
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	611 []
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	612 >>> difflineranges2(b'', b'AB')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	613 [(1, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	614 >>> difflineranges2(b'abc', b'ac')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	615 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	616 >>> difflineranges2(b'ab', b'aCb')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	617 [(2, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	618 >>> difflineranges2(b'abc', b'aBc')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	619 [(2, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	620 >>> difflineranges2(b'ab', b'AB')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	621 [(1, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	622 >>> difflineranges2(b'abcde', b'aBcDe')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	623 [(2, 2), (4, 4)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	624 >>> difflineranges2(b'abcde', b'aBCDe')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	625 [(2, 4)]
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 ranges = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	628 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	629 firstline, lastline = lines[2:4]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	630 if kind == b'!' and firstline != lastline:
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	631 ranges.append((firstline + 1, lastline))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	632 return ranges
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	633
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	634
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	635 def getbasectxs(repo, opts, revstofix):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	636 """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	637
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	638 The base contexts determine which lines are considered modified when we
38590 f068495a1c28 fix: add test case that shows why --whole with --base is useful Danny Hooper <hooper@google.com> parents: 38537 diff changeset	639 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: 38537 diff changeset	640 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: 38537 diff changeset	641 --whole is used.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	642 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	643 # 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	644 # 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	645 if opts.get(b'base'):
48116 5ced12cfa41b errors: raise InputError on bad revset to revrange() iff provided by the user Martin von Zweigbergk <martinvonz@google.com> parents: 47924 diff changeset	646 baserevs = set(logcmdutil.revrange(repo, opts.get(b'base')))
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	647 if not baserevs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	648 baserevs = {nullrev}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	649 basectxs = {repo[rev] for rev in baserevs}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	650 return {rev: basectxs for rev in revstofix}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	651
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	652 # 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	653 # 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	654 basectxs = collections.defaultdict(set)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	655 for rev in sorted(revstofix):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	656 ctx = repo[rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	657 for pctx in ctx.parents():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	658 if pctx.rev() in basectxs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	659 basectxs[rev].update(basectxs[pctx.rev()])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	660 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	661 basectxs[rev].add(pctx)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	662 return basectxs
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	663
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	664
45074 797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	665 def _prefetchfiles(repo, workqueue, basepaths):
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	666 toprefetch = set()
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	667
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	668 # Prefetch the files that will be fixed.
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	669 for srcrev, path, _dstrevs in workqueue:
f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	670 if srcrev == wdirrev:
45074 797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	671 continue
48178 f12a19d03d2c fix: reduce number of tool executions Danny Hooper <hooper@google.com> parents: 48116 diff changeset	672 toprefetch.add((srcrev, path))
45074 797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	673
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	674 # Prefetch the base contents for lineranges().
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	675 for (baserev, fixrev, path), basepath in basepaths.items():
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	676 toprefetch.add((baserev, basepath))
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	677
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	678 if toprefetch:
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	679 scmutil.prefetchfiles(
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	680 repo,
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	681 [
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	682 (rev, scmutil.matchfiles(repo, [path]))
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	683 for rev, path in toprefetch
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	684 ],
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	685 )
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	686
797ef6f8295e fix: prefetch file contents Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45073 diff changeset	687
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	688 def _augmented_env(wvfs, extra_paths):
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	689 if os.supports_bytes_environ:
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	690 env = encoding.environ.copy()
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	691 raw_path = env.get(b'PATH', b'')
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	692 extra_paths = [wvfs.join(i) for i in extra_paths]
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	693 path_items = extra_paths + raw_path.split(pycompat.ospathsep)
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	694 env[b'PATH'] = pycompat.ospathsep.join(path_items)
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	695 else:
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	696 path_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	697 extra_str = [p.decode(path_encoding, 'ignore') for p in extra_paths]
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	698 base = wvfs.base.decode(path_encoding, 'ignore')
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	699 extra_str = [os.path.join(base, i) for i in extra_str]
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	700
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	701 # use (os).xxx to bypass checkcode complains. We are doing this
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	702 # unicode access on purpose.
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	703 env = (os).environ.copy()
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	704 raw_path = env.get('PATH', '')
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	705 path_items = extra_str + raw_path.split((os).pathsep)
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	706 env['PATH'] = (os).pathsep.join(path_items)
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	707 return env
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	708
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	709
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	710 def fixfile(ui, repo, opts, fixers, fixctx, path, basepaths, basectxs):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	711 """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	712
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	713 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	714 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	715 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	716 (i.e. they will only avoid lines that are common to all basectxs).
38967 a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	717
a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	718 A fixer tool's stdout will become the file's new content if and only if it
42673 74b4cd091e0d fix: run fixer tools in the repo root as cwd so they can use the working copy Danny Hooper <hooper@google.com> parents: 42655 diff changeset	719 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: 42655 diff changeset	720 root.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	721 """
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	722 metadata = {}
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	723 newdata = fixctx[path].data()
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	724
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	725 env = None
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	726 extra_paths = ui.configlist(b'fix', b'extra-bin-paths')
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	727 if extra_paths:
1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	728 env = _augmented_env(repo.wvfs, extra_paths)
48913 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48875 diff changeset	729 for fixername, fixer in fixers.items():
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	730 if fixer.affects(opts, fixctx, path):
45073 54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	731 ranges = lineranges(
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	732 opts, path, basepaths, basectxs, fixctx, newdata
54009f8c3e25 fix: obtain base paths before starting workers Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44856 diff changeset	733 )
42758 e9f503074044 fix: pass line ranges as value instead of callback Danny Hooper <hooper@google.com> parents: 42757 diff changeset	734 command = fixer.command(ui, path, ranges)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	735 if command is None:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	736 continue
49977 b5ecd0bcbcd7 fix: add more information to the debug output Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48946 diff changeset	737 msg = b'fixing: %s - %s - %s\n'
b5ecd0bcbcd7 fix: add more information to the debug output Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48946 diff changeset	738 msg %= (fixctx, fixername, path)
b5ecd0bcbcd7 fix: add more information to the debug output Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48946 diff changeset	739 ui.debug(msg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	740 ui.debug(b'subprocess: %s\n' % (command,))
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	741 proc = subprocess.Popen(
39836 f1d6021453c2 py3: remove a couple of superfluous calls to pycompat.rapply() Matt Harbison <matt_harbison@yahoo.com> parents: 39826 diff changeset	742 procutil.tonativestr(command),
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	743 shell=True,
43193 2d1f9880af1b py3: convert cwd to native string when running `fix` Matt Harbison <matt_harbison@yahoo.com> parents: 43117 diff changeset	744 cwd=procutil.tonativestr(repo.root),
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	745 stdin=subprocess.PIPE,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	746 stdout=subprocess.PIPE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	747 stderr=subprocess.PIPE,
52995 1330278b9029 fix: add a `extra-bin-paths` option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51859 diff changeset	748 env=env,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	749 )
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	750 stdout, stderr = proc.communicate(newdata)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	751 if stderr:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	752 showstderr(ui, fixctx.rev(), fixername, stderr)
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	753 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	754 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	755 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	756 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	757 metadata[fixername] = pycompat.json_loads(metadatajson)
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	758 except ValueError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	759 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	760 _(b'ignored invalid output from fixer tool: %s\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	761 % (fixername,)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	762 )
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	763 continue
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	764 else:
0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	765 metadata[fixername] = None
38967 a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	766 if proc.returncode == 0:
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	767 newdata = newerdata
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	768 else:
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	769 if not stderr:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	770 message = _(b'exited with status %d\n') % (proc.returncode,)
40532 93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	771 showstderr(ui, fixctx.rev(), fixername, message)
93bab80993f4 fix: add a config to abort when a fixer tool fails Danny Hooper <hooper@google.com> parents: 40431 diff changeset	772 checktoolfailureaction(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	773 ui,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	774 _(b'no fixes will be applied'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	775 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	776 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	777 b'successful fixes anyway'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	778 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	779 )
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	780 return metadata, newdata
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	781
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	782
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	783 def showstderr(ui, rev, fixername, stderr):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	784 """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	785
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	786 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	787 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	788 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	789 relevant.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	790 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	791 for line in re.split(b'[\r\n]+', stderr):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	792 if line:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	793 ui.warn(b'[')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	794 if rev is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	795 ui.warn(_(b'wdir'), label=b'evolve.rev')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	796 else:
43501 b2f95f9d3588 fix: replace str() by b'%d' for formatting integer Martin von Zweigbergk <martinvonz@google.com> parents: 43380 diff changeset	797 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	798 ui.warn(b'] %s: %s\n' % (fixername, line))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	799
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	800
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	801 def writeworkingdir(repo, ctx, filedata, replacements):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	802 """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	803
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	804 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	805 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	806 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	807 unless the --working-dir flag is given.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	808
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	809 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	810 """
48913 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48875 diff changeset	811 for path, data in filedata.items():
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	812 fctx = ctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	813 fctx.write(data, fctx.flags())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	814
47766 3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	815 oldp1 = repo.dirstate.p1()
3feda1e779d4 fix: rewrite writeworkingdir() to explicitly not work with merges Martin von Zweigbergk <martinvonz@google.com> parents: 47735 diff changeset	816 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	817 if newp1 != oldp1:
47886 86a60679cf61 fix: again allow formatting the working copy while merging Martin von Zweigbergk <martinvonz@google.com> parents: 47797 diff changeset	818 assert repo.dirstate.p2() == nullid
50090 a3c856e2ea2f branching: merge with default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49977 diff changeset	819 with repo.dirstate.changing_parents(repo):
47767 66ad7e32011f fix: use scmutil.movedirstate() instead of reimplementing Martin von Zweigbergk <martinvonz@google.com> parents: 47766 diff changeset	820 scmutil.movedirstate(repo, repo[newp1])
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	821
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	822
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	823 def replacerev(ui, repo, ctx, filedata, replacements):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	824 """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	825
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	826 "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	827
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	828 "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	829 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	830 "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	831 they will be added.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	832
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	833 "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	834 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	835 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	836
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	837 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	838 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	839 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	840 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	841 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	842
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	843 p1rev, p2rev = repo.changelog.parentrevs(ctx.rev())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	844 p1ctx, p2ctx = repo[p1rev], repo[p2rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	845 newp1node = replacements.get(p1ctx.node(), p1ctx.node())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	846 newp2node = replacements.get(p2ctx.node(), p2ctx.node())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	847
40570 ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40566 diff changeset	848 # 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: 40566 diff changeset	849 # 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: 40566 diff changeset	850 # 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: 40566 diff changeset	851 # 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: 40566 diff changeset	852 # 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: 40566 diff changeset	853 # regardless of file content changes.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	854 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	855 not filedata
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	856 and p1ctx.node() not in replacements
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	857 and p2ctx.node() not in replacements
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	858 ):
40570 ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40566 diff changeset	859 return
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40566 diff changeset	860
ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40566 diff changeset	861 extra = ctx.extra().copy()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	862 extra[b'fix_source'] = ctx.hex()
40570 ad71c792a8d8 fix: add extra field to fixed revisions to avoid creating obsolescence cycles Danny Hooper <hooper@google.com> parents: 40566 diff changeset	863
43962 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	864 wctx = context.overlayworkingctx(repo)
44092 833210fbd900 graftcopies: remove `skip` and `repo` arguments Martin von Zweigbergk <martinvonz@google.com> parents: 44090 diff changeset	865 wctx.setbase(repo[newp1node])
44271 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44129 diff changeset	866 merge.revert_to(ctx, wc=wctx)
44092 833210fbd900 graftcopies: remove `skip` and `repo` arguments Martin von Zweigbergk <martinvonz@google.com> parents: 44090 diff changeset	867 copies.graftcopies(wctx, ctx, ctx.p1())
43962 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	868
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	869 for path in filedata.keys():
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	870 fctx = ctx[path]
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	871 copysource = fctx.copysource()
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	872 wctx.write(path, filedata[path], flags=fctx.flags())
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	873 if copysource:
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	874 wctx.markcopied(path, copysource)
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	875
45713 04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45218 diff changeset	876 desc = rewriteutil.update_hash_refs(
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45218 diff changeset	877 repo,
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45218 diff changeset	878 ctx.description(),
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45218 diff changeset	879 {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: 45218 diff changeset	880 )
04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45218 diff changeset	881
43962 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	882 memctx = wctx.tomemctx(
45713 04de8a1ec08f fix: update commit hash references in the new commits Matt Harbison <matt_harbison@yahoo.com> parents: 45218 diff changeset	883 text=desc,
43962 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	884 branch=ctx.branch(),
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	885 extra=extra,
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	886 date=ctx.date(),
43962 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	887 parents=(newp1node, newp2node),
eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	888 user=ctx.user(),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	889 )
43962 eebdd6709868 fix: fix handling of merge commits by using overlayworkingctx Kyle Lippincott <spectral@google.com> parents: 43936 diff changeset	890
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	891 sucnode = memctx.commit()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	892 prenode = ctx.node()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	893 if prenode == sucnode:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	894 ui.debug(b'node %s already existed\n' % (ctx.hex()))
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	895 else:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	896 replacements[ctx.node()] = sucnode
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	897
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	898
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	899 def getfixers(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	900 """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	901
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	902 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	903 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	904 """
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	905 fixers = {}
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	906 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	907 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	908 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	909 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	910 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	911 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	912 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	913 skipclean = ui.configbool(b'fix', name + b':skipclean')
42655 2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42653 diff changeset	914 # 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: 42653 diff changeset	915 # 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: 42653 diff changeset	916 # 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: 42653 diff changeset	917 # default.
43220 d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	918 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	919 ui.warn(
d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	920 _(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	921 )
d3d1a3afe7aa fix: warn when a fixer doesn't have a configured command Martin von Zweigbergk <martinvonz@google.com> parents: 43219 diff changeset	922 elif pattern is None:
42655 2987d015aba4 fix: ignore fixer tool configurations that are missing patterns Danny Hooper <hooper@google.com> parents: 42653 diff changeset	923 ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	924 _(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	925 )
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	926 elif not enabled:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	927 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	928 else:
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	929 fixers[name] = Fixer(
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	930 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	931 )
40566 b9557567cc3f fix: add suboption for configuring execution order of tools Danny Hooper <hooper@google.com> parents: 40533 diff changeset	932 return collections.OrderedDict(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	933 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	934 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	935
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	936
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	937 def fixernames(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	938 """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	939 names = set()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	940 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	941 if b':' in k:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	942 names.add(k.split(b':', 1)[0])
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	943 return names
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	944
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	945
48946 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48913 diff changeset	946 class Fixer:
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	947 """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	948
43219 0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	949 def __init__(
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	950 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	951 ):
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	952 self._command = command
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	953 self._pattern = pattern
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	954 self._linerange = linerange
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	955 self._priority = priority
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	956 self._metadata = metadata
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	957 self._skipclean = skipclean
0101db49606f fix: make Fixer initialization more explicit for clarity Martin von Zweigbergk <martinvonz@google.com> parents: 43218 diff changeset	958
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	959 def affects(self, opts, fixctx, path):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	960 """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	961 repo = fixctx.repo()
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	962 matcher = matchmod.match(
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	963 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	964 )
f02d3c0eed18 fix: match patterns relative to root Martin von Zweigbergk <martinvonz@google.com> parents: 43221 diff changeset	965 return matcher(path)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	966
42194 0da689a60163 fix: allow fixer tools to return metadata in addition to the file content Danny Hooper <hooper@google.com> parents: 42009 diff changeset	967 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	968 """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	969 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	970
42758 e9f503074044 fix: pass line ranges as value instead of callback Danny Hooper <hooper@google.com> parents: 42757 diff changeset	971 def command(self, ui, path, ranges):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	972 """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	973
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	974 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	975 parameters.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	976 """
37774 d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	977 expand = cmdutil.rendercommandtemplate
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	978 parts = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	979 expand(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	980 ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	981 self._command,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	982 {b'rootpath': path, b'basename': os.path.basename(path)},
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	983 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	984 ]
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	985 if self._linerange:
42756 ed0da6e0d6ee fix: allow tools to use :linerange, but also run if a file is unchanged Danny Hooper <hooper@google.com> parents: 42673 diff changeset	986 if self._skipclean and not ranges:
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	987 # 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	988 return None
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	989 for first, last in ranges:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	990 parts.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	991 expand(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	992 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	993 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43058 diff changeset	994 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	995 return b' '.join(parts)

Mercurial > public > mercurial-scm > hg

annotate hgext/fix.py @ 52995:1330278b9029