Fossil

Diff
Login

Differences From Artifact [9fc8d44860]:

To Artifact [a1b27c6c4b]:


411
412
413
414
415
416
417
418

419
420
421
422
423
424
425
426
427
428
      zMetadataOnly = "0";
    }
  }
}

/*
** COMMAND: rm
** COMMAND: delete*

**
** Usage: %fossil rm FILE1 ?FILE2 ...?
**    or: %fossil delete FILE1 ?FILE2 ...?
**
** Remove one or more files or directories from the repository.
**
** This command does NOT remove the files from disk.  It just marks the
** files as no longer being part of the project.  In other words, future
** changes to the named files will not be versioned.
**







|
>

|
<







411
412
413
414
415
416
417
418
419
420
421

422
423
424
425
426
427
428
      zMetadataOnly = "0";
    }
  }
}

/*
** COMMAND: rm
** COMMAND: delete
** COMMAND: forget*
**
** Usage: %fossil rm|delete|forget FILE1 ?FILE2 ...?

**
** Remove one or more files or directories from the repository.
**
** This command does NOT remove the files from disk.  It just marks the
** files as no longer being part of the project.  In other words, future
** changes to the named files will not be versioned.
**
449
450
451
452
453
454
455


456
457
458
459
460
461
462
463
  capture_metadata_only_option();

  /* We should be done with options.. */
  verify_all_options();

  db_must_be_within_tree();
  db_begin_transaction();


  if( zMetadataOnly ){
    removeFiles = is_false(zMetadataOnly);
  }else{
#if FOSSIL_ENABLE_LEGACY_MV_RM
    removeFiles = db_get_boolean("remove-files",0);
#else
    removeFiles = FOSSIL_RM_CHECKOUT_FILE_ON_RM;
#endif







>
>
|







449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
  capture_metadata_only_option();

  /* We should be done with options.. */
  verify_all_options();

  db_must_be_within_tree();
  db_begin_transaction();
  if(g.argv[1][0]=='f'){
    removeFiles = 0;
  }else if( zMetadataOnly ){
    removeFiles = is_false(zMetadataOnly);
  }else{
#if FOSSIL_ENABLE_LEGACY_MV_RM
    removeFiles = db_get_boolean("remove-files",0);
#else
    removeFiles = FOSSIL_RM_CHECKOUT_FILE_ON_RM;
#endif
812
813
814
815
816
817
818


819
820
821
822
823
824
825
826
    fossil_fatal("no checkout rename files in");
  }
  if( g.argc<4 ){
    usage("OLDNAME NEWNAME");
  }
  zDest = g.argv[g.argc-1];
  db_begin_transaction();


  if( zMetadataOnly ){
    moveFiles = is_false(zMetadataOnly);
  }else{
#if FOSSIL_ENABLE_LEGACY_MV_RM
    moveFiles = db_get_boolean("move-files",0);
#else
    moveFiles = FOSSIL_MV_CHECKOUT_FILE_ON_MV;
#endif







>
>
|







814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
    fossil_fatal("no checkout rename files in");
  }
  if( g.argc<4 ){
    usage("OLDNAME NEWNAME");
  }
  zDest = g.argv[g.argc-1];
  db_begin_transaction();
  if(g.argv[1][0]=='r'){
    moveFiles = 0;
  }else if( zMetadataOnly ){
    moveFiles = is_false(zMetadataOnly);
  }else{
#if FOSSIL_ENABLE_LEGACY_MV_RM
    moveFiles = db_get_boolean("move-files",0);
#else
    moveFiles = FOSSIL_MV_CHECKOUT_FILE_ON_MV;
#endif