Fossil SCM

Integrate andygoth-metadata-info.

andygoth 2015-05-17 00:59 trunk merge
Commit b80c9e3be2016ddfef3a4c0d71e5914661eebbb2
Parent dca018c447dc32f…
3 files changed +16 -4 +3 +3
~ src/info.c ~ www/changes.wiki ~ www/changes.wiki
M src/info.c
+16 -4
--- src/info.c
+++ src/info.c
@@ -376,12 +376,17 @@
376376
 }else if( zOld==0 ){
377377
 @ <p>Added %h(zName)</p>
378378
 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
379379
 @ <p>Name change from %h(zOldName) to %h(zName)
380380
 }else if( fossil_strcmp(zNew, zOld)==0 ){
381
- @ <p>Execute permission %s(( mperm==PERM_EXE )?"set":"cleared")
382
- @ for %h(zName)</p>
381
+ if( mperm==PERM_EXE ){
382
+ @ <p>%h(zName) became executable.</p>
383
+ }else if( mperm==PERM_LNK ){
384
+ @ <p>%h(zName) became a symlink.</p>
385
+ }else{
386
+ @ <p>%h(zName) became a regular file.</p>
387
+ }
383388
 }else{
384389
 @ <p>Changes to %h(zName)</p>
385390
 }
386391
 if( diffFlags ){
387392
 append_diff(zOld, zNew, diffFlags, pRe);
@@ -395,12 +400,19 @@
395400
 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
396401
 @ <p>Name change
397402
 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
398403
 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
399404
 }else{
400
- @ <p>Execute permission %s(( mperm==PERM_EXE )?"set":"cleared") for
401
- @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
405
+ @ <p>%z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
406
+ if( mperm==PERM_EXE ){
407
+ @ executable with contents
408
+ }else if( mperm==PERM_LNK ){
409
+ @ a symlink with target
410
+ }else{
411
+ @ a regular file with contents
412
+ }
413
+ @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
402414
 }
403415
 }else if( zOld ){
404416
 @ <p>Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
405417
 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
406418
 }else{
407419
--- src/info.c
+++ src/info.c
@@ -376,12 +376,17 @@
376 }else if( zOld==0 ){
377 @ <p>Added %h(zName)</p>
378 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
379 @ <p>Name change from %h(zOldName) to %h(zName)
380 }else if( fossil_strcmp(zNew, zOld)==0 ){
381 @ <p>Execute permission %s(( mperm==PERM_EXE )?"set":"cleared")
382 @ for %h(zName)</p>
 
 
 
 
 
383 }else{
384 @ <p>Changes to %h(zName)</p>
385 }
386 if( diffFlags ){
387 append_diff(zOld, zNew, diffFlags, pRe);
@@ -395,12 +400,19 @@
395 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
396 @ <p>Name change
397 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
398 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
399 }else{
400 @ <p>Execute permission %s(( mperm==PERM_EXE )?"set":"cleared") for
401 @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
 
 
 
 
 
 
 
402 }
403 }else if( zOld ){
404 @ <p>Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
405 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
406 }else{
407
--- src/info.c
+++ src/info.c
@@ -376,12 +376,17 @@
376 }else if( zOld==0 ){
377 @ <p>Added %h(zName)</p>
378 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
379 @ <p>Name change from %h(zOldName) to %h(zName)
380 }else if( fossil_strcmp(zNew, zOld)==0 ){
381 if( mperm==PERM_EXE ){
382 @ <p>%h(zName) became executable.</p>
383 }else if( mperm==PERM_LNK ){
384 @ <p>%h(zName) became a symlink.</p>
385 }else{
386 @ <p>%h(zName) became a regular file.</p>
387 }
388 }else{
389 @ <p>Changes to %h(zName)</p>
390 }
391 if( diffFlags ){
392 append_diff(zOld, zNew, diffFlags, pRe);
@@ -395,12 +400,19 @@
400 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
401 @ <p>Name change
402 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
403 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
404 }else{
405 @ <p>%z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
406 if( mperm==PERM_EXE ){
407 @ executable with contents
408 }else if( mperm==PERM_LNK ){
409 @ a symlink with target
410 }else{
411 @ a regular file with contents
412 }
413 @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
414 }
415 }else if( zOld ){
416 @ <p>Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
417 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
418 }else{
419
M www/changes.wiki
+3
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,13 @@
3434
 * Update the built-in SQLite to version 3.8.10.1.
3535
 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
3636
 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
3737
 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
3838
 * Added fork warning to be issued if sync produced a fork
39
+ * Update the [/help?cmd=/info|info] page to report when a file becomes a
40
+ symlink. Additionally show the UUID for files whose types have changed
41
+ without changing contents or symlink target.
3942
 * Have [/help/cmd=changes|fossil changes] and
4043
 [/help/cmd=status|fossil status] report when executable or symlink status
4144
 changes on otherwise unmodified files.
4245
4346
 <h2>Changes for Version 1.32 (2015-03-14)</h2>
4447
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,13 @@
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38 * Added fork warning to be issued if sync produced a fork
 
 
 
39 * Have [/help/cmd=changes|fossil changes] and
40 [/help/cmd=status|fossil status] report when executable or symlink status
41 changes on otherwise unmodified files.
42
43 <h2>Changes for Version 1.32 (2015-03-14)</h2>
44
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,13 @@
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38 * Added fork warning to be issued if sync produced a fork
39 * Update the [/help?cmd=/info|info] page to report when a file becomes a
40 symlink. Additionally show the UUID for files whose types have changed
41 without changing contents or symlink target.
42 * Have [/help/cmd=changes|fossil changes] and
43 [/help/cmd=status|fossil status] report when executable or symlink status
44 changes on otherwise unmodified files.
45
46 <h2>Changes for Version 1.32 (2015-03-14)</h2>
47
M www/changes.wiki
+3
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,13 @@
3434
 * Update the built-in SQLite to version 3.8.10.1.
3535
 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
3636
 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
3737
 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
3838
 * Added fork warning to be issued if sync produced a fork
39
+ * Update the [/help?cmd=/info|info] page to report when a file becomes a
40
+ symlink. Additionally show the UUID for files whose types have changed
41
+ without changing contents or symlink target.
3942
 * Have [/help/cmd=changes|fossil changes] and
4043
 [/help/cmd=status|fossil status] report when executable or symlink status
4144
 changes on otherwise unmodified files.
4245
4346
 <h2>Changes for Version 1.32 (2015-03-14)</h2>
4447
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,13 @@
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38 * Added fork warning to be issued if sync produced a fork
 
 
 
39 * Have [/help/cmd=changes|fossil changes] and
40 [/help/cmd=status|fossil status] report when executable or symlink status
41 changes on otherwise unmodified files.
42
43 <h2>Changes for Version 1.32 (2015-03-14)</h2>
44
--- www/changes.wiki
+++ www/changes.wiki
@@ -34,10 +34,13 @@
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38 * Added fork warning to be issued if sync produced a fork
39 * Update the [/help?cmd=/info|info] page to report when a file becomes a
40 symlink. Additionally show the UUID for files whose types have changed
41 without changing contents or symlink target.
42 * Have [/help/cmd=changes|fossil changes] and
43 [/help/cmd=status|fossil status] report when executable or symlink status
44 changes on otherwise unmodified files.
45
46 <h2>Changes for Version 1.32 (2015-03-14)</h2>
47

Keyboard Shortcuts

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