Fossil SCM

merge trunk

jan.nijtmans 2014-03-27 09:06 cleanX merge
Commit a40d3f90eb48fee7116ad811d92b9650005f60f7
Parent b0b723fbff39289…
4 files changed +20 -19 +9 +1 -1 +9
~ src/manifest.c ~ src/tar.c ~ src/timeline.c ~ src/zip.c
M src/manifest.c
+20 -19
--- 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)",
@@ -1946,15 +1947,15 @@
19461947
 free(zComment);
19471948
 }else{
19481949
 char *zComment;
19491950
 if( p->zAttachSrc && p->zAttachSrc[0] ){
19501951
 zComment = mprintf(
1951
- "Add attachment [/artifact/%S|%h] to ticket [%S]",
1952
- p->zAttachSrc, p->zAttachName, p->zAttachTarget);
1952
+ "Add attachment [/artifact/%S|%h] to ticket [%s|%.10s]",
1953
+ p->zAttachSrc, p->zAttachName, p->zAttachTarget, p->zAttachTarget);
19531954
 }else{
1954
- zComment = mprintf("Delete attachment \"%h\" from ticket [%.10s]",
1955
- p->zAttachName, p->zAttachTarget);
1955
+ zComment = mprintf("Delete attachment \"%h\" from ticket [%s|%.10s]",
1956
+ p->zAttachName, p->zAttachTarget, p->zAttachTarget);
19561957
 }
19571958
 db_multi_exec(
19581959
 "REPLACE INTO event(type,mtime,objid,user,comment)"
19591960
 "VALUES('t',%.17g,%d,%Q,%Q)",
19601961
 p->rDate, rid, p->zUser, zComment
@@ -1978,12 +1979,12 @@
19781979
 for(i=0; i<p->nTag; i++){
19791980
 zTagUuid = p->aTag[i].zUuid;
19801981
 if( !zTagUuid ) continue;
19811982
 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
19821983
 blob_appendf(&comment,
1983
- " Edit [%S]:",
1984
- zTagUuid);
1984
+ " Edit [%s|%.10s]:",
1985
+ zTagUuid, zTagUuid);
19851986
 branchMove = 0;
19861987
 if( permitHooks && db_exists("SELECT 1 FROM event, blob"
19871988
 " WHERE event.type='ci' AND event.objid=blob.rid"
19881989
 " AND blob.uuid='%s'", zTagUuid) ){
19891990
 zScript = xfer_commit_code();
@@ -1992,11 +1993,11 @@
19921993
 }
19931994
 zName = p->aTag[i].zName;
19941995
 zValue = p->aTag[i].zValue;
19951996
 if( strcmp(zName, "*branch")==0 ){
19961997
 blob_appendf(&comment,
1997
- " Move to branch [/timeline?r=%h&nd&dp=%S&unhide | %h].",
1998
+ " Move to branch [/timeline?r=%h&nd&dp=%s&unhide | %h].",
19981999
 zValue, zTagUuid, zValue);
19992000
 branchMove = 1;
20002001
 continue;
20012002
 }else if( strcmp(zName, "*bgcolor")==0 ){
20022003
 blob_appendf(&comment,
20032004
--- 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)",
@@ -1946,15 +1947,15 @@
1946 free(zComment);
1947 }else{
1948 char *zComment;
1949 if( p->zAttachSrc && p->zAttachSrc[0] ){
1950 zComment = mprintf(
1951 "Add attachment [/artifact/%S|%h] to ticket [%S]",
1952 p->zAttachSrc, p->zAttachName, p->zAttachTarget);
1953 }else{
1954 zComment = mprintf("Delete attachment \"%h\" from ticket [%.10s]",
1955 p->zAttachName, p->zAttachTarget);
1956 }
1957 db_multi_exec(
1958 "REPLACE INTO event(type,mtime,objid,user,comment)"
1959 "VALUES('t',%.17g,%d,%Q,%Q)",
1960 p->rDate, rid, p->zUser, zComment
@@ -1978,12 +1979,12 @@
1978 for(i=0; i<p->nTag; i++){
1979 zTagUuid = p->aTag[i].zUuid;
1980 if( !zTagUuid ) continue;
1981 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
1982 blob_appendf(&comment,
1983 " Edit [%S]:",
1984 zTagUuid);
1985 branchMove = 0;
1986 if( permitHooks && db_exists("SELECT 1 FROM event, blob"
1987 " WHERE event.type='ci' AND event.objid=blob.rid"
1988 " AND blob.uuid='%s'", zTagUuid) ){
1989 zScript = xfer_commit_code();
@@ -1992,11 +1993,11 @@
1992 }
1993 zName = p->aTag[i].zName;
1994 zValue = p->aTag[i].zValue;
1995 if( strcmp(zName, "*branch")==0 ){
1996 blob_appendf(&comment,
1997 " Move to branch [/timeline?r=%h&nd&dp=%S&unhide | %h].",
1998 zValue, zTagUuid, zValue);
1999 branchMove = 1;
2000 continue;
2001 }else if( strcmp(zName, "*bgcolor")==0 ){
2002 blob_appendf(&comment,
2003
--- 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)",
@@ -1946,15 +1947,15 @@
1947 free(zComment);
1948 }else{
1949 char *zComment;
1950 if( p->zAttachSrc && p->zAttachSrc[0] ){
1951 zComment = mprintf(
1952 "Add attachment [/artifact/%S|%h] to ticket [%s|%.10s]",
1953 p->zAttachSrc, p->zAttachName, p->zAttachTarget, p->zAttachTarget);
1954 }else{
1955 zComment = mprintf("Delete attachment \"%h\" from ticket [%s|%.10s]",
1956 p->zAttachName, p->zAttachTarget, p->zAttachTarget);
1957 }
1958 db_multi_exec(
1959 "REPLACE INTO event(type,mtime,objid,user,comment)"
1960 "VALUES('t',%.17g,%d,%Q,%Q)",
1961 p->rDate, rid, p->zUser, zComment
@@ -1978,12 +1979,12 @@
1979 for(i=0; i<p->nTag; i++){
1980 zTagUuid = p->aTag[i].zUuid;
1981 if( !zTagUuid ) continue;
1982 if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
1983 blob_appendf(&comment,
1984 " Edit [%s|%.10s]:",
1985 zTagUuid, zTagUuid);
1986 branchMove = 0;
1987 if( permitHooks && db_exists("SELECT 1 FROM event, blob"
1988 " WHERE event.type='ci' AND event.objid=blob.rid"
1989 " AND blob.uuid='%s'", zTagUuid) ){
1990 zScript = xfer_commit_code();
@@ -1992,11 +1993,11 @@
1993 }
1994 zName = p->aTag[i].zName;
1995 zValue = p->aTag[i].zValue;
1996 if( strcmp(zName, "*branch")==0 ){
1997 blob_appendf(&comment,
1998 " Move to branch [/timeline?r=%h&nd&dp=%s&unhide | %h].",
1999 zValue, zTagUuid, zValue);
2000 branchMove = 1;
2001 continue;
2002 }else if( strcmp(zName, "*bgcolor")==0 ){
2003 blob_appendf(&comment,
2004
M src/tar.c
+9
--- src/tar.c
+++ src/tar.c
@@ -571,10 +571,19 @@
571571
 ** WEBPAGE: tarball
572572
 ** URL: /tarball/RID.tar.gz
573573
 **
574574
 ** Generate a compressed tarball for a checkin.
575575
 ** Return that tarball as the HTTP reply content.
576
+**
577
+** Optional URL Parameters:
578
+**
579
+** - name=base name of the output file. Defaults to
580
+** something project/version-specific.
581
+**
582
+** - uuid=the version to tar (may be a tag/branch name).
583
+** Defaults to trunk.
584
+**
576585
 */
577586
 void tarball_page(void){
578587
 int rid;
579588
 char *zName, *zRid;
580589
 int nName, nRid;
581590
--- src/tar.c
+++ src/tar.c
@@ -571,10 +571,19 @@
571 ** WEBPAGE: tarball
572 ** URL: /tarball/RID.tar.gz
573 **
574 ** Generate a compressed tarball for a checkin.
575 ** Return that tarball as the HTTP reply content.
 
 
 
 
 
 
 
 
 
576 */
577 void tarball_page(void){
578 int rid;
579 char *zName, *zRid;
580 int nName, nRid;
581
--- src/tar.c
+++ src/tar.c
@@ -571,10 +571,19 @@
571 ** WEBPAGE: tarball
572 ** URL: /tarball/RID.tar.gz
573 **
574 ** Generate a compressed tarball for a checkin.
575 ** Return that tarball as the HTTP reply content.
576 **
577 ** Optional URL Parameters:
578 **
579 ** - name=base name of the output file. Defaults to
580 ** something project/version-specific.
581 **
582 ** - uuid=the version to tar (may be a tag/branch name).
583 ** Defaults to trunk.
584 **
585 */
586 void tarball_page(void){
587 int rid;
588 char *zName, *zRid;
589 int nName, nRid;
590
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
M src/zip.c
+9
--- src/zip.c
+++ src/zip.c
@@ -418,10 +418,19 @@
418418
 ** WEBPAGE: zip
419419
 ** URL: /zip/RID.zip
420420
 **
421421
 ** Generate a ZIP archive for the baseline.
422422
 ** Return that ZIP archive as the HTTP reply content.
423
+**
424
+** Optional URL Parameters:
425
+**
426
+** - name=base name of the output file. Defaults to
427
+** something project/version-specific.
428
+**
429
+** - uuid=the version to zip (may be a tag/branch name).
430
+** Defaults to trunk.
431
+**
423432
 */
424433
 void baseline_zip_page(void){
425434
 int rid;
426435
 char *zName, *zRid;
427436
 int nName, nRid;
428437
--- src/zip.c
+++ src/zip.c
@@ -418,10 +418,19 @@
418 ** WEBPAGE: zip
419 ** URL: /zip/RID.zip
420 **
421 ** Generate a ZIP archive for the baseline.
422 ** Return that ZIP archive as the HTTP reply content.
 
 
 
 
 
 
 
 
 
423 */
424 void baseline_zip_page(void){
425 int rid;
426 char *zName, *zRid;
427 int nName, nRid;
428
--- src/zip.c
+++ src/zip.c
@@ -418,10 +418,19 @@
418 ** WEBPAGE: zip
419 ** URL: /zip/RID.zip
420 **
421 ** Generate a ZIP archive for the baseline.
422 ** Return that ZIP archive as the HTTP reply content.
423 **
424 ** Optional URL Parameters:
425 **
426 ** - name=base name of the output file. Defaults to
427 ** something project/version-specific.
428 **
429 ** - uuid=the version to zip (may be a tag/branch name).
430 ** Defaults to trunk.
431 **
432 */
433 void baseline_zip_page(void){
434 int rid;
435 char *zName, *zRid;
436 int nName, nRid;
437

Keyboard Shortcuts

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