Fossil SCM
Merge updates from trunk.
Commit
3e4eba78f0d579267505374aeed6a269195026d3
Parent
9a9938968088ed1…
3 files changed
+2
-2
+2
-2
+2
-2
+2
-2
| --- src/allrepo.c | ||
| +++ src/allrepo.c | ||
| @@ -375,11 +375,11 @@ | ||
| 375 | 375 | " FROM global_config" |
| 376 | 376 | " WHERE substr(name, 1, 5)=='repo:'" |
| 377 | 377 | " ORDER BY 1" |
| 378 | 378 | ); |
| 379 | 379 | } |
| 380 | - db_multi_exec("CREATE TEMP TABLE todel(x TEXT)"); | |
| 380 | + db_multi_exec("CREATE TEMP TABLE toDel(x TEXT)"); | |
| 381 | 381 | db_prepare(&q, "SELECT name, tag FROM repolist ORDER BY 1"); |
| 382 | 382 | while( db_step(&q)==SQLITE_ROW ){ |
| 383 | 383 | const char *zFilename = db_column_text(&q, 0); |
| 384 | 384 | #if !USE_SEE |
| 385 | 385 | if( sqlite3_strglob("*.efossil", zFilename)==0 ) continue; |
| @@ -386,11 +386,11 @@ | ||
| 386 | 386 | #endif |
| 387 | 387 | if( file_access(zFilename, F_OK) |
| 388 | 388 | || !file_is_canonical(zFilename) |
| 389 | 389 | || (useCheckouts && file_isdir(zFilename)!=1) |
| 390 | 390 | ){ |
| 391 | - db_multi_exec("INSERT INTO todel VALUES(%Q)", db_column_text(&q, 1)); | |
| 391 | + db_multi_exec("INSERT INTO toDel VALUES(%Q)", db_column_text(&q, 1)); | |
| 392 | 392 | nToDel++; |
| 393 | 393 | continue; |
| 394 | 394 | } |
| 395 | 395 | if( zCmd[0]=='l' ){ |
| 396 | 396 | fossil_print("%s\n", zFilename); |
| 397 | 397 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -375,11 +375,11 @@ | |
| 375 | " FROM global_config" |
| 376 | " WHERE substr(name, 1, 5)=='repo:'" |
| 377 | " ORDER BY 1" |
| 378 | ); |
| 379 | } |
| 380 | db_multi_exec("CREATE TEMP TABLE todel(x TEXT)"); |
| 381 | db_prepare(&q, "SELECT name, tag FROM repolist ORDER BY 1"); |
| 382 | while( db_step(&q)==SQLITE_ROW ){ |
| 383 | const char *zFilename = db_column_text(&q, 0); |
| 384 | #if !USE_SEE |
| 385 | if( sqlite3_strglob("*.efossil", zFilename)==0 ) continue; |
| @@ -386,11 +386,11 @@ | |
| 386 | #endif |
| 387 | if( file_access(zFilename, F_OK) |
| 388 | || !file_is_canonical(zFilename) |
| 389 | || (useCheckouts && file_isdir(zFilename)!=1) |
| 390 | ){ |
| 391 | db_multi_exec("INSERT INTO todel VALUES(%Q)", db_column_text(&q, 1)); |
| 392 | nToDel++; |
| 393 | continue; |
| 394 | } |
| 395 | if( zCmd[0]=='l' ){ |
| 396 | fossil_print("%s\n", zFilename); |
| 397 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -375,11 +375,11 @@ | |
| 375 | " FROM global_config" |
| 376 | " WHERE substr(name, 1, 5)=='repo:'" |
| 377 | " ORDER BY 1" |
| 378 | ); |
| 379 | } |
| 380 | db_multi_exec("CREATE TEMP TABLE toDel(x TEXT)"); |
| 381 | db_prepare(&q, "SELECT name, tag FROM repolist ORDER BY 1"); |
| 382 | while( db_step(&q)==SQLITE_ROW ){ |
| 383 | const char *zFilename = db_column_text(&q, 0); |
| 384 | #if !USE_SEE |
| 385 | if( sqlite3_strglob("*.efossil", zFilename)==0 ) continue; |
| @@ -386,11 +386,11 @@ | |
| 386 | #endif |
| 387 | if( file_access(zFilename, F_OK) |
| 388 | || !file_is_canonical(zFilename) |
| 389 | || (useCheckouts && file_isdir(zFilename)!=1) |
| 390 | ){ |
| 391 | db_multi_exec("INSERT INTO toDel VALUES(%Q)", db_column_text(&q, 1)); |
| 392 | nToDel++; |
| 393 | continue; |
| 394 | } |
| 395 | if( zCmd[0]=='l' ){ |
| 396 | fossil_print("%s\n", zFilename); |
| 397 |
+2
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -774,12 +774,12 @@ | ||
| 774 | 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | 775 | ** which the second version of the file or files is taken. If there is |
| 776 | 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | 777 | ** are used. |
| 778 | 778 | ** |
| 779 | -** If the "--checkin VERSION" option shows the changes made by | |
| 780 | -** check-in VERSION relative to its primary parent | |
| 779 | +** The "--checkin VERSION" option shows the changes made by | |
| 780 | +** check-in VERSION relative to its primary parent. | |
| 781 | 781 | ** |
| 782 | 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | 783 | ** rather than any external diff program that might be configured using |
| 784 | 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 | 786 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -774,12 +774,12 @@ | |
| 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | ** which the second version of the file or files is taken. If there is |
| 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | ** are used. |
| 778 | ** |
| 779 | ** If the "--checkin VERSION" option shows the changes made by |
| 780 | ** check-in VERSION relative to its primary parent |
| 781 | ** |
| 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | ** rather than any external diff program that might be configured using |
| 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -774,12 +774,12 @@ | |
| 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | ** which the second version of the file or files is taken. If there is |
| 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | ** are used. |
| 778 | ** |
| 779 | ** The "--checkin VERSION" option shows the changes made by |
| 780 | ** check-in VERSION relative to its primary parent. |
| 781 | ** |
| 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | ** rather than any external diff program that might be configured using |
| 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 |
+2
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -774,12 +774,12 @@ | ||
| 774 | 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | 775 | ** which the second version of the file or files is taken. If there is |
| 776 | 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | 777 | ** are used. |
| 778 | 778 | ** |
| 779 | -** If the "--checkin VERSION" option shows the changes made by | |
| 780 | -** check-in VERSION relative to its primary parent | |
| 779 | +** The "--checkin VERSION" option shows the changes made by | |
| 780 | +** check-in VERSION relative to its primary parent. | |
| 781 | 781 | ** |
| 782 | 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | 783 | ** rather than any external diff program that might be configured using |
| 784 | 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 | 786 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -774,12 +774,12 @@ | |
| 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | ** which the second version of the file or files is taken. If there is |
| 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | ** are used. |
| 778 | ** |
| 779 | ** If the "--checkin VERSION" option shows the changes made by |
| 780 | ** check-in VERSION relative to its primary parent |
| 781 | ** |
| 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | ** rather than any external diff program that might be configured using |
| 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -774,12 +774,12 @@ | |
| 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | ** which the second version of the file or files is taken. If there is |
| 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | ** are used. |
| 778 | ** |
| 779 | ** The "--checkin VERSION" option shows the changes made by |
| 780 | ** check-in VERSION relative to its primary parent. |
| 781 | ** |
| 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | ** rather than any external diff program that might be configured using |
| 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 |