Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch improved-name-change-display Excluding Merge-Ins
This is equivalent to a diff from a39a992b4e to 6dba4c6a58
|
2012-12-18
| ||
| 02:38 | Fix the display of file renames so that they show up as just renames and do not also appear as a delete. check-in: ebd36f9b2b user: drh tags: trunk | |
| 02:18 | Fix a typo - repeated word "from" Leaf check-in: 6dba4c6a58 user: drh tags: improved-name-change-display | |
| 01:54 | Here is a better fix for the name-change-display issue. This one does not require running "fossil rebuild" assuming you start from trunk. (If you are updating from the previous check-in on this branch a rebuild is necessary to undo the changes that the previous check-in added.) check-in: aa9a2485de user: drh tags: improved-name-change-display | |
| 01:39 | When a file is renamed, do not show it has having been deleted in addition to being renamed. After upgrading through this change, you must run "fossil rebuild" for the fix to take effect. check-in: 4ac43fe6e3 user: drh tags: improved-name-change-display | |
|
2012-12-17
| ||
| 14:00 | Enhanced comments in the diff.c source code file. No code changes. check-in: a39a992b4e user: drh tags: trunk | |
| 00:38 | Change the footer in the 'Enhanced Default' skin to show the approximate time needed to generated the HTML for the page. check-in: 0c6e645175 user: mistachkin tags: trunk | |
Changes to src/info.c.
358 358 }else{ 359 359 if( zOld && zNew ){ 360 360 if( fossil_strcmp(zOld, zNew)!=0 ){ 361 361 @ <p>Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a> 362 362 @ from %z(href("%R/artifact/%s",zOld))[%S(zOld)]</a> 363 363 @ to %z(href("%R/artifact/%s",zNew))[%S(zNew)].</a> 364 364 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ 365 - @ <p>Name change from 365 + @ <p>Name change 366 366 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a> 367 367 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>. 368 368 }else{ 369 369 @ <p>Execute permission %s(( mperm==PERM_EXE )?"set":"cleared") for 370 370 @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a> 371 371 } 372 372 }else if( zOld ){ ................................................................................ 698 698 "SELECT name," 699 699 " mperm," 700 700 " (SELECT uuid FROM blob WHERE rid=mlink.pid)," 701 701 " (SELECT uuid FROM blob WHERE rid=mlink.fid)," 702 702 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)" 703 703 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" 704 704 " WHERE mlink.mid=%d" 705 + " AND (mlink.fid>0" 706 + " OR mlink.fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=%d))" 705 707 " ORDER BY name /*sort*/", 706 - rid 708 + rid, rid 707 709 ); 708 710 diffFlags = construct_diff_flags(showDiff, sideBySide); 709 711 while( db_step(&q)==SQLITE_ROW ){ 710 712 const char *zName = db_column_text(&q,0); 711 713 int mperm = db_column_int(&q, 1); 712 714 const char *zOld = db_column_text(&q,2); 713 715 const char *zNew = db_column_text(&q,3);
Changes to src/manifest.c.
1981 1981 manifest_cache_insert(p); 1982 1982 }else{ 1983 1983 manifest_destroy(p); 1984 1984 } 1985 1985 assert( blob_is_reset(pContent) ); 1986 1986 return 1; 1987 1987 } 1988 + 1989 +/* 1990 +** COMMAND: test-crosslink 1991 +** 1992 +** Usage: %fossil test-crosslink RECORDID 1993 +** 1994 +** Run the manifest_crosslink() routine on the artifact with the given 1995 +** record ID. This is typically done in the debugger. 1996 +*/ 1997 +void test_crosslink_cmd(void){ 1998 + int rid; 1999 + Blob content; 2000 + db_find_and_open_repository(0, 0); 2001 + if( g.argc!=3 ) usage("RECORDID"); 2002 + rid = name_to_rid(g.argv[2]); 2003 + content_get(rid, &content); 2004 + manifest_crosslink(rid, &content); 2005 +}
Changes to src/timeline.c.
424 424 " (fid==0) AS isdel," 425 425 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name," 426 426 " (SELECT uuid FROM blob WHERE rid=fid)," 427 427 " (SELECT uuid FROM blob WHERE rid=pid)," 428 428 " (SELECT name FROM filename WHERE fnid=mlink.pfnid) AS oldnm" 429 429 " FROM mlink" 430 430 " WHERE mid=:mid AND (pid!=fid OR pfnid>0)" 431 + " AND (fid>0 OR" 432 + " fnid NOT IN (SELECT pfnid FROM mlink WHERE mid=:mid))" 431 433 " ORDER BY 3 /*sort*/" 432 434 ); 433 435 fchngQueryInit = 1; 434 436 } 435 437 db_bind_int(&fchngQuery, ":mid", rid); 436 438 while( db_step(&fchngQuery)==SQLITE_ROW ){ 437 439 const char *zFilename = db_column_text(&fchngQuery, 2);