Mercurial > evolve

changeset 3625:7e253bbac9a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: show first line of commit message in test-evolve-phase-divergence.t This patch adds 'firstline' filter to description in the log template.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 23 Mar 2018 18:28:37 +0530
parents 6756f2a85f5b
children 760210aa0d78
files tests/test-evolve-phase-divergence.t
diffstat 1 files changed, 3 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t	Fri Mar 23 17:49:26 2018 +0530
+++ b/tests/test-evolve-phase-divergence.t	Fri Mar 23 18:28:37 2018 +0530
@@ -3,7 +3,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [alias]
-  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
+  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}"
   > [extensions]
   > rebase =
   > EOF
@@ -333,8 +333,6 @@
 
   $ hg glog
   @  5:3d62500c673d phase-divergent update to aa071e5554e3:
-  |
-  |  added bar to foo
   |   (bm) draft
   o  3:aa071e5554e3 added foo to foo
   |   () public
@@ -443,8 +441,6 @@
   | o  6:b756eb10ea73 added bar to bar
   |/    () public
   o  5:3d62500c673d phase-divergent update to aa071e5554e3:
-  |
-  |  added bar to foo
   |   () public
   o  3:aa071e5554e3 added foo to foo
   |   () public
@@ -483,14 +479,10 @@
 
   $ hg glog
   @  8:502e73736632 phase-divergent update to b756eb10ea73:
-  |
-  |  foo to bar
   |   (bm) draft
   o  6:b756eb10ea73 added bar to bar
   |   () public
   o  5:3d62500c673d phase-divergent update to aa071e5554e3:
-  |
-  |  added bar to foo
   |   () public
   o  3:aa071e5554e3 added foo to foo
   |   () public
@@ -584,15 +576,12 @@
   | o  9:2352021b3785 added x to x
   | |   () public
   | o  8:502e73736632 phase-divergent update to b756eb10ea73:
-  | |
-  | |  foo to bar
   | |   () public
   | o  6:b756eb10ea73 added bar to bar
   |/    () public
   o  5:3d62500c673d phase-divergent update to aa071e5554e3:
-  |
-  ~  added bar to foo
-      () public
+  |   () public
+  ~
 
 Using `hg evolve` to resolve phase-divergence
 ---------------------------------------------
@@ -611,14 +600,10 @@
   @  9:2352021b3785 added x to x
   |   (bm) public
   o  8:502e73736632 phase-divergent update to b756eb10ea73:
-  |
-  |  foo to bar
   |   () public
   o  6:b756eb10ea73 added bar to bar
   |   () public
   o  5:3d62500c673d phase-divergent update to aa071e5554e3:
-  |
-  |  added bar to foo
   |   () public
   o  3:aa071e5554e3 added foo to foo
   |   () public