Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Update the "checkin" command so that the template check-in message contains a comment that shows the branch tags that will be associated with the new check-in. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
6df39e37f2094628ecdda8f3575deabf |
| User & Date: | drh 2009-12-17 14:51:24.000 |
Context
|
2009-12-17
| ||
| 15:23 | Remove from the "New Report Format" text obsolete instructions that had been copied out of CVSTrac. Ticket [66de5264986]. ... (check-in: 4b0d2fbefb user: drh tags: trunk) | |
| 14:51 | Update the "checkin" command so that the template check-in message contains a comment that shows the branch tags that will be associated with the new check-in. ... (check-in: 6df39e37f2 user: drh tags: trunk) | |
| 14:27 | Change the "ls" command so that it only shows the filenames by default. To see the extra information about the status of each file, add the -l option. Ex: "fossil ls -l" ... (check-in: 9c06ea3120 user: drh tags: trunk) | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
259 260 261 262 263 264 265 266 | /* ** Prepare a commit comment. Let the user modify it using the ** editor specified in the global_config table or either ** the VISUAL or EDITOR environment variable. ** ** Store the final commit comment in pComment. pComment is assumed ** to be uninitialized - any prior content is overwritten. */ | > > > > > > > > > | > > > > > > > > > > > | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 |
/*
** Prepare a commit comment. Let the user modify it using the
** editor specified in the global_config table or either
** the VISUAL or EDITOR environment variable.
**
** Store the final commit comment in pComment. pComment is assumed
** to be uninitialized - any prior content is overwritten.
**
** zInit is the text of the most recent failed attempt to check in
** this same change. Use zInit to reinitialize the check-in comment
** so that the user does not have to retype.
**
** zBranch is the name of a new branch that this check-in is forced into.
** zBranch might be NULL or an empty string if no forcing occurs.
**
** parent_rid is the recordid of the parent check-in.
*/
static void prepare_commit_comment(
Blob *pComment,
char *zInit,
const char *zBranch,
int parent_rid
){
const char *zEditor;
char *zCmd;
char *zFile;
Blob text, line;
char *zComment;
int i;
blob_init(&text, zInit, -1);
blob_append(&text,
"\n"
"# Enter comments on this check-in. Lines beginning with # are ignored.\n"
"# The check-in comment follows wiki formatting rules.\n"
"#\n", -1
);
if( zBranch && zBranch[0] ){
blob_appendf(&text, "# tags: %s\n#\n", zBranch);
}else{
char *zTags = info_tags_of_checkin(parent_rid);
if( zTags ) blob_appendf(&text, "# tags: %z\n#\n", zTags);
}
if( g.markPrivate ){
blob_append(&text,
"# PRIVATE BRANCH: This check-in will be private and will not sync to\n"
"# repositories.\n"
"#\n", -1
);
}
|
| ︙ | ︙ | |||
556 557 558 559 560 561 562 |
blob_zero(&comment);
blob_append(&comment, zComment, -1);
}else if( zCommentFile ){
blob_zero(&comment);
blob_read_from_file(&comment, zCommentFile);
}else{
char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
| | | 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 |
blob_zero(&comment);
blob_append(&comment, zComment, -1);
}else if( zCommentFile ){
blob_zero(&comment);
blob_read_from_file(&comment, zCommentFile);
}else{
char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
prepare_commit_comment(&comment, zInit, zBranch, vid);
free(zInit);
}
if( blob_size(&comment)==0 ){
Blob ans;
blob_zero(&ans);
prompt_user("empty check-in comment. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | ** "info" command gives command-line access to information about ** the current tree, or a particular artifact or check-in. */ #include "config.h" #include "info.h" #include <assert.h> /* ** Print common information about a particular record. ** ** * The UUID ** * The record ID ** * mtime and ctime | > > > > > > > > > > > > > > > > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
** "info" command gives command-line access to information about
** the current tree, or a particular artifact or check-in.
*/
#include "config.h"
#include "info.h"
#include <assert.h>
/*
** Return a string (in memory obtained from malloc) holding a
** comma-separated list of tags that apply to check-in with
** record-id rid.
**
** Return NULL if there are no such tags.
*/
char *info_tags_of_checkin(int rid){
char *zTags;
zTags = db_text(0, "SELECT group_concat(substr(tagname, 5), ', ')"
" FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagxref.tagtype>0"
" AND tag.tagid=tagxref.tagid"
" AND tag.tagname GLOB 'sym-*'",
rid);
return zTags;
}
/*
** Print common information about a particular record.
**
** * The UUID
** * The record ID
** * mtime and ctime
|
| ︙ | ︙ | |||
75 76 77 78 79 80 81 |
"SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d",
db_column_int(&q, 1)
);
printf("child: %s %s\n", zUuid, zDate);
free(zDate);
}
db_finalize(&q);
| < < < < < | | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
"SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d",
db_column_int(&q, 1)
);
printf("child: %s %s\n", zUuid, zDate);
free(zDate);
}
db_finalize(&q);
zTags = info_tags_of_checkin(rid);
if( zTags && zTags[0] ){
printf("tags: %s\n", zTags);
}
free(zTags);
if( zComment ){
printf("comment:\n%s\n", zComment);
free(zComment);
|
| ︙ | ︙ |