##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: change _minimize() to minimize a single conflict...
simplemerge: change _minimize() to minimize a single conflict `_minimize()` is weird in that it changes `a_lines` and `b_lines` but leaves `base_lines` unchanged, which means they'll be inconsistent. That was fine because the caller never used `base_lines`. With the recent refactorings of this code, we can now make this function cleaner by having it minimize a single conflict and not care about `base_lines`. This also makes the code simpler and makes the code for each `render_*()` function more similar. Differential Revision: https://phab.mercurial-scm.org/D11981
Matt Harbison - - Load All Authors

File last commit:

r47655:3d32b975 default
r49396:da04f362 default
Show More
fix.hgrc
14 lines | 496 B | text/plain | TextLexer
/ contrib / examples / fix.hgrc
History | Source | Raw |Copy content |Copy permalink
Augie Fackler
contrib: add new examples area and start it out with a config for `hg fix`...
 r43235 [fix]
Kyle Lippincott
fix: correct the clang-format example hgrc so that it actually works...
 r44460 clang-format:command = clang-format --style file
clang-format:pattern = set:(**.c or **.cc or **.h) and not "include:contrib/clang-format-ignorelist"
Augie Fackler
examples: add sample fix integration for `rustfmt`...
 r43236
Martin von Zweigbergk
examples: refer to nightly rustfmt in Windows-compatible way...
 r44562 rustfmt:command = rustfmt +nightly
Martin von Zweigbergk
rust: move rustfmt.toml to repo root so it can be used by `hg fix`...
 r46195 rustfmt:pattern = set:"**.rs" - "mercurial/thirdparty/**"
Augie Fackler
examples: include a sample of how to use black with fix...
 r43335
Matt Harbison
contrib: restore the `hg fix` configuration in the examples...
 r47655 black:command = black --config=pyproject.toml -
Gregory Szorc
python-zstandard: blacken at 80 characters...
 r44605 black:pattern = set:**.py - mercurial/thirdparty/**
Augie Fackler
examples: add an example configuration for go source files...
 r44373
# Mercurial doesn't have any Go code, but if we did this is how we
# would configure `hg fix` for Go:
go:command = gofmt
go:pattern = set:**.go