Index: src/bisect.c
==================================================================
--- src/bisect.c
+++ src/bisect.c
@@ -21,198 +21,23 @@
*/
#include "config.h"
#include "bisect.h"
#include <assert.h>
-#if INTERFACE
-/* Nodes for the shortest path algorithm.
-*/
-struct BisectNode {
- int rid; /* ID for this node */
- int fromIsParent; /* True if pFrom is the parent of rid */
- BisectNode *pFrom; /* Node we came from */
- union {
- BisectNode *pPeer; /* List of nodes of the same generation */
- BisectNode *pTo; /* Next on path from beginning to end */
- } u;
- BisectNode *pAll; /* List of all nodes */
-};
-#endif
-
/*
** Local variables for this module
*/
static struct {
- BisectNode *pCurrent; /* Current generation of nodes */
- BisectNode *pAll; /* All nodes */
- Bag seen; /* Nodes seen before */
int bad; /* The bad version */
int good; /* The good version */
- int nStep; /* Number of steps from good to bad */
- BisectNode *pStart; /* Earliest node (bad) */
- BisectNode *pEnd; /* Most recent (good) */
} bisect;
-/*
-** Create a new node
-*/
-static BisectNode *bisect_new_node(int rid, BisectNode *pFrom, int isParent){
- BisectNode *p;
-
- p = fossil_malloc( sizeof(*p) );
- p->rid = rid;
- p->fromIsParent = isParent;
- p->pFrom = pFrom;
- p->u.pPeer = bisect.pCurrent;
- bisect.pCurrent = p;
- p->pAll = bisect.pAll;
- bisect.pAll = p;
- bisect.pEnd = p;
- bag_insert(&bisect.seen, rid);
- return p;
-}
-
-/*
-** Reset memory used by the shortest path algorithm.
-*/
-void bisect_reset(void){
- BisectNode *p;
- while( bisect.pAll ){
- p = bisect.pAll;
- bisect.pAll = p->pAll;
- fossil_free(p);
- }
- bag_clear(&bisect.seen);
- bisect.pCurrent = 0;
- bisect.pAll = 0;
- bisect.pEnd = 0;
- bisect.nStep = 0;
-}
-
-/*
-** Compute the shortest path from iFrom to iTo
-**
-** If directOnly is true, then use only the "primary" links from parent to
-** child. In other words, ignore merges.
-*/
-BisectNode *bisect_shortest_path(int iFrom, int iTo, int directOnly){
- Stmt s;
- BisectNode *pPrev;
- BisectNode *p;
-
- bisect_reset();
- bisect.pStart = bisect_new_node(iFrom, 0, 0);
- if( iTo==iFrom ) return bisect.pStart;
- if( directOnly ){
- db_prepare(&s,
- "SELECT cid, 1 FROM plink WHERE pid=:pid AND isprim "
- "UNION ALL "
- "SELECT pid, 0 FROM plink WHERE cid=:pid AND isprim"
- );
- }else{
- db_prepare(&s,
- "SELECT cid, 1 FROM plink WHERE pid=:pid "
- "UNION ALL "
- "SELECT pid, 0 FROM plink WHERE cid=:pid"
- );
- }
- while( bisect.pCurrent ){
- bisect.nStep++;
- pPrev = bisect.pCurrent;
- bisect.pCurrent = 0;
- while( pPrev ){
- db_bind_int(&s, ":pid", pPrev->rid);
- while( db_step(&s)==SQLITE_ROW ){
- int cid = db_column_int(&s, 0);
- int isParent = db_column_int(&s, 1);
- if( bag_find(&bisect.seen, cid) ) continue;
- p = bisect_new_node(cid, pPrev, isParent);
- if( cid==iTo ){
- db_finalize(&s);
- return p;
- }
- }
- db_reset(&s);
- pPrev = pPrev->u.pPeer;
- }
- }
- bisect_reset();
- return 0;
-}
-
-/*
-** Construct the path from bisect.pStart to bisect.pEnd in the u.pTo fields.
-*/
-BisectNode *bisect_reverse_path(void){
- BisectNode *p;
- for(p=bisect.pEnd; p && p->pFrom; p = p->pFrom){
- p->pFrom->u.pTo = p;
- }
- bisect.pEnd->u.pTo = 0;
- assert( p==bisect.pStart );
- return p;
-}
-
-/*
-** COMMAND: test-shortest-path
-**
-** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
-**
-** Report the shortest path between two checkins. If the --no-merge flag
-** is used, follow only direct parent-child paths and omit merge links.
-*/
-void shortest_path_test_cmd(void){
- int iFrom;
- int iTo;
- BisectNode *p;
- int n;
- int directOnly;
-
- db_find_and_open_repository(0,0);
- directOnly = find_option("no-merge",0,0)!=0;
- if( g.argc!=4 ) usage("VERSION1 VERSION2");
- iFrom = name_to_rid(g.argv[2]);
- iTo = name_to_rid(g.argv[3]);
- p = bisect_shortest_path(iFrom, iTo, directOnly);
- if( p==0 ){
- fossil_fatal("no path from %s to %s", g.argv[1], g.argv[2]);
- }
- bisect_reverse_path();
- for(n=1, p=bisect.pStart; p; p=p->u.pTo, n++){
- char *z;
- z = db_text(0,
- "SELECT substr(uuid,1,12) || ' ' || datetime(mtime)"
- " FROM blob, event"
- " WHERE blob.rid=%d AND event.objid=%d AND event.type='ci'",
- p->rid, p->rid);
- printf("%4d: %s", n, z);
- fossil_free(z);
- if( p->u.pTo ){
- printf(" is a %s of\n", p->u.pTo->fromIsParent ? "parent" : "child");
- }else{
- printf("\n");
- }
- }
-}
-
-/*
-** WEBPAGE: path
-**
-** example: /path?from=trunk&to=experimental&nomerge
-**
-** Show a timeline of all changes along a path between two versions.
-*/
-void path_page(void){
- login_check_credentials();
- if( !g.okRead ){ login_needed(); return; }
-}
-
/*
** Find the shortest path between bad and good.
*/
-static BisectNode *bisect_path(void){
- BisectNode *p;
+void bisect_path(void){
+ PathNode *p;
bisect.bad = db_lget_int("bisect-bad", 0);
if( bisect.bad==0 ){
bisect.bad = db_int(0, "SELECT cid FROM plink ORDER BY mtime DESC LIMIT 1");
db_lset_int("bisect-bad", bisect.bad);
}
@@ -219,21 +44,18 @@
bisect.good = db_lget_int("bisect-good", 0);
if( bisect.good==0 ){
bisect.good = db_int(0,"SELECT pid FROM plink ORDER BY mtime LIMIT 1");
db_lset_int("bisect-good", bisect.good);
}
- p = bisect_shortest_path(bisect.good, bisect.bad, 0);
+ p = path_shortest(bisect.good, bisect.bad, 0);
if( p==0 ){
char *zBad = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", bisect.bad);
char *zGood = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", bisect.good);
fossil_fatal("no path from good ([%S]) to bad ([%S]) or back",
zGood, zBad);
}
- return p;
}
-
-
/*
** COMMAND: bisect
**
** Usage: %fossil bisect SUBCOMMAND ...
@@ -286,19 +108,18 @@
}else{
ridGood = name_to_rid(g.argv[3]);
}
db_lset_int("bisect-good", ridGood);
}else if( memcmp(zCmd, "next", n)==0 ){
- BisectNode *p;
- int n;
+ PathNode *pMid;
bisect_path();
- if( bisect.nStep<2 ){
+ pMid = path_midpoint();
+ if( pMid==0 ){
fossil_fatal("bisect is done - there are no more intermediate versions");
}
- for(p=bisect.pEnd, n=0; p && n<bisect.nStep/2; p=p->pFrom, n++){}
g.argv[1] = "update";
- g.argv[2] = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", p->rid);
+ g.argv[2] = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", pMid->rid);
g.argc = 3;
g.fNoSync = 1;
update_cmd();
}else if( memcmp(zCmd, "reset", n)==0 ){
db_multi_exec(
@@ -306,162 +127,35 @@
" SELECT 'bisect-good', pid FROM plink ORDER BY mtime LIMIT 1;"
"REPLACE INTO vvar(name, value) "
" SELECT 'bisect-bad', cid FROM plink ORDER BY mtime DESC LIMIT 1;"
);
}else if( memcmp(zCmd, "vlist", n)==0 ){
- BisectNode *p;
+ PathNode *p;
int vid = db_lget_int("checkout", 0);
int n;
Stmt s;
+ int nStep;
bisect_path();
db_prepare(&s, "SELECT substr(blob.uuid,1,20) || ' ' || "
" datetime(event.mtime) FROM blob, event"
" WHERE blob.rid=:rid AND event.objid=:rid"
" AND event.type='ci'");
- for(p=bisect.pEnd, n=0; p; p=p->pFrom, n++){
+ nStep = path_length();
+ for(p=path_last(), n=0; p; p=p->pFrom, n++){
const char *z;
db_bind_int(&s, ":rid", p->rid);
if( db_step(&s)==SQLITE_ROW ){
z = db_column_text(&s, 0);
printf("%s", z);
if( p->rid==bisect.good ) printf(" GOOD");
if( p->rid==bisect.bad ) printf(" BAD");
if( p->rid==vid ) printf(" CURRENT");
- if( bisect.nStep>1 && n==bisect.nStep/2 ) printf(" NEXT");
+ if( nStep>1 && n==nStep/2 ) printf(" NEXT");
printf("\n");
}
db_reset(&s);
}
db_finalize(&s);
}else{
usage("bad|good|next|reset|vlist ...");
}
}
-
-/*
-** A record of a file rename operation.
-*/
-typedef struct NameChange NameChange;
-struct NameChange {
- int origName; /* Original name of file */
- int curName; /* Current name of the file */
- int newName; /* Name of file in next version */
- NameChange *pNext; /* List of all name changes */
-};
-
-/*
-** Compute all file name changes that occur going from checkin iFrom
-** to checkin iTo.
-**
-** The number of name changes is written into *pnChng. For each name
-** change, two integers are allocated for *piChng. The first is the
-** filename.fnid for the original name and the second is for new name.
-** Space to hold *piChng is obtained from fossil_malloc() and should
-** be released by the caller.
-**
-** This routine really has nothing to do with bisection. It is located
-** in this bisect.c module in order to leverage some of the bisect
-** infrastructure.
-*/
-void find_filename_changes(
- int iFrom,
- int iTo,
- int *pnChng,
- int **aiChng
-){
- BisectNode *p; /* For looping over path from iFrom to iTo */
- NameChange *pAll = 0; /* List of all name changes seen so far */
- NameChange *pChng; /* For looping through the name change list */
- int nChng = 0; /* Number of files whose names have changed */
- int *aChng; /* Two integers per name change */
- int i; /* Loop counter */
- Stmt q1; /* Query of name changes */
-
- *pnChng = 0;
- *aiChng = 0;
- bisect_reset();
- p = bisect_shortest_path(iFrom, iTo, 0);
- if( p==0 ) return;
- bisect_reverse_path();
- db_prepare(&q1,
- "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0"
- );
- for(p=bisect.pStart; p; p=p->u.pTo){
- int fnid, pfnid;
- if( !p->fromIsParent && (p->u.pTo==0 || p->u.pTo->fromIsParent) ){
- /* Skip nodes where the parent is not on the path */
- continue;
- }
- db_bind_int(&q1, ":mid", p->rid);
- while( db_step(&q1)==SQLITE_ROW ){
- if( p->fromIsParent ){
- fnid = db_column_int(&q1, 1);
- pfnid = db_column_int(&q1, 0);
- }else{
- fnid = db_column_int(&q1, 0);
- pfnid = db_column_int(&q1, 1);
- }
- for(pChng=pAll; pChng; pChng=pChng->pNext){
- if( pChng->curName==pfnid ){
- pChng->newName = fnid;
- break;
- }
- }
- if( pChng==0 ){
- pChng = fossil_malloc( sizeof(*pChng) );
- pChng->pNext = pAll;
- pAll = pChng;
- pChng->origName = pfnid;
- pChng->curName = pfnid;
- pChng->newName = fnid;
- nChng++;
- }
- }
- for(pChng=pAll; pChng; pChng=pChng->pNext) pChng->curName = pChng->newName;
- db_reset(&q1);
- }
- db_finalize(&q1);
- if( nChng ){
- *pnChng = nChng;
- aChng = *aiChng = fossil_malloc( nChng*2*sizeof(int) );
- for(pChng=pAll, i=0; pChng; pChng=pChng->pNext, i+=2){
- aChng[i] = pChng->origName;
- aChng[i+1] = pChng->newName;
- }
- while( pAll ){
- pChng = pAll;
- pAll = pAll->pNext;
- fossil_free(pChng);
- }
- }
-}
-
-/*
-** COMMAND: test-name-changes
-**
-** Usage: %fossil test-name-changes VERSION1 VERSION2
-**
-** Show all filename changes that occur going from VERSION1 to VERSION2
-*/
-void test_name_change(void){
- int iFrom;
- int iTo;
- int *aChng;
- int nChng;
- int i;
-
- db_find_and_open_repository(0,0);
- if( g.argc!=4 ) usage("VERSION1 VERSION2");
- iFrom = name_to_rid(g.argv[2]);
- iTo = name_to_rid(g.argv[3]);
- find_filename_changes(iFrom, iTo, &nChng, &aChng);
- for(i=0; i<nChng; i++){
- char *zFrom, *zTo;
-
- zFrom = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2]);
- zTo = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2+1]);
- printf("[%s] -> [%s]\n", zFrom, zTo);
- fossil_free(zFrom);
- fossil_free(zTo);
- }
- fossil_free(aChng);
-}
Index: src/descendants.c
==================================================================
--- src/descendants.c
+++ src/descendants.c
@@ -162,12 +162,12 @@
Bag seen;
PQueue queue;
bag_init(&seen);
pqueue_init(&queue);
bag_insert(&seen, rid);
- pqueue_insert(&queue, rid, 0.0);
- while( (N--)>0 && (rid = pqueue_extract(&queue))!=0 ){
+ pqueue_insert(&queue, rid, 0.0, 0);
+ while( (N--)>0 && (rid = pqueue_extract(&queue, 0))!=0 ){
Stmt q;
db_multi_exec("INSERT OR IGNORE INTO ok VALUES(%d)", rid);
db_prepare(&q,
"SELECT a.pid, b.mtime FROM plink a LEFT JOIN plink b ON b.cid=a.pid"
" WHERE a.cid=%d", rid
@@ -174,11 +174,11 @@
);
while( db_step(&q)==SQLITE_ROW ){
int pid = db_column_int(&q, 0);
double mtime = db_column_double(&q, 1);
if( bag_insert(&seen, pid) ){
- pqueue_insert(&queue, pid, -mtime);
+ pqueue_insert(&queue, pid, -mtime, 0);
}
}
db_finalize(&q);
}
bag_clear(&seen);
@@ -193,20 +193,20 @@
Bag seen;
PQueue queue;
bag_init(&seen);
pqueue_init(&queue);
bag_insert(&seen, rid);
- pqueue_insert(&queue, rid, 0.0);
- while( (N--)>0 && (rid = pqueue_extract(&queue))!=0 ){
+ pqueue_insert(&queue, rid, 0.0, 0);
+ while( (N--)>0 && (rid = pqueue_extract(&queue, 0))!=0 ){
Stmt q;
db_multi_exec("INSERT OR IGNORE INTO ok VALUES(%d)", rid);
db_prepare(&q,"SELECT cid, mtime FROM plink WHERE pid=%d", rid);
while( db_step(&q)==SQLITE_ROW ){
int pid = db_column_int(&q, 0);
double mtime = db_column_double(&q, 1);
if( bag_insert(&seen, pid) ){
- pqueue_insert(&queue, pid, mtime);
+ pqueue_insert(&queue, pid, mtime, 0);
}
}
db_finalize(&q);
}
bag_clear(&seen);
Index: src/main.mk
==================================================================
--- src/main.mk
+++ src/main.mk
@@ -54,10 +54,11 @@
$(SRCDIR)/manifest.c \
$(SRCDIR)/md5.c \
$(SRCDIR)/merge.c \
$(SRCDIR)/merge3.c \
$(SRCDIR)/name.c \
+ $(SRCDIR)/path.c \
$(SRCDIR)/pivot.c \
$(SRCDIR)/popen.c \
$(SRCDIR)/pqueue.c \
$(SRCDIR)/printf.c \
$(SRCDIR)/rebuild.c \
@@ -136,10 +137,11 @@
$(OBJDIR)/manifest_.c \
$(OBJDIR)/md5_.c \
$(OBJDIR)/merge_.c \
$(OBJDIR)/merge3_.c \
$(OBJDIR)/name_.c \
+ $(OBJDIR)/path_.c \
$(OBJDIR)/pivot_.c \
$(OBJDIR)/popen_.c \
$(OBJDIR)/pqueue_.c \
$(OBJDIR)/printf_.c \
$(OBJDIR)/rebuild_.c \
@@ -218,10 +220,11 @@
$(OBJDIR)/manifest.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/merge.o \
$(OBJDIR)/merge3.o \
$(OBJDIR)/name.o \
+ $(OBJDIR)/path.o \
$(OBJDIR)/pivot.o \
$(OBJDIR)/popen.o \
$(OBJDIR)/pqueue.o \
$(OBJDIR)/printf.o \
$(OBJDIR)/rebuild.o \
@@ -304,11 +307,11 @@
$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
$(OBJDIR)/mkindex $(TRANS_SRC) >$@
$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
- $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
+ $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
touch $(OBJDIR)/headers
$(OBJDIR)/headers: Makefile
Makefile:
$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
$(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c
@@ -623,10 +626,17 @@
$(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
$(OBJDIR)/name.h: $(OBJDIR)/headers
+$(OBJDIR)/path_.c: $(SRCDIR)/path.c $(OBJDIR)/translate
+ $(OBJDIR)/translate $(SRCDIR)/path.c >$(OBJDIR)/path_.c
+
+$(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
+
+$(OBJDIR)/path.h: $(OBJDIR)/headers
$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
$(OBJDIR)/translate $(SRCDIR)/pivot.c >$(OBJDIR)/pivot_.c
$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/pivot.o -c $(OBJDIR)/pivot_.c
Index: src/makemake.tcl
==================================================================
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -60,10 +60,11 @@
manifest
md5
merge
merge3
name
+ path
pivot
popen
pqueue
printf
rebuild
Index: src/name.c
==================================================================
--- src/name.c
+++ src/name.c
@@ -147,11 +147,11 @@
int vid;
char *zUuid =
db_text(0,
"SELECT blob.uuid"
" FROM tag, tagxref, event, blob"
- " WHERE tag.tagname='sym-'||%Q "
+ " WHERE tag.tagname='sym-%q' "
" AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
" AND event.objid=tagxref.rid "
" AND blob.rid=event.objid "
" ORDER BY event.mtime DESC ",
zTag
@@ -171,11 +171,11 @@
useUtc = 1;
}
zUuid = db_text(0,
"SELECT blob.uuid"
" FROM tag, tagxref, event, blob"
- " WHERE tag.tagname='sym-'||%Q "
+ " WHERE tag.tagname='sym-%q' "
" AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
" AND event.objid=tagxref.rid "
" AND blob.rid=event.objid "
" AND event.mtime<=julianday(%Q %s)"
" ORDER BY event.mtime DESC ",
ADDED src/path.c
Index: src/path.c
==================================================================
--- src/path.c
+++ src/path.c
@@ -0,0 +1,451 @@
+/*
+** Copyright (c) 2011 D. Richard Hipp
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the Simplified BSD License (also
+** known as the "2-Clause License" or "FreeBSD License".)
+
+** This program is distributed in the hope that it will be useful,
+** but without any warranty; without even the implied warranty of
+** merchantability or fitness for a particular purpose.
+**
+** Author contact information:
+** drh@sqlite.org
+**
+*******************************************************************************
+**
+** This file contains code used to trace paths of through the
+** directed acyclic graph (DAG) of checkins.
+*/
+#include "config.h"
+#include "path.h"
+#include <assert.h>
+
+#if INTERFACE
+/* Nodes for the paths through the DAG.
+*/
+struct PathNode {
+ int rid; /* ID for this node */
+ u8 fromIsParent; /* True if pFrom is the parent of rid */
+ u8 isPrim; /* True if primary side of common ancestor */
+ PathNode *pFrom; /* Node we came from */
+ union {
+ PathNode *pPeer; /* List of nodes of the same generation */
+ PathNode *pTo; /* Next on path from beginning to end */
+ } u;
+ PathNode *pAll; /* List of all nodes */
+};
+#endif
+
+/*
+** Local variables for this module
+*/
+static struct {
+ PathNode *pCurrent; /* Current generation of nodes */
+ PathNode *pAll; /* All nodes */
+ Bag seen; /* Nodes seen before */
+ int nStep; /* Number of steps from first to last */
+ PathNode *pStart; /* Earliest node */
+ PathNode *pPivot; /* Common ancestor of pStart and pEnd */
+ PathNode *pEnd; /* Most recent */
+} path;
+
+/*
+** Return the first (last) element of the computed path.
+*/
+PathNode *path_first(void){ return path.pStart; }
+PathNode *path_last(void){ return path.pEnd; }
+
+/*
+** Return the number of steps in the computed path.
+*/
+int path_length(void){ return path.nStep; }
+
+/*
+** Create a new node
+*/
+static PathNode *path_new_node(int rid, PathNode *pFrom, int isParent){
+ PathNode *p;
+
+ p = fossil_malloc( sizeof(*p) );
+ memset(p, 0, sizeof(*p));
+ p->rid = rid;
+ p->fromIsParent = isParent;
+ p->pFrom = pFrom;
+ p->u.pPeer = path.pCurrent;
+ path.pCurrent = p;
+ p->pAll = path.pAll;
+ path.pAll = p;
+ bag_insert(&path.seen, rid);
+ return p;
+}
+
+/*
+** Reset memory used by the shortest path algorithm.
+*/
+void path_reset(void){
+ PathNode *p;
+ while( path.pAll ){
+ p = path.pAll;
+ path.pAll = p->pAll;
+ fossil_free(p);
+ }
+ bag_clear(&path.seen);
+ path.pCurrent = 0;
+ path.pAll = 0;
+ path.pEnd = 0;
+ path.nStep = 0;
+}
+
+/*
+** Construct the path from path.pStart to path.pEnd in the u.pTo fields.
+*/
+void path_reverse_path(void){
+ PathNode *p;
+ for(p=path.pEnd; p && p->pFrom; p = p->pFrom){
+ p->pFrom->u.pTo = p;
+ }
+ path.pEnd->u.pTo = 0;
+ assert( p==path.pStart );
+}
+
+/*
+** Compute the shortest path from iFrom to iTo
+**
+** If directOnly is true, then use only the "primary" links from parent to
+** child. In other words, ignore merges.
+**
+** Return a pointer to the beginning of the path (the iFrom node).
+** Elements of the path can be traversed by following the PathNode.u.pTo
+** pointer chain.
+**
+** Return NULL if no path is found.
+*/
+PathNode *path_shortest(int iFrom, int iTo, int directOnly){
+ Stmt s;
+ PathNode *pPrev;
+ PathNode *p;
+
+ path_reset();
+ path.pStart = path_new_node(iFrom, 0, 0);
+ if( iTo==iFrom ) return path.pStart;
+ if( directOnly ){
+ db_prepare(&s,
+ "SELECT cid, 1 FROM plink WHERE pid=:pid AND isprim "
+ "UNION ALL "
+ "SELECT pid, 0 FROM plink WHERE cid=:pid AND isprim"
+ );
+ }else{
+ db_prepare(&s,
+ "SELECT cid, 1 FROM plink WHERE pid=:pid "
+ "UNION ALL "
+ "SELECT pid, 0 FROM plink WHERE cid=:pid"
+ );
+ }
+ while( path.pCurrent ){
+ path.nStep++;
+ pPrev = path.pCurrent;
+ path.pCurrent = 0;
+ while( pPrev ){
+ db_bind_int(&s, ":pid", pPrev->rid);
+ while( db_step(&s)==SQLITE_ROW ){
+ int cid = db_column_int(&s, 0);
+ int isParent = db_column_int(&s, 1);
+ if( bag_find(&path.seen, cid) ) continue;
+ p = path_new_node(cid, pPrev, isParent);
+ if( cid==iTo ){
+ db_finalize(&s);
+ path.pEnd = p;
+ path_reverse_path();
+ return path.pStart;
+ }
+ }
+ db_reset(&s);
+ pPrev = pPrev->u.pPeer;
+ }
+ }
+ db_finalize(&s);
+ path_reset();
+ return 0;
+}
+
+/*
+** Find the mid-point of the path. If the path contains fewer than
+** 2 steps, return 0.
+*/
+PathNode *path_midpoint(void){
+ PathNode *p;
+ int i;
+ if( path.nStep<2 ) return 0;
+ for(p=path.pEnd, i=0; p && i<path.nStep/2; p=p->pFrom, i++){}
+ return p;
+}
+
+/*
+** COMMAND: test-shortest-path
+**
+** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
+**
+** Report the shortest path between two checkins. If the --no-merge flag
+** is used, follow only direct parent-child paths and omit merge links.
+*/
+void shortest_path_test_cmd(void){
+ int iFrom;
+ int iTo;
+ PathNode *p;
+ int n;
+ int directOnly;
+
+ db_find_and_open_repository(0,0);
+ directOnly = find_option("no-merge",0,0)!=0;
+ if( g.argc!=4 ) usage("VERSION1 VERSION2");
+ iFrom = name_to_rid(g.argv[2]);
+ iTo = name_to_rid(g.argv[3]);
+ p = path_shortest(iFrom, iTo, directOnly);
+ if( p==0 ){
+ fossil_fatal("no path from %s to %s", g.argv[1], g.argv[2]);
+ }
+ for(n=1, p=path.pStart; p; p=p->u.pTo, n++){
+ char *z;
+ z = db_text(0,
+ "SELECT substr(uuid,1,12) || ' ' || datetime(mtime)"
+ " FROM blob, event"
+ " WHERE blob.rid=%d AND event.objid=%d AND event.type='ci'",
+ p->rid, p->rid);
+ printf("%4d: %s", n, z);
+ fossil_free(z);
+ if( p->u.pTo ){
+ printf(" is a %s of\n", p->u.pTo->fromIsParent ? "parent" : "child");
+ }else{
+ printf("\n");
+ }
+ }
+}
+
+/*
+** Find the closest common ancestor of two nodes. "Closest" means the
+** fewest number of arcs.
+*/
+int path_common_ancestor(int iMe, int iYou){
+ Stmt s;
+ PathNode *pPrev;
+ PathNode *p;
+ Bag me, you;
+
+ if( iMe==iYou ) return iMe;
+ if( iMe==0 || iYou==0 ) return 0;
+ path_reset();
+ path.pStart = path_new_node(iMe, 0, 0);
+ path.pStart->isPrim = 1;
+ path.pEnd = path_new_node(iYou, 0, 0);
+ db_prepare(&s, "SELECT pid FROM plink WHERE cid=:cid");
+ bag_init(&me);
+ bag_insert(&me, iMe);
+ bag_init(&you);
+ bag_insert(&you, iYou);
+ while( path.pCurrent ){
+ pPrev = path.pCurrent;
+ path.pCurrent = 0;
+ while( pPrev ){
+ db_bind_int(&s, ":cid", pPrev->rid);
+ while( db_step(&s)==SQLITE_ROW ){
+ int pid = db_column_int(&s, 0);
+ if( bag_find(pPrev->isPrim ? &you : &me, pid) ){
+ /* pid is the common ancestor */
+ PathNode *pNext;
+ for(p=path.pAll; p && p->rid!=pid; p=p->pAll){}
+ assert( p!=0 );
+ pNext = p;
+ while( pNext ){
+ pNext = p->pFrom;
+ p->pFrom = pPrev;
+ pPrev = p;
+ p = pNext;
+ }
+ if( pPrev==path.pStart ) path.pStart = path.pEnd;
+ path.pEnd = pPrev;
+ path_reverse_path();
+ db_finalize(&s);
+ return pid;
+ }else if( bag_find(&path.seen, pid) ){
+ /* pid is just an alternative path on one of the legs */
+ continue;
+ }
+ p = path_new_node(pid, pPrev, 0);
+ p->isPrim = pPrev->isPrim;
+ bag_insert(pPrev->isPrim ? &me : &you, pid);
+ }
+ db_reset(&s);
+ pPrev = pPrev->u.pPeer;
+ }
+ }
+ db_finalize(&s);
+ path_reset();
+ return 0;
+}
+
+/*
+** COMMAND: test-ancestor-path
+**
+** Usage: %fossil test-ancestor-path VERSION1 VERSION2
+**
+** Report the path from VERSION1 to VERSION2 through their most recent
+** common ancestor.
+*/
+void ancestor_path_test_cmd(void){
+ int iFrom;
+ int iTo;
+ int iPivot;
+ PathNode *p;
+ int n;
+
+ db_find_and_open_repository(0,0);
+ if( g.argc!=4 ) usage("VERSION1 VERSION2");
+ iFrom = name_to_rid(g.argv[2]);
+ iTo = name_to_rid(g.argv[3]);
+ iPivot = path_common_ancestor(iFrom, iTo);
+ for(n=1, p=path.pStart; p; p=p->u.pTo, n++){
+ char *z;
+ z = db_text(0,
+ "SELECT substr(uuid,1,12) || ' ' || datetime(mtime)"
+ " FROM blob, event"
+ " WHERE blob.rid=%d AND event.objid=%d AND event.type='ci'",
+ p->rid, p->rid);
+ printf("%4d: %s", n, z);
+ fossil_free(z);
+ if( p->rid==iFrom ) printf(" VERSION1");
+ if( p->rid==iTo ) printf(" VERSION2");
+ if( p->rid==iPivot ) printf(" PIVOT");
+ printf("\n");
+ }
+}
+
+
+/*
+** A record of a file rename operation.
+*/
+typedef struct NameChange NameChange;
+struct NameChange {
+ int origName; /* Original name of file */
+ int curName; /* Current name of the file */
+ int newName; /* Name of file in next version */
+ NameChange *pNext; /* List of all name changes */
+};
+
+/*
+** Compute all file name changes that occur going from checkin iFrom
+** to checkin iTo.
+**
+** The number of name changes is written into *pnChng. For each name
+** change, two integers are allocated for *piChng. The first is the
+** filename.fnid for the original name and the second is for new name.
+** Space to hold *piChng is obtained from fossil_malloc() and should
+** be released by the caller.
+**
+** This routine really has nothing to do with pathion. It is located
+** in this path.c module in order to leverage some of the path
+** infrastructure.
+*/
+void find_filename_changes(
+ int iFrom,
+ int iTo,
+ int *pnChng,
+ int **aiChng
+){
+ PathNode *p; /* For looping over path from iFrom to iTo */
+ NameChange *pAll = 0; /* List of all name changes seen so far */
+ NameChange *pChng; /* For looping through the name change list */
+ int nChng = 0; /* Number of files whose names have changed */
+ int *aChng; /* Two integers per name change */
+ int i; /* Loop counter */
+ Stmt q1; /* Query of name changes */
+
+ *pnChng = 0;
+ *aiChng = 0;
+ path_reset();
+ p = path_shortest(iFrom, iTo, 0);
+ if( p==0 ) return;
+ path_reverse_path();
+ db_prepare(&q1,
+ "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0"
+ );
+ for(p=path.pStart; p; p=p->u.pTo){
+ int fnid, pfnid;
+ if( !p->fromIsParent && (p->u.pTo==0 || p->u.pTo->fromIsParent) ){
+ /* Skip nodes where the parent is not on the path */
+ continue;
+ }
+ db_bind_int(&q1, ":mid", p->rid);
+ while( db_step(&q1)==SQLITE_ROW ){
+ if( p->fromIsParent ){
+ fnid = db_column_int(&q1, 1);
+ pfnid = db_column_int(&q1, 0);
+ }else{
+ fnid = db_column_int(&q1, 0);
+ pfnid = db_column_int(&q1, 1);
+ }
+ for(pChng=pAll; pChng; pChng=pChng->pNext){
+ if( pChng->curName==pfnid ){
+ pChng->newName = fnid;
+ break;
+ }
+ }
+ if( pChng==0 ){
+ pChng = fossil_malloc( sizeof(*pChng) );
+ pChng->pNext = pAll;
+ pAll = pChng;
+ pChng->origName = pfnid;
+ pChng->curName = pfnid;
+ pChng->newName = fnid;
+ nChng++;
+ }
+ }
+ for(pChng=pAll; pChng; pChng=pChng->pNext) pChng->curName = pChng->newName;
+ db_reset(&q1);
+ }
+ db_finalize(&q1);
+ if( nChng ){
+ *pnChng = nChng;
+ aChng = *aiChng = fossil_malloc( nChng*2*sizeof(int) );
+ for(pChng=pAll, i=0; pChng; pChng=pChng->pNext, i+=2){
+ aChng[i] = pChng->origName;
+ aChng[i+1] = pChng->newName;
+ }
+ while( pAll ){
+ pChng = pAll;
+ pAll = pAll->pNext;
+ fossil_free(pChng);
+ }
+ }
+}
+
+/*
+** COMMAND: test-name-changes
+**
+** Usage: %fossil test-name-changes VERSION1 VERSION2
+**
+** Show all filename changes that occur going from VERSION1 to VERSION2
+*/
+void test_name_change(void){
+ int iFrom;
+ int iTo;
+ int *aChng;
+ int nChng;
+ int i;
+
+ db_find_and_open_repository(0,0);
+ if( g.argc!=4 ) usage("VERSION1 VERSION2");
+ iFrom = name_to_rid(g.argv[2]);
+ iTo = name_to_rid(g.argv[3]);
+ find_filename_changes(iFrom, iTo, &nChng, &aChng);
+ for(i=0; i<nChng; i++){
+ char *zFrom, *zTo;
+
+ zFrom = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2]);
+ zTo = db_text(0, "SELECT name FROM filename WHERE fnid=%d", aChng[i*2+1]);
+ printf("[%s] -> [%s]\n", zFrom, zTo);
+ fossil_free(zFrom);
+ fossil_free(zTo);
+ }
+ fossil_free(aChng);
+}
Index: src/pqueue.c
==================================================================
--- src/pqueue.c
+++ src/pqueue.c
@@ -38,10 +38,11 @@
struct PQueue {
int cnt; /* Number of entries in the queue */
int sz; /* Number of slots in a[] */
struct QueueElement {
int id; /* ID of the element */
+ void *p; /* Content pointer */
double value; /* Value of element. Kept in ascending order */
} *a;
};
#endif
@@ -69,11 +70,11 @@
}
/*
** Insert element e into the queue.
*/
-void pqueue_insert(PQueue *p, int e, double v){
+void pqueue_insert(PQueue *p, int e, double v, void *pData){
int i, j;
if( p->cnt+1>p->sz ){
pqueue_resize(p, p->cnt+5);
}
for(i=0; i<p->cnt; i++){
@@ -83,26 +84,29 @@
}
break;
}
}
p->a[i].id = e;
+ p->a[i].p = pData;
p->a[i].value = v;
p->cnt++;
}
/*
** Extract the first element from the queue (the element with
** the smallest value) and return its ID. Return 0 if the queue
** is empty.
*/
-int pqueue_extract(PQueue *p){
+int pqueue_extract(PQueue *p, void **pp){
int e, i;
if( p->cnt==0 ){
+ if( pp ) *pp = 0;
return 0;
}
e = p->a[0].id;
+ if( pp ) *pp = p->a[0].p;
for(i=0; i<p->cnt-1; i++){
p->a[i] = p->a[i+1];
}
p->cnt--;
return e;
}
Index: src/tag.c
==================================================================
--- src/tag.c
+++ src/tag.c
@@ -44,11 +44,11 @@
Stmt ins; /* INSERT INTO tagxref */
Stmt eventupdate; /* UPDATE event */
assert( tagType==0 || tagType==2 );
pqueue_init(&queue);
- pqueue_insert(&queue, pid, 0.0);
+ pqueue_insert(&queue, pid, 0.0, 0);
/* Query for children of :pid to which to propagate the tag.
** Three returns: (1) rid of the child. (2) timestamp of child.
** (3) True to propagate or false to block.
*/
@@ -79,18 +79,18 @@
if( tagid==TAG_BGCOLOR ){
db_prepare(&eventupdate,
"UPDATE event SET bgcolor=%Q WHERE objid=:rid", zValue
);
}
- while( (pid = pqueue_extract(&queue))!=0 ){
+ while( (pid = pqueue_extract(&queue, 0))!=0 ){
db_bind_int(&s, ":pid", pid);
while( db_step(&s)==SQLITE_ROW ){
int doit = db_column_int(&s, 2);
if( doit ){
int cid = db_column_int(&s, 0);
double mtime = db_column_double(&s, 1);
- pqueue_insert(&queue, cid, mtime);
+ pqueue_insert(&queue, cid, mtime, 0);
db_bind_int(&ins, ":rid", cid);
db_step(&ins);
db_reset(&ins);
if( tagid==TAG_BGCOLOR ){
db_bind_int(&eventupdate, ":rid", cid);
Index: src/timeline.c
==================================================================
--- src/timeline.c
+++ src/timeline.c
@@ -763,10 +763,12 @@
const char *zThisUser = 0; /* Suppress links to this user */
HQuery url; /* URL for various branch links */
int from_rid = name_to_rid(P("from")); /* from= for path timelines */
int to_rid = name_to_rid(P("to")); /* to= for path timelines */
int noMerge = P("nomerge")!=0; /* Do not follow merge links */
+ int me_rid = name_to_rid(P("me")); /* me= for common ancestory path */
+ int you_rid = name_to_rid(P("you"));/* you= for common ancst path */
/* To view the timeline, must have permission to read project data.
*/
login_check_credentials();
if( !g.okRead && !g.okRdTkt && !g.okRdWiki ){ login_needed(); return; }
@@ -795,38 +797,46 @@
blob_zero(&desc);
blob_append(&sql, "INSERT OR IGNORE INTO timeline ", -1);
blob_append(&sql, timeline_query_for_www(), -1);
url_initialize(&url, "timeline");
if( !useDividers ) url_add_parameter(&url, "nd", 0);
- if( from_rid && to_rid && g.okRead ){
+ if( ((from_rid && to_rid) || (me_rid && you_rid)) && g.okRead ){
/* If from= and to= are present, display all nodes on a path connecting
** the two */
- BisectNode *p;
- const char *z;
+ PathNode *p = 0;
+ const char *zFrom = 0;
+ const char *zTo = 0;
- bisect_shortest_path(from_rid, to_rid, noMerge);
- p = bisect_reverse_path();
+ if( from_rid && to_rid ){
+ p = path_shortest(from_rid, to_rid, noMerge);
+ zFrom = P("from");
+ zTo = P("to");
+ }else{
+ if( path_common_ancestor(me_rid, you_rid) ){
+ p = path_first();
+ }
+ zFrom = P("me");
+ zTo = P("you");
+ }
blob_append(&sql, " AND event.objid IN (0", -1);
while( p ){
blob_appendf(&sql, ",%d", p->rid);
p = p->u.pTo;
}
blob_append(&sql, ")", -1);
- bisect_reset();
+ path_reset();
blob_append(&desc, "All nodes on the path from ", -1);
- z = P("from");
if( g.okHistory ){
- blob_appendf(&desc, "<a href='%s/info/%h'>[%h]</a>", g.zTop, z, z);
+ blob_appendf(&desc, "<a href='%s/info/%h'>[%h]</a>", g.zTop,zFrom,zFrom);
}else{
- blob_appendf(&desc, "[%h]", z);
+ blob_appendf(&desc, "[%h]", zFrom);
}
blob_append(&desc, " and ", -1);
- z = P("to");
if( g.okHistory ){
- blob_appendf(&desc, "<a href='%s/info/%h'>[%h]</a>.", g.zTop, z, z);
+ blob_appendf(&desc, "<a href='%s/info/%h'>[%h]</a>.", g.zTop, zTo, zTo);
}else{
- blob_appendf(&desc, "[%h].", z);
+ blob_appendf(&desc, "[%h].", zTo);
}
tmFlags |= TIMELINE_DISJOINT;
db_multi_exec("%s", blob_str(&sql));
}else if( (p_rid || d_rid) && g.okRead ){
/* If p= or d= is present, ignore all other parameters other than n= */
Index: win/Makefile.dmc
==================================================================
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,13 +24,13 @@
TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
LIBS = $(DMDIR)\extra\lib\ zlib wsock32
SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
RC=$(DMDIR)\bin\rcc
RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
@@ -44,11 +44,11 @@
$(OBJDIR)\fossil.res: $B\win\fossil.rc
$(RC) $(RCFLAGS) -o$@ $**
$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
- +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo graph gzip http http_socket http_ssl http_transport import info leaf login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
+ +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo graph gzip http http_socket http_ssl http_transport import info leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
+echo fossil >> $@
+echo fossil >> $@
+echo $(LIBS) >> $@
+echo. >> $@
+echo fossil >> $@
@@ -358,10 +358,16 @@
$(OBJDIR)\name$O : name_.c name.h
$(TCC) -o$@ -c name_.c
name_.c : $(SRCDIR)\name.c
+translate$E $** > $@
+
+$(OBJDIR)\path$O : path_.c path.h
+ $(TCC) -o$@ -c path_.c
+
+path_.c : $(SRCDIR)\path.c
+ +translate$E $** > $@
$(OBJDIR)\pivot$O : pivot_.c pivot.h
$(TCC) -o$@ -c pivot_.c
pivot_.c : $(SRCDIR)\pivot.c
@@ -570,7 +576,7 @@
zip_.c : $(SRCDIR)\zip.c
+translate$E $** > $@
headers: makeheaders$E page_index.h VERSION.h
- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
@copy /Y nul: headers
Index: win/Makefile.mingw
==================================================================
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -117,10 +117,11 @@
$(SRCDIR)/manifest.c \
$(SRCDIR)/md5.c \
$(SRCDIR)/merge.c \
$(SRCDIR)/merge3.c \
$(SRCDIR)/name.c \
+ $(SRCDIR)/path.c \
$(SRCDIR)/pivot.c \
$(SRCDIR)/popen.c \
$(SRCDIR)/pqueue.c \
$(SRCDIR)/printf.c \
$(SRCDIR)/rebuild.c \
@@ -199,10 +200,11 @@
$(OBJDIR)/manifest_.c \
$(OBJDIR)/md5_.c \
$(OBJDIR)/merge_.c \
$(OBJDIR)/merge3_.c \
$(OBJDIR)/name_.c \
+ $(OBJDIR)/path_.c \
$(OBJDIR)/pivot_.c \
$(OBJDIR)/popen_.c \
$(OBJDIR)/pqueue_.c \
$(OBJDIR)/printf_.c \
$(OBJDIR)/rebuild_.c \
@@ -281,10 +283,11 @@
$(OBJDIR)/manifest.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/merge.o \
$(OBJDIR)/merge3.o \
$(OBJDIR)/name.o \
+ $(OBJDIR)/path.o \
$(OBJDIR)/pivot.o \
$(OBJDIR)/popen.o \
$(OBJDIR)/pqueue.o \
$(OBJDIR)/printf.o \
$(OBJDIR)/rebuild.o \
@@ -382,11 +385,11 @@
$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
$(MKINDEX) $(TRANS_SRC) >$@
$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
echo Done >$(OBJDIR)/headers
$(OBJDIR)/headers: Makefile
Makefile:
$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -702,10 +705,17 @@
$(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
name.h: $(OBJDIR)/headers
+$(OBJDIR)/path_.c: $(SRCDIR)/path.c $(OBJDIR)/translate
+ $(TRANSLATE) $(SRCDIR)/path.c >$(OBJDIR)/path_.c
+
+$(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
+
+path.h: $(OBJDIR)/headers
$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
$(TRANSLATE) $(SRCDIR)/pivot.c >$(OBJDIR)/pivot_.c
$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/pivot.o -c $(OBJDIR)/pivot_.c
Index: win/Makefile.msc
==================================================================
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -38,13 +38,13 @@
LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
-OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
+OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
APPNAME = $(OX)\fossil$(E)
all: $(OX) $(APPNAME)
@@ -52,11 +52,11 @@
$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
cd $(OX)
link -LINK -OUT:$@ $(LIBDIR) @linkopts
$(OX)\linkopts: $B\win\Makefile.msc
- echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo graph gzip http http_socket http_ssl http_transport import info leaf login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
+ echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo graph gzip http http_socket http_ssl http_transport import info leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
echo $(LIBS) >> $@
@@ -369,10 +369,16 @@
$(OX)\name$O : name_.c name.h
$(TCC) /Fo$@ -c name_.c
name_.c : $(SRCDIR)\name.c
translate$E $** > $@
+
+$(OX)\path$O : path_.c path.h
+ $(TCC) /Fo$@ -c path_.c
+
+path_.c : $(SRCDIR)\path.c
+ translate$E $** > $@
$(OX)\pivot$O : pivot_.c pivot.h
$(TCC) /Fo$@ -c pivot_.c
pivot_.c : $(SRCDIR)\pivot.c
@@ -581,7 +587,7 @@
zip_.c : $(SRCDIR)\zip.c
translate$E $** > $@
headers: makeheaders$E page_index.h VERSION.h
- makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
+ makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
@copy /Y nul: headers