Changes On Branch search-in-help
Not logged in

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

Changes In Branch search-in-help Excluding Merge-Ins

This is equivalent to a diff from 31e75c3a41 to 21c54d5db0

2025-04-04
12:18
Enable the search in the built-in help text even without a repository. check-in: 3db304c755 user: tsbg tags: trunk
2025-04-02
11:55
Enable the search in the built-in help text even without a repository. Closed-Leaf check-in: 21c54d5db0 user: tsbg tags: search-in-help
11:52
Fix a harmless typo in a comment. check-in: 6e47e6b38b user: drh tags: trunk
2025-04-01
15:38
Do not silently overwrite existing files when doing 'mv --hard'. check-in: 31e75c3a41 user: danield tags: trunk
13:33
Make use of the Accept-Encoding header value to help distinguish humans from robots. check-in: 0d41eb4790 user: drh tags: trunk

Changes to src/search.c.
616
617
618
619
620
621
622

623
624
625
626
627
628
629
  const char *zScope = 0;
  const char *zWidth = find_option("width","W",1);
  int bDebug = find_option("debug",0,0)!=0;     /* Undocumented */
  int nLimit = zLimit ? atoi(zLimit) : -1000;
  int width;
  int nTty = 0;          /* VT100 highlight color for matching text */
  const char *zHighlight = 0;


  nTty =  terminal_is_vt100();

  /* Undocumented option to change highlight color */
  zHighlight = find_option("highlight",0,1);
  if( zHighlight ) nTty = atoi(zHighlight);








>







616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
  const char *zScope = 0;
  const char *zWidth = find_option("width","W",1);
  int bDebug = find_option("debug",0,0)!=0;     /* Undocumented */
  int nLimit = zLimit ? atoi(zLimit) : -1000;
  int width;
  int nTty = 0;          /* VT100 highlight color for matching text */
  const char *zHighlight = 0;
  int bFlags = 0;        /* DB open flags */

  nTty =  terminal_is_vt100();

  /* Undocumented option to change highlight color */
  zHighlight = find_option("highlight",0,1);
  if( zHighlight ) nTty = atoi(zHighlight);

664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
  if( find_option("technotes",0,0) ){  srchFlags |= SRCH_TECHNOTE; bFts = 1; }
  if( find_option("tickets",0,0) ){    srchFlags |= SRCH_TKT;      bFts = 1; }
  if( find_option("wiki",0,0) ){       srchFlags |= SRCH_WIKI;     bFts = 1; }

  /* If no search objects are specified, default to "check-in comments" */
  if( srchFlags==0 ) srchFlags = SRCH_CKIN;


  db_find_and_open_repository(0, 0);
  verify_all_options();
  if( g.argc<3 ) return;
  login_set_capabilities("s", 0);
  if( search_restrict(srchFlags)==0 && (srchFlags & SRCH_HELP)==0 ){
    const char *zC1 = 0, *zPlural = "s";
    if( srchFlags & SRCH_TECHNOTE ){  zC1 = "technote"; }
    if( srchFlags & SRCH_TKT ){       zC1 = "ticket";   }







|
|







665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
  if( find_option("technotes",0,0) ){  srchFlags |= SRCH_TECHNOTE; bFts = 1; }
  if( find_option("tickets",0,0) ){    srchFlags |= SRCH_TKT;      bFts = 1; }
  if( find_option("wiki",0,0) ){       srchFlags |= SRCH_WIKI;     bFts = 1; }

  /* If no search objects are specified, default to "check-in comments" */
  if( srchFlags==0 ) srchFlags = SRCH_CKIN;

  if( srchFlags==SRCH_HELP ) bFlags = OPEN_OK_NOT_FOUND|OPEN_SUBSTITUTE;
  db_find_and_open_repository(bFlags, 0);
  verify_all_options();
  if( g.argc<3 ) return;
  login_set_capabilities("s", 0);
  if( search_restrict(srchFlags)==0 && (srchFlags & SRCH_HELP)==0 ){
    const char *zC1 = 0, *zPlural = "s";
    if( srchFlags & SRCH_TECHNOTE ){  zC1 = "technote"; }
    if( srchFlags & SRCH_TKT ){       zC1 = "ticket";   }