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

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

mergestate: don't pop stateextras when there are no conflicts on filemerge...
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148
Augie Fackler - - Load All Authors

File last commit:

r47532:decc3bd3 default
r47539:1099ca17 default
Show More
fix.hgrc
14 lines | 470 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
Augie Fackler
black: merge config into main pyproject.toml now that we have it...
 r47532 black:command = black
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