Fossil

Check-in [fa6311a5]
Login

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

Overview
Comment:make "fossil rm FOO" work as expected on case-insensitive file systems, where committed files "foo/*" exist.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: fa6311a5078112d1fcb92f93859f54b2dddd9e11
User & Date: jan.nijtmans 2013-06-05 08:12:36
Context
2013-06-10
07:07
A typo in help screen (reported by Sergei Gavrikov) check-in: b894afad user: jan.nijtmans tags: trunk
2013-06-08
02:37
Merge updates from trunk. Closed-Leaf check-in: b8919a55 user: edward tags: berner-nt
01:34
Merge updates from trunk. Leaf check-in: 7872db85 user: edward tags: long-double-bug
2013-06-06
12:16
merge trunk check-in: cf3d716e user: jan.nijtmans tags: cleanX-no-clean-glob
06:31
Teach config.h to recognize Sun's C compiler. Leaf check-in: 57b58527 user: edward tags: sun-compiler
2013-06-05
08:12
make "fossil rm FOO" work as expected on case-insensitive file systems, where committed files "foo/*" exist. check-in: fa6311a5 user: jan.nijtmans tags: trunk
2013-05-31
17:41
Avoid SQL errors when the "fossil ticket" command is misused to try to append icomment text. Ticket [d4378c258d9fc6b] check-in: 878f7008 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/add.c.

   344    344   
   345    345       file_tree_name(g.argv[i], &treeName, 1);
   346    346       zTreeName = blob_str(&treeName);
   347    347       db_multi_exec(
   348    348          "INSERT OR IGNORE INTO sfile"
   349    349          " SELECT pathname FROM vfile"
   350    350          "  WHERE (pathname=%Q %s"
   351         -       "     OR (pathname>'%q/' AND pathname<'%q0'))"
          351  +       "     OR (pathname>'%q/' %s AND pathname<'%q0' %s))"
   352    352          "    AND NOT deleted",
   353         -       zTreeName, filename_collation(), zTreeName, zTreeName
          353  +       zTreeName, filename_collation(), zTreeName,
          354  +       filename_collation(), zTreeName, filename_collation()
   354    355       );
   355    356       blob_reset(&treeName);
   356    357     }
   357    358     
   358    359     db_prepare(&loop, "SELECT x FROM sfile");
   359    360     while( db_step(&loop)==SQLITE_ROW ){
   360    361       fossil_print("DELETED %s\n", db_column_text(&loop, 0));
................................................................................
   647    648         int nOrig;
   648    649         file_tree_name(g.argv[i], &orig, 1);
   649    650         zOrig = blob_str(&orig);
   650    651         nOrig = blob_size(&orig);
   651    652         db_prepare(&q,
   652    653            "SELECT pathname FROM vfile"
   653    654            " WHERE vid=%d"
   654         -         "   AND (pathname='%q' %s OR (pathname>'%q/' AND pathname<'%q0'))"
          655  +         "   AND (pathname='%q' %s OR (pathname>'%q/' %s AND pathname<'%q0' %s))"
   655    656            " ORDER BY 1",
   656         -         vid, zOrig, filename_collation(), zOrig, zOrig
          657  +         vid, zOrig, filename_collation(), zOrig, filename_collation(),
          658  +         zOrig, filename_collation()
   657    659         );
   658    660         while( db_step(&q)==SQLITE_ROW ){
   659    661           const char *zPath = db_column_text(&q, 0);
   660    662           int nPath = db_column_bytes(&q, 0);
   661    663           const char *zTail;
   662    664           if( nPath==nOrig ){
   663    665             zTail = file_tail(zPath);