Fossil

Diff
Login

Diff

Differences From Artifact [0a80193dbe]:

To Artifact [9c883a6f39]:


2058
2059
2060
2061
2062
2063
2064

2065
2066
2067
2068
2069
2070
2071
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072







+







  int fNewPropagateColor;       /* True if color propagates after edit */
  int fHasHidden = 0;           /* True if hidden tag already set */
  int fHasClosed = 0;           /* True if closed tag already set */
  const char *zChngTime = 0;     /* Value of chngtime= query param, if any */
  char *zUuid;
  Blob comment;
  char *zBranchName = 0;
  const char *trunk;
  Stmt q;

  login_check_credentials();
  if( !g.perm.Write ){ login_needed(); return; }
  rid = name_to_typed_rid(P("r"), "ci");
  zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
  zComment = db_text(0, "SELECT coalesce(ecomment,comment)"
2220
2221
2222
2223
2224
2225
2226
2227

2228


2229
2230

2231
2232




2233
2234
2235
2236
2237
2238
2239
2221
2222
2223
2224
2225
2226
2227

2228
2229
2230
2231
2232
2233
2234
2235

2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246







-
+

+
+


+

-
+
+
+
+







  @   if( toggle ){
  @     id.disabled = true;
  @     id.checked = false;
  @   }else{
  @     id.disabled = false;
  @   }
  @ }
  @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
  @ function hauc(cbxid,zdef,formid,toggle){
  @   if( cbxid ) hcbxbi(cbxid,toggle);
  @   hidbrid = gebi('hbranch');
  @   cidbrid = gebi('cbranch');
  @   if( toggle ){
  @     stcbi(hidbrid,zdef);
  @     if(cidbrid) stcbi(cidbrid,zdef);
  @   }else{
  @     if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value);
  @     if( gebi(formid).value ){
  @       stcbi(hidbrid,gebi(formid).value);
  @       if(cidbrid) stcbi(cidbrid,gebi(formid).value);
  @     }
  @   }
  @ }
  @ </script>
  if( P("preview") ){
    Blob suffix;
    int nTag = 0;
    @ <b>Preview:</b>
2315
2316
2317
2318
2319
2320
2321

2322
2323
2324
2325
2326
2327
2328
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336







+







  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
  );
  trunk = db_get("main-branch", "trunk");
  while( db_step(&q)==SQLITE_ROW ){
    int tagid = db_column_int(&q, 0);
    const char *zTagName = db_column_text(&q, 1);
    int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0;
    char zLabel[30];

    if (tagid == TAG_CLOSED){
2354
2355
2356
2357
2358
2359
2360
2361
2362


2363
2364
2365

2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376


2377
2378
2379

2380
2381
2382
2383
2384
2385
2386
2387
2388
2389

2390
2391
2392
2393
2394
2395
2396
2362
2363
2364
2365
2366
2367
2368


2369
2370
2371
2372

2373
2374
2375
2376
2377
2378
2379
2380
2381
2382


2383
2384
2385
2386

2387
2388
2389
2390
2391
2392
2393
2394
2395
2396

2397
2398
2399
2400
2401
2402
2403
2404







-
-
+
+


-
+









-
-
+
+


-
+









-
+







  db_finalize(&q);
  @ </td></tr>

  @ <tr><th align="right" valign="top">Branching:</th>
  @ <td valign="top">
  @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
  if( !fHasHidden && zBranchName ){
    if( fossil_strcmp(zBranchName, "trunk")==0 ){
      @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)',
    if( fossil_strcmp(zBranchName, trunk)==0 ){
      @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)',
      @ 'brname',this.value)"
    }else{
      @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)',
      @ onclick="hauc(null,'%h(zBranchName)',
      @ 'brname',this.value)"
    }
  }
  @ />
  @ Make this check-in the start of a new branch named:</label>
  @ <input type="text" style="width:15;" id="brname" name="brname"
  @ value="%h(zNewBranch)"
  if( !fHasHidden && zBranchName ){
    @ onkeyup="gebi('newbr').checked=!!this.value;
    if( fossil_strcmp(zBranchName, "trunk")==0 ){
      @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)',
    if( fossil_strcmp(zBranchName, trunk)==0 ){
      @ hauc(gebi('hidebr'),'%h(zBranchName)',
      @ 'brname',!this.value)"
    }else{
      @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)"
      @ hauc(null,'%h(zBranchName)','brname',!this.value)"
    }
  }
  @ />
  @ </td></tr>

  if( !fHasHidden && zBranchName ){
    @ <tr><th align="right" valign="top">Branch Hiding:</th>
    @ <td valign="top">
    @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) 
    if( fossil_strcmp(zBranchName, "trunk")==0 ){
    if( fossil_strcmp(zBranchName, trunk)==0 ){
      @ disabled />
    }else{
      @ />
    }
    @ Hide branch 
    @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
    @ from the timeline starting from this check-in</label>