Patchwork [12,of,12,V2] diff: use `context.diff` to produce diff

login
register
mail settings
Submitter Boris Feld
Date July 3, 2018, 10:32 a.m.
Message ID <9023a46c916c103ebafb.1530613951@FB-lair>
Download mbox | patch
Permalink /patch/32578/
State Accepted
Headers show

Comments

Boris Feld - July 3, 2018, 10:32 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1527082304 -7200
#      Wed May 23 15:31:44 2018 +0200
# Node ID 9023a46c916c103ebafba08e16e7c029c79a7137
# Parent  f323b9631f290ec68d5e5322eedf4b86676a1113
# EXP-Topic diff-cleanup
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 9023a46c916c
diff: use `context.diff` to produce diff

We want to make sure `context.diff` if full featured. Using it in the main

Patch

diff code path is a good way to do so.

The end goal is to be able to easily compute diff between in-memory context.

diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -76,9 +76,9 @@  def diffordiffstat(ui, repo, diffopts, n
         if not ui.plain():
             width = ui.termwidth()
 
-    chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,
-                        prefix=prefix, relroot=relroot,
-                        hunksfilterfn=hunksfilterfn)
+    chunks = repo[node2].diff(repo[node1], match, changes, opts=diffopts,
+                              prefix=prefix, relroot=relroot,
+                              hunksfilterfn=hunksfilterfn)
 
     if fp is not None or ui.canwritewithoutlabels():
         out = fp or ui