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

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

amend: stop specifying matcher, get all copies in wctx...
amend: stop specifying matcher, get all copies in wctx When we're recreating the commit that we'll be committing, we don't want to filter our copy information based on just the *new* [versions of the] files we're amending. The test has an example of this case, but for clarity, the situation is: ``` $ hg cp src dst && hg commit <do some work> $ hg amend some_unrelated_file.txt $ hg status --copies A dst A some_unrelated_file.txt ``` What *should* happen is that `dst` should remain marked as a copy of `src`, but this did not previously happen. `matcher` here only includes the files that were specified on the commandline, so it only gets the copy information (if any, in this example there's not) for `some_unrelated_file.txt`. When it goes to apply the memctx to actually create the commit, the file copy information is incomplete and loses the information for the files that shouldn't have been affected at all by the amend. Differential Revision: https://phab.mercurial-scm.org/D12625
Matt Harbison - - Load All Authors

File last commit:

r47655:3d32b975 default
r50074:df68d64b stable
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