Fossil

Changes On Branch grep-hash-digits
Login

Changes On Branch grep-hash-digits

Hide Diff Patch Side-by-Side Diff

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

Changes In Branch grep-hash-digits Excluding Merge-Ins

This is equivalent to a diff from 20187be7 to dccab378

2019-11-19
15:12
Merged in [grep-hash-digits] branch. See https://fossil-scm.org/forum/forumpost/44c8339561 ... (check-in: 4de1ed78 user: stephan tags: trunk)
2019-11-15
02:50
Removed the media="screen" part of the stylesheet link output because it provides no benefit to on-screen reading and causes the style to be completely lost when printing. See https://fossil-scm.org/forum/forumpost/63a45d759e. ... (check-in: f27d4b50 user: stephan tags: trunk)
02:31
Modified grep command to respect the hash-digits config option. ... (Closed-Leaf check-in: dccab378 user: stephan tags: grep-hash-digits)
2019-11-11
15:22
Omit some asm code from the SHA1 implementation as it provides no performance improvement with modern compilers, and SHA1 is seldom used now anyhow. ... (check-in: 20187be7 user: drh tags: trunk)
2019-11-09
04:27
Told .editorconfig to use tabs for Makefiles, otherwise it mangles them with the default indention style (spaces). ... (check-in: b86c8b47 user: stephan tags: trunk)

Changes to src/regexp.c.

︙
735
736
737
738
739
740
741
742

743
744
745

746
747
748
749
750
751
752

735
736
737
738
739
740
741

742
743
744

745
746
747
748
749
750
751
752








-
+


-
+








  for(i=j=ln=cnt=0; z[i]; i=j+1){
    for(j=i; z[j] && z[j]!='\n'; j++){}
    n = j - i;
    ln++;
    if( re_match(pRe, (const unsigned char*)(z+i), j-i) ){
      cnt++;
      if( flags & GREP_EXISTS ){
        fossil_print("%s\n", zName);
        fossil_print("%S\n", zName);
        break;
      }
      fossil_print("%s:%d:%.*s\n", zName, ln, n, z+i);
      fossil_print("%S:%d:%.*s\n", zName, ln, n, z+i);
    }
  }
  return cnt;
}

/*
** COMMAND: test-grep
︙
823
824
825
826
827
828
829
830

831
832
833
834
835
836
837
838
839
840
841

842
843
844
845
846
847

823
824
825
826
827
828
829

830
831
832
833
834
835
836
837
838
839
840

841
842
843
844
845
846
847








-
+










-
+







  if( file_tree_name(g.argv[3], &fullName, 0, 0) ){
    int fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q",
                      blob_str(&fullName));
    if( fnid ){
      Stmt q;
      add_content_sql_commands(g.db);
      db_prepare(&q,
        "SELECT content(ux), substr(ux,1,10) FROM ("
        "SELECT content(ux), ux FROM ("
        "  SELECT blob.uuid AS ux, min(event.mtime) AS mx"
        "    FROM mlink, blob, event"
        "   WHERE mlink.mid=event.objid"
        "     AND mlink.fid=blob.rid"
        "     AND mlink.fnid=%d"
        "   GROUP BY blob.uuid"
        ") ORDER BY mx DESC;",
        fnid
      );
      while( db_step(&q)==SQLITE_ROW ){
        if( bVerbose ) fossil_print("%s:\n", db_column_text(&q,1));
        if( bVerbose ) fossil_print("%S:\n", db_column_text(&q,1));
        grep_buffer(pRe, db_column_text(&q,1), db_column_text(&q,0), flags);
      }
      db_finalize(&q);
    }
  }
}