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

annotate hgext/fix.py @ 40293:c303d65d2e34

help: assigning categories to existing commands I'm separating this into its own commit so people can bikeshed over the actual categorization (vs the support for categories). These categories are based on the help implementation we've been using internally at Google, and have had zero complaints. Differential Revision: https://phab.mercurial-scm.org/D5067

author	rdamazio@google.com
date	Sat, 13 Oct 2018 02:17:41 -0700
parents	f1d6021453c2
children	8ebb05f747e5

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
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	12 Here is an example configuration that causes :hg:`fix` to apply automatic
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	13 formatting fixes to modified lines in C++ code::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	14
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	15 [fix]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	16 clang-format:command=clang-format --assume-filename={rootpath}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	17 clang-format:linerange=--lines={first}:{last}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	18 clang-format:fileset=set:.cpp or .hpp
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	19
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	20 The :command suboption forms the first part of the shell command that will be
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	21 used to fix a file. The content of the file is passed on standard input, and the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	22 fixed file content is expected on standard output. If there is any output on
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	23 standard error, the file will not be affected. Some values may be substituted
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	24 into the command::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	25
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	26 {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	27 {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	28
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	29 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	30 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	31 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	32 substituted into the command::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	33
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	34 {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	35 {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	36
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	37 The :fileset suboption determines which files will be passed through each
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	38 configured tool. See :hg:`help fileset` for possible values. If there are file
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	39 arguments to :hg:`fix`, the intersection of these filesets is used.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	40
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	41 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	42 processed by :hg:`fix`::
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	43
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	44 [fix]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	45 maxfilesize=2MB
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	46
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	47 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	48
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	49 from __future__ import absolute_import
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	50
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	51 import collections
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	52 import itertools
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	53 import os
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	54 import re
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	55 import subprocess
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	56
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	57 from mercurial.i18n import _
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	58 from mercurial.node import nullrev
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	59 from mercurial.node import wdirrev
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	60
39826 c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 38967 diff changeset	61 from mercurial.utils import (
c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 38967 diff changeset	62 procutil,
c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 38967 diff changeset	63 )
c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 38967 diff changeset	64
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	65 from mercurial import (
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	66 cmdutil,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	67 context,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	68 copies,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	69 error,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	70 mdiff,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	71 merge,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	72 obsolete,
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	73 pycompat,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	74 registrar,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	75 scmutil,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	76 util,
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	77 worker,
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	78 )
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	79
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	80 # 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	81 # 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	82 # 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	83 # leave the attribute unspecified.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	84 testedwith = 'ships-with-hg-core'
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	85
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	86 cmdtable = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	87 command = registrar.command(cmdtable)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	88
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	89 configtable = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	90 configitem = registrar.configitem(configtable)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	91
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	92 # Register the suboptions allowed for each configured fixer.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	93 FIXER_ATTRS = ('command', 'linerange', 'fileset')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	94
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	95 for key in FIXER_ATTRS:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	96 configitem('fix', '.*(:%s)?' % key, default=None, generic=True)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	97
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	98 # 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	99 # 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	100 # user.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	101 configitem('fix', 'maxfilesize', default='2MB')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	102
38949 b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	103 allopt = ('', 'all', False, _('fix all non-public non-obsolete revisions'))
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	104 baseopt = ('', 'base', [], _('revisions to diff against (overrides automatic '
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	105 'selection, and applies to every revision being '
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	106 'fixed)'), _('REV'))
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	107 revopt = ('r', 'rev', [], _('revisions to fix'), _('REV'))
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	108 wdiropt = ('w', 'working-dir', False, _('fix the working directory'))
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	109 wholeopt = ('', 'whole', False, _('always fix every line of a file'))
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	110 usage = _('[OPTION]... [FILE]...')
b0c591950e51 fix: pull out flag definitions to make them re-usable from extensions Danny Hooper <hooper@google.com> parents: 38860 diff changeset	111
40293 c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 39836 diff changeset	112 @command('fix', [allopt, baseopt, revopt, wdiropt, wholeopt], usage,
c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 39836 diff changeset	113 helpcategory=command.CATEGORY_FILE_CONTENTS)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	114 def fix(ui, repo, pats, *opts):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	115 """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	116
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	117 Runs any configured tools to fix the content of files. Only affects files
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	118 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	119 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	120 whole file regardless of --whole.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	121
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	122 If revisions are specified with --rev, those revisions will be checked, and
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	123 they may be replaced with new revisions that have fixed file content. It is
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	124 desirable to specify all descendants of each specified revision, so that the
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	125 fixes propagate to the descendants. If all descendants are fixed at the same
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	126 time, no merging, rebasing, or evolution will be required.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	127
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	128 If --working-dir is used, files with uncommitted changes in the working copy
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	129 will be fixed. If the checked-out revision is also fixed, the working
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	130 directory will update to the replacement revision.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	131
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	132 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	133 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	134 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	135 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	136 """
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	137 opts = pycompat.byteskwargs(opts)
37595 e2506748b47f fix: add --all flag to fix non-public non-obsolete revisions Danny Hooper <hooper@google.com> parents: 37213 diff changeset	138 if opts['all']:
e2506748b47f fix: add --all flag to fix non-public non-obsolete revisions Danny Hooper <hooper@google.com> parents: 37213 diff changeset	139 if opts['rev']:
e2506748b47f fix: add --all flag to fix non-public non-obsolete revisions Danny Hooper <hooper@google.com> parents: 37213 diff changeset	140 raise error.Abort(_('cannot specify both "--rev" and "--all"'))
e2506748b47f fix: add --all flag to fix non-public non-obsolete revisions Danny Hooper <hooper@google.com> parents: 37213 diff changeset	141 opts['rev'] = ['not public() and not obsolete()']
e2506748b47f fix: add --all flag to fix non-public non-obsolete revisions Danny Hooper <hooper@google.com> parents: 37213 diff changeset	142 opts['working_dir'] = True
38420 c1f4364f9336 fix: include cleanupnodes() in transaction Martin von Zweigbergk <martinvonz@google.com> parents: 37774 diff changeset	143 with repo.wlock(), repo.lock(), repo.transaction('fix'):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	144 revstofix = getrevstofix(ui, repo, opts)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	145 basectxs = getbasectxs(repo, opts, revstofix)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	146 workqueue, numitems = getworkqueue(ui, repo, pats, opts, revstofix,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	147 basectxs)
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	148 fixers = getfixers(ui)
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	149
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	150 # 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	151 # 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	152 def getfixes(items):
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	153 for rev, path in items:
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	154 ctx = repo[rev]
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	155 olddata = ctx[path].data()
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	156 newdata = fixfile(ui, opts, fixers, ctx, path, basectxs[rev])
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	157 # Don't waste memory/time passing unchanged content back, but
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	158 # produce one result per item either way.
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	159 yield (rev, path, newdata if newdata != olddata else None)
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	160 results = worker.worker(ui, 1.0, getfixes, tuple(), workqueue)
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	161
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	162 # 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	163 # 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	164 # 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	165 # 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	166 # 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	167 # 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	168 filedata = collections.defaultdict(dict)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	169 replacements = {}
38950 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38949 diff changeset	170 wdirwritten = False
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	171 commitorder = sorted(revstofix, reverse=True)
38537 a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	172 with ui.makeprogress(topic=_('fixing'), unit=_('files'),
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	173 total=sum(numitems.values())) as progress:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	174 for rev, path, newdata in results:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	175 progress.increment(item=path)
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	176 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	177 filedata[rev][path] = newdata
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	178 numitems[rev] -= 1
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	179 # 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	180 # 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	181 # 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	182 # 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	183 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	184 rev = commitorder.pop()
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	185 ctx = repo[rev]
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	186 if rev == wdirrev:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	187 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	188 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	189 else:
a3be09e277e9 fix: add progress bar for number of file revisions processed Danny Hooper <hooper@google.com> parents: 38536 diff changeset	190 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	191 del filedata[rev]
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	192
38950 35bc4b6e132d fix: correctly set wdirwritten given that the dict item is deleted Danny Hooper <hooper@google.com> parents: 38949 diff changeset	193 cleanup(repo, replacements, wdirwritten)
38811 64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	194
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	195 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	196 """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	197
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	198 "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	199 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	200 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	201
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	202 "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	203 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	204
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	205 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	206 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	207 """
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	208 replacements = {prec: [succ] for prec, succ in replacements.iteritems()}
64535d43c103 fix: add a monkey-patchable point after all new revisions have been committed Danny Hooper <hooper@google.com> parents: 38770 diff changeset	209 scmutil.cleanupnodes(repo, replacements, 'fix', fixphase=True)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	210
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	211 def getworkqueue(ui, repo, pats, opts, revstofix, basectxs):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	212 """"Constructs the list of files to be fixed at specific revisions
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	213
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	214 It is up to the caller how to consume the work items, and the only
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	215 dependence between them is that replacement revisions must be committed in
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	216 topological order. Each work item represents a file in the working copy or
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	217 in some revision that should be fixed and written back to the working copy
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	218 or into a replacement revision.
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	219
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	220 Work items for the same revision are grouped together, so that a worker
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	221 pool starting with the first N items in parallel is likely to finish the
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	222 first revision's work before other revisions. This can allow us to write
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	223 the result to disk and reduce memory footprint. At time of writing, the
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	224 partition strategy in worker.py seems favorable to this. We also sort the
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	225 items by ascending revision number to match the order in which we commit
5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	226 the fixes later.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	227 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	228 workqueue = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	229 numitems = collections.defaultdict(int)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	230 maxfilesize = ui.configbytes('fix', 'maxfilesize')
38536 5ffe2041d427 fix: use a worker pool to parallelize running tools Danny Hooper <hooper@google.com> parents: 38423 diff changeset	231 for rev in sorted(revstofix):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	232 fixctx = repo[rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	233 match = scmutil.match(fixctx, pats, opts)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	234 for path in pathstofix(ui, repo, pats, opts, match, basectxs[rev],
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	235 fixctx):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	236 if path not in fixctx:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	237 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	238 fctx = fixctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	239 if fctx.islink():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	240 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	241 if fctx.size() > maxfilesize:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	242 ui.warn(_('ignoring file larger than %s: %s\n') %
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	243 (util.bytecount(maxfilesize), path))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	244 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	245 workqueue.append((rev, path))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	246 numitems[rev] += 1
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	247 return workqueue, numitems
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	248
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	249 def getrevstofix(ui, repo, opts):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	250 """Returns the set of revision numbers that should be fixed"""
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	251 revs = set(scmutil.revrange(repo, opts['rev']))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	252 for rev in revs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	253 checkfixablectx(ui, repo, repo[rev])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	254 if revs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	255 cmdutil.checkunfinished(repo)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	256 checknodescendants(repo, revs)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	257 if opts.get('working_dir'):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	258 revs.add(wdirrev)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	259 if list(merge.mergestate.read(repo).unresolved()):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	260 raise error.Abort('unresolved conflicts', hint="use 'hg resolve'")
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	261 if not revs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	262 raise error.Abort(
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	263 'no changesets specified', hint='use --rev or --working-dir')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	264 return revs
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 def checknodescendants(repo, revs):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	267 if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	268 repo.revs('(%ld::) - (%ld)', revs, revs)):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	269 raise error.Abort(_('can only fix a changeset together '
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	270 'with all its descendants'))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	271
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	272 def checkfixablectx(ui, repo, ctx):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	273 """Aborts if the revision shouldn't be replaced with a fixed one."""
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	274 if not ctx.mutable():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	275 raise error.Abort('can\'t fix immutable changeset %s' %
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	276 (scmutil.formatchangeid(ctx),))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	277 if ctx.obsolete():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	278 # It would be better to actually check if the revision has a successor.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	279 allowdivergence = ui.configbool('experimental',
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	280 'evolution.allowdivergence')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	281 if not allowdivergence:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	282 raise error.Abort('fixing obsolete revision could cause divergence')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	283
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	284 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	285 """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	286
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	287 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	288 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	289 ancestors of the context being fixed.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	290 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	291 files = set()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	292 for basectx in basectxs:
38770 260c17eaf3f7 fix: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2) Martin von Zweigbergk <martinvonz@google.com> parents: 38590 diff changeset	293 stat = basectx.status(fixctx, match=match, listclean=bool(pats),
260c17eaf3f7 fix: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2) Martin von Zweigbergk <martinvonz@google.com> parents: 38590 diff changeset	294 listunknown=bool(pats))
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	295 files.update(
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	296 set(itertools.chain(stat.added, stat.modified, stat.clean,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	297 stat.unknown)))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	298 return files
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	299
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	300 def lineranges(opts, path, basectxs, fixctx, content2):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	301 """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	302
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	303 Of the form [(10, 20), (30, 40)].
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	304
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	305 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	306 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	307 renamed versus any of them.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	308
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	309 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	310 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	311 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	312 if opts.get('whole'):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	313 # 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	314 # idea of how many lines are in the file, instead of reimplementing it.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	315 return difflineranges('', content2)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	316
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	317 rangeslist = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	318 for basectx in basectxs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	319 basepath = copies.pathcopies(basectx, fixctx).get(path, path)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	320 if basepath in basectx:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	321 content1 = basectx[basepath].data()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	322 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	323 content1 = ''
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	324 rangeslist.extend(difflineranges(content1, content2))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	325 return unionranges(rangeslist)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	326
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	327 def unionranges(rangeslist):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	328 """Return the union of some closed intervals
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	329
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	330 >>> unionranges([])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	331 []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	332 >>> unionranges([(1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	333 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	334 >>> unionranges([(1, 100), (1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	335 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	336 >>> unionranges([(1, 100), (2, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	337 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	338 >>> unionranges([(1, 99), (1, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	339 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	340 >>> unionranges([(1, 100), (40, 60)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	341 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	342 >>> unionranges([(1, 49), (50, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	343 [(1, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	344 >>> unionranges([(1, 48), (50, 100)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	345 [(1, 48), (50, 100)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	346 >>> unionranges([(1, 2), (3, 4), (5, 6)])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	347 [(1, 6)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	348 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	349 rangeslist = sorted(set(rangeslist))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	350 unioned = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	351 if rangeslist:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	352 unioned, rangeslist = [rangeslist[0]], rangeslist[1:]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	353 for a, b in rangeslist:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	354 c, d = unioned[-1]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	355 if a > d + 1:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	356 unioned.append((a, b))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	357 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	358 unioned[-1] = (c, max(b, d))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	359 return unioned
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	360
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	361 def difflineranges(content1, content2):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	362 """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	363
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	364 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	365 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	366 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	367 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	368 the string.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	369
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	370 >>> from mercurial import pycompat
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	371 >>> 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	372 >>> 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	373 >>> difflineranges2(b'', b'')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	374 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	375 >>> difflineranges2(b'a', b'')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	376 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	377 >>> difflineranges2(b'', b'A')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	378 [(1, 1)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	379 >>> difflineranges2(b'a', b'a')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	380 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	381 >>> difflineranges2(b'a', b'A')
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	382 [(1, 1)]
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	383 >>> difflineranges2(b'ab', b'')
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	384 []
893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	385 >>> difflineranges2(b'', b'AB')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	386 [(1, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	387 >>> difflineranges2(b'abc', b'ac')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	388 []
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	389 >>> difflineranges2(b'ab', b'aCb')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	390 [(2, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	391 >>> difflineranges2(b'abc', b'aBc')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	392 [(2, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	393 >>> difflineranges2(b'ab', b'AB')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	394 [(1, 2)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	395 >>> difflineranges2(b'abcde', b'aBcDe')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	396 [(2, 2), (4, 4)]
37213 893ff8c3bc57 py3: fix fix doctests to be bytes-safe Yuya Nishihara <yuya@tcha.org> parents: 37207 diff changeset	397 >>> difflineranges2(b'abcde', b'aBCDe')
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	398 [(2, 4)]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	399 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	400 ranges = []
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	401 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	402 firstline, lastline = lines[2:4]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	403 if kind == '!' and firstline != lastline:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	404 ranges.append((firstline + 1, lastline))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	405 return ranges
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	406
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	407 def getbasectxs(repo, opts, revstofix):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	408 """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	409
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	410 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	411 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	412 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	413 --whole is used.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	414 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	415 # 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	416 # exactly the set of baserevs that the user specified.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	417 if opts.get('base'):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	418 baserevs = set(scmutil.revrange(repo, opts.get('base')))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	419 if not baserevs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	420 baserevs = {nullrev}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	421 basectxs = {repo[rev] for rev in baserevs}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	422 return {rev: basectxs for rev in revstofix}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	423
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	424 # 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	425 # 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	426 basectxs = collections.defaultdict(set)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	427 for rev in sorted(revstofix):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	428 ctx = repo[rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	429 for pctx in ctx.parents():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	430 if pctx.rev() in basectxs:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	431 basectxs[rev].update(basectxs[pctx.rev()])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	432 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	433 basectxs[rev].add(pctx)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	434 return basectxs
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	435
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	436 def fixfile(ui, opts, fixers, fixctx, path, basectxs):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	437 """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	438
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	439 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	440 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	441 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	442 (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	443
a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	444 A fixer tool's stdout will become the file's new content if and only if it
a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	445 exits with code zero.
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	446 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	447 newdata = fixctx[path].data()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	448 for fixername, fixer in fixers.iteritems():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	449 if fixer.affects(opts, fixctx, path):
38860 257c9846b532 fix: compute changed lines lazily to make whole-file fixer tools faster Danny Hooper <hooper@google.com> parents: 38811 diff changeset	450 rangesfn = lambda: lineranges(opts, path, basectxs, fixctx, newdata)
257c9846b532 fix: compute changed lines lazily to make whole-file fixer tools faster Danny Hooper <hooper@google.com> parents: 38811 diff changeset	451 command = fixer.command(ui, path, rangesfn)
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	452 if command is None:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	453 continue
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	454 ui.debug('subprocess: %s\n' % (command,))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	455 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	456 procutil.tonativestr(command),
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	457 shell=True,
39826 c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess Matt Harbison <matt_harbison@yahoo.com> parents: 38967 diff changeset	458 cwd=procutil.tonativestr(b'/'),
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	459 stdin=subprocess.PIPE,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	460 stdout=subprocess.PIPE,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	461 stderr=subprocess.PIPE)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	462 newerdata, stderr = proc.communicate(newdata)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	463 if stderr:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	464 showstderr(ui, fixctx.rev(), fixername, stderr)
38967 a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	465 if proc.returncode == 0:
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	466 newdata = newerdata
38967 a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	467 elif not stderr:
a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	468 showstderr(ui, fixctx.rev(), fixername,
a009589cd32a fix: determine fixer tool failure by exit code instead of stderr Danny Hooper <hooper@google.com> parents: 38950 diff changeset	469 _('exited with status %d\n') % (proc.returncode,))
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	470 return newdata
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	471
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	472 def showstderr(ui, rev, fixername, stderr):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	473 """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	474
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	475 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	476 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	477 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	478 relevant.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	479 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	480 for line in re.split('[\r\n]+', stderr):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	481 if line:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	482 ui.warn(('['))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	483 if rev is None:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	484 ui.warn(_('wdir'), label='evolve.rev')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	485 else:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	486 ui.warn((str(rev)), label='evolve.rev')
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	487 ui.warn(('] %s: %s\n') % (fixername, line))
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	488
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	489 def writeworkingdir(repo, ctx, filedata, replacements):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	490 """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	491
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	492 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	493 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	494 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	495 unless the --working-dir flag is given.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	496
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	497 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	498 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	499 for path, data in filedata.iteritems():
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	500 fctx = ctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	501 fctx.write(data, fctx.flags())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	502 if repo.dirstate[path] == 'n':
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	503 repo.dirstate.normallookup(path)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	504
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	505 oldparentnodes = repo.dirstate.parents()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	506 newparentnodes = [replacements.get(n, n) for n in oldparentnodes]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	507 if newparentnodes != oldparentnodes:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	508 repo.setparents(*newparentnodes)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	509
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	510 def replacerev(ui, repo, ctx, filedata, replacements):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	511 """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	512
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	513 "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	514
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	515 "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	516 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	517 "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	518 they will be added.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	519
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	520 "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	521 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	522 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	523
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	524 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	525 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	526 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	527 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	528 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	529
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	530 p1rev, p2rev = repo.changelog.parentrevs(ctx.rev())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	531 p1ctx, p2ctx = repo[p1rev], repo[p2rev]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	532 newp1node = replacements.get(p1ctx.node(), p1ctx.node())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	533 newp2node = replacements.get(p2ctx.node(), p2ctx.node())
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	534
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	535 def filectxfn(repo, memctx, path):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	536 if path not in ctx:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	537 return None
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	538 fctx = ctx[path]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	539 copied = fctx.renamed()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	540 if copied:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	541 copied = copied[0]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	542 return context.memfilectx(
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	543 repo,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	544 memctx,
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	545 path=fctx.path(),
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	546 data=filedata.get(path, fctx.data()),
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	547 islink=fctx.islink(),
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	548 isexec=fctx.isexec(),
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	549 copied=copied)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	550
38423 32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	551 memctx = context.memctx(
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	552 repo,
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	553 parents=(newp1node, newp2node),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	554 text=ctx.description(),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	555 files=set(ctx.files()) \| set(filedata.keys()),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	556 filectxfn=filectxfn,
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	557 user=ctx.user(),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	558 date=ctx.date(),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	559 extra=ctx.extra(),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	560 branch=ctx.branch(),
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	561 editor=None)
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	562 sucnode = memctx.commit()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	563 prenode = ctx.node()
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	564 if prenode == sucnode:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	565 ui.debug('node %s already existed\n' % (ctx.hex()))
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	566 else:
32fba6fe893d scmutil: make cleanupnodes optionally also fix the phase Martin von Zweigbergk <martinvonz@google.com> parents: 38420 diff changeset	567 replacements[ctx.node()] = sucnode
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	568
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	569 def getfixers(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	570 """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	571
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	572 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	573 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	574 """
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	575 result = {}
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	576 for name in fixernames(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	577 result[name] = Fixer()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	578 attrs = ui.configsuboptions('fix', name)[1]
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	579 for key in FIXER_ATTRS:
37618 1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	580 setattr(result[name], pycompat.sysstr('_' + key),
1edf3738e000 fix: port most of the way to python 3 Augie Fackler <augie@google.com> parents: 37595 diff changeset	581 attrs.get(key, ''))
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	582 return result
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	583
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	584 def fixernames(ui):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	585 """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	586 names = set()
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	587 for k, v in ui.configitems('fix'):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	588 if ':' in k:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	589 names.add(k.split(':', 1)[0])
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	590 return names
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	591
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	592 class Fixer(object):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	593 """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	594
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	595 def affects(self, opts, fixctx, path):
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	596 """Should this fixer run on the file at the given path and context?"""
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	597 return scmutil.match(fixctx, [self._fileset], opts)(path)
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	598
38860 257c9846b532 fix: compute changed lines lazily to make whole-file fixer tools faster Danny Hooper <hooper@google.com> parents: 38811 diff changeset	599 def command(self, ui, path, rangesfn):
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	600 """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	601
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	602 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	603 parameters.
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	604 """
37774 d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	605 expand = cmdutil.rendercommandtemplate
d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	606 parts = [expand(ui, self._command,
d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	607 {'rootpath': path, 'basename': os.path.basename(path)})]
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	608 if self._linerange:
38860 257c9846b532 fix: compute changed lines lazily to make whole-file fixer tools faster Danny Hooper <hooper@google.com> parents: 38811 diff changeset	609 ranges = rangesfn()
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	610 if not ranges:
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	611 # 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	612 return None
ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	613 for first, last in ranges:
37774 d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	614 parts.append(expand(ui, self._linerange,
d6970628b95f fix: use templater to substitute values in command string Yuya Nishihara <yuya@tcha.org> parents: 37618 diff changeset	615 {'first': first, 'last': last}))
37183 ded5ea279a93 fix: new extension for automatically modifying file contents Danny Hooper <hooper@google.com> parents: diff changeset	616 return ' '.join(parts)

Mercurial > public > mercurial-scm > hg

annotate hgext/fix.py @ 40293:c303d65d2e34