Mercurial > hg
annotate black.toml @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
parents | 5e84a96d865b |
children |
rev | line source |
---|---|
43064
929678eb4cbd
black: add a pyproject.toml that contains our black settings
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 [tool.black] |
929678eb4cbd
black: add a pyproject.toml that contains our black settings
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 line-length = 80 |
43224
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
3 exclude = ''' |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
4 build/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
5 | wheelhouse/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
6 | dist/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
7 | packages/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
8 | \.hg/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
9 | \.mypy_cache/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
10 | \.venv/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
11 | mercurial/thirdparty/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
12 ''' |
43223
15c05732d177
black: move remaining config knobs into toml file
Augie Fackler <augie@google.com>
parents:
43222
diff
changeset
|
13 skip-string-normalization = true |
15c05732d177
black: move remaining config knobs into toml file
Augie Fackler <augie@google.com>
parents:
43222
diff
changeset
|
14 quiet = true |