Fossil

Check-in [eab6be7b]
Login

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

Overview
Comment:(cherry-pick): Update the "search" command to honor the -R option.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | branch-1.37
Files: files | file ages | folders
SHA1:eab6be7b02d4bbf72551e7a056df960a7de548fa
User & Date: jan.nijtmans 2017-01-27 12:27:47
Context
2017-01-27
12:28
(cherry-pick): The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. check-in: 80d5408d user: jan.nijtmans tags: branch-1.37
12:27
(cherry-pick): Update the "search" command to honor the -R option. check-in: eab6be7b user: jan.nijtmans tags: branch-1.37
12:26
(cherry-pick): Fix the --differ option on "fossil changes" which was broken in the 1.37 release. Openssl 1.0.2j -> 1.0.2k check-in: 86db9145 user: jan.nijtmans tags: branch-1.37
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/search.c.

594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
    if( (width!=0) && (width<=20) ){
      fossil_fatal("-W|--width value must be >20 or 0");
    }
  }else{
    width = -1;
  }

  db_must_be_within_tree();
  if( g.argc<2 ) return;
  blob_init(&pattern, g.argv[2], -1);
  for(i=3; i<g.argc; i++){
    blob_appendf(&pattern, " %s", g.argv[i]);
  }
  (void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
  blob_reset(&pattern);







|







594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
    if( (width!=0) && (width<=20) ){
      fossil_fatal("-W|--width value must be >20 or 0");
    }
  }else{
    width = -1;
  }

  db_find_and_open_repository(0, 0);
  if( g.argc<2 ) return;
  blob_init(&pattern, g.argv[2], -1);
  for(i=3; i<g.argc; i++){
    blob_appendf(&pattern, " %s", g.argv[i]);
  }
  (void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
  blob_reset(&pattern);