You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@xbc.nu> on 2003/11/12 03:27:55 UTC
[PATCH] Stop using "svn:this_dir" in the entres file [was Re: 0.33
== Beta]
Branko Čibej wrote:
>C. Michael Pilato wrote:
>
>>Branko Čibej <br...@xbc.nu> writes:
>>
>>>What about the infamous svn:this-dir in the entries file? IMHO we should
>>>get rid of ir before beta; it was a debugging aid, and we don't need it
>>>any more.
>>>
>>+1. Karl fusses about this every time he sees it.
>>
>O.K., I'm on it. :-)
>
>
How about this, then? It looks like a simple "svn up" will automagically
upgrade all the entries files.If I hear no objections (and the tests
pass) I'll commit this tomorrow.
[[[
Use "" instead of "svn:this_dir" in the entries file.
* subversion/include/svn_wc.h (SVN_WC_ENTRIES_THIS_DIR): Define to "".
* subversion/libsvn_wc/entries.c (svn_wc__atts_to_entry): It the
entry name is "svn:this_dir", change it to SVN_WC_ENTRIES_THIS_DIR.
]]]
Index: subversion/include/svn_wc.h
===================================================================
--- subversion/include/svn_wc.h (revision 7710)
+++ subversion/include/svn_wc.h (working copy)
@@ -785,7 +785,7 @@
/** How an entries file's owner dir is named in the entries file. */
-#define SVN_WC_ENTRY_THIS_DIR "svn:this_dir"
+#define SVN_WC_ENTRY_THIS_DIR ""
/** Set @a *entry to an entry for @a path, allocated in the access baton
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 7710)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -177,6 +177,12 @@
/* Find the name and set up the entry under that name. */
name = apr_hash_get (atts, SVN_WC__ENTRY_ATTR_NAME, APR_HASH_KEY_STRING);
+ /* XXX Replace the obsolete "svn:this_dir".
+ XXX This code should go away by 1.0 */
+ {
+ if (name && 0 == strcmp(name, "svn:this_dir"))
+ name = SVN_WC_ENTRY_THIS_DIR;
+ }
entry->name = name ? name : SVN_WC_ENTRY_THIS_DIR;
/* Attempt to set revision (resolve_to_defaults may do it later, too) */
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Stop using "svn:this_dir" in the entres file [was Re:
0.33 == Beta]
Posted by Branko Čibej <br...@xbc.nu>.
Branko Čibej wrote:
>Branko Čibej wrote:
>
>
>>C. Michael Pilato wrote:
>>
>>
>>>Branko Čibej <br...@xbc.nu> writes:
>>>
>>>
>>>>What about the infamous svn:this-dir in the entries file? IMHO we should
>>>>get rid of ir before beta; it was a debugging aid, and we don't need it
>>>>any more.
>>>>
>>>>
>>>+1. Karl fusses about this every time he sees it.
>>>
>>>
>>O.K., I'm on it. :-)
>>
>>
>How about this, then? It looks like a simple "svn up" will automagically
>upgrade all the entries files.If I hear no objections (and the tests
>pass) I'll commit this tomorrow.
>
>
The ra:_local tests pass, and I don't believe ra_svn and ra_dav would be
any more relevant.in this case.
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Stop using "svn:this_dir" in the entres file [was Re: 0.33 == Beta]
Posted by "C. Michael Pilato" <cm...@collab.net>.
Branko Čibej <br...@xbc.nu> writes:
> How about this, then?
[...]
> + /* XXX Replace the obsolete "svn:this_dir".
> + XXX This code should go away by 1.0 */
> + {
> + if (name && 0 == strcmp(name, "svn:this_dir"))
^^^
Well, there's that pesky adherence to coding styles thing, but...
Could you pretty please make that line:
if (name && (strcmp (name, "svn:this_dir") == 0))
*Smooch*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org