Fossil SCM
3 more "full UUID" cases
Commit
f46482a9053484560f08abffbe2d6fec7cfd62d7
Parent
a16236e70dafc57…
1 file changed
+7
-7
+7
-7
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1947,15 +1947,15 @@ | ||
| 1947 | 1947 | free(zComment); |
| 1948 | 1948 | }else{ |
| 1949 | 1949 | char *zComment; |
| 1950 | 1950 | if( p->zAttachSrc && p->zAttachSrc[0] ){ |
| 1951 | 1951 | zComment = mprintf( |
| 1952 | - "Add attachment [/artifact/%S|%h] to ticket [%S]", | |
| 1953 | - 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); | |
| 1954 | 1954 | }else{ |
| 1955 | - zComment = mprintf("Delete attachment \"%h\" from ticket [%.10s]", | |
| 1956 | - p->zAttachName, p->zAttachTarget); | |
| 1955 | + zComment = mprintf("Delete attachment \"%h\" from ticket [%s|%.10s]", | |
| 1956 | + p->zAttachName, p->zAttachTarget, p->zAttachTarget); | |
| 1957 | 1957 | } |
| 1958 | 1958 | db_multi_exec( |
| 1959 | 1959 | "REPLACE INTO event(type,mtime,objid,user,comment)" |
| 1960 | 1960 | "VALUES('t',%.17g,%d,%Q,%Q)", |
| 1961 | 1961 | p->rDate, rid, p->zUser, zComment |
| @@ -1979,12 +1979,12 @@ | ||
| 1979 | 1979 | for(i=0; i<p->nTag; i++){ |
| 1980 | 1980 | zTagUuid = p->aTag[i].zUuid; |
| 1981 | 1981 | if( !zTagUuid ) continue; |
| 1982 | 1982 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1983 | 1983 | blob_appendf(&comment, |
| 1984 | - " Edit [%S]:", | |
| 1985 | - zTagUuid); | |
| 1984 | + " Edit [%s|%.10s]:", | |
| 1985 | + zTagUuid, zTagUuid); | |
| 1986 | 1986 | branchMove = 0; |
| 1987 | 1987 | if( permitHooks && db_exists("SELECT 1 FROM event, blob" |
| 1988 | 1988 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1989 | 1989 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1990 | 1990 | zScript = xfer_commit_code(); |
| @@ -1993,11 +1993,11 @@ | ||
| 1993 | 1993 | } |
| 1994 | 1994 | zName = p->aTag[i].zName; |
| 1995 | 1995 | zValue = p->aTag[i].zValue; |
| 1996 | 1996 | if( strcmp(zName, "*branch")==0 ){ |
| 1997 | 1997 | blob_appendf(&comment, |
| 1998 | - " Move to branch [/timeline?r=%h&nd&dp=%S&unhide | %h].", | |
| 1998 | + " Move to branch [/timeline?r=%h&nd&dp=%s&unhide | %h].", | |
| 1999 | 1999 | zValue, zTagUuid, zValue); |
| 2000 | 2000 | branchMove = 1; |
| 2001 | 2001 | continue; |
| 2002 | 2002 | }else if( strcmp(zName, "*bgcolor")==0 ){ |
| 2003 | 2003 | blob_appendf(&comment, |
| 2004 | 2004 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1947,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]", |
| 1953 | p->zAttachSrc, p->zAttachName, p->zAttachTarget); |
| 1954 | }else{ |
| 1955 | zComment = mprintf("Delete attachment \"%h\" from ticket [%.10s]", |
| 1956 | p->zAttachName, 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 |
| @@ -1979,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]:", |
| 1985 | 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(); |
| @@ -1993,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 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1947,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 |
| @@ -1979,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(); |
| @@ -1993,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 |