Mercurial > hg
annotate tests/unwrap-message-id.py @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:37:56 +0200 |
parents | a1908951ca42 |
children | 6000f5b25c9b |
rev | line source |
---|---|
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
diff
changeset
|
1 from __future__ import absolute_import, print_function |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
diff
changeset
|
2 |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
diff
changeset
|
3 import sys |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
diff
changeset
|
4 |
44405
a1908951ca42
tests: handle In-Reply-To headers for line wrapping
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
5 for line in sys.stdin: |
a1908951ca42
tests: handle In-Reply-To headers for line wrapping
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
6 if line.lower() in ("message-id: \n", "in-reply-to: \n"): |
a1908951ca42
tests: handle In-Reply-To headers for line wrapping
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
7 line = line[:-2] |
a1908951ca42
tests: handle In-Reply-To headers for line wrapping
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
8 print(line, end="") |