[Bug-gnu-arch] [bug #5554] file-find doesn't find implicitly named files

[nobody]

=================== BUG #5554: LATEST MODIFICATIONS ==================
http://savannah.gnu.org/bugs/?func=detailbug&bug_id=5554&group_id=4899

Changes by: Bruce Stephens <address@hidden>
Date: Thu 11/06/2003 at 21:12 (GMT)

------------------ Additional Follow-up Comments ----------------------------
Excellent!  That seems to do the trick.



This also seems to fix #5635.





=================== BUG #5554: FULL BUG SNAPSHOT ===================


Submitted by: None                    Project: GNU arch -- a revision control 
system
Submitted on: Wed 09/24/2003 at 21:56
Category:  tla                        Severity:  5 - Major                  
Bug Group:  bug                       Resolution:  None                     
Status:  Open                         Release:  
address@hidden/tla--devo--1.1--patch-177
Fixed Release:                        Merge Request?:  None                 
Your Archive Name:                    Your Archive Location:                
Assigned to:  None                    

Summary:  file-find doesn't find implicitly named files

Original Submission:  With tagging method tagline, files which are source 
(because

they have a suitable name) but which don't have taglines and

haven't been explicitly added, aren't found by file-find.



This is a recent change (in the last few days).

Follow-up Comments
*******************

-------------------------------------------------------
Date: Thu 11/06/2003 at 21:12       By: cenderis
Excellent!  That seems to do the trick.



This also seems to fix #5635.



-------------------------------------------------------
Date: Sat 11/01/2003 at 22:45       By: gnubert
Hm, since attaching the patch didn't work, now sending it inline ...



--- orig/libarch/file-diffs.c

+++ mod/libarch/file-diffs.c

@@ -15,6 +15,7 @@

 #include "tla/libarch/cached-inventory.h"

 #include "tla/libarch/local-cache.h"

 #include "tla/libarch/inv-ids.h"

+#include "tla/libarch/invent.h"

 #include "tla/libarch/file-diffs.h"

 

 



@@ -30,10 +31,15 @@

   t_uchar * orig_loc = 0;

   t_uchar * orig_path = 0;

   int status = 2;

+  struct arch_inventory_options inv_options;

 

   mod_path = file_name_in_vicinity (0, tree_root, mod_loc);

   safe_chdir (tree_root);

-  id = arch_inventory_id (arch_unspecified_id_tagging, 0, mod_loc, 0, 0, 0);

+

+  mem_set0 ((t_uchar *)&inv_options, sizeof (inv_options));

+  arch_get_inventory_naming_conventions (&inv_options, tree_root);

+

+  id = arch_inventory_id (arch_unspecified_id_tagging, 
inv_options.untagged_source_category, mod_loc, 0, 0, 0);

 

   cached_tree = arch_find_or_make_local_copy (out_fd, ".", 0, 0, archive, 
revision);

   if (!cached_tree)



-------------------------------------------------------
Date: Sat 11/01/2003 at 22:39       By: gnubert
arch_file_get_or_diff specifies 0 as 'untagged_is_source' argument to

arch_inventory_id, which then returns a null pointer in case of

untagged files.



The appended patch inserts a call to

arch_get_inventory_naming_conventions before, to get a proper value

for untagged_is_source.



BTW, arch_inventory_id internally sets



      untagged_is_source = (untagged_is_source == arch_inventory_source);



the function argument `untagged_is_source' sometimes is provided as

result of the above expression, sometimes untagged_source_category

(member of struct arch_inventory_options) is inserted. This will work

for both cases as long as arch_inventory_source is 1 (perhaps no

coincidence).




CC list is empty


No files currently attached


For detailed info, follow this link:
http://savannah.gnu.org/bugs/?func=detailbug&bug_id=5554&group_id=4899

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/