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

[PATCH] global-ignores line too long in config

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-09-29 00:37:00 CEST

Currently, the global-ignores line in the autogenerated ~/.svn/config
file is 108 characters long! Ick. Instead it should wrap (and be a
nice example of continuation lines anyway).

This change isn't quite trivial, since the code that prints it uses
the SVN_CONFIG_DEFAULT_GLOBAL_IGNORES #define, and you don't want to
put the newline and # in that variable. I have a patch that "works",
but might be too ugly. What do you think?

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
Index: subversion/include/svn_config.h
===================================================================
--- subversion/include/svn_config.h	(revision 26831)
+++ subversion/include/svn_config.h	(working copy)
@@ -121,9 +121,17 @@ typedef struct svn_config_t svn_config_t
 /*** Configuration Default Values ***/
 /* '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'. */
+/* We want this to be printed on two lines in the generated config file,
+ * but we don't want the # character to end up in the variable.
+ */
+#define SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1 \
+  "*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo"
+#define SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2 \
+  "*.rej *~ #*# .#* .*.swp .DS_Store"
+
 #define SVN_CONFIG_DEFAULT_GLOBAL_IGNORES \
-    "*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo" \
-    " *.rej *~ #*# .#* .*.swp .DS_Store"
+  SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1 " " \
+  SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2
 #define SVN_CONFIG_TRUE  "true"
 #define SVN_CONFIG_FALSE "false"
Index: subversion/libsvn_subr/config_file.c
===================================================================
--- subversion/libsvn_subr/config_file.c	(revision 26846)
+++ subversion/libsvn_subr/config_file.c	(working copy)
@@ -962,7 +962,8 @@ svn_config_ensure(const char *config_dir
         "### which Subversion will ignore in its 'status' output, and"       NL
         "### while importing or adding files and directories."               NL
         "### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'."     NL
-        "# global-ignores = " SVN_CONFIG_DEFAULT_GLOBAL_IGNORES ""           NL
+        "# global-ignores = " SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1      NL
+        "#   " SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2                     NL
         "### Set log-encoding to the default encoding for log messages"      NL
         "# log-encoding = latin1"                                            NL
         "### Set use-commit-times to make checkout/update/switch/revert"     NL
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 29 00:37:09 2007

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