Check-in [a27df49629]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Final bug-fixes (I hope)
Timelines: family | ancestors | descendants | both | tkt-change-hook
Files: files | file ages | folders
SHA1: a27df4962939072647cc27ae4a7f83307a1856ea
User & Date: jan.nijtmans 2013-07-10 14:05:11.432
Context
2013-07-11
10:46
Don't allow "tktnew" and "tktedit" pages or the "Common" hook to use the "http" command any more. Don't let "fossil rebuild" run any hooks. check-in: 57d1d2811b user: jan.nijtmans tags: tkt-change-hook
2013-07-10
14:05
Final bug-fixes (I hope) check-in: a27df49629 user: jan.nijtmans tags: tkt-change-hook
13:00
Bug-fixes: - ticket change resulted in ticket hook firing twice. - uuid for commits was determined wrong. check-in: 078c67e0c4 user: jan.nijtmans tags: tkt-change-hook
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/checkin.c.
1682
1683
1684
1685
1686
1687
1688

1689
1690
1691
1692
1693
1694
1695
  }
  nvid = content_put(&manifest);
  if( nvid==0 ){
    fossil_panic("trouble committing manifest: %s", g.zErrMsg);
  }
  db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid);
  if( !dryRunFlag ){

    manifest_crosslink(nvid, &manifest);
  }
  assert( blob_is_reset(&manifest) );
  content_deltify(vid, nvid, 0);
  zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid);
  fossil_print("New_Version: %s\n", zUuid);
  if( outputManifest ){







>







1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
  }
  nvid = content_put(&manifest);
  if( nvid==0 ){
    fossil_panic("trouble committing manifest: %s", g.zErrMsg);
  }
  db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid);
  if( !dryRunFlag ){
    run_common_script();
    manifest_crosslink(nvid, &manifest);
  }
  assert( blob_is_reset(&manifest) );
  content_deltify(vid, nvid, 0);
  zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid);
  fossil_print("New_Version: %s\n", zUuid);
  if( outputManifest ){
Changes to src/manifest.c.
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
  if( hook ){
    const char *zScript = db_get(hook, 0);
    if( zScript && *zScript ){
      Th_FossilInit(0, 1, 1); /* Make sure TH1 is ready. */
      if( zUuid ){
        Th_SetVar(g.interp, "uuid", -1, zUuid, strlen(zUuid));
      }
      return Th_Eval(g.interp, 0, zScript, -1) == TH_OK;
    }
  }
  if( p->type==CFTYPE_MANIFEST ){
    manifest_cache_insert(p);
  }else{
    manifest_destroy(p);
  }







|







2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
  if( hook ){
    const char *zScript = db_get(hook, 0);
    if( zScript && *zScript ){
      Th_FossilInit(0, 1, 1); /* Make sure TH1 is ready. */
      if( zUuid ){
        Th_SetVar(g.interp, "uuid", -1, zUuid, strlen(zUuid));
      }
      Th_Eval(g.interp, 0, zScript, -1);
    }
  }
  if( p->type==CFTYPE_MANIFEST ){
    manifest_cache_insert(p);
  }else{
    manifest_destroy(p);
  }
Changes to src/th_main.c.
308
309
310
311
312
313
314

315
316
317
318
319
320
321
                     " (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
  blob_appendf(&hdr, "Content-Type: text/plain\r\n");
  blob_appendf(&hdr, "Content-Length: %d\r\n\r\n", blob_size(&payload));

  transport_send(&hdr);
  transport_send(&payload);
  transport_close();

  Th_SetResult(interp, "", -1);
  return TH_OK;
}

/*
** TH command:      date
**







>







308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
                     " (" MANIFEST_DATE " " MANIFEST_VERSION ")\r\n");
  blob_appendf(&hdr, "Content-Type: text/plain\r\n");
  blob_appendf(&hdr, "Content-Length: %d\r\n\r\n", blob_size(&payload));

  transport_send(&hdr);
  transport_send(&payload);
  transport_close();
  g.urlProtocol=0; /* Make sure the url is not re-used. */
  Th_SetResult(interp, "", -1);
  return TH_OK;
}

/*
** TH command:      date
**
Changes to src/tkt.c.
520
521
522
523
524
525
526

527
528
529
530
531
532
533
      "INSERT INTO modreq(objid, tktid) VALUES(%d,'%s')",
      rid, zTktId
    );
  }else{
    db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
    db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
  }

  manifest_crosslink_begin();
  manifest_crosslink(rid, pTicket);
  assert( blob_is_reset(pTicket) );
  manifest_crosslink_end();
}

/*







>







520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
      "INSERT INTO modreq(objid, tktid) VALUES(%d,'%s')",
      rid, zTktId
    );
  }else{
    db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
    db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
  }
  run_common_script();
  manifest_crosslink_begin();
  manifest_crosslink(rid, pTicket);
  assert( blob_is_reset(pTicket) );
  manifest_crosslink_end();
}

/*