Mercurial > hg

changeset 35310:10cce12fdcd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: reverse _inlinediff output for consistency
author Matthieu Laneuville <matthieu.laneuville@octobus.net>
date Fri, 08 Dec 2017 16:47:18 +0900
parents d13526333835
children 12ce62c72c24
files mercurial/patch.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py	Wed Dec 06 15:46:41 2017 +0100
+++ b/mercurial/patch.py	Fri Dec 08 16:47:18 2017 +0900
@@ -2515,7 +2515,7 @@
                                 yield (token, 'diff.tab')
                             else:
                                 if i in matches:
-                                    for l, t in _inlinediff(
+                                    for t, l in _inlinediff(
                                                   lines[i].rstrip(),
                                                   lines[matches[i]].rstrip(),
                                                   label):
@@ -2587,10 +2587,10 @@
             token += part[2:]
             continue
         else:
-            buff.append((label, token))
+            buff.append((token, label))
             label = l
             token = part[2:]
-    buff.append((label, token))
+    buff.append((token, label))
 
     return buff