Mercurial > evolve
annotate setup.cfg @ 3787:dc81a788f278
evolve: use cmdrewrite.amend() instead of creating a new commit
This patch backs out changeset 88601e1cd5d8.
We replaced cmdrewrite.amend() with creating new commit because using amend(), a
high level function was not good and creating a new commit gave us more control
over things.
**HOWEVER** to get more control, you need to get arrange all the pieces together
perfectly. Creating a new commit, the existing logic has some bugs around
dirstate handling, the `repo.dirstate.setparents()` call especially. Sometimes
this fixes the dirstate correctly sometimes not.
As Pierre-Yves David said, "Having a "clumsy" implementation with the right
behavior is usually a good first step. So having an amend based implementation
seems like a good first step.", let's take a step back and get back using amend
so that we can have a correct basic implementation which is bug free.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 05 Jun 2018 00:53:21 +0530 |
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 |