Fossil

Check-in [61c8d418]
Login

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

Overview
Comment:Remove stale code accidently left in an earlier commit.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 61c8d418723b59bbac937752a930177d88768bc7
User & Date: drh 2015-12-17 02:02:29
Context
2015-12-17
03:29
Minor corrections in grammar to Fossil vs Git rewrite. check-in: 0b90da30 user: andybradford tags: trunk
02:02
Remove stale code accidently left in an earlier commit. check-in: 61c8d418 user: drh tags: trunk
2015-12-16
19:01
Enhancements to the "webpage-ex.md" documentation page: "Webpage Examples". check-in: 03a64a6f user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
*/
const char *diff_get_binary_glob(void){
  const char *zBinGlob = find_option("binary", 0, 1);
  if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0);
  return zBinGlob;
}

/*
** The input is a list of file and/or directory names either in the current
** checkout, or in the undo buffer if useUndo is true, or in check-outs
** zFrom and/or zTo if they are not null.  Return a new list that consists
** of only filenames.  Any directories on the input list are expected into
** multiple files in the output list.  The output list uses space obtained
** from malloc() and is NULL terminated.
*/
static char **diff_expand_dirs(
  int argc,                /* Number of entries in argv[] */
  const char **argv,       /* List of files and/or directories to be diffed */
  const char *zFrom,       /* Source check-in name, or NULL */
  const char *zTo,         /* Target check-in name, or NULL */
  int useUndo              /* True if diffing against the undo buffer */
){
  Stmt q;
  int i;
  db_multi_exec(
    "CREATE TEMP TABLE dfiles("
    "  name TEXT PRIMARY KEY,"
    "  path TEXT"
    ") WITHOUT ROWID;"
    "CREATE TEMP TABLE allowed("
    "  fn TEXT PRIMARY KEY"
    ") WITHOUT ROWID;"
  );
  if( useUndo ){
    db_multi_exec(
      "INSERT OR IGNORE INTO allowed(fn)"
      " SELECT pathname FROM undo INTERSECT SELECT pathname FROM vfile;"
    );
  }else if( zTo ){
  }
  db_prepare(&q, "INSERT OR IGNORE INTO dfiles(names) VALUES(:txt)");
  for(i=0; i<argc; i++){
    db_bind_text(&q, ":txt", argv[i]);
    db_step(&q);
    db_reset(&q);
  }
  db_finalize(&q);
  
}

/*
** COMMAND: diff
** COMMAND: gdiff
**
** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...?
**
** Show the difference between the current version of each of the FILEs







<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<







753
754
755
756
757
758
759











































760
761
762
763
764
765
766
*/
const char *diff_get_binary_glob(void){
  const char *zBinGlob = find_option("binary", 0, 1);
  if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0);
  return zBinGlob;
}












































/*
** COMMAND: diff
** COMMAND: gdiff
**
** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...?
**
** Show the difference between the current version of each of the FILEs