Fossil

Diff
Login

Differences From Artifact [ffbb452f74]:

To Artifact [4a024d4405]:


103
104
105
106
107
108
109
110

111
112
113
114
115
116


117
118
119
120
121
122
123
103
104
105
106
107
108
109

110
111
112
113
114


115
116
117
118
119
120
121
122
123







-
+




-
-
+
+







    }
  }
  zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rootid);
  blob_appendf(&branch, "P %s\n", zUuid);
  blob_appendf(&branch, "R %s\n", mParent.zRepoCksum);
  manifest_clear(&mParent);

  /* Add the symbolic branch name and the "newbranch" tag to identify
  /* Add the symbolic branch name and the "branch" tag to identify
  ** this as a new branch */
  if( zColor!=0 ){
    blob_appendf(&branch, "T *bgcolor * %F\n", zColor);
  }
  blob_appendf(&branch, "T *sym-%F *\n", zBranch);
  blob_appendf(&branch, "T +newbranch *\n");
  blob_appendf(&branch, "T *branch * %F\n", zBranch);
  blob_appendf(&branch, "T *sym-%F *\n", zBranch);

  /* Cancel all other symbolic tags */
  db_prepare(&q,
      "SELECT tagname FROM tagxref, tag"
      " WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"
      "   AND tagtype>0 AND tagname GLOB 'sym-*'"
      " ORDER BY tagname",
199
200
201
202
203
204
205
206

207
208

209
210
211
212
213
214
215
199
200
201
202
203
204
205

206
207

208
209
210
211
212
213
214
215







-
+

-
+







  if( n>=2 && strncmp(g.argv[2],"new",n)==0 ){
    branch_new();
  }else if( n>=2 && strncmp(g.argv[2],"list",n)==0 ){
    Stmt q;
    db_prepare(&q,
      "%s"
      "   AND blob.rid IN (SELECT rid FROM tagxref"
      "                     WHERE tagid=%d AND tagtype==1)"
      "                     WHERE tagid=%d AND tagtype==2 AND srcid!=0)"
      " ORDER BY event.mtime DESC",
      timeline_query_for_tty(), TAG_NEWBRANCH
      timeline_query_for_tty(), TAG_BRANCH
    );
    print_timeline(&q, 2000);
    db_finalize(&q);
  }else{
    fossil_panic("branch subcommand should be one of: "
                 "new list");
  }
248
249
250
251
252
253
254
255


256
257

258
259
260
261
262
263
264
248
249
250
251
252
253
254

255
256
257

258
259
260
261
262
263
264
265







-
+
+

-
+







  login_check_credentials();
  if( !g.okRead ){ login_needed(); return; }

  style_header("Branches");
  login_anonymous_available();
  @ <h2>The initial check-in for each branch:</h2>
  db_prepare(&q,
    "%s AND blob.rid IN (SELECT rid FROM tagxref WHERE tagtype>0 AND tagid=%d)"
    "%s AND blob.rid IN (SELECT rid FROM tagxref"
    "                     WHERE tagtype>0 AND tagid=%d AND srcid!=0)"
    " ORDER BY event.mtime DESC",
    timeline_query_for_www(), TAG_NEWBRANCH
    timeline_query_for_www(), TAG_BRANCH
  );
  www_print_timeline(&q, 0, brlist_extra);
  db_finalize(&q);
  @ <br clear="both">
  @ <script>
  @ function xin(id){
  @ }
284
285
286
287
288
289
290
291

292
293
294
295
296
297
298
299
300
301
302
303
285
286
287
288
289
290
291

292
293
294
295
296
297
298
299
300
301
302
303
304







-
+












  @ <h2>Check-ins that have one or more primary symbolic tags</h2>
  db_prepare(&q,
    "%s AND blob.rid IN (SELECT rid FROM tagxref"
    "                     WHERE tagtype>1 AND srcid>0"
    "                       AND tagid IN (SELECT tagid FROM tag "
    "                                      WHERE tagname GLOB 'sym-*'))"
    " ORDER BY event.mtime DESC",
    timeline_query_for_www(), TAG_NEWBRANCH
    timeline_query_for_www()
  );
  www_print_timeline(&q, 0, 0);
  db_finalize(&q);
  @ <br clear="both">
  @ <script>
  @ function xin(id){
  @ }
  @ function xout(id){
  @ }
  @ </script>
  style_footer();
}