view setup.cfg @ 5979:4a09e95d29c9 stable

rewriteutil: fix broken touch of merge commits (issue6416)

`rewriteutil.rewrite()` is for rewriting a linear chain of commits
into a single commit, i.e. what `hg fold` does. Many of the callers
passed in a single commit because they wanted to rewrite just a single
commit (e.g. `hg touch`). Before this patch, the code worked by going
through the commits to fold and adding up all the modified files in
them, then building a `memctx` based on that. As reported in
issue6416, that can lose changes in merge commits. We could probably
fix that without changing the existing code too much, but it seems the
easiest way is to rewrite the code so it instead creates the new
commit by effectively checking out the base and then revert to the
head of the chain, so that's what this patch does. It does so by using
in-memory merge.

[flake8]
ignore =
         #closing bracket does not match indentation of opening bracket's line
         E123,
         # closing bracket does not match visual indentation
         E124,
         # visually indented line with same indent as next logical line
         E129,
         # at least two spaces before inline comment
         E261,
         # too many leading '#' for block comment
         E266,
         # expected 2 blank lines, found 0
         E302,
         # expected 2 blank lines after end of function or class
         E305,
         # module level import not at top of file
         E402,
         # line too long (82 > 79 characters)
         E501,
         # do not assign a lambda expression, use a def
         E731,
         # class names should use CapWords convention
         N801,
         # line break occurred before a binary operator
         W503
builtins=xrange, execfile