umpf: omit hash/version info on show without --identical

The topic-range and hashinfo information won't be used later on, unless
--identical is given. It thus makes sense to ignore them in umpf show
too, unless the user requests them with --identical.

Signed-off-by: Ahmad Fatoum <[email protected]>

tests/meson.build

@@ -23,6 +23,7 @@ tests = [
   'umpf-format-patch',
   'umpf-format-patch-bb',
   'umpf-show',
+  'umpf-show-identical',
   'umpf-versions'
 ]
 foreach test_name : tests

tests/series-identical-v1.ref

@@ -0,0 +1,10 @@
+# umpf-base: base
+# umpf-name: name
+# umpf-version: name/20221209-1
+# umpf-topic: a
+# umpf-hashinfo: f46ed0419d2c31ed10f978cc461e0d1ae4b3b426
+# umpf-topic-range: d306da785d874c09b89264d3f71632bc14bfe51f..b2b9f854952b0be84ba2472f236783d09bfa6561
+# umpf-topic: b
+# umpf-hashinfo: 3755a03cf640725df1aeb13789cba87154a47b04
+# umpf-topic-range: b2b9f854952b0be84ba2472f236783d09bfa6561..e791a2bb22e021b8513809e1e1cbf692be74fd99
+# umpf-end

tests/series-v1.ref

@@ -1,10 +1,5 @@
 # umpf-base: base
 # umpf-name: name
-# umpf-version: name/20221209-1
 # umpf-topic: a
-# umpf-hashinfo: f46ed0419d2c31ed10f978cc461e0d1ae4b3b426
-# umpf-topic-range: d306da785d874c09b89264d3f71632bc14bfe51f..b2b9f854952b0be84ba2472f236783d09bfa6561
 # umpf-topic: b
-# umpf-hashinfo: 3755a03cf640725df1aeb13789cba87154a47b04
-# umpf-topic-range: b2b9f854952b0be84ba2472f236783d09bfa6561..e791a2bb22e021b8513809e1e1cbf692be74fd99
 # umpf-end

tests/umpf-merge

@@ -6,6 +6,6 @@
 umpf merge a
 umpf merge b
 
-umpf show --base=base --name=name > series.merge
+umpf show --identical --base=base --name=name > series.merge
 
 diff -u ${TEST_DIR}/series-merge.ref series.merge

tests/umpf-merge-build

@@ -6,5 +6,5 @@
 git checkout umpf-merge
 umpf build --remote=origin --base=base --name=name
 
-umpf show > series.build
+umpf show --identical > series.build
 diff -u ${TEST_DIR}/series-merge.ref series.build

tests/umpf-series-build

@@ -9,5 +9,5 @@ git ls-tree umpf-build > ls-tree.ref
 git ls-tree HEAD > ls-tree.build
 diff -u ls-tree.ref ls-tree.build
 
-umpf show HEAD > series.build
+umpf show --identical HEAD > series.build
 diff -u ${TEST_DIR}/series-merge.ref series.build

tests/umpf-series-tag-continue-flags

@@ -20,7 +20,7 @@ sed -i '/^# umpf-base: base$/a # umpf-flags: extraversion=conflictfree' series.c
 umpf tag -f --version=2 series.conflict --remote=origin || test $? = 1
 git add a.txt
 echo | umpf continue
-umpf show 2>&1
+umpf show --identical 2>&1
 
 diff -u ${TEST_DIR}/version-files/ref/Makefile.conflictfree Makefile
 git log --format=%B -n 1 | grep "^# umpf-" > series.tag

tests/umpf-show-identical

@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# Test the output of "umpf show".
+#
+
+umpf show --identical umpf-tag > series.show
+
+diff -u ${TEST_DIR}/series-identical-v1.ref series.show

umpf

@@ -1877,7 +1877,13 @@ do_abort() {
 
 do_show() {
 	VERBOSE=true
-	prepare_persistent show "${@}"
+	prepare_persistent show "${@}" | (
+		if $IDENTICAL; then
+			cat
+		else
+			sed -r '/^# umpf-(version|topic-range|hashinfo|release): /d'
+		fi
+	)
 	cleanup
 }