#
# patch "ChangeLog"
#  from [973cd3894dedea02f195bf4bf9232a504cdc1082]
#    to [2e6ecb428ab7b222480305afacc112d3a5a43163]
#
# patch "commands.cc"
#  from [161856b13e6c22b444c56d6399b170722e37d687]
#    to [8795409ea042fe9d2b529258a02b06adbbe46ced]
#
========================================================================
--- ChangeLog	973cd3894dedea02f195bf4bf9232a504cdc1082
+++ ChangeLog	2e6ecb428ab7b222480305afacc112d3a5a43163
@@ -1,5 +1,10 @@
 2005-08-30  Benoît Dejean  <address@hidden>

+	* commands.cc: Merged complete(..., file_id) and
+	complete(..., manifest_id) into template complete(..., ID).
+
+2005-08-30  Benoît Dejean  <address@hidden>
+
 	* commands.cc (ls_certs): Reworked for i18n.
 	(CMD(commit)): Merged 2 strings.

========================================================================
--- commands.cc	161856b13e6c22b444c56d6399b170722e37d687
+++ commands.cc	8795409ea042fe9d2b529258a02b06adbbe46ced
@@ -470,63 +470,34 @@
   P(F("expanded to '%s'\n") %  completion);
 }

-static void
-complete(app_state & app,
-         string const & str,
-         manifest_id & completion)
-{
-  N(str.find_first_not_of(constants::legal_id_bytes) == string::npos,
-    F("non-hex digits in id"));
-  if (str.size() == constants::idlen)
-    {
-      completion = manifest_id(str);
-      return;
-    }
-  set<manifest_id> completions;
-  app.db.complete(str, completions);
-  N(completions.size() != 0,
-    F("partial id '%s' does not have a unique expansion") % str);
-  if (completions.size() > 1)
-    {
-      string err = (F("partial id '%s' has multiple ambiguous expansions: \n") % str).str();
-      for (set<manifest_id>::const_iterator i = completions.begin();
-           i != completions.end(); ++i)
-        err += (i->inner()() + "\n");
-      N(completions.size() == 1, boost::format(err));
-    }
-  completion = *(completions.begin());
-  P(F("expanding partial id '%s'\n"
-      "expanded to '%s'\n")
-    % str % completion);
-}

+template<typename ID>
 static void
 complete(app_state & app,
          string const & str,
-         file_id & completion)
+         ID & completion)
 {
   N(str.find_first_not_of(constants::legal_id_bytes) == string::npos,
     F("non-hex digits in id"));
   if (str.size() == constants::idlen)
     {
-      completion = file_id(str);
+      completion = ID(str);
       return;
     }
-  set<file_id> completions;
+  set<ID> completions;
   app.db.complete(str, completions);
   N(completions.size() != 0,
-    F("partial id '%s' does not have a unique expansion") % str);
+    F("partial id '%s' does not have an expansion") % str);
   if (completions.size() > 1)
     {
       string err = (F("partial id '%s' has multiple ambiguous expansions: \n") % str).str();
-      for (set<file_id>::const_iterator i = completions.begin();
+      for (typename set<ID>::const_iterator i = completions.begin();
            i != completions.end(); ++i)
         err += (i->inner()() + "\n");
       N(completions.size() == 1, boost::format(err));
     }
   completion = *(completions.begin());
-  P(F("expanding partial id '%s'\n"
-      "expanded to '%s'\n")
+  P(F("expanded partial id '%s' to '%s'\n")
     % str % completion);
 }