Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch annotate_links Excluding Merge-Ins
This is equivalent to a diff from e320f0cd79 to f14798e0e3
2013-03-14
| ||
14:56 | Enhance the web timeline so that with the "namechng" query parameter it shows only check-ins that involve filename changes. ... (check-in: 1d2f4c2f26 user: drh tags: trunk) | |
14:48 | Merging from trunk to get the annotate fixes. Trivial conflict solved. <strong>Update:</strong> the new branch viric_flavour ([b31afcc2ca]) includes most of these changes in a more recent fossil. ... (Closed-Leaf check-in: f14798e0e3 user: viriketo tags: annotate_links) | |
14:41 | merge trunk. Add fossil and fossil.exe to "ignore-glob". ... (check-in: 4acff0a6d3 user: jan.nijtmans tags: clean-with-ignore) | |
14:18 | Update the "annotate" command and webpage to prefer to take changes from direct ancestors of the version being analyzed, rather than more recent changes on branches. ... (check-in: e320f0cd79 user: drh tags: trunk) | |
14:09 | style ... (check-in: 3ba9a4d5ca user: jan.nijtmans tags: trunk) | |
2013-02-15
| ||
14:37 | Fixing annotate. It was hanging. ... (check-in: 96c3133576 user: viriketo tags: annotate_links) | |
Changes to src/checkin.c.
︙ | ︙ | |||
97 98 99 100 101 102 103 104 | }else if( isRenamed ){ blob_appendf(report, "RENAMED %s\n", zDisplayName); } free(zFullName); } blob_reset(&rewrittenPathname); db_finalize(&q); db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid" | > > > | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | }else if( isRenamed ){ blob_appendf(report, "RENAMED %s\n", zDisplayName); } free(zFullName); } blob_reset(&rewrittenPathname); db_finalize(&q); /* -3 holds the baseline-based merges - nor cherrypick nor backout. * Now we can't report easily the baseline-based merges, because * we don't store the baseline point in vmerge */ db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid" " WHERE id<=0 AND id >= -2"); while( db_step(&q)==SQLITE_ROW ){ const char *zLabel = "MERGED_WITH"; switch( db_column_int(&q, 1) ){ case -1: zLabel = "CHERRYPICK "; break; case -2: zLabel = "BACKOUT "; break; } blob_append(report, zPrefix, nPrefix); |
︙ | ︙ | |||
1227 1228 1229 1230 1231 1232 1233 1234 1235 | */ if( select_commit_files() ){ blob_zero(&ans); prompt_user("continue (y/N)? ", &ans); cReply = blob_str(&ans)[0]; if( cReply!='y' && cReply!='Y' ) fossil_exit(1);; } isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0"); if( g.aCommitFile && isAMerge ){ | > | | 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 | */ if( select_commit_files() ){ blob_zero(&ans); prompt_user("continue (y/N)? ", &ans); cReply = blob_str(&ans)[0]; if( cReply!='y' && cReply!='Y' ) fossil_exit(1);; } /* id=0 means that it introduces a new parent */ isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0"); if( g.aCommitFile && isAMerge ){ fossil_fatal("cannot do a partial commit of a graph merge"); } /* Doing "fossil mv fileA fileB; fossil add fileA; fossil commit fileA" ** will generate a manifest that has two fileA entries, which is illegal. ** When you think about it, the sequence above makes no sense. So detect ** it and disallow it. Ticket [0ff64b0a5fc8]. */ |
︙ | ︙ |
Changes to src/db.c.
︙ | ︙ | |||
2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 | { "editor", 0, 32, 0, "" }, { "empty-dirs", 0, 40, 1, "" }, { "encoding-glob", 0, 40, 1, "" }, { "gdiff-command", 0, 40, 0, "gdiff" }, { "gmerge-command",0, 40, 0, "" }, { "http-port", 0, 16, 0, "8080" }, { "https-login", 0, 0, 0, "off" }, { "ignore-glob", 0, 40, 1, "" }, { "localauth", 0, 0, 0, "off" }, { "main-branch", 0, 40, 0, "trunk" }, { "manifest", 0, 0, 1, "off" }, #ifdef FOSSIL_ENABLE_MARKDOWN { "markdown", 0, 0, 0, "off" }, #endif | > | 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 | { "editor", 0, 32, 0, "" }, { "empty-dirs", 0, 40, 1, "" }, { "encoding-glob", 0, 40, 1, "" }, { "gdiff-command", 0, 40, 0, "gdiff" }, { "gmerge-command",0, 40, 0, "" }, { "http-port", 0, 16, 0, "8080" }, { "https-login", 0, 0, 0, "off" }, { "href-targets", 0, 0, 0, "on" }, { "ignore-glob", 0, 40, 1, "" }, { "localauth", 0, 0, 0, "off" }, { "main-branch", 0, 40, 0, "trunk" }, { "manifest", 0, 0, 1, "off" }, #ifdef FOSSIL_ENABLE_MARKDOWN { "markdown", 0, 0, 0, "off" }, #endif |
︙ | ︙ |
Changes to src/diff.c.
︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 | #define LOOK_LF (LOOK_LONE_LF|LOOK_CRLF) /* One or more LF chars were found. */ #endif /* INTERFACE */ /* ** Maximum length of a line in a text file, in bytes. (2**13 = 8192 bytes) */ #define LENGTH_MASK_SZ 13 #define LENGTH_MASK ((1<<LENGTH_MASK_SZ)-1) /* ** Information about each line of a file being diffed. ** ** The lower LENGTH_MASK_SZ bits of the hash (DLine.h) are the length ** of the line. If any line is longer than LENGTH_MASK characters, | > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | #define LOOK_LF (LOOK_LONE_LF|LOOK_CRLF) /* One or more LF chars were found. */ #endif /* INTERFACE */ /* ** Maximum length of a line in a text file, in bytes. (2**13 = 8192 bytes) */ #define LENGTH_MASK_SZ 13 #define TABLENGTH 4 #define LENGTH_MASK ((1<<LENGTH_MASK_SZ)-1) /* ** Information about each line of a file being diffed. ** ** The lower LENGTH_MASK_SZ bits of the hash (DLine.h) are the length ** of the line. If any line is longer than LENGTH_MASK characters, |
︙ | ︙ | |||
677 678 679 680 681 682 683 684 685 686 687 688 689 690 | for(j=0; j<m; j++){ if( showLn ) appendDiffLineno(pOut, a+j+1, b+j+1, html); appendDiffLine(pOut, ' ', &B[b+j], html, 0); } } } /* ** Status of a single output line */ typedef struct SbsLine SbsLine; struct SbsLine { char *zLine; /* The output line under construction */ int n; /* Index of next unused slot in the zLine[] */ | > > | 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 | for(j=0; j<m; j++){ if( showLn ) appendDiffLineno(pOut, a+j+1, b+j+1, html); appendDiffLine(pOut, ' ', &B[b+j], html, 0); } } } static int maxwidth; /* ** Status of a single output line */ typedef struct SbsLine SbsLine; struct SbsLine { char *zLine; /* The output line under construction */ int n; /* Index of next unused slot in the zLine[] */ |
︙ | ︙ | |||
718 719 720 721 722 723 724 725 726 727 728 | int i; /* Number of input characters consumed */ int j; /* Number of output characters generated */ int k; /* Cursor position */ int needEndSpan = 0; const char *zIn = pLine->z; char *z = &p->zLine[p->n]; int w = p->width; int colorize = p->escHtml; if( colorize && p->pRe && re_dline_match(p->pRe, pLine, 1)==0 ){ colorize = 0; } | > > > > > | > | > | > | > > | > > > | > | | > > | | > > | | > > | | > > | > > | | | > > > > > | 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 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 810 811 812 813 814 815 816 | int i; /* Number of input characters consumed */ int j; /* Number of output characters generated */ int k; /* Cursor position */ int needEndSpan = 0; const char *zIn = pLine->z; char *z = &p->zLine[p->n]; int w = p->width; int colorize = p->escHtml; if( colorize && p->pRe && re_dline_match(p->pRe, pLine, 1)==0 ){ colorize = 0; } /* In the case w == 0, we want to calculate the output line * width (k), but not write anything to 'z', because it has * a buffer of limited size. */ for(i=j=k=0; (w == 0 || k<w) && i<n; i++, k++){ char c = zIn[i]; if( colorize ){ if( i==p->iStart ){ int x = strlen(p->zStart); if (w != 0) memcpy(z+j, p->zStart, x); j += x; needEndSpan = 1; if( p->iStart2 ){ p->iStart = p->iStart2; p->zStart = p->zStart2; p->iStart2 = 0; } }else if( i==p->iEnd ){ if (w != 0) memcpy(z+j, "</span>", 7); j += 7; needEndSpan = 0; if( p->iEnd2 ){ p->iEnd = p->iEnd2; p->iEnd2 = 0; } } } if( c=='\t' ){ if (w != 0) z[j++] = ' '; while( (k%TABLENGTH)!=0 && (w == 0 || k<w) ){ if (w != 0) z[j++] = ' '; k++; } }else if( c=='\r' || c=='\f' ){ if (w != 0) z[j++] = ' '; }else if( c=='<' && p->escHtml ){ if (w != 0) { memcpy(&z[j], "<", 4); j += 4; } }else if( c=='&' && p->escHtml ){ if (w != 0) { memcpy(&z[j], "&", 5); j += 5; } }else if( c=='>' && p->escHtml ){ if (w != 0) { memcpy(&z[j], ">", 4); j += 4; } }else if( c=='"' && p->escHtml ){ if (w != 0) { memcpy(&z[j], """, 6); j += 6; } }else{ if (w != 0) { z[j++] = c; } if( (c&0xc0)==0x80 ) k--; } } if( needEndSpan ){ if (w != 0) { memcpy(&z[j], "</span>", 7); j += 7; } } if (k > maxwidth) maxwidth = k; if( (flags & SBS_PAD)!=0 ){ while( k<w ){ k++; z[j++] = ' '; } } if( flags & SBS_NEWLINE ){ z[j++] = '\n'; } p->n += j; |
︙ | ︙ | |||
1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 | int nChunk = 0; /* Number of chunks of diff output seen so far */ SbsLine s; /* Output line buffer */ int nContext; /* Lines of context above and below each change */ int showDivider = 0; /* True to show the divider */ memset(&s, 0, sizeof(s)); s.width = diff_width(diffFlags); s.zLine = fossil_malloc( 15*s.width + 200 ); if( s.zLine==0 ) return; nContext = diff_context_lines(diffFlags); s.escHtml = (diffFlags & DIFF_HTML)!=0; s.pRe = pRe; s.iStart = -1; s.iStart2 = 0; | > > > > > > > > | 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 | int nChunk = 0; /* Number of chunks of diff output seen so far */ SbsLine s; /* Output line buffer */ int nContext; /* Lines of context above and below each change */ int showDivider = 0; /* True to show the divider */ memset(&s, 0, sizeof(s)); s.width = diff_width(diffFlags); if( s.width == 0 ) { /* May Autocalculate */ Blob dump; maxwidth = -1; /* The webserver may call sbsDiff more than once per process */ blob_zero(&dump); sbsDiff(p, &dump, pRe, diffFlags | DIFF_WIDTH_MASK); s.width = maxwidth; blob_reset(&dump); } s.zLine = fossil_malloc( 15*s.width + 200 ); if( s.zLine==0 ) return; nContext = diff_context_lines(diffFlags); s.escHtml = (diffFlags & DIFF_HTML)!=0; s.pRe = pRe; s.iStart = -1; s.iStart2 = 0; |
︙ | ︙ | |||
1941 1942 1943 1944 1945 1946 1947 | /* ** Extract the width of columns for side-by-side diff. Supply an ** appropriate default if no width is given. */ int diff_width(u64 diffFlags){ int w = (diffFlags & DIFF_WIDTH_MASK)/(DIFF_CONTEXT_MASK+1); | < | 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 | /* ** Extract the width of columns for side-by-side diff. Supply an ** appropriate default if no width is given. */ int diff_width(u64 diffFlags){ int w = (diffFlags & DIFF_WIDTH_MASK)/(DIFF_CONTEXT_MASK+1); return w; } /* ** Generate a report of the differences between files pA and pB. ** If pOut is not NULL then a unified diff is appended there. It ** is assumed that pOut has already been initialized. If pOut is |
︙ | ︙ | |||
2273 2274 2275 2276 2277 2278 2279 | /* ** Compute a complete annotation on a file. The file is identified ** by its filename number (filename.fnid) and the baseline in which ** it was checked in (mlink.mid). */ static void annotate_file( Annotator *p, /* The annotator */ | | > > > > > > > > > > | | | > | | > > > > | > > > > > | > | 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 | /* ** Compute a complete annotation on a file. The file is identified ** by its filename number (filename.fnid) and the baseline in which ** it was checked in (mlink.mid). */ static void annotate_file( Annotator *p, /* The annotator */ const char *zFilename,/* The name of the file to be annotated */ int fnid, /* The file name id of the file to be annotated */ int mid, /* Use the version of the file in this check-in */ int webLabel, /* Use web-style annotations if true */ int iLimit, /* Limit the number of levels if greater than zero */ int annFlags /* Flags to alter the annotation */ ){ Blob toAnnotate; /* Text of the final (mid) version of the file */ Blob step; /* Text of previous revision */ int rid; /* Artifact ID of the file being annotated */ char *zLabel; /* Label to apply to a line */ Stmt q; /* Query returning all ancestor versions */ int cnt = 0; /* Number of versions examined */ const char *zInfoTarget; /* String for target info window */ const char *zDiffTarget; /* String for target diff window */ zInfoTarget = db_get_boolean("href-targets", 1) ? "target='infowindow'" : ""; zDiffTarget = db_get_boolean("href-targets", 1) ? "target='diffwindow'" : ""; /* Initialize the annotation */ rid = db_int(0, "SELECT fid FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid); if( rid==0 ){ fossil_panic("file #%d is unchanged in manifest #%d", fnid, mid); } if( !content_get(rid, &toAnnotate) ){ fossil_panic("unable to retrieve content of artifact #%d", rid); } if( iLimit<=0 ) iLimit = 1000000000; annotation_start(p, &toAnnotate); db_prepare(&q, "SELECT (SELECT uuid FROM blob WHERE rid=mlink.%s)," " (SELECT uuid FROM blob WHERE rid=mlink.fid)," " (SELECT uuid FROM blob WHERE rid=mlink.pid)," " date(event.mtime)," " coalesce(event.euser,event.user)," " mlink.pid" " FROM mlink, event" " WHERE mlink.fid=:rid" " AND event.objid=mlink.mid" " ORDER BY %s event.mtime", (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid", (annFlags & ANN_FILE_ANCEST)!=0 ? "(mlink.mid IN (SELECT rid FROM ancestor)) DESC,":"" ); db_bind_int(&q, ":rid", rid); if( iLimit==0 ) iLimit = 1000000000; while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){ const char *zUuid = db_column_text(&q, 0); const char *zUuidFile = db_column_text(&q, 1); const char *zUuidParentFile = db_column_text(&q, 2); const char *zDate = db_column_text(&q, 3); const char *zUser = db_column_text(&q, 4); int prevId = db_column_int(&q, 5); if( webLabel ){ if (zUuidParentFile) { zLabel = mprintf( "<a href='%R/info/%s' %s>%.10s</a> " "<a href='%R/fdiff?v1=%s&v2=%s' %s>d</a> " "%s %13.13s", zUuid, zInfoTarget, zUuid, zUuidParentFile, zUuidFile, zDiffTarget, zDate, zUser); }else{ zLabel = mprintf( "<a href='%R/info/%s' %s>%.10s</a> " "%s %13.13s", zUuid, zInfoTarget, zUuid, zDate, zUser); } }else{ zLabel = mprintf("%.10s %s %13.13s", zUuid, zDate, zUser); } p->nVers++; p->azVers = fossil_realloc(p->azVers, p->nVers*sizeof(p->azVers[0]) ); p->azVers[p->nVers-1] = zLabel; content_get(rid, &step); |
︙ | ︙ | |||
2372 2373 2374 2375 2376 2377 2378 | iLimit = atoi(PD("limit","-1")); if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid) ){ fossil_redirect_home(); } compute_direct_ancestors(mid, 10000000); style_header("File Annotation"); if( P("filevers") ) annFlags |= ANN_FILE_VERS; | | | 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 | iLimit = atoi(PD("limit","-1")); if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d AND fnid=%d",mid,fnid) ){ fossil_redirect_home(); } compute_direct_ancestors(mid, 10000000); style_header("File Annotation"); if( P("filevers") ) annFlags |= ANN_FILE_VERS; annotate_file(&ann, P("filename"), fnid, mid, g.perm.Hyperlink, iLimit, annFlags); if( P("log") ){ int i; @ <h2>Versions analyzed:</h2> @ <ol> for(i=0; i<ann.nVers; i++){ @ <li><tt>%s(ann.azVers[i])</tt></li> } |
︙ | ︙ | |||
2464 2465 2466 2467 2468 2469 2470 | " ORDER BY ancestor.generation ASC LIMIT 1", fid, fnid); if( mid==0 ){ fossil_panic("unable to find manifest"); } if( fileVers ) annFlags |= ANN_FILE_VERS; annFlags |= ANN_FILE_ANCEST; | | | 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 | " ORDER BY ancestor.generation ASC LIMIT 1", fid, fnid); if( mid==0 ){ fossil_panic("unable to find manifest"); } if( fileVers ) annFlags |= ANN_FILE_VERS; annFlags |= ANN_FILE_ANCEST; annotate_file(&ann, zFilename, fnid, mid, 0, iLimit, annFlags); if( showLog ){ for(i=0; i<ann.nVers; i++){ printf("version %3d: %s\n", i+1, ann.azVers[i]); } printf("---------------------------------------------------\n"); } for(i=0; i<ann.nOrig; i++){ |
︙ | ︙ |
Changes to src/diffcmd.c.
︙ | ︙ | |||
48 49 50 51 52 53 54 | char *z = 0; if( diffFlags & DIFF_BRIEF ){ /* no-op */ }else if( diffFlags & DIFF_SIDEBYSIDE ){ int w = diff_width(diffFlags); int n1 = strlen(zLeft); int x; | > | | > > > > > > | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | char *z = 0; if( diffFlags & DIFF_BRIEF ){ /* no-op */ }else if( diffFlags & DIFF_SIDEBYSIDE ){ int w = diff_width(diffFlags); int n1 = strlen(zLeft); int x; if (w > 0) { if( n1>w*2 ) n1 = w*2; x = w*2+17 - (n1+2); }else{ /* Autocalculate width * We can't know the width in advance, so we'll make it * output three = around the name */ x = 6; } z = mprintf("%.*c %.*s %.*c\n", x/2, '=', n1, zLeft, (x+1)/2, '='); }else{ z = mprintf("--- %s\n+++ %s\n", zLeft, zRight); } fossil_print("%s", z); fossil_free(z); |
︙ | ︙ |
Changes to src/doc.c.
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | { "mpeg", 4, "video/mpeg" }, { "mpg", 3, "video/mpeg" }, { "mpga", 4, "audio/mpeg" }, { "ms", 2, "application/x-troff-ms" }, { "msh", 3, "model/mesh" }, { "nc", 2, "application/x-netcdf" }, { "oda", 3, "application/oda" }, { "ogg", 3, "application/ogg" }, { "ogm", 3, "application/ogg" }, { "pbm", 3, "image/x-portable-bitmap" }, { "pdb", 3, "chemical/x-pdb" }, { "pdf", 3, "application/pdf" }, { "pgm", 3, "image/x-portable-graymap" }, { "pgn", 3, "application/x-chess-pgn" }, | > > > | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | { "mpeg", 4, "video/mpeg" }, { "mpg", 3, "video/mpeg" }, { "mpga", 4, "audio/mpeg" }, { "ms", 2, "application/x-troff-ms" }, { "msh", 3, "model/mesh" }, { "nc", 2, "application/x-netcdf" }, { "oda", 3, "application/oda" }, { "odp", 3, "application/vnd.oasis.opendocument.presentation" }, { "ods", 3, "application/vnd.oasis.opendocument.spreadsheet" }, { "odt", 3, "application/vnd.oasis.opendocument.text" }, { "ogg", 3, "application/ogg" }, { "ogm", 3, "application/ogg" }, { "pbm", 3, "image/x-portable-bitmap" }, { "pdb", 3, "chemical/x-pdb" }, { "pdf", 3, "application/pdf" }, { "pgm", 3, "image/x-portable-graymap" }, { "pgn", 3, "application/x-chess-pgn" }, |
︙ | ︙ |
Changes to src/info.c.
︙ | ︙ | |||
404 405 406 407 408 409 410 | if( showDiff==0 ){ diffFlags = 0; /* Zero means do not show any diff */ }else{ int x; if( sideBySide ){ diffFlags = DIFF_SIDEBYSIDE | DIFF_IGNORE_EOLWS; | | > | | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | if( showDiff==0 ){ diffFlags = 0; /* Zero means do not show any diff */ }else{ int x; if( sideBySide ){ diffFlags = DIFF_SIDEBYSIDE | DIFF_IGNORE_EOLWS; /* "dw" query parameter determines width of each column * 0 means autocalculate. */ x = atoi(PD("dw","0"))*(DIFF_CONTEXT_MASK+1); if( x<0 || x>DIFF_WIDTH_MASK ) x = DIFF_WIDTH_MASK; diffFlags += x; }else{ diffFlags = DIFF_INLINE | DIFF_IGNORE_EOLWS; } /* "dc" query parameter determines lines of context */ |
︙ | ︙ | |||
588 589 590 591 592 593 594 595 596 597 598 599 600 601 | } @ </td></tr> @ <tr><th>Other Links:</th> @ <td> @ %z(href("%R/dir?ci=%S",zUuid))files</a> @ | %z(href("%R/fileage?name=%S",zUuid))file ages</a> @ | %z(href("%R/artifact/%S",zUuid))manifest</a> if( g.perm.Write ){ @ | %z(href("%R/ci_edit?r=%S",zUuid))edit</a> } @ </td> @ </tr> } @ </table> | > > | 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 | } @ </td></tr> @ <tr><th>Other Links:</th> @ <td> @ %z(href("%R/dir?ci=%S",zUuid))files</a> @ | %z(href("%R/fileage?name=%S",zUuid))file ages</a> @ | %z(href("%R/artifact/%S",zUuid))manifest</a> @ | <a href="%s(g.zTop)/vdiff?from=pbranch:%S(zUuid)&to=%S(zUuid)"> @ vdiff to parent branch</a> if( g.perm.Write ){ @ | %z(href("%R/ci_edit?r=%S",zUuid))edit</a> } @ </td> @ </tr> } @ </table> |
︙ | ︙ | |||
813 814 815 816 817 818 819 820 821 822 823 824 825 | ** Output a description of a check-in */ static void checkin_description(int rid){ Stmt q; db_prepare(&q, "SELECT datetime(mtime), coalesce(euser,user)," " coalesce(ecomment,comment), uuid," " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" " FROM event, blob" " WHERE event.objid=%d AND type='ci'" " AND blob.rid=%d", | > > | > > > | 816 817 818 819 820 821 822 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 848 849 850 851 852 853 | ** Output a description of a check-in */ static void checkin_description(int rid){ Stmt q; db_prepare(&q, "SELECT datetime(mtime), coalesce(euser,user)," " coalesce(ecomment,comment), uuid," " coalesce((SELECT value FROM tagxref" " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid),'trunk')," " (SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref" " WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid" " AND tagxref.rid=blob.rid AND tagxref.tagtype>0)" " FROM event, blob" " WHERE event.objid=%d AND type='ci'" " AND blob.rid=%d", TAG_BRANCH, rid, rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zDate = db_column_text(&q, 0); const char *zUser = db_column_text(&q, 1); const char *zUuid = db_column_text(&q, 3); const char *zBranch = db_column_text(&q, 4); const char *zTagList = db_column_text(&q, 4); Blob comment; int wikiFlags = WIKI_INLINE|WIKI_NOBADLINKS; if( db_get_boolean("timeline-block-markup", 0)==0 ){ wikiFlags |= WIKI_NOBLOCK; } hyperlink_to_uuid(zUuid); @ on branch <a href="%R/timeline?r=%s(zBranch)&nd&c=%T(zDate)"> @ %s(zBranch)</a> - blob_zero(&comment); db_column_blob(&q, 2, &comment); wiki_convert(&comment, 0, wikiFlags); blob_reset(&comment); @ (user: hyperlink_to_user(zUser,zDate,","); if( zTagList && zTagList[0] && g.perm.Hyperlink ){ |
︙ | ︙ | |||
912 913 914 915 916 917 918 | pFrom = vdiff_parse_manifest("from", &ridFrom); if( pFrom==0 ) return; sideBySide = atoi(PD("sbs","1")); showDetail = atoi(PD("detail","0")); if( !showDetail && sideBySide ) showDetail = 1; zFrom = P("from"); zTo = P("to"); | > > > > > | | | | < > > | | | > > > | 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 | pFrom = vdiff_parse_manifest("from", &ridFrom); if( pFrom==0 ) return; sideBySide = atoi(PD("sbs","1")); showDetail = atoi(PD("detail","0")); if( !showDetail && sideBySide ) showDetail = 1; zFrom = P("from"); zTo = P("to"); if (showDetail){ style_submenu_element("Abstract", "abstract", "%s/vdiff?from=%T&to=%T&detail=0&sbs=0", g.zTop, zFrom, zTo); } if( !showDetail || sideBySide ){ style_submenu_element("Unified Diff", "udiff", "%R/vdiff?from=%T&to=%T&detail=1&sbs=0", zFrom, zTo); } if (!sideBySide){ style_submenu_element("Side-by-side Diff", "sbsdiff", "%R/vdiff?from=%T&to=%T&detail=1&sbs=1", zFrom, zTo); } style_submenu_element("Patch", "patch", "%s/vpatch?from=%T&to=%T", g.zTop, zFrom, zTo); style_submenu_element("Invert", "invert", "%R/vdiff?from=%T&to=%T&detail=%d&sbs=%d", zTo, zFrom, showDetail, sideBySide); style_header("Check-in Differences"); @ <h2>Difference From:</h2><blockquote> checkin_description(ridFrom); @ </blockquote><h2>To:</h2><blockquote> |
︙ | ︙ |
Changes to src/merge.c.
︙ | ︙ | |||
628 629 630 631 632 633 634 | } /* ** Clean up the mid and pid VFILE entries. Then commit the changes. */ db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)", | | | 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 | } /* ** Clean up the mid and pid VFILE entries. Then commit the changes. */ db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)", pickFlag ? -1 : (backoutFlag ? -2 : (zPivot ? -3 : 0)), mid); if( pickFlag ){ /* For a cherry-pick merge, make the default check-in comment the same ** as the check-in comment on the check-in that is being merged in. */ db_multi_exec( "REPLACE INTO vvar(name,value)" " SELECT 'ci-comment', coalesce(ecomment,comment) FROM event" " WHERE type='ci' AND objid=%d", |
︙ | ︙ |
Changes to src/name.c.
︙ | ︙ | |||
110 111 112 113 114 115 116 117 118 119 120 121 122 123 | rid = db_int(0, "SELECT objid FROM event" " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'" " ORDER BY mtime DESC LIMIT 1", &zTag[5], zType); return rid; } if( fossil_isdate(zTag) ){ rid = db_int(0, "SELECT objid FROM event" " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'" " ORDER BY mtime DESC LIMIT 1", zTag, zType); if( rid) return rid; | > > > > > > > > | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | rid = db_int(0, "SELECT objid FROM event" " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'" " ORDER BY mtime DESC LIMIT 1", &zTag[5], zType); return rid; } if( memcmp(zTag, "pbranch:", 8)==0 ){ int branchRid = symbolic_name_to_rid(&zTag[8], zType); if (branchRid == 0) return 0; rid = get_parent_branch_rid(branchRid); return rid; } if( fossil_isdate(zTag) ){ rid = db_int(0, "SELECT objid FROM event" " WHERE mtime<=julianday(%Q,'utc') AND type GLOB '%q'" " ORDER BY mtime DESC LIMIT 1", zTag, zType); if( rid) return rid; |
︙ | ︙ | |||
520 521 522 523 524 525 526 | db_column_text(&q, 2)); fossil_print(" "); comment_print(db_column_text(&q,4), 10, 78); } db_finalize(&q); } } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 | db_column_text(&q, 2)); fossil_print(" "); comment_print(db_column_text(&q,4), 10, 78); } db_finalize(&q); } } int get_parent_branch_rid(int ridRequested){ Stmt s; const char *branchName; /* Name of the branch requested at rid */ const char *parentBranchName; /* Name of the parent branch */ int rid; /* Get the name of the current branch */ branchName = db_text(0, "SELECT value FROM tagxref" " WHERE tagid=%d" " AND tagxref.tagtype>0" " AND rid=%d", TAG_BRANCH, ridRequested); if ( !branchName ) return 0; /* Find the name of the branch this was forked from */ db_prepare(&s, "SELECT pid, tagxref.value FROM plink JOIN tagxref" " WHERE cid=:rid" " AND isprim=1" " AND tagxref.tagid=%d" " AND tagxref.tagtype>0" " AND tagxref.rid=pid", TAG_BRANCH); rid = ridRequested; while( rid > 0 ) { db_bind_int(&s, ":rid", rid); if ( db_step(&s) == SQLITE_ROW ) { rid = db_column_int(&s, 0); parentBranchName = db_column_text(&s, 1); if ( !parentBranchName ) { rid = 0; break; } if ( fossil_strcmp(parentBranchName, branchName) ) { parentBranchName = fossil_strdup(parentBranchName); break; } }else{ rid = 0; break; } db_reset(&s); } db_finalize(&s); if (rid == 0) return 0; /* Find the last checkin coming from the parent branch */ db_prepare(&s, "SELECT pid, tagxref.value FROM plink JOIN tagxref" " WHERE cid=:rid" " AND tagxref.tagid=%d" " AND tagxref.tagtype>0" " AND tagxref.rid=pid ORDER BY isprim ASC", TAG_BRANCH); rid = ridRequested; while( rid > 0 ) { db_bind_int(&s, ":rid", rid); int found = 0; while ( db_step(&s) == SQLITE_ROW ) { const char *branchNamePid; /* Branch name of the pid */ ++found; rid = db_column_int(&s, 0); branchNamePid = db_column_text(&s, 1); if ( !branchNamePid ) { break; } if ( fossil_strcmp(parentBranchName, branchNamePid)==0 ) { /* Found the last merge from the parent branch */ db_finalize(&s); return rid; } } if (found == 0) { break; } db_reset(&s); } db_finalize(&s); return 0; } |
Changes to src/timeline.c.
︙ | ︙ | |||
117 118 119 120 121 122 123 | /* ** Hash a string and use the hash to determine a background color. */ char *hash_color(const char *z){ int i; /* Loop counter */ unsigned int h = 0; /* Hash on the branch name */ int r, g, b; /* Values for red, green, and blue */ | < < | > > > > | | < < < < < | < > | | > | | | | < > | > | | | < < < | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | /* ** Hash a string and use the hash to determine a background color. */ char *hash_color(const char *z){ int i; /* Loop counter */ unsigned int h = 0; /* Hash on the branch name */ int r, g, b; /* Values for red, green, and blue */ static char zColor[10]; /* The resulting color */ static int whitefg = -1; int cpc = 4; /* colours per component */ int cfactor = 128/cpc; /* Factor so n*cpc < 128 */ int cmin = cfactor - 1; /* Factor so the max component is 127 and the min is different than the bg */ if( whitefg = -1 ) whitefg = db_get_boolean("white-foreground", 0); /* Calculate the hash based on the branch name */ for( i=0; z[i]; i++ ){ h = (h<<11) ^ (h<<1) ^ (h>>3) ^ z[i]; } /* 'cpc' different random values per component, between 'cmin' and 127 */ r = cmin + (h % cpc) * cfactor; h /= cpc; g = cmin + (h % cpc) * cfactor; h /= cpc; b = cmin + (h % cpc) * cfactor; h /= cpc; /* In case of blackfg, get the inverse effect */ if( !whitefg ) { r = 255 - r; g = 255 - g; b = 255 - b; } sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b); return zColor; } /* ** COMMAND: test-hash-color |
︙ | ︙ | |||
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | int suppressCnt = 0; char zPrevDate[20]; GraphContext *pGraph = 0; int prevWasDivider = 0; /* True if previous output row was <hr> */ int fchngQueryInit = 0; /* True if fchngQuery is initialized */ Stmt fchngQuery; /* Query for file changes on check-ins */ static Stmt qbranch; int pendingEndTr = 0; /* True if a </td></tr> is needed */ zPrevDate[0] = 0; mxWikiLen = db_get_int("timeline-max-comment", 0); if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); /* style is not moved to css, because this is ** a technical div for the timeline graph */ @ <div id="canvas" style="position:relative;height:0px;width:0px;" @ onclick="clickOnGraph(event)"></div> | > > > | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | int suppressCnt = 0; char zPrevDate[20]; GraphContext *pGraph = 0; int prevWasDivider = 0; /* True if previous output row was <hr> */ int fchngQueryInit = 0; /* True if fchngQuery is initialized */ Stmt fchngQuery; /* Query for file changes on check-ins */ static Stmt qbranch; const char *zDiffTarget; /* String for the target diff window */ int pendingEndTr = 0; /* True if a </td></tr> is needed */ zPrevDate[0] = 0; mxWikiLen = db_get_int("timeline-max-comment", 0); zDiffTarget = db_get_boolean("href-targets", 1) ? "target='diffwindow'": ""; if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); /* style is not moved to css, because this is ** a technical div for the timeline graph */ @ <div id="canvas" style="position:relative;height:0px;width:0px;" @ onclick="clickOnGraph(event)"></div> |
︙ | ︙ | |||
445 446 447 448 449 450 451 | const char *zNew = db_column_text(&fchngQuery, 3); if( !inUl ){ @ <ul class="filelist"> inUl = 1; } if( isNew ){ @ <li> %h(zFilename) (new file) | | | | | 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 | const char *zNew = db_column_text(&fchngQuery, 3); if( !inUl ){ @ <ul class="filelist"> inUl = 1; } if( isNew ){ @ <li> %h(zFilename) (new file) @ %z(xhref(zDiffTarget,"%R/artifact/%S",zNew)) @ [view]</a></li> }else if( isDel ){ @ <li> %h(zFilename) (deleted)</li> }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){ @ <li> %h(zOldName) → %h(zFilename) @ %z(xhref(zDiffTarget,"%R/artifact/%S",zNew)) @ [view]</a></li> }else{ if( zOldName!=0 ){ @ <li> %h(zOldName) → %h(zFilename) }else{ @ <li> %h(zFilename) } @ %z(xhref(zDiffTarget,"%R/fdiff?v1=%S&v2=%S",zOld,zNew)) @ [diff]</a></li> } } db_reset(&fchngQuery); if( inUl ){ @ </ul> } |
︙ | ︙ |