Fossil: Check-in [3555c0fc6f]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:	3555c0fc6fd0d1684422c729ac6a571ec3762715
Date:	2010-03-15 17:41:54
User:	drh
Comment:	Add a --ignore option to the "extra" command, and an "ignore-glob" setting which causes files with given patterns to be ignored. Tickets [705181a992c] and [5125de2e624]. See also ticket [4e8410bfd69].

Tags And Properties

branch=trunk inherited from [a28c83647d]
sym-trunk inherited from [a28c83647d]

Changes

hide diffs unified diffs patch

Changes to src/checkin.c

--- Old (68f82b881294436e)
+++ New (5c5ed2a07e6fa7a6)
 /*
 ** Copyright (c) 2007 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
+  }
   db_finalize(&q);
+}
 /*
+** Construct and return a string which is an SQL expression that will
+** be TRUE if value zVal matches any of the GLOB expressions in the list
+** zGlobList.  For example:
+**
+**    zVal:       "x"
+**    zGlobList:  "*.o,*.obj"
+**
+**    Result:     "(x GLOB '*.o' OR x GLOB '*.obj')"
+**
+** Each element of the GLOB list may optionally be enclosed in either '...'
+** or "...".  This allows commas in the expression.  Whitespace at the
+** beginning and end of each GLOB pattern is ignored, except when enclosed
+** within '...' or "...".
+**
+** This routine makes no effort to free the memory space it uses.
+*/
+char *glob_expr(const char *zVal, const char *zGlobList){
+  Blob expr;
+  char *zSep = "(";
+  int nTerm = 0;
+  int i;
+  int cTerm;
@@ > / 222 @@
+  if( zGlobList==0 || zGlobList[0]==0 ) return "0";
+  blob_zero(&expr);
+  while( zGlobList[0] ){
+    while( isspace(zGlobList[0]) || zGlobList[0]==',' ) zGlobList++;
+    if( zGlobList[0]==0 ) break;
+    if( zGlobList[0]=='\'' || zGlobList[0]=='"' ){
+      cTerm = zGlobList[0];
+      zGlobList++;
+    }else{
+      cTerm = ',';
+    }
+    for(i=0; zGlobList[i] && zGlobList[i]!=cTerm; i++){}
+    if( cTerm==',' ){
+      while( i>0 && isspace(zGlobList[i-1]) ){ i--; }
+    }
+    blob_appendf(&expr, "%s%s GLOB '%.*q'", zSep, zVal, i, zGlobList);
+    zSep = " OR ";
+    if( cTerm!=',' && zGlobList[i] ) i++;
+    zGlobList += i;
+    if( zGlobList[0] ) zGlobList++;
+    nTerm++;
+  }
+  if( nTerm ){
+    blob_appendf(&expr, ")");
+    return blob_str(&expr);
+  }else{
+    return "0";
+  }
+}
@@ > / 252 @@
+/*
 ** COMMAND: extras
-** Usage: %fossil extras ?--dotfiles?
+** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN?
 **
 ** Print a list of all files in the source tree that are not part of
 ** the current checkout.  See also the "clean" command.
 **
 ** Files and subdirectories whose names begin with "." are normally
 void extra_cmd(void){
   Blob path;
   Blob repo;
   Stmt q;
   int n;
+  const char *zIgnoreFlag = find_option("ignore",0,1);
   int allFlag = find_option("dotfiles",0,0)!=0;
@@ > / 270 @@
   db_must_be_within_tree();
   db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
   n = strlen(g.zLocalRoot);
   blob_init(&path, g.zLocalRoot, n-1);
+  if( zIgnoreFlag==0 ){
+    zIgnoreFlag = db_get("ignore-glob", 0);
+  }
   vfile_scan(0, &path, blob_size(&path), allFlag);
   db_prepare(&q,
       "SELECT x FROM sfile"
       " WHERE x NOT IN ('manifest','manifest.uuid','_FOSSIL_')"
-      " ORDER BY 1");
+      "   AND NOT %s"
@@ | / 283 / " ORDER BY 1", @@
@@ | / 284 / glob_expr("x", zIgnoreFlag) @@
@@ | / 285 / ); @@
   if( file_tree_name(g.zRepositoryName, &repo, 0) ){
     db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
+  }
   while( db_step(&q)==SQLITE_ROW ){
     printf("%s\n", db_column_text(&q, 0));
   free(zMidUuid);
   return;
 #undef USAGE
+}

Changes to src/db.c

--- Old (20b0e9153b4bf5ae)
+++ New (62f60a50b626578f)
 /*
 ** Copyright (c) 2006 D. Richard Hipp
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public
 **                     diff. If undefined, text diff will be used.
 **
 **    http-port        The TCP/IP port number to use by the "server"
 **                     and "ui" commands.  Default: 8080
 **
+**    ignore-glob      The VALUE is a comma-separated list of GLOB patterns
+**                     specifying files that the "extra" command will ignore.
+**                     Example:  *.o,*.obj,*.exe
+**
 **    localauth        If enabled, require that HTTP connections from
 **                     127.0.0.1 be authenticated by password.  If
 **                     false, all HTTP requests from localhost have
 **                     unrestricted access to the repository.
 **
     "clearsign",
     "diff-command",
     "dont-push",
     "editor",
     "gdiff-command",
+    "ignore-glob",
     "http-port",
     "localauth",
     "mtime-changes",
     "pgp-command",
     "proxy",
+    }
   }else{
     usage("?PROPERTY? ?VALUE?");
+  }
+}