From 1c37362d09c51b069aa72fae7d5feefa3040ce1e Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Mar 25 2020 08:51:39 +0000
Subject: display merge mode for external repos


Fixes: https://pagure.io/koji/issue/2096

---

diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py
index a175f9b..a16047a 100644
--- a/cli/koji_cli/commands.py
+++ b/cli/koji_cli/commands.py
@@ -4898,7 +4898,8 @@ def anon_handle_taginfo(goptions, session, args):
         if external_repos:
             print("External repos:")
             for rinfo in external_repos:
-                print("  %(priority)3i %(external_repo_name)s (%(url)s)" % rinfo)
+                print("  %(priority)3i %(external_repo_name)s "
+                      "(%(url)s, merge mode: %(merge_mode)s)" % rinfo)
         print("Inheritance:")
         for parent in session.getInheritanceData(info['id'], **event_opts):
             parent['flags'] = format_inheritance_flags(parent)
diff --git a/www/kojiweb/taginfo.chtml b/www/kojiweb/taginfo.chtml
index 1298996..6bf5a18 100644
--- a/www/kojiweb/taginfo.chtml
+++ b/www/kojiweb/taginfo.chtml
@@ -102,7 +102,7 @@
       <th>External&nbsp;repos</th>
       <td>
 	#for $external_repo in $external_repos
-	<a href="externalrepoinfo?extrepoID=$external_repo.external_repo_id">$external_repo.external_repo_name</a>
+	<a href="externalrepoinfo?extrepoID=$external_repo.external_repo_id">$external_repo.external_repo_name</a> [$external_repo.merge_mode]
 	#if $external_repo.tag_id != $tag.id
 	<span class="smaller">(inherited from <a href="taginfo?tagID=$external_repo.tag_id">$external_repo.tag_name</a>)</span>
 	#end if