[Gnu-arch-users] patch: clean up some cacherev mess

[Derek Zhou]

Looks like some code are duplicated three times. I also change the dir
for temp tree from "." to /tmp, which makes more sense to me. Also a big
boost in speed for those of us who use a nfs mounted home dir.

Derek

* looking for address@hidden/tla--derek--1.3--patch-1 to compare with
* comparing to address@hidden/tla--derek--1.3--patch-1
M  libarch/cmd-cacherev.c
M  libarch/cmd-tag.c
M  libarch/archive-cache.c

* modified files

--- orig/libarch/archive-cache.c
+++ mod/libarch/archive-cache.c
@@ -27,7 +27,7 @@
   t_uchar * tmp_dir = 0;
   t_uchar * pristine_dir = 0;
 
-  tmp_dir = tmp_file_name (".", ",,archive-cache-revision");
+  tmp_dir = tmp_file_name ("/tmp", ",,archive-cache-revision");
   pristine_dir = file_name_in_vicinity (0, tmp_dir, revision);
 
   safe_mkdir (tmp_dir, 0777);


--- orig/libarch/cmd-cacherev.c
+++ mod/libarch/cmd-cacherev.c
@@ -23,6 +23,7 @@
 #include "tla/libarch/build-revision.h"
 #include "tla/libarch/cmd.h"
 #include "tla/libarch/cmd-cacherev.h"
+#include "tla/libarch/archive-cache.h"
 
 
 
@@ -192,9 +193,6 @@
     if (!cache_dir)
       cache_dir = str_save (0, ".");
 
-    tmp_dir = tmp_file_name (".", ",,archive-cache-revision");
-    pristine_dir = file_name_in_vicinity (0, tmp_dir, revision);
-
     arch = arch_archive_connect (archive, 0);
 
     arch_revision_type (&type, &is_cached, arch, revision);
@@ -205,26 +203,10 @@
         exit (1);
       }
 
-    safe_mkdir (tmp_dir, 0777);
-    safe_mkdir (pristine_dir, 0777);
-
-    arch_build_revision (1, pristine_dir, arch, archive, revision, cache_dir);
-
-    {
-      t_uchar * errstr;
-
-      if (arch_archive_put_cached (&errstr, arch, revision, pristine_dir))
-        {
-          safe_printfmt (2, "%s: unable to store cached revision of %s/%s 
(%s)\n",
-                         argv[0], archive, revision, errstr);
-          exit (1);
-        }
-    }
+    arch_archive_cache (1, arch, archive, revision, cache_dir);
 
     arch_archive_close (arch);
 
-    rmrf_file (tmp_dir);
-
     lim_free (0, archive);
     lim_free (0, revision);
   }


--- orig/libarch/cmd-tag.c
+++ mod/libarch/cmd-tag.c
@@ -25,6 +25,7 @@
 #include "tla/libarch/cmd-tag.h"
 #include "tla/libarch/cmdutils.h"
 #include "tla/libarch/archive-setup.h"
+#include "tla/libarch/archive-cache.h"
 
 
 
@@ -349,30 +350,8 @@
         safe_printfmt (1, "* Archive caching revision\n");
         safe_flush (1);
 
-        tmp_dir = tmp_file_name (".", ",,archive-cache-revision");
-        pristine_dir = file_name_in_vicinity (0, tmp_dir, tag_revision);
-        safe_mkdir (tmp_dir, 0777);
-        safe_mkdir (pristine_dir, 0777);
-
-        arch_build_revision (1, pristine_dir, tag_arch, tag_archive, 
tag_revision, ".");
-          
-          {
-            t_uchar * errstr;
-            
-            if (arch_archive_put_cached (&errstr, tag_arch, tag_revision, 
pristine_dir))
-              {
-                safe_printfmt (2, "Warning: %s: was unable to cache revision 
%s/%s (%s)\n",
-                               argv[0], tag_archive, tag_revision, errstr);
-              }
-            else
-              {
-                safe_printfmt (1, "* Made cached revision of  %s/%s \n", 
tag_archive, tag_revision);
-              }
-          }
-        rmrf_file (tmp_dir);
-        rmrf_file (tmp_dir);
-        lim_free (0, pristine_dir);
-        lim_free (0, tmp_dir);
+        arch_archive_cache (1, tag_arch, tag_archive, tag_revision, ".");
+        safe_printfmt (1, "* Made cached revision of  %s/%s \n", tag_archive, 
tag_revision);
       }
 
     if (log_file)