Check-in [d97fe53685]
Not logged in

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

Overview
Comment:Merge in the latest trunk changes.
Timelines: family | ancestors | descendants | both | sbsreloaded
Files: files | file ages | folders
SHA1:d97fe536859ea8987cf3bf7f883b28e0578e9d50
User & Date: drh 2013-07-09 11:46:52
Context
2013-07-09
20:51
Add better comment explaining why .txtA/.txtB lines are padded with spaces. check-in: 2d8f2b4e24 user: joel tags: sbsreloaded
12:05
[Backed out: see next commit in sbsreloaded branch.] Do not pad lines of the Tk diff view with spaces. Closed-Leaf check-in: 0a869bebc2 user: drh tags: backed-out
11:46
Merge in the latest trunk changes. check-in: d97fe53685 user: drh tags: sbsreloaded
10:54
Comment enhancements. No changes to code. check-in: f04a3242ec user: drh tags: sbsreloaded
08:51
Fix "fossil commit" when specifying a directory on the command line which doesn't exist. check-in: 062b82c8b0 user: jan.nijtmans tags: trunk
Changes

Changes to src/checkin.c.

747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
...
762
763
764
765
766
767
768
769
770
771

772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
*/
int select_commit_files(void){
  int result = 0;
  assert( g.aCommitFile==0 );
  if( g.argc>2 ){
    int ii, jj=0;
    Blob fname;
    int isDir;
    Stmt q;
    const char *zCollate;
    Bag toCommit;

    zCollate = filename_collation();
    blob_zero(&fname);
    bag_init(&toCommit);
................................................................................
    for(ii=2; ii<g.argc; ii++){
      int cnt = 0;
      file_tree_name(g.argv[ii], &fname, 1);
      if( fossil_strcmp(blob_str(&fname),".")==0 ){
        bag_clear(&toCommit);
        return result;
      }
      isDir = file_isdir(g.argv[ii]);
      if( isDir==1 ){
        db_prepare(&q,

          "SELECT id FROM vfile WHERE pathname>'%q/' %s AND pathname<'%q0' %s",
          blob_str(&fname), zCollate, blob_str(&fname), zCollate);
      }else if( isDir==2 ){
        db_prepare(&q,
          "SELECT id FROM vfile WHERE pathname=%Q %s",
          blob_str(&fname), zCollate);
      }else{
        fossil_warning("not found: %s", g.argv[ii]);
        result = 1;
        continue;
      }
      while( db_step(&q)==SQLITE_ROW ){
        cnt++;
        bag_insert(&toCommit, db_column_int(&q, 0));
      }
      db_finalize(&q);
      if( cnt==0 ){
        fossil_warning("fossil knows nothing about: %s", g.argv[ii]);







<







 







<
<
|
>
|
|
<
<
<
|
<
<
<
<
<







747
748
749
750
751
752
753

754
755
756
757
758
759
760
...
761
762
763
764
765
766
767


768
769
770
771



772





773
774
775
776
777
778
779
*/
int select_commit_files(void){
  int result = 0;
  assert( g.aCommitFile==0 );
  if( g.argc>2 ){
    int ii, jj=0;
    Blob fname;

    Stmt q;
    const char *zCollate;
    Bag toCommit;

    zCollate = filename_collation();
    blob_zero(&fname);
    bag_init(&toCommit);
................................................................................
    for(ii=2; ii<g.argc; ii++){
      int cnt = 0;
      file_tree_name(g.argv[ii], &fname, 1);
      if( fossil_strcmp(blob_str(&fname),".")==0 ){
        bag_clear(&toCommit);
        return result;
      }


      db_prepare(&q,
        "SELECT id FROM vfile WHERE pathname=%Q %s"
        " OR (pathname>'%q/' %s AND pathname<'%q0' %s)",
        blob_str(&fname), zCollate, blob_str(&fname),



        zCollate, blob_str(&fname), zCollate);





      while( db_step(&q)==SQLITE_ROW ){
        cnt++;
        bag_insert(&toCommit, db_column_int(&q, 0));
      }
      db_finalize(&q);
      if( cnt==0 ){
        fossil_warning("fossil knows nothing about: %s", g.argv[ii]);