Mercurial > evolve
annotate setup.cfg @ 4891:a9929dd36405 stable
pick: don't create any successors when there were no changes (issue6093)
For example, when a changeset that user is trying to pick was already grafted
or rebased (and no obsmarkers were created), pick will naturally say that
there's no changes to commit and will not create the new commit. In that case
it should not mark any changeset as a successor of the picked changeset,
because the actual file changes were already there before picking.
Technically, pick could (and did before this patch) mark the wdir commit as a
successor of picked changeset (may be useful in the most trivial cases when
e.g. wdir is a graft of the required change), but there are cases when the
picked change is introduced in an ancestor of wdir, or even in multiple
ancestors piece by piece. Pick definitely shouldn't be trying to guess
something this complicated, so with this patch it always marks the picked
change as pruned if it gave no changes to commit.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 07 Oct 2019 14:38:56 +0700 |
parents | b81d3775006b |
children |
rev | line source |
---|---|
2001
ddfc87788d5c
flake8: add file for rules to ignore
Sean Farley <sean@farley.io>
parents:
diff
changeset
|
1 [flake8] |
2029
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
2 ignore = |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
3 #closing bracket does not match indentation of opening bracket's line |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
4 E123, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
5 # closing bracket does not match visual indentation |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
6 E124, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
7 # visually indented line with same indent as next logical line |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
8 E129, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
9 # at least two spaces before inline comment |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
10 E261, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
11 # too many leading '#' for block comment |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
12 E266, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
13 # expected 2 blank lines, found 0 |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
14 E302, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
15 # expected 2 blank lines after end of function or class |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
16 E305, |
2030
3e8fcf47fb1e
flake8: ignore an addition rules related to import
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2029
diff
changeset
|
17 # module level import not at top of file |
3e8fcf47fb1e
flake8: ignore an addition rules related to import
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2029
diff
changeset
|
18 E402, |
2029
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
19 # line too long (82 > 79 characters) |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
20 E501, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
21 # do not assign a lambda expression, use a def |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
22 E731, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
23 # class names should use CapWords convention |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
24 N801, |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
25 # line break occurred before a binary operator |
a6410877339a
flake8: document all the exception we added
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2020
diff
changeset
|
26 W503 |
2049
b81d3775006b
evolve: move extension metadata in their own module
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2031
diff
changeset
|
27 builtins=xrange, execfile |
2020
143c8e4dc22d
topic: merge the topic extension in the evolve repository
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2010
diff
changeset
|
28 |