Fossil

Check-in [8c9f949a]
Login

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

Overview
Comment:Alternative implementation to the improved "remove directory" error message.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8c9f949a3f3024eb15d11142051c67538c61d03c
User & Date: drh 2010-02-08 16:10:50
Context
2010-02-08
16:12
Implement a graph of changes in the timeline to replace the older flashing asterisk mechanism. Does not work on IE6. Probably still contains bugs. check-in: d89fea6a user: drh tags: trunk
16:10
Alternative implementation to the improved "remove directory" error message. check-in: 8c9f949a user: drh tags: trunk
16:08
Alternative fix for ticket [9ff56ae8a6]. check-in: 3cc4cd55 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/add.c.

202
203
204
205
206
207
208




209
210
211
212
213
214
215
  db_begin_transaction();
  for(i=2; i<g.argc; i++){
    char *zName;
    char *zPath;
    Blob pathname;

    zName = mprintf("%/", g.argv[i]);




    file_tree_name(zName, &pathname, 1);
    zPath = blob_str(&pathname);
    if( !db_exists(
             "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){
      fossil_fatal("not in the repository: %s", zName);
    }else{
      db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);







>
>
>
>







202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
  db_begin_transaction();
  for(i=2; i<g.argc; i++){
    char *zName;
    char *zPath;
    Blob pathname;

    zName = mprintf("%/", g.argv[i]);
    if( file_isdir(zName) ){
      fossil_fatal("cannot remove directories -"
                   " remove individual files instead");
    }
    file_tree_name(zName, &pathname, 1);
    zPath = blob_str(&pathname);
    if( !db_exists(
             "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){
      fossil_fatal("not in the repository: %s", zName);
    }else{
      db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);