Fossil

Check-in [6e21c7d706]
Login

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

Overview
Comment:Pedantic cosmetic change: do un-rm before un-add.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | unaddremove-command
Files: files | file ages | folders
SHA3-256: 6e21c7d70626f331124f08e1f24c1491144ee99dbedb40f6eb082cd73d7b3cb9
User & Date: stephan 2020-04-23 00:06:54.242
Context
2020-04-23
11:30
Refactored unaddremove into (add|rm|addremove --reset). ... (check-in: 72fdb21ae8 user: stephan tags: unaddremove-command)
00:06
Pedantic cosmetic change: do un-rm before un-add. ... (check-in: 6e21c7d706 user: stephan tags: unaddremove-command)
2020-04-22
23:45
Initial draft of new unaddremove command (will be renamed once a suitable name is found), as discussed at [https://fossil-scm.org/forum/forumpost/b9b20b04bd|forumpost/b9b20b04bd]. ... (check-in: 369a14b33f user: stephan tags: unaddremove-command)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/add.c.
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750

  db_must_be_within_tree();
  fVerbose = find_option("verbose", "v", 0)!=0;
  verify_all_options();

  db_begin_transaction();
  db_prepare(&stmt, "SELECT id, rid, deleted, pathname FROM vfile "
                    "ORDER BY deleted<>0, pathname");
  while( db_step(&stmt)==SQLITE_ROW ){
    /* This loop exists only so we can restore the contents of un-rm'd
    ** files. All manipulation of vfile's contents happens after the
    ** loop. */
    int const rid = db_column_int(&stmt, 1);
    int const deleted = db_column_int(&stmt, 2);
    if(deleted!=0 || rid==0){







|







736
737
738
739
740
741
742
743
744
745
746
747
748
749
750

  db_must_be_within_tree();
  fVerbose = find_option("verbose", "v", 0)!=0;
  verify_all_options();

  db_begin_transaction();
  db_prepare(&stmt, "SELECT id, rid, deleted, pathname FROM vfile "
                    "ORDER BY deleted=0, pathname");
  while( db_step(&stmt)==SQLITE_ROW ){
    /* This loop exists only so we can restore the contents of un-rm'd
    ** files. All manipulation of vfile's contents happens after the
    ** loop. */
    int const rid = db_column_int(&stmt, 1);
    int const deleted = db_column_int(&stmt, 2);
    if(deleted!=0 || rid==0){