Fossil SCM

Backout changes from timeline_showfiles_fix branch which was attempting to fix discrepancy between CLI and web when listing modified files in checkins. Make "fossil timeline -v" command behave like the web interface so the CLI timeline command get fixed instead of breaking the web interface.

mgagnon 2015-10-21 12:04 trunk merge
Commit 3c34db8d0ecb671bcc837c46a300613a1f4879c8
Parent b88e6c7746363e6…
3 files changed +1 -1 +3 -5 +3 -5
~ src/info.c ~ src/timeline.c ~ src/timeline.c
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -738,11 +738,11 @@
738738
 " mperm,"
739739
 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
740740
 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
741741
 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
742742
 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
743
- " WHERE mlink.mid=%d"
743
+ " WHERE mlink.mid=%d AND NOT mlink.isaux"
744744
 " AND (mlink.fid>0"
745745
 " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))"
746746
 " ORDER BY name /*sort*/",
747747
 rid, rid
748748
 );
749749
--- src/info.c
+++ src/info.c
@@ -738,11 +738,11 @@
738 " mperm,"
739 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
740 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
741 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
742 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
743 " WHERE mlink.mid=%d"
744 " AND (mlink.fid>0"
745 " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))"
746 " ORDER BY name /*sort*/",
747 rid, rid
748 );
749
--- src/info.c
+++ src/info.c
@@ -738,11 +738,11 @@
738 " mperm,"
739 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
740 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
741 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
742 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
743 " WHERE mlink.mid=%d AND NOT mlink.isaux"
744 " AND (mlink.fid>0"
745 " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))"
746 " ORDER BY name /*sort*/",
747 rid, rid
748 );
749
M src/timeline.c
+3 -5
--- src/timeline.c
+++ src/timeline.c
@@ -491,11 +491,10 @@
491491
 /* Generate the file-change list if requested */
492492
 if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0
493493
 && zType[0]=='c' && g.perm.Hyperlink
494494
 ){
495495
 int inUl = 0;
496
- int prevFid = -1;
497496
 if( !fchngQueryInit ){
498497
 db_prepare(&fchngQuery,
499498
 "SELECT pid,"
500499
 " fid,"
501500
 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
@@ -504,11 +503,12 @@
504503
 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
505504
 " FROM mlink"
506505
 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
507506
 " AND (fid>0 OR"
508507
 " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
509
- " ORDER BY 3, mlink.isaux /*sort*/"
508
+ " AND NOT mlink.isaux"
509
+ " ORDER BY 3 /*sort*/"
510510
 );
511511
 fchngQueryInit = 1;
512512
 }
513513
 db_bind_int(&fchngQuery, ":mid", rid);
514514
 while( db_step(&fchngQuery)==SQLITE_ROW ){
@@ -521,12 +521,10 @@
521521
 const char *zOld = db_column_text(&fchngQuery, 4);
522522
 const char *zNew = db_column_text(&fchngQuery, 3);
523523
 const char *zUnpub = "";
524524
 char *zA;
525525
 char zId[20];
526
- if( prevFid==fid ) continue;
527
- prevFid = fid;
528526
 if( !inUl ){
529527
 @ <ul class="filelist">
530528
 inUl = 1;
531529
 }
532530
 if( tmFlags & TIMELINE_SHOWRID ){
@@ -1864,11 +1862,11 @@
18641862
 " (fid==0) AS isdel,"
18651863
 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
18661864
 " (SELECT uuid FROM blob WHERE rid=fid),"
18671865
 " (SELECT uuid FROM blob WHERE rid=pid)"
18681866
 " FROM mlink"
1869
- " WHERE mid=:mid AND pid!=fid"
1867
+ " WHERE mid=:mid AND pid!=fid AND NOT mlink.isaux"
18701868
 " ORDER BY 3 /*sort*/"
18711869
 );
18721870
 fchngQueryInit = 1;
18731871
 }
18741872
 db_bind_int(&fchngQuery, ":mid", rid);
18751873
--- src/timeline.c
+++ src/timeline.c
@@ -491,11 +491,10 @@
491 /* Generate the file-change list if requested */
492 if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0
493 && zType[0]=='c' && g.perm.Hyperlink
494 ){
495 int inUl = 0;
496 int prevFid = -1;
497 if( !fchngQueryInit ){
498 db_prepare(&fchngQuery,
499 "SELECT pid,"
500 " fid,"
501 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
@@ -504,11 +503,12 @@
504 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
505 " FROM mlink"
506 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
507 " AND (fid>0 OR"
508 " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
509 " ORDER BY 3, mlink.isaux /*sort*/"
 
510 );
511 fchngQueryInit = 1;
512 }
513 db_bind_int(&fchngQuery, ":mid", rid);
514 while( db_step(&fchngQuery)==SQLITE_ROW ){
@@ -521,12 +521,10 @@
521 const char *zOld = db_column_text(&fchngQuery, 4);
522 const char *zNew = db_column_text(&fchngQuery, 3);
523 const char *zUnpub = "";
524 char *zA;
525 char zId[20];
526 if( prevFid==fid ) continue;
527 prevFid = fid;
528 if( !inUl ){
529 @ <ul class="filelist">
530 inUl = 1;
531 }
532 if( tmFlags & TIMELINE_SHOWRID ){
@@ -1864,11 +1862,11 @@
1864 " (fid==0) AS isdel,"
1865 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
1866 " (SELECT uuid FROM blob WHERE rid=fid),"
1867 " (SELECT uuid FROM blob WHERE rid=pid)"
1868 " FROM mlink"
1869 " WHERE mid=:mid AND pid!=fid"
1870 " ORDER BY 3 /*sort*/"
1871 );
1872 fchngQueryInit = 1;
1873 }
1874 db_bind_int(&fchngQuery, ":mid", rid);
1875
--- src/timeline.c
+++ src/timeline.c
@@ -491,11 +491,10 @@
491 /* Generate the file-change list if requested */
492 if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0
493 && zType[0]=='c' && g.perm.Hyperlink
494 ){
495 int inUl = 0;
 
496 if( !fchngQueryInit ){
497 db_prepare(&fchngQuery,
498 "SELECT pid,"
499 " fid,"
500 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
@@ -504,11 +503,12 @@
503 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
504 " FROM mlink"
505 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
506 " AND (fid>0 OR"
507 " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
508 " AND NOT mlink.isaux"
509 " ORDER BY 3 /*sort*/"
510 );
511 fchngQueryInit = 1;
512 }
513 db_bind_int(&fchngQuery, ":mid", rid);
514 while( db_step(&fchngQuery)==SQLITE_ROW ){
@@ -521,12 +521,10 @@
521 const char *zOld = db_column_text(&fchngQuery, 4);
522 const char *zNew = db_column_text(&fchngQuery, 3);
523 const char *zUnpub = "";
524 char *zA;
525 char zId[20];
 
 
526 if( !inUl ){
527 @ <ul class="filelist">
528 inUl = 1;
529 }
530 if( tmFlags & TIMELINE_SHOWRID ){
@@ -1864,11 +1862,11 @@
1862 " (fid==0) AS isdel,"
1863 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
1864 " (SELECT uuid FROM blob WHERE rid=fid),"
1865 " (SELECT uuid FROM blob WHERE rid=pid)"
1866 " FROM mlink"
1867 " WHERE mid=:mid AND pid!=fid AND NOT mlink.isaux"
1868 " ORDER BY 3 /*sort*/"
1869 );
1870 fchngQueryInit = 1;
1871 }
1872 db_bind_int(&fchngQuery, ":mid", rid);
1873
M src/timeline.c
+3 -5
--- src/timeline.c
+++ src/timeline.c
@@ -491,11 +491,10 @@
491491
 /* Generate the file-change list if requested */
492492
 if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0
493493
 && zType[0]=='c' && g.perm.Hyperlink
494494
 ){
495495
 int inUl = 0;
496
- int prevFid = -1;
497496
 if( !fchngQueryInit ){
498497
 db_prepare(&fchngQuery,
499498
 "SELECT pid,"
500499
 " fid,"
501500
 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
@@ -504,11 +503,12 @@
504503
 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
505504
 " FROM mlink"
506505
 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
507506
 " AND (fid>0 OR"
508507
 " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
509
- " ORDER BY 3, mlink.isaux /*sort*/"
508
+ " AND NOT mlink.isaux"
509
+ " ORDER BY 3 /*sort*/"
510510
 );
511511
 fchngQueryInit = 1;
512512
 }
513513
 db_bind_int(&fchngQuery, ":mid", rid);
514514
 while( db_step(&fchngQuery)==SQLITE_ROW ){
@@ -521,12 +521,10 @@
521521
 const char *zOld = db_column_text(&fchngQuery, 4);
522522
 const char *zNew = db_column_text(&fchngQuery, 3);
523523
 const char *zUnpub = "";
524524
 char *zA;
525525
 char zId[20];
526
- if( prevFid==fid ) continue;
527
- prevFid = fid;
528526
 if( !inUl ){
529527
 @ <ul class="filelist">
530528
 inUl = 1;
531529
 }
532530
 if( tmFlags & TIMELINE_SHOWRID ){
@@ -1864,11 +1862,11 @@
18641862
 " (fid==0) AS isdel,"
18651863
 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
18661864
 " (SELECT uuid FROM blob WHERE rid=fid),"
18671865
 " (SELECT uuid FROM blob WHERE rid=pid)"
18681866
 " FROM mlink"
1869
- " WHERE mid=:mid AND pid!=fid"
1867
+ " WHERE mid=:mid AND pid!=fid AND NOT mlink.isaux"
18701868
 " ORDER BY 3 /*sort*/"
18711869
 );
18721870
 fchngQueryInit = 1;
18731871
 }
18741872
 db_bind_int(&fchngQuery, ":mid", rid);
18751873
--- src/timeline.c
+++ src/timeline.c
@@ -491,11 +491,10 @@
491 /* Generate the file-change list if requested */
492 if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0
493 && zType[0]=='c' && g.perm.Hyperlink
494 ){
495 int inUl = 0;
496 int prevFid = -1;
497 if( !fchngQueryInit ){
498 db_prepare(&fchngQuery,
499 "SELECT pid,"
500 " fid,"
501 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
@@ -504,11 +503,12 @@
504 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
505 " FROM mlink"
506 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
507 " AND (fid>0 OR"
508 " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
509 " ORDER BY 3, mlink.isaux /*sort*/"
 
510 );
511 fchngQueryInit = 1;
512 }
513 db_bind_int(&fchngQuery, ":mid", rid);
514 while( db_step(&fchngQuery)==SQLITE_ROW ){
@@ -521,12 +521,10 @@
521 const char *zOld = db_column_text(&fchngQuery, 4);
522 const char *zNew = db_column_text(&fchngQuery, 3);
523 const char *zUnpub = "";
524 char *zA;
525 char zId[20];
526 if( prevFid==fid ) continue;
527 prevFid = fid;
528 if( !inUl ){
529 @ <ul class="filelist">
530 inUl = 1;
531 }
532 if( tmFlags & TIMELINE_SHOWRID ){
@@ -1864,11 +1862,11 @@
1864 " (fid==0) AS isdel,"
1865 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
1866 " (SELECT uuid FROM blob WHERE rid=fid),"
1867 " (SELECT uuid FROM blob WHERE rid=pid)"
1868 " FROM mlink"
1869 " WHERE mid=:mid AND pid!=fid"
1870 " ORDER BY 3 /*sort*/"
1871 );
1872 fchngQueryInit = 1;
1873 }
1874 db_bind_int(&fchngQuery, ":mid", rid);
1875
--- src/timeline.c
+++ src/timeline.c
@@ -491,11 +491,10 @@
491 /* Generate the file-change list if requested */
492 if( (tmFlags & (TIMELINE_FCHANGES|TIMELINE_FRENAMES))!=0
493 && zType[0]=='c' && g.perm.Hyperlink
494 ){
495 int inUl = 0;
 
496 if( !fchngQueryInit ){
497 db_prepare(&fchngQuery,
498 "SELECT pid,"
499 " fid,"
500 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
@@ -504,11 +503,12 @@
503 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm"
504 " FROM mlink"
505 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)"
506 " AND (fid>0 OR"
507 " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))"
508 " AND NOT mlink.isaux"
509 " ORDER BY 3 /*sort*/"
510 );
511 fchngQueryInit = 1;
512 }
513 db_bind_int(&fchngQuery, ":mid", rid);
514 while( db_step(&fchngQuery)==SQLITE_ROW ){
@@ -521,12 +521,10 @@
521 const char *zOld = db_column_text(&fchngQuery, 4);
522 const char *zNew = db_column_text(&fchngQuery, 3);
523 const char *zUnpub = "";
524 char *zA;
525 char zId[20];
 
 
526 if( !inUl ){
527 @ <ul class="filelist">
528 inUl = 1;
529 }
530 if( tmFlags & TIMELINE_SHOWRID ){
@@ -1864,11 +1862,11 @@
1862 " (fid==0) AS isdel,"
1863 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
1864 " (SELECT uuid FROM blob WHERE rid=fid),"
1865 " (SELECT uuid FROM blob WHERE rid=pid)"
1866 " FROM mlink"
1867 " WHERE mid=:mid AND pid!=fid AND NOT mlink.isaux"
1868 " ORDER BY 3 /*sort*/"
1869 );
1870 fchngQueryInit = 1;
1871 }
1872 db_bind_int(&fchngQuery, ":mid", rid);
1873

Keyboard Shortcuts

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