Fossil SCM

Use full UUID's in hyperlinks

jan.nijtmans 2014-03-26 11:03 UTC trunk
Commit a16236e70dafc57f564b20f35670afad02a8fc7a
Parent 4adcd4f4f55f4a1…
2 files changed +13 -12 +1 -1
~ src/manifest.c ~ src/timeline.c
M src/manifest.c
+13 -12
--- src/manifest.c
+++ src/manifest.c
@@ -1589,40 +1589,41 @@
15891589
 if( fossil_strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
15901590
 zNewStatus = pManifest->aField[i].zValue;
15911591
 }
15921592
 }
15931593
 if( zNewStatus ){
1594
- blob_appendf(&comment, "%h ticket [%.10s]: <i>%h</i>",
1595
- zNewStatus, pManifest->zTicketUuid, zTitle
1594
+ blob_appendf(&comment, "%h ticket [%s|%.10s]: <i>%h</i>",
1595
+ zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
15961596
 );
15971597
 if( pManifest->nField>1 ){
15981598
 blob_appendf(&comment, " plus %d other change%s",
15991599
 pManifest->nField-1, pManifest->nField==2 ? "" : "s");
16001600
 }
1601
- blob_appendf(&brief, "%h ticket [%.10s].",
1602
- zNewStatus, pManifest->zTicketUuid);
1601
+ blob_appendf(&brief, "%h ticket [%s|%.10s].",
1602
+ zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid);
16031603
 }else{
16041604
 zNewStatus = db_text("unknown",
16051605
 "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
16061606
 zStatusColumn, pManifest->zTicketUuid
16071607
 );
1608
- blob_appendf(&comment, "Ticket [%.10s] <i>%h</i> status still %h with "
1608
+ blob_appendf(&comment, "Ticket [%s|%.10s] <i>%h</i> status still %h with "
16091609
 "%d other change%s",
1610
- pManifest->zTicketUuid, zTitle, zNewStatus, pManifest->nField,
1611
- pManifest->nField==1 ? "" : "s"
1610
+ pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle, zNewStatus,
1611
+ pManifest->nField, pManifest->nField==1 ? "" : "s"
16121612
 );
16131613
 free(zNewStatus);
1614
- blob_appendf(&brief, "Ticket [%.10s]: %d change%s",
1615
- pManifest->zTicketUuid, pManifest->nField,
1614
+ blob_appendf(&brief, "Ticket [%s|%.10s]: %d change%s",
1615
+ pManifest->zTicketUuid, pManifest->zTicketUuid, pManifest->nField,
16161616
 pManifest->nField==1 ? "" : "s"
16171617
 );
16181618
 }
16191619
 }else{
1620
- blob_appendf(&comment, "New ticket [%.10s] <i>%h</i>.",
1621
- pManifest->zTicketUuid, zTitle
1620
+ blob_appendf(&comment, "New ticket [%s|%.10s] <i>%h</i>.",
1621
+ pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
16221622
 );
1623
- blob_appendf(&brief, "New ticket [%.10s].", pManifest->zTicketUuid);
1623
+ blob_appendf(&brief, "New ticket [%s|%.10s].", pManifest->zTicketUuid,
1624
+ pManifest->zTicketUuid);
16241625
 }
16251626
 free(zTitle);
16261627
 db_multi_exec(
16271628
 "REPLACE INTO event(type,tagid,mtime,objid,user,comment,brief)"
16281629
 "VALUES('t',%d,%.17g,%d,%Q,%Q,%Q)",
16291630
--- src/manifest.c
+++ src/manifest.c
@@ -1589,40 +1589,41 @@
1589 if( fossil_strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
1590 zNewStatus = pManifest->aField[i].zValue;
1591 }
1592 }
1593 if( zNewStatus ){
1594 blob_appendf(&comment, "%h ticket [%.10s]: <i>%h</i>",
1595 zNewStatus, pManifest->zTicketUuid, zTitle
1596 );
1597 if( pManifest->nField>1 ){
1598 blob_appendf(&comment, " plus %d other change%s",
1599 pManifest->nField-1, pManifest->nField==2 ? "" : "s");
1600 }
1601 blob_appendf(&brief, "%h ticket [%.10s].",
1602 zNewStatus, pManifest->zTicketUuid);
1603 }else{
1604 zNewStatus = db_text("unknown",
1605 "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
1606 zStatusColumn, pManifest->zTicketUuid
1607 );
1608 blob_appendf(&comment, "Ticket [%.10s] <i>%h</i> status still %h with "
1609 "%d other change%s",
1610 pManifest->zTicketUuid, zTitle, zNewStatus, pManifest->nField,
1611 pManifest->nField==1 ? "" : "s"
1612 );
1613 free(zNewStatus);
1614 blob_appendf(&brief, "Ticket [%.10s]: %d change%s",
1615 pManifest->zTicketUuid, pManifest->nField,
1616 pManifest->nField==1 ? "" : "s"
1617 );
1618 }
1619 }else{
1620 blob_appendf(&comment, "New ticket [%.10s] <i>%h</i>.",
1621 pManifest->zTicketUuid, zTitle
1622 );
1623 blob_appendf(&brief, "New ticket [%.10s].", pManifest->zTicketUuid);
 
1624 }
1625 free(zTitle);
1626 db_multi_exec(
1627 "REPLACE INTO event(type,tagid,mtime,objid,user,comment,brief)"
1628 "VALUES('t',%d,%.17g,%d,%Q,%Q,%Q)",
1629
--- src/manifest.c
+++ src/manifest.c
@@ -1589,40 +1589,41 @@
1589 if( fossil_strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
1590 zNewStatus = pManifest->aField[i].zValue;
1591 }
1592 }
1593 if( zNewStatus ){
1594 blob_appendf(&comment, "%h ticket [%s|%.10s]: <i>%h</i>",
1595 zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1596 );
1597 if( pManifest->nField>1 ){
1598 blob_appendf(&comment, " plus %d other change%s",
1599 pManifest->nField-1, pManifest->nField==2 ? "" : "s");
1600 }
1601 blob_appendf(&brief, "%h ticket [%s|%.10s].",
1602 zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid);
1603 }else{
1604 zNewStatus = db_text("unknown",
1605 "SELECT %s FROM ticket WHERE tkt_uuid='%s'",
1606 zStatusColumn, pManifest->zTicketUuid
1607 );
1608 blob_appendf(&comment, "Ticket [%s|%.10s] <i>%h</i> status still %h with "
1609 "%d other change%s",
1610 pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle, zNewStatus,
1611 pManifest->nField, pManifest->nField==1 ? "" : "s"
1612 );
1613 free(zNewStatus);
1614 blob_appendf(&brief, "Ticket [%s|%.10s]: %d change%s",
1615 pManifest->zTicketUuid, pManifest->zTicketUuid, pManifest->nField,
1616 pManifest->nField==1 ? "" : "s"
1617 );
1618 }
1619 }else{
1620 blob_appendf(&comment, "New ticket [%s|%.10s] <i>%h</i>.",
1621 pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1622 );
1623 blob_appendf(&brief, "New ticket [%s|%.10s].", pManifest->zTicketUuid,
1624 pManifest->zTicketUuid);
1625 }
1626 free(zTitle);
1627 db_multi_exec(
1628 "REPLACE INTO event(type,tagid,mtime,objid,user,comment,brief)"
1629 "VALUES('t',%d,%.17g,%d,%Q,%Q,%Q)",
1630
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -48,11 +48,11 @@
4848
 */
4949
 void hyperlink_to_uuid(const char *zUuid){
5050
 char z[UUID_SIZE+1];
5151
 shorten_uuid(z, zUuid);
5252
 if( g.perm.Hyperlink ){
53
- @ %z(xhref("class='timelineHistLink'","%R/info/%s",z))[%s(z)]</a>
53
+ @ %z(xhref("class='timelineHistLink'","%R/info/%s",zUuid))[%s(z)]</a>
5454
 }else{
5555
 @ <span class="timelineHistDsp">[%s(z)]</span>
5656
 }
5757
 }
5858
5959
--- src/timeline.c
+++ src/timeline.c
@@ -48,11 +48,11 @@
48 */
49 void hyperlink_to_uuid(const char *zUuid){
50 char z[UUID_SIZE+1];
51 shorten_uuid(z, zUuid);
52 if( g.perm.Hyperlink ){
53 @ %z(xhref("class='timelineHistLink'","%R/info/%s",z))[%s(z)]</a>
54 }else{
55 @ <span class="timelineHistDsp">[%s(z)]</span>
56 }
57 }
58
59
--- src/timeline.c
+++ src/timeline.c
@@ -48,11 +48,11 @@
48 */
49 void hyperlink_to_uuid(const char *zUuid){
50 char z[UUID_SIZE+1];
51 shorten_uuid(z, zUuid);
52 if( g.perm.Hyperlink ){
53 @ %z(xhref("class='timelineHistLink'","%R/info/%s",zUuid))[%s(z)]</a>
54 }else{
55 @ <span class="timelineHistDsp">[%s(z)]</span>
56 }
57 }
58
59

Keyboard Shortcuts

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