Fossil SCM

Improved help and remove redundant file listings for the "fossil purge" command.

drh 2016-08-02 14:52 UTC purge
Commit 2c53d022c340a4c69a2d77aa5db03b717c38944f
1 file changed +2 -3
+2 -3
--- src/purge.c
+++ src/purge.c
@@ -452,11 +452,12 @@
452452
/*
453453
** COMMAND: purge
454454
**
455455
** The purge command removes content from a repository and stores that content
456456
** in a "graveyard". The graveyard exists so that content can be recovered
457
-** using the "fossil purge undo" command.
457
+** using the "fossil purge undo" command. The "fossil purge obliterate"
458
+** command empties the graveyard, making the content unrecoverable.
458459
**
459460
** ==== WARNING: This command can potentially destroy historical data and ====
460461
** ==== leave your repository in a goofy state. Know what you are doing! ====
461462
** ==== Make a backup of your repository before using this command! ====
462463
**
@@ -576,11 +577,10 @@
576577
vid = db_lget_int("checkout",0);
577578
if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){
578579
fossil_fatal("cannot purge the current checkout");
579580
}
580581
find_checkin_associates("ok", 1);
581
- describe_artifacts_to_stdout("IN ok", 0);
582582
purge_artifact_list("ok", "", purgeFlags);
583583
db_end_transaction(0);
584584
}else if( strncmp(zSubcmd, "files", n)==0 ){
585585
verify_all_options();
586586
db_begin_transaction();
@@ -592,11 +592,10 @@
592592
" WHERE mlink.fnid=filename.fnid"
593593
" AND (filename.name=%Q OR filename.name GLOB '%q/*')",
594594
g.argv[i], g.argv[i]
595595
);
596596
}
597
- describe_artifacts_to_stdout("IN ok", 0);
598597
purge_artifact_list("ok", "", purgeFlags);
599598
db_end_transaction(0);
600599
}else if( strncmp(zSubcmd, "list", n)==0 || strcmp(zSubcmd,"ls")==0 ){
601600
int showDetail = find_option("l","l",0)!=0;
602601
if( !db_table_exists("repository","purgeevent") ) return;
603602
--- src/purge.c
+++ src/purge.c
@@ -452,11 +452,12 @@
452 /*
453 ** COMMAND: purge
454 **
455 ** The purge command removes content from a repository and stores that content
456 ** in a "graveyard". The graveyard exists so that content can be recovered
457 ** using the "fossil purge undo" command.
 
458 **
459 ** ==== WARNING: This command can potentially destroy historical data and ====
460 ** ==== leave your repository in a goofy state. Know what you are doing! ====
461 ** ==== Make a backup of your repository before using this command! ====
462 **
@@ -576,11 +577,10 @@
576 vid = db_lget_int("checkout",0);
577 if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){
578 fossil_fatal("cannot purge the current checkout");
579 }
580 find_checkin_associates("ok", 1);
581 describe_artifacts_to_stdout("IN ok", 0);
582 purge_artifact_list("ok", "", purgeFlags);
583 db_end_transaction(0);
584 }else if( strncmp(zSubcmd, "files", n)==0 ){
585 verify_all_options();
586 db_begin_transaction();
@@ -592,11 +592,10 @@
592 " WHERE mlink.fnid=filename.fnid"
593 " AND (filename.name=%Q OR filename.name GLOB '%q/*')",
594 g.argv[i], g.argv[i]
595 );
596 }
597 describe_artifacts_to_stdout("IN ok", 0);
598 purge_artifact_list("ok", "", purgeFlags);
599 db_end_transaction(0);
600 }else if( strncmp(zSubcmd, "list", n)==0 || strcmp(zSubcmd,"ls")==0 ){
601 int showDetail = find_option("l","l",0)!=0;
602 if( !db_table_exists("repository","purgeevent") ) return;
603
--- src/purge.c
+++ src/purge.c
@@ -452,11 +452,12 @@
452 /*
453 ** COMMAND: purge
454 **
455 ** The purge command removes content from a repository and stores that content
456 ** in a "graveyard". The graveyard exists so that content can be recovered
457 ** using the "fossil purge undo" command. The "fossil purge obliterate"
458 ** command empties the graveyard, making the content unrecoverable.
459 **
460 ** ==== WARNING: This command can potentially destroy historical data and ====
461 ** ==== leave your repository in a goofy state. Know what you are doing! ====
462 ** ==== Make a backup of your repository before using this command! ====
463 **
@@ -576,11 +577,10 @@
577 vid = db_lget_int("checkout",0);
578 if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){
579 fossil_fatal("cannot purge the current checkout");
580 }
581 find_checkin_associates("ok", 1);
 
582 purge_artifact_list("ok", "", purgeFlags);
583 db_end_transaction(0);
584 }else if( strncmp(zSubcmd, "files", n)==0 ){
585 verify_all_options();
586 db_begin_transaction();
@@ -592,11 +592,10 @@
592 " WHERE mlink.fnid=filename.fnid"
593 " AND (filename.name=%Q OR filename.name GLOB '%q/*')",
594 g.argv[i], g.argv[i]
595 );
596 }
 
597 purge_artifact_list("ok", "", purgeFlags);
598 db_end_transaction(0);
599 }else if( strncmp(zSubcmd, "list", n)==0 || strcmp(zSubcmd,"ls")==0 ){
600 int showDetail = find_option("l","l",0)!=0;
601 if( !db_table_exists("repository","purgeevent") ) return;
602

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button