Fossil

Differences From Artifact [86544db96f]:

• File src/file.c — part of check-in [85b83206f4] at 2022-06-23 12:44:23 on branch trunk — Changes to the file_getcwd() routine to avoid a false-positive compiler warning from gcc 10.2.1. (user: drh size: 80430)

To Artifact [654c4f3095]:

• File src/file.c — part of check-in [360d8652e7] at 2022-07-05 07:38:50 on branch dryrun-dry-run — Replaced --dryrun with --dry-run in the commands which still used the former, except for two unrelated internal-use/debugging-only flags where the change might have had undesired side effects. Removed the undocumented --dryrun backwards-compatibility flag from a couple commands for consistency's sake (else we need to have that option in all dry-run-capable commands). Discussion is in [forum:d732b4026f44bdba | forum post d732b4026f44bdba]. (user: stephan size: 80394)

2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505

  int timeFlag;           /* -1==--checkin, 1==--checkout, 0==--now */
  i64 nowTime = 0;        /* Timestamp of --now or --checkout */
  Stmt q;
  Blob absBuffer = empty_blob; /* Absolute filename buffer */

  verboseFlag = find_option("verbose","v",0)!=0;
  quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet;
  dryRunFlag = find_option("dry-run","n",0)!=0
    || find_option("dryrun",0,0)!=0;
  zGlobList = find_option("glob", "g",1);
  zGlobFile = find_option("globfile", "G",1);

  if(zGlobList && zGlobFile){
    fossil_fatal("Options -g and -G may not be used together.");
  }

|
<

2490
2491
2492
2493
2494
2495
2496
2497

2498
2499
2500
2501
2502
2503
2504

  int timeFlag;           /* -1==--checkin, 1==--checkout, 0==--now */
  i64 nowTime = 0;        /* Timestamp of --now or --checkout */
  Stmt q;
  Blob absBuffer = empty_blob; /* Absolute filename buffer */

  verboseFlag = find_option("verbose","v",0)!=0;
  quietFlag = find_option("quiet","q",0)!=0 || g.fQuiet;
  dryRunFlag = find_option("dry-run","n",0)!=0;

  zGlobList = find_option("glob", "g",1);
  zGlobFile = find_option("globfile", "G",1);

  if(zGlobList && zGlobFile){
    fossil_fatal("Options -g and -G may not be used together.");
  }