obslog: fix --patch with --no-graph options
authorAlain Leufroy
Sun, 17 Sep 2017 12:45:28 +0200
changeset 2954 54f7b8fcdf3b
parent 2953 b9aea9e48203
child 2955 b899a94472fd
obslog: fix --patch with --no-graph options The repo given to _debughistorydisplaymarker which computes the diff was filtered when graph mode is disabled.
hgext3rd/evolve/obshistory.py
tests/test-evolve-obshistory.t
--- a/hgext3rd/evolve/obshistory.py	Thu Sep 21 15:18:28 2017 +0200
+++ b/hgext3rd/evolve/obshistory.py	Sun Sep 17 12:45:28 2017 +0200
@@ -375,7 +375,7 @@
 
         markerfm = fm.nested("debugobshistory.markers")
         for successor in sorted(succs):
-            _debugobshistorydisplaymarker(markerfm, successor, ctxnode, repo, opts)
+            _debugobshistorydisplaymarker(markerfm, successor, ctxnode, unfi, opts)
         markerfm.end()
 
         precs = precursors.get(ctxnode, ())
--- a/tests/test-evolve-obshistory.t	Thu Sep 21 15:18:28 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Sun Sep 17 12:45:28 2017 +0200
@@ -72,6 +72,27 @@
          +42
   
   
+
+  $ hg obslog --no-graph --patch 4ae3a4151de9
+  4ae3a4151de9 (2) A1
+  471f378eab4c (1) A0
+    rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+      --- a/471f378eab4c-changeset-description	
+      +++ b/4ae3a4151de9-changeset-description	
+      @@ -1,1 +1,3 @@
+      -A0
+      +A1
+      +
+      +Better commit message
+  
+      diff -r 471f378eab4c -r 4ae3a4151de9 A0
+      --- a/A0	Thu Jan 01 00:00:00 1970 +0000
+      +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
+      @@ -1,1 +1,2 @@
+       A0
+      +42
+  
+
   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
   [
       {