Fossil SCM

Include branch information in the output of the finfo command. Patches from Peter Spjuth.

drh 2012-08-27 21:09 trunk
Commit 724bf68a2f4eaccd6b1ed91fb7c299c68dab5550
Parent 22806c5f59db5b4…
1 file changed +9 -4
~ src/finfo.c
M src/finfo.c
+9 -4
--- src/finfo.c
+++ src/finfo.c
@@ -158,19 +158,21 @@
158158
 }
159159
 zFilename = blob_str(&fname);
160160
 db_prepare(&q,
161161
 "SELECT b.uuid, ci.uuid, date(event.mtime,'localtime'),"
162162
 " coalesce(event.ecomment, event.comment),"
163
- " coalesce(event.euser, event.user)"
163
+ " coalesce(event.euser, event.user),"
164
+ " (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
165
+ " AND tagxref.rid=mlink.mid)" /* Tags */
164166
 " FROM mlink, blob b, event, blob ci, filename"
165167
 " WHERE filename.name=%Q %s"
166168
 " AND mlink.fnid=filename.fnid"
167169
 " AND b.rid=mlink.fid"
168170
 " AND event.objid=mlink.mid"
169171
 " AND event.objid=ci.rid"
170172
 " ORDER BY event.mtime DESC LIMIT %d OFFSET %d",
171
- zFilename, filename_collation(), iLimit, iOffset
173
+ TAG_BRANCH, zFilename, filename_collation(), iLimit, iOffset
172174
 );
173175
 blob_zero(&line);
174176
 if( iBrief ){
175177
 fossil_print("History of %s\n", blob_str(&fname));
176178
 }
@@ -178,22 +180,25 @@
178180
 const char *zFileUuid = db_column_text(&q, 0);
179181
 const char *zCiUuid = db_column_text(&q,1);
180182
 const char *zDate = db_column_text(&q, 2);
181183
 const char *zCom = db_column_text(&q, 3);
182184
 const char *zUser = db_column_text(&q, 4);
185
+ const char *zBr = db_column_text(&q, 5);
183186
 char *zOut;
187
+ if( zBr==0 ) zBr = "trunk";
184188
 if( iBrief ){
185189
 fossil_print("%s ", zDate);
186
- zOut = sqlite3_mprintf("[%.10s] %s (user: %s, artifact: [%.10s])",
187
- zCiUuid, zCom, zUser, zFileUuid);
190
+ zOut = sqlite3_mprintf("[%.10s] %s (user: %s, artifact: [%.10s], branch: %s)",
191
+ zCiUuid, zCom, zUser, zFileUuid, zBr);
188192
 comment_print(zOut, 11, 79);
189193
 sqlite3_free(zOut);
190194
 }else{
191195
 blob_reset(&line);
192196
 blob_appendf(&line, "%.10s ", zCiUuid);
193197
 blob_appendf(&line, "%.10s ", zDate);
194198
 blob_appendf(&line, "%8.8s ", zUser);
199
+ blob_appendf(&line, "%8.8s ", zBr);
195200
 blob_appendf(&line,"%-40.40s\n", zCom );
196201
 comment_print(blob_str(&line), 0, 79);
197202
 }
198203
 }
199204
 db_finalize(&q);
200205
--- src/finfo.c
+++ src/finfo.c
@@ -158,19 +158,21 @@
158 }
159 zFilename = blob_str(&fname);
160 db_prepare(&q,
161 "SELECT b.uuid, ci.uuid, date(event.mtime,'localtime'),"
162 " coalesce(event.ecomment, event.comment),"
163 " coalesce(event.euser, event.user)"
 
 
164 " FROM mlink, blob b, event, blob ci, filename"
165 " WHERE filename.name=%Q %s"
166 " AND mlink.fnid=filename.fnid"
167 " AND b.rid=mlink.fid"
168 " AND event.objid=mlink.mid"
169 " AND event.objid=ci.rid"
170 " ORDER BY event.mtime DESC LIMIT %d OFFSET %d",
171 zFilename, filename_collation(), iLimit, iOffset
172 );
173 blob_zero(&line);
174 if( iBrief ){
175 fossil_print("History of %s\n", blob_str(&fname));
176 }
@@ -178,22 +180,25 @@
178 const char *zFileUuid = db_column_text(&q, 0);
179 const char *zCiUuid = db_column_text(&q,1);
180 const char *zDate = db_column_text(&q, 2);
181 const char *zCom = db_column_text(&q, 3);
182 const char *zUser = db_column_text(&q, 4);
 
183 char *zOut;
 
184 if( iBrief ){
185 fossil_print("%s ", zDate);
186 zOut = sqlite3_mprintf("[%.10s] %s (user: %s, artifact: [%.10s])",
187 zCiUuid, zCom, zUser, zFileUuid);
188 comment_print(zOut, 11, 79);
189 sqlite3_free(zOut);
190 }else{
191 blob_reset(&line);
192 blob_appendf(&line, "%.10s ", zCiUuid);
193 blob_appendf(&line, "%.10s ", zDate);
194 blob_appendf(&line, "%8.8s ", zUser);
 
195 blob_appendf(&line,"%-40.40s\n", zCom );
196 comment_print(blob_str(&line), 0, 79);
197 }
198 }
199 db_finalize(&q);
200
--- src/finfo.c
+++ src/finfo.c
@@ -158,19 +158,21 @@
158 }
159 zFilename = blob_str(&fname);
160 db_prepare(&q,
161 "SELECT b.uuid, ci.uuid, date(event.mtime,'localtime'),"
162 " coalesce(event.ecomment, event.comment),"
163 " coalesce(event.euser, event.user),"
164 " (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
165 " AND tagxref.rid=mlink.mid)" /* Tags */
166 " FROM mlink, blob b, event, blob ci, filename"
167 " WHERE filename.name=%Q %s"
168 " AND mlink.fnid=filename.fnid"
169 " AND b.rid=mlink.fid"
170 " AND event.objid=mlink.mid"
171 " AND event.objid=ci.rid"
172 " ORDER BY event.mtime DESC LIMIT %d OFFSET %d",
173 TAG_BRANCH, zFilename, filename_collation(), iLimit, iOffset
174 );
175 blob_zero(&line);
176 if( iBrief ){
177 fossil_print("History of %s\n", blob_str(&fname));
178 }
@@ -178,22 +180,25 @@
180 const char *zFileUuid = db_column_text(&q, 0);
181 const char *zCiUuid = db_column_text(&q,1);
182 const char *zDate = db_column_text(&q, 2);
183 const char *zCom = db_column_text(&q, 3);
184 const char *zUser = db_column_text(&q, 4);
185 const char *zBr = db_column_text(&q, 5);
186 char *zOut;
187 if( zBr==0 ) zBr = "trunk";
188 if( iBrief ){
189 fossil_print("%s ", zDate);
190 zOut = sqlite3_mprintf("[%.10s] %s (user: %s, artifact: [%.10s], branch: %s)",
191 zCiUuid, zCom, zUser, zFileUuid, zBr);
192 comment_print(zOut, 11, 79);
193 sqlite3_free(zOut);
194 }else{
195 blob_reset(&line);
196 blob_appendf(&line, "%.10s ", zCiUuid);
197 blob_appendf(&line, "%.10s ", zDate);
198 blob_appendf(&line, "%8.8s ", zUser);
199 blob_appendf(&line, "%8.8s ", zBr);
200 blob_appendf(&line,"%-40.40s\n", zCom );
201 comment_print(blob_str(&line), 0, 79);
202 }
203 }
204 db_finalize(&q);
205

Keyboard Shortcuts

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