Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mdiff.py @ 52669:e627cc25b6f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pyupgrade: rewrite `yield` statements in a loop to `yield from` This is the `legacy` fixer in `pyupgrade`, with the `yield` statement yielding loop commented back in. This seems to help pytype in some cases, and hurt it in others. But that can be manually fixed later. Note that it's possibly buggy in that it aggressively changed `import-checker.py` to `yield from 'fcntl', 'grp', 'pwd', 'select', 'termios': # Unix only`, which is invalid syntax. Possibly it needed help from the token fixer that I've disabled locally (because that wants to make a bunch of unrelated changes). Just change those few places to yield from a list, to avoid having to constantly revert that.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 05 Jan 2025 22:26:16 -0500
parents d7f17819ae9e
children
line wrap: on
line diff
--- a/mercurial/mdiff.py	Sun Jan 05 22:23:31 2025 -0500
+++ b/mercurial/mdiff.py	Sun Jan 05 22:26:16 2025 -0500
@@ -529,8 +529,7 @@
                 if not has_hunks:
                     has_hunks = True
                     yield True
-                for x in yieldhunk(hunk):
-                    yield x
+                yield from yieldhunk(hunk)
         if prev:
             # we've joined the previous hunk, record the new ending points.
             hunk = (hunk[0], a2, hunk[2], b2, hunk[4])
@@ -547,8 +546,7 @@
         if not has_hunks:
             has_hunks = True
             yield True
-        for x in yieldhunk(hunk):
-            yield x
+        yield from yieldhunk(hunk)
     elif not has_hunks:
         yield False