[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Outstanding Patches.

From: Philip Martin <philip_martin_at_ntlworld.com>
Date: 2001-10-29 15:53:59 CET

[I am still having problems with the subversion mailing lists. I got
messages very slowly, and out of order, yesterday, with no messages so
far today.]

Kevin Pilch-Bisson <kevin@pilch-bisson.net> writes:

> > +svn_stringbuf_t *
> > +svn_wc__adm_empty_file (const svn_stringbuf_t *path,
> > + apr_pool_t *pool)
> > +{
> > + svn_stringbuf_t *empty_file_path = svn_stringbuf_dup (path, pool);
> > + svn_path_remove_component (empty_file_path, svn_path_local_style);
> > + svn_path_add_component_nts (empty_file_path, SVN_WC_ADM_DIR_NAME,
> > + svn_path_local_style);
> > + svn_path_add_component_nts (empty_file_path, SVN_WC__ADM_EMPTY_FILE,
> > + svn_path_local_style);
> > + return empty_file_path;
> > +}
>
> It might be better to just use thing_path here, no?

I don't think so. For example, given a path:

 dir1/dir2/xxx

I want to get:

 dir1/dir2/.svn/empty-file

whereas thing_path will give me something containing xxx such as

 dir1/dir2/.svn/empty-file/xxx

However looking at thing_path I see I could use extend_with_adm_name:

Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/.svn/text-base/adm_files.c Sun Oct 28 14:14:39 2001
+++ subversion/libsvn_wc/adm_files.c Mon Oct 29 14:48:41 2001
@@ -376,6 +376,16 @@
   return thing_path (path, SVN_WC__ADM_TEXT_BASE, tmp, pool);
 }
 
+svn_stringbuf_t *
+svn_wc__adm_empty_file (const svn_stringbuf_t *path,
+ apr_pool_t *pool)
+{
+ svn_stringbuf_t *empty_file_path = svn_stringbuf_dup (path, pool);
+ svn_path_remove_component (empty_file_path, svn_path_local_style);
+ extend_with_adm_name (empty_file_path, 0, pool, SVN_WC__ADM_EMPTY_FILE, NULL);
+ return empty_file_path;
+}
+
 
 static svn_error_t *
 prop_path_internal (svn_stringbuf_t **prop_path,
@@ -1180,6 +1190,10 @@
 
   /* SVN_WC__ADM_ENTRIES */
   SVN_ERR (svn_wc__entries_init (path, ancestor_path, pool));
+
+ /* SVN_WC__ADM_EMPTY_FILE */
+ SVN_ERR (svn_wc__make_adm_thing (path, SVN_WC__ADM_EMPTY_FILE, svn_node_file,
+ APR_UREAD, 0, pool));
 
   /* THIS FILE MUST BE CREATED LAST:
      After this exists, the dir is considered complete. */

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:46 2006

This is an archived mail posted to the Subversion Dev mailing list.