Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch cancel-tag-fix Excluding Merge-Ins
This is equivalent to a diff from 4e463bf7ba to 818c0acd07
|
2013-12-16
| ||
| 10:46 | If the name of a 'sym-<branchname>' tag sorts before the 'branch' tag, no option in the ci_edit page should be displayed to cancel the tag. Bug-fix discovered and implemented by Andy Bradford. check-in: 3529f2c47b user: jan.nijtmans tags: trunk | |
|
2013-12-14
| ||
| 17:32 | Revert to original ordering to retain sorting of special tags. Get the branch name prior to the loop that displays the special and sym- tags. Closed-Leaf check-in: 818c0acd07 user: andybradford tags: cancel-tag-fix | |
|
2013-12-13
| ||
| 20:36 | Prevent the argument that follows -A from being interpreted as a repository and avoid incorrect file already exists errors. check-in: cc421c006a user: andybradford tags: trunk | |
| 17:50 | Prevent sym- tag that matches branch name that sorts prior to branch name from displaying an option to cancel the tag. Also clean up a couple strcmp. check-in: c36ad48a87 user: andybradford tags: cancel-tag-fix | |
| 14:19 | Merge trunk and fix typo (missing backslash) check-in: 847107015b user: jan.nijtmans tags: tkt-change-hook | |
| 13:53 | merge trunk check-in: 46e1d4c812 user: jan.nijtmans tags: win32-longpath | |
| 13:48 | Better use GetCurrentDirectoryW in stead of _wgetcwd. check-in: 4e463bf7ba user: jan.nijtmans tags: trunk | |
| 13:05 | Better implementation of file_access() for win32: The function _waccess cannot handle long paths, and lies too much (e.g. when handling specific smb drives). Implementation borrowed from Tcl 8.6: http://core.tcl.tk/tcl/artifact/c6b5d4f8d7?ln=1510-1756 check-in: 0b0eb52c07 user: jan.nijtmans tags: trunk | |
Changes to src/info.c.
| ︙ | ︙ | |||
2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 |
@ <tr><th align="right" valign="top">Tags:</th>
@ <td valign="top">
@ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) />
@ Add the following new tag name to this check-in:</label>
@ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)"
@ onkeyup="gebi('newtag').checked=!!this.value" />
db_prepare(&q,
"SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
" ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
" ELSE tagname END /*sort*/",
rid
);
while( db_step(&q)==SQLITE_ROW ){
int tagid = db_column_int(&q, 0);
const char *zTagName = db_column_text(&q, 1);
| > > > | < | | 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 |
@ <tr><th align="right" valign="top">Tags:</th>
@ <td valign="top">
@ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) />
@ Add the following new tag name to this check-in:</label>
@ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)"
@ onkeyup="gebi('newtag').checked=!!this.value" />
zBranchName = db_text(0, "SELECT value FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
" AND tagxref.tagid=%d", rid, TAG_BRANCH);
db_prepare(&q,
"SELECT tag.tagid, tagname, tagxref.value FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
" ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
" ELSE tagname END /*sort*/",
rid
);
while( db_step(&q)==SQLITE_ROW ){
int tagid = db_column_int(&q, 0);
const char *zTagName = db_column_text(&q, 1);
int isSpecialTag = fossil_strncmp(zTagName, "sym-", 4)!=0;
char zLabel[30];
if (tagid == TAG_CLOSED){
fHasClosed = 1;
}else if (tagid == TAG_COMMENT){
continue;
}else if (tagid == TAG_BRANCH){
continue;
}else if( !isSpecialTag && zBranchName &&
fossil_strcmp(&zTagName[4], zBranchName)==0){
continue;
}
sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
@ <br /><label>
if( P(zLabel) ){
@ <input type="checkbox" name="c%d(tagid)" checked="checked" />
}else{
|
| ︙ | ︙ |