#
#
# patch "cmd_list.cc"
#  from [1003103a7784a9150135b61cdf6e84337e4842f5]
#    to [03d285c5e0f6c9889f427e4d189a6f542629368b]
# 
# patch "tests/db_kill_tag_locally/__driver__.lua"
#  from [eb96c1472d7ef266ce84d3fcfb4beb75b3c57661]
#    to [412ff7d7544bb55aee63e6e6333ae23b1acc12e6]
# 
# patch "tests/importing_cvs_tricky_repo_with_tags/test.tags"
#  from [0e376f92987174e84d147334850c1573219d6e89]
#    to [7e382e03da27d4a3309a4661e5154669078f4dfe]
# 
# patch "tests/ls_tags_with_ambiguous_tags/__driver__.lua"
#  from [86ca8c16ab1e8b7c071c1e3dd73f47852059a31e]
#    to [5478308acb6e9d10f39a2411e5cfae4637cfe737]
# 
# patch "tests/tags_and_tagging_of_revisions/__driver__.lua"
#  from [417a74a8f678051c254c7fc3a041d9f703987239]
#    to [81e6f1af6cbe3b957c7a8680a5539a2d14da858d]
#
============================================================
--- cmd_list.cc	1003103a7784a9150135b61cdf6e84337e4842f5
+++ cmd_list.cc	03d285c5e0f6c9889f427e4d189a6f542629368b
@@ -562,8 +562,11 @@ CMD(tags, "tags", "", CMD_REF(list), "[P
 
       if (inc.matches(i->name()) && !exc.matches(i->name()))
         {
-          cout << i->name << ' ' << i->ident << ' ';
-
+          hexenc<id> hexid;
+          encode_hexenc(i->ident.inner(), hexid);
+         
+          cout << i->name << ' ' << hexid().substr(0,10) << "... ";
+    
           for (vector<cert>::const_iterator c = certs.begin(); 
                c != certs.end(); ++c)
             {
============================================================
--- tests/db_kill_tag_locally/__driver__.lua	eb96c1472d7ef266ce84d3fcfb4beb75b3c57661
+++ tests/db_kill_tag_locally/__driver__.lua	412ff7d7544bb55aee63e6e6333ae23b1acc12e6
@@ -22,36 +22,43 @@ check(mtn("tag", R4, "other_tag"), 0, fa
 check(mtn("tag", R3, "test_tag"), 0, false, false)
 check(mtn("tag", R4, "other_tag"), 0, false, false)
 
+-- abbreviated revision ids
+
+a1=string.sub(R1, 0, 10) .. "..."
+a2=string.sub(R2, 0, 10) .. "..."
+a3=string.sub(R3, 0, 10) .. "..."
+a4=string.sub(R4, 0, 10) .. "..."
+
 check(mtn("ls", "tags"), 0, true, false)
-check(qgrep(R1, "stdout"))
+check(qgrep(a1, "stdout"))
 check(qgrep("ambig_tag", "stdout"))
-check(qgrep(R2, "stdout"))
+check(qgrep(a2, "stdout"))
 check(qgrep("ambig_tag", "stdout"))
-check(qgrep(R3, "stdout"))
+check(qgrep(a3, "stdout"))
 check(qgrep("test_tag", "stdout"))
-check(qgrep(R4, "stdout"))
+check(qgrep(a4, "stdout"))
 check(qgrep("other_tag", "stdout"))
 
 check(mtn("db", "kill_tag_locally", "test_tag"), 0, false, false)
 
 check(mtn("ls", "tags"), 0, true, false)
-check(qgrep(R1, "stdout"))
+check(qgrep(a1, "stdout"))
 check(qgrep("ambig_tag", "stdout"))
-check(qgrep(R2, "stdout"))
+check(qgrep(a2, "stdout"))
 check(qgrep("ambig_tag", "stdout"))
-check(not qgrep(R3, "stdout"))
+check(not qgrep(a3, "stdout"))
 check(not qgrep("test_tag", "stdout"))
-check(qgrep(R4, "stdout"))
+check(qgrep(a4, "stdout"))
 check(qgrep("other_tag", "stdout"))
 
 check(mtn("db", "kill_tag_locally", "ambig_tag"), 0, false, false)
 
 check(mtn("ls", "tags"), 0, true, false)
-check(not qgrep(R1, "stdout"))
+check(not qgrep(a1, "stdout"))
 check(not qgrep("ambig_tag", "stdout"))
-check(not qgrep(R2, "stdout"))
+check(not qgrep(a2, "stdout"))
 check(not qgrep("ambig_tag", "stdout"))
-check(not qgrep(R3, "stdout"))
+check(not qgrep(a3, "stdout"))
 check(not qgrep("test_tag", "stdout"))
-check(qgrep(R4, "stdout"))
+check(qgrep(a4, "stdout"))
 check(qgrep("other_tag", "stdout"))
============================================================
--- tests/importing_cvs_tricky_repo_with_tags/test.tags	0e376f92987174e84d147334850c1573219d6e89
+++ tests/importing_cvs_tricky_repo_with_tags/test.tags	7e382e03da27d4a3309a4661e5154669078f4dfe
@@ -1,3 +1,3 @@
-initial 7be6a094cb29307bed5bbacf40b3f3642222f413 foo.bar.redhat address@hidden (46ec58576f...)
-portable-branch-base 32ba3f451dcf277762ca1c328043df2e2ceebc17 foo.bar address@hidden (46ec58576f...)
-portable-branch-fork-20050601T0139 32ba3f451dcf277762ca1c328043df2e2ceebc17 foo.bar address@hidden (46ec58576f...)
+initial 7be6a094cb... foo.bar.redhat address@hidden (46ec58576f...)
+portable-branch-base 32ba3f451d... foo.bar address@hidden (46ec58576f...)
+portable-branch-fork-20050601T0139 32ba3f451d... foo.bar address@hidden (46ec58576f...)
============================================================
--- tests/ls_tags_with_ambiguous_tags/__driver__.lua	86ca8c16ab1e8b7c071c1e3dd73f47852059a31e
+++ tests/ls_tags_with_ambiguous_tags/__driver__.lua	5478308acb6e9d10f39a2411e5cfae4637cfe737
@@ -12,6 +12,11 @@ check(mtn("tag", R2, "ambig_tag"), 0, fa
 check(mtn("tag", R1, "ambig_tag"), 0, false, false)
 check(mtn("tag", R2, "ambig_tag"), 0, false, false)
 
+-- abbreviated revision ids
+
+a1=string.sub(R1, 0, 10) .. "..."
+a2=string.sub(R2, 0, 10) .. "..."
+
 check(mtn("ls", "tags"), 0, true, false)
-check(qgrep(R1, "stdout"))
-check(qgrep(R2, "stdout"))
+check(qgrep(a1, "stdout"))
+check(qgrep(a2, "stdout"))
============================================================
--- tests/tags_and_tagging_of_revisions/__driver__.lua	417a74a8f678051c254c7fc3a041d9f703987239
+++ tests/tags_and_tagging_of_revisions/__driver__.lua	81e6f1af6cbe3b957c7a8680a5539a2d14da858d
@@ -13,30 +13,30 @@ check(mtn("add", "file1"), 0, false, fal
 -- make and tag revision 1
 
 check(mtn("add", "file1"), 0, false, false)
-commit()
+commit("branch1")
 revs[1] = base_revision()
 check(mtn("tag", revs[1], "tag1"), 0, false, false)
 
 -- make and tag revision 2
 
 check(mtn("add", "file2"), 0, false, false)
-commit()
+commit("branch2")
 revs[2] = base_revision()
 check(mtn("tag", revs[2], "tag2"), 0, false, false)
 
 -- make and tag revision 3
 
 check(mtn("add", "file3"), 0, false, false)
-commit()
+commit("branch3")
 revs[3] = base_revision()
 check(mtn("tag", revs[3], "tag3"), 0, true, true)
 
 -- check tags created above
 
 check(mtn("ls", "tags"), 0, true, false)
-check(qgrep("tag1", "stdout"))
-check(qgrep("tag2", "stdout"))
-check(qgrep("tag3", "stdout"))
+check(qgrep("tag1 .* branch1 ", "stdout"))
+check(qgrep("tag2 .* branch2 ", "stdout"))
+check(qgrep("tag3 .* branch3 ", "stdout"))
 
 -- make sure 'ls tags' output is sorted
 if existsonpath("sort") then