Fossil SCM

fine tuning the layout of the command line help strings

wolfgang 2010-10-08 15:05 wolfgangHelpCmd
Commit c6d187906931f543ade6261636b53b49c587fda3
Parent ff6760ba0940c3b…
13 files changed +2 -2 +3 -3 +10 -11 +2 -2 +19 -19 +64 -63 +4 -3 +8 -2 +4 -4 +10 -8 +8 -8 +7 -7 +2 -2
~ src/add.c ~ src/allrepo.c ~ src/checkin.c ~ src/clone.c ~ src/configure.c ~ src/db.c ~ src/diffcmd.c ~ src/main.c ~ src/merge.c ~ src/rebuild.c ~ src/sync.c ~ src/undo.c ~ src/zip.c
M src/add.c
+2 -2
--- src/add.c
+++ src/add.c
@@ -295,12 +295,12 @@
295295
 ** or: %fossil mv|rename OLDNAME... DIR
296296
 **
297297
 ** Move or rename one or more files within the tree
298298
 **
299299
 ** This command does not rename the files on disk. This command merely
300
-** records the fact that filenames have changed so that appropriate notations
301
-** can be made at the next <a>commit</a>/checkin.
300
+** records the fact that filenames have changed so that appropriate
301
+** notations can be made at the next <a>commit</a>/checkin.
302302
 */
303303
 void mv_cmd(void){
304304
 int i;
305305
 int vid;
306306
 char *zDest;
307307
--- src/add.c
+++ src/add.c
@@ -295,12 +295,12 @@
295 ** or: %fossil mv|rename OLDNAME... DIR
296 **
297 ** Move or rename one or more files within the tree
298 **
299 ** This command does not rename the files on disk. This command merely
300 ** records the fact that filenames have changed so that appropriate notations
301 ** can be made at the next <a>commit</a>/checkin.
302 */
303 void mv_cmd(void){
304 int i;
305 int vid;
306 char *zDest;
307
--- src/add.c
+++ src/add.c
@@ -295,12 +295,12 @@
295 ** or: %fossil mv|rename OLDNAME... DIR
296 **
297 ** Move or rename one or more files within the tree
298 **
299 ** This command does not rename the files on disk. This command merely
300 ** records the fact that filenames have changed so that appropriate
301 ** notations can be made at the next <a>commit</a>/checkin.
302 */
303 void mv_cmd(void){
304 int i;
305 int vid;
306 char *zDest;
307
M src/allrepo.c
+3 -3
--- src/allrepo.c
+++ src/allrepo.c
@@ -51,13 +51,13 @@
5151
 /*
5252
 ** COMMAND: all
5353
 **
5454
 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync)
5555
 **
56
-** The ~/.fossil file records the location of all repositories for a
57
-** user. This command performs certain operations on all repositories
58
-** that can be useful before or after a period of disconnected operation.
56
+** The ~/.fossil file records the location of all repositories for a user.
57
+** This command performs certain operations on all repositories that can
58
+** be useful before or after a period of disconnected operation.
5959
 **
6060
 ** On Win32 systems, the file is named "_fossil" and is located in
6161
 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
6262
 **
6363
 ** Available operations are:
6464
--- src/allrepo.c
+++ src/allrepo.c
@@ -51,13 +51,13 @@
51 /*
52 ** COMMAND: all
53 **
54 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync)
55 **
56 ** The ~/.fossil file records the location of all repositories for a
57 ** user. This command performs certain operations on all repositories
58 ** that can be useful before or after a period of disconnected operation.
59 **
60 ** On Win32 systems, the file is named "_fossil" and is located in
61 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
62 **
63 ** Available operations are:
64
--- src/allrepo.c
+++ src/allrepo.c
@@ -51,13 +51,13 @@
51 /*
52 ** COMMAND: all
53 **
54 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync)
55 **
56 ** The ~/.fossil file records the location of all repositories for a user.
57 ** This command performs certain operations on all repositories that can
58 ** be useful before or after a period of disconnected operation.
59 **
60 ** On Win32 systems, the file is named "_fossil" and is located in
61 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
62 **
63 ** Available operations are:
64
M src/checkin.c
+10 -11
--- src/checkin.c
+++ src/checkin.c
@@ -295,17 +295,16 @@
295295
 **
296296
 ** Delete all "extra" files in the source tree. "Extra" files are
297297
 ** files that are not officially part of the checkout. See also
298298
 ** the <a>extras</a> command. This operation cannot be undone.
299299
 **
300
-** You will be prompted before removing each file. If you are
301
-** sure you wish to remove all "extra" files you can specify the
302
-** optional --force flag and no prompts will be issued.
300
+** You will be prompted before removing each file. If you are sure
301
+** you wish to remove all "extra" files you can specify the optional
302
+** --force flag and no prompts will be issued.
303303
 **
304
-** Files and subdirectories whose names begin with "." are
305
-** normally ignored. They are included if the "--dotfiles" option
306
-** is used.
304
+** Files and subdirectories whose names begin with "." are normally
305
+** ignored. They are included if the "--dotfiles" option is used.
307306
 */
308307
 void clean_cmd(void){
309308
 int allFlag;
310309
 int dotfilesFlag;
311310
 Blob path, repo;
@@ -557,27 +556,27 @@
557556
 **
558557
 ** Usage: %fossil commit ?OPTIONS? ?FILE...?
559558
 **
560559
 ** Create a new version containing all of the changes in the current
561560
 ** checkout. You will be prompted to enter a check-in comment unless
562
-** the comment has been specified on the command-line using "-m".
563
-** The editor defined in the "editor" fossil option (see %fossil help set)
561
+** the comment has been specified on the command-line using "-m". The
562
+** editor defined in the "editor" fossil option (see %fossil help set)
564563
 ** will be used, or from the "VISUAL" or "EDITOR" environment variables
565564
 ** (in that order) if no editor is set.
566565
 **
567566
 ** You will be prompted for your GPG passphrase in order to sign the
568567
 ** new manifest unless the "--nosign" option is used. All files that
569568
 ** have changed will be committed unless some subset of files is
570569
 ** specified on the command line.
571570
 **
572571
 ** The --branch option followed by a branch name cases the new check-in
573
-** to be placed in the named branch. The --bgcolor option can be followed
572
+** to be placed in the named branch. The --bgcolor option can be followed
574573
 ** by a color name (ex: '#ffc0c0') to specify the background color of
575574
 ** entries in the new branch when shown in the web timeline interface.
576575
 **
577
-** A check-in is not permitted to fork unless the --force or -f
578
-** option appears. A check-in is not allowed against a closed check-in.
576
+** A check-in is not permitted to fork unless the --force or -f option
577
+** appears. A check-in is not allowed against a closed check-in.
579578
 **
580579
 ** The --private option creates a private check-in that is never synced.
581580
 ** Children of private check-ins are automatically private.
582581
 **
583582
 ** Options:
584583
--- src/checkin.c
+++ src/checkin.c
@@ -295,17 +295,16 @@
295 **
296 ** Delete all "extra" files in the source tree. "Extra" files are
297 ** files that are not officially part of the checkout. See also
298 ** the <a>extras</a> command. This operation cannot be undone.
299 **
300 ** You will be prompted before removing each file. If you are
301 ** sure you wish to remove all "extra" files you can specify the
302 ** optional --force flag and no prompts will be issued.
303 **
304 ** Files and subdirectories whose names begin with "." are
305 ** normally ignored. They are included if the "--dotfiles" option
306 ** is used.
307 */
308 void clean_cmd(void){
309 int allFlag;
310 int dotfilesFlag;
311 Blob path, repo;
@@ -557,27 +556,27 @@
557 **
558 ** Usage: %fossil commit ?OPTIONS? ?FILE...?
559 **
560 ** Create a new version containing all of the changes in the current
561 ** checkout. You will be prompted to enter a check-in comment unless
562 ** the comment has been specified on the command-line using "-m".
563 ** The editor defined in the "editor" fossil option (see %fossil help set)
564 ** will be used, or from the "VISUAL" or "EDITOR" environment variables
565 ** (in that order) if no editor is set.
566 **
567 ** You will be prompted for your GPG passphrase in order to sign the
568 ** new manifest unless the "--nosign" option is used. All files that
569 ** have changed will be committed unless some subset of files is
570 ** specified on the command line.
571 **
572 ** The --branch option followed by a branch name cases the new check-in
573 ** to be placed in the named branch. The --bgcolor option can be followed
574 ** by a color name (ex: '#ffc0c0') to specify the background color of
575 ** entries in the new branch when shown in the web timeline interface.
576 **
577 ** A check-in is not permitted to fork unless the --force or -f
578 ** option appears. A check-in is not allowed against a closed check-in.
579 **
580 ** The --private option creates a private check-in that is never synced.
581 ** Children of private check-ins are automatically private.
582 **
583 ** Options:
584
--- src/checkin.c
+++ src/checkin.c
@@ -295,17 +295,16 @@
295 **
296 ** Delete all "extra" files in the source tree. "Extra" files are
297 ** files that are not officially part of the checkout. See also
298 ** the <a>extras</a> command. This operation cannot be undone.
299 **
300 ** You will be prompted before removing each file. If you are sure
301 ** you wish to remove all "extra" files you can specify the optional
302 ** --force flag and no prompts will be issued.
303 **
304 ** Files and subdirectories whose names begin with "." are normally
305 ** ignored. They are included if the "--dotfiles" option is used.
 
306 */
307 void clean_cmd(void){
308 int allFlag;
309 int dotfilesFlag;
310 Blob path, repo;
@@ -557,27 +556,27 @@
556 **
557 ** Usage: %fossil commit ?OPTIONS? ?FILE...?
558 **
559 ** Create a new version containing all of the changes in the current
560 ** checkout. You will be prompted to enter a check-in comment unless
561 ** the comment has been specified on the command-line using "-m". The
562 ** editor defined in the "editor" fossil option (see %fossil help set)
563 ** will be used, or from the "VISUAL" or "EDITOR" environment variables
564 ** (in that order) if no editor is set.
565 **
566 ** You will be prompted for your GPG passphrase in order to sign the
567 ** new manifest unless the "--nosign" option is used. All files that
568 ** have changed will be committed unless some subset of files is
569 ** specified on the command line.
570 **
571 ** The --branch option followed by a branch name cases the new check-in
572 ** to be placed in the named branch. The --bgcolor option can be followed
573 ** by a color name (ex: '#ffc0c0') to specify the background color of
574 ** entries in the new branch when shown in the web timeline interface.
575 **
576 ** A check-in is not permitted to fork unless the --force or -f option
577 ** appears. A check-in is not allowed against a closed check-in.
578 **
579 ** The --private option creates a private check-in that is never synced.
580 ** Children of private check-ins are automatically private.
581 **
582 ** Options:
583
M src/clone.c
+2 -2
--- src/clone.c
+++ src/clone.c
@@ -26,12 +26,12 @@
2626
 /*
2727
 ** COMMAND: clone
2828
 **
2929
 ** Usage: %fossil clone ?OPTIONS? URL FILENAME
3030
 **
31
-** Make a clone of a repository specified by URL in the local
32
-** file named FILENAME.
31
+** Make a clone of a repository specified by URL in the local file
32
+** named FILENAME.
3333
 **
3434
 ** By default, your current login name is used to create the default
3535
 ** admin user. This can be overridden using the -A|--admin-user
3636
 ** parameter.
3737
 **
3838
--- src/clone.c
+++ src/clone.c
@@ -26,12 +26,12 @@
26 /*
27 ** COMMAND: clone
28 **
29 ** Usage: %fossil clone ?OPTIONS? URL FILENAME
30 **
31 ** Make a clone of a repository specified by URL in the local
32 ** file named FILENAME.
33 **
34 ** By default, your current login name is used to create the default
35 ** admin user. This can be overridden using the -A|--admin-user
36 ** parameter.
37 **
38
--- src/clone.c
+++ src/clone.c
@@ -26,12 +26,12 @@
26 /*
27 ** COMMAND: clone
28 **
29 ** Usage: %fossil clone ?OPTIONS? URL FILENAME
30 **
31 ** Make a clone of a repository specified by URL in the local file
32 ** named FILENAME.
33 **
34 ** By default, your current login name is used to create the default
35 ** admin user. This can be overridden using the -A|--admin-user
36 ** parameter.
37 **
38
M src/configure.c
+19 -19
--- src/configure.c
+++ src/configure.c
@@ -369,48 +369,48 @@
369369
 /*
370370
 ** COMMAND: configuration
371371
 **
372372
 ** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY?
373373
 **
374
-** Where METHOD is one of: export import merge pull push reset. All methods
375
-** accept the -R or --repository option to specific a repository.
374
+** Where METHOD is one of: export import merge pull push reset. All
375
+** methods accept the -R or --repository option to specify a repository.
376376
 **
377377
 ** %fossil configuration export AREA FILENAME
378378
 **
379
-** Write to FILENAME exported configuraton information for AREA.
380
-** AREA can be one of: all email project shun skin ticket user
379
+** Write to FILENAME exported configuraton information for AREA.
380
+** AREA can be one of: all email project shun skin ticket user
381381
 **
382382
 ** %fossil configuration import FILENAME
383383
 **
384
-** Read a configuration from FILENAME, overwriting the current
385
-** configuration.
384
+** Read a configuration from FILENAME, overwriting the current
385
+** configuration.
386386
 **
387387
 ** %fossil configuration merge FILENAME
388388
 **
389
-** Read a configuration from FILENAME and merge its values into
390
-** the current configuration. Existing values take priority over
391
-** values read from FILENAME.
389
+** Read a configuration from FILENAME and merge its values into
390
+** the current configuration. Existing values take priority
391
+** over values read from FILENAME.
392392
 **
393393
 ** %fossil configuration pull AREA ?URL?
394394
 **
395
-** Pull and install the configuration from a different server
396
-** identified by URL. If no URL is specified, then the default
397
-** server is used.
395
+** Pull and install the configuration from a different server
396
+** identified by URL. If no URL is specified, then the default
397
+** server is used.
398398
 **
399399
 ** %fossil configuration push AREA ?URL?
400400
 **
401
-** Push the local configuration into the remote server identified
402
-** by URL. Admin privilege is required on the remote server for
403
-** this to work.
401
+** Push the local configuration into the remote server identified
402
+** by URL. Admin privilege is required on the remote server for
403
+** this to work.
404404
 **
405405
 ** %fossil configuration reset AREA
406406
 **
407
-** Restore the configuration to the default. AREA as above.
407
+** Restore the configuration to the default. AREA as above.
408408
 **
409
-** WARNING: Do not import, merge, or pull configurations from an untrusted
410
-** source. The inbound configuration is not checked for safety and can
411
-** introduce security vulnerabilities.
409
+** WARNING: Do not import or merge or pull configurations from an
410
+** untrusted source. The inbound configuration is not checked for
411
+** safety and can introduce security vulnerabilities.
412412
 */
413413
 void configuration_cmd(void){
414414
 int n;
415415
 const char *zMethod;
416416
 if( g.argc<3 ){
417417
--- src/configure.c
+++ src/configure.c
@@ -369,48 +369,48 @@
369 /*
370 ** COMMAND: configuration
371 **
372 ** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY?
373 **
374 ** Where METHOD is one of: export import merge pull push reset. All methods
375 ** accept the -R or --repository option to specific a repository.
376 **
377 ** %fossil configuration export AREA FILENAME
378 **
379 ** Write to FILENAME exported configuraton information for AREA.
380 ** AREA can be one of: all email project shun skin ticket user
381 **
382 ** %fossil configuration import FILENAME
383 **
384 ** Read a configuration from FILENAME, overwriting the current
385 ** configuration.
386 **
387 ** %fossil configuration merge FILENAME
388 **
389 ** Read a configuration from FILENAME and merge its values into
390 ** the current configuration. Existing values take priority over
391 ** values read from FILENAME.
392 **
393 ** %fossil configuration pull AREA ?URL?
394 **
395 ** Pull and install the configuration from a different server
396 ** identified by URL. If no URL is specified, then the default
397 ** server is used.
398 **
399 ** %fossil configuration push AREA ?URL?
400 **
401 ** Push the local configuration into the remote server identified
402 ** by URL. Admin privilege is required on the remote server for
403 ** this to work.
404 **
405 ** %fossil configuration reset AREA
406 **
407 ** Restore the configuration to the default. AREA as above.
408 **
409 ** WARNING: Do not import, merge, or pull configurations from an untrusted
410 ** source. The inbound configuration is not checked for safety and can
411 ** introduce security vulnerabilities.
412 */
413 void configuration_cmd(void){
414 int n;
415 const char *zMethod;
416 if( g.argc<3 ){
417
--- src/configure.c
+++ src/configure.c
@@ -369,48 +369,48 @@
369 /*
370 ** COMMAND: configuration
371 **
372 ** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY?
373 **
374 ** Where METHOD is one of: export import merge pull push reset. All
375 ** methods accept the -R or --repository option to specify a repository.
376 **
377 ** %fossil configuration export AREA FILENAME
378 **
379 ** Write to FILENAME exported configuraton information for AREA.
380 ** AREA can be one of: all email project shun skin ticket user
381 **
382 ** %fossil configuration import FILENAME
383 **
384 ** Read a configuration from FILENAME, overwriting the current
385 ** configuration.
386 **
387 ** %fossil configuration merge FILENAME
388 **
389 ** Read a configuration from FILENAME and merge its values into
390 ** the current configuration. Existing values take priority
391 ** over values read from FILENAME.
392 **
393 ** %fossil configuration pull AREA ?URL?
394 **
395 ** Pull and install the configuration from a different server
396 ** identified by URL. If no URL is specified, then the default
397 ** server is used.
398 **
399 ** %fossil configuration push AREA ?URL?
400 **
401 ** Push the local configuration into the remote server identified
402 ** by URL. Admin privilege is required on the remote server for
403 ** this to work.
404 **
405 ** %fossil configuration reset AREA
406 **
407 ** Restore the configuration to the default. AREA as above.
408 **
409 ** WARNING: Do not import or merge or pull configurations from an
410 ** untrusted source. The inbound configuration is not checked for
411 ** safety and can introduce security vulnerabilities.
412 */
413 void configuration_cmd(void){
414 int n;
415 const char *zMethod;
416 if( g.argc<3 ){
417
M src/db.c
+64 -63
--- src/db.c
+++ src/db.c
@@ -1536,77 +1536,78 @@
15361536
 ** COMMAND: settings
15371537
 ** COMMAND: unset
15381538
 ** %fossil settings ?PROPERTY? ?VALUE? ?-global?
15391539
 ** %fossil unset PROPERTY ?-global?
15401540
 **
1541
-** The "settings" command with no arguments lists all properties and their
1542
-** values. With just a property name it shows the value of that property.
1543
-** With a value argument it changes the property for the current repository.
1541
+** The "settings" command with no arguments lists all properties and
1542
+** their values. With just a property name it shows the value of that
1543
+** property. With a value argument it changes the property for the
1544
+** current repository.
15441545
 **
15451546
 ** The "unset" command clears a property setting.
15461547
 **
15471548
 **
1548
-** auto-captcha If enabled, the Login page provides a button to
1549
-** fill in the captcha password. Default: on
1550
-**
1551
-** auto-shun If enabled, automatically pull the shunning list
1552
-** from a server to which the client autosyncs.
1553
-**
1554
-** autosync If enabled, automatically pull prior to commit
1555
-** or update and automatically push after commit or
1556
-** tag or branch creation. If the value is "pullonly"
1557
-** then only pull operations occur automatically.
1558
-**
1559
-** binary-glob The VALUE is a comma-separated list of GLOB patterns
1560
-** that should be treated as binary files for merging
1561
-** purposes. Example: *.xml
1562
-**
1563
-** clearsign When enabled, fossil will attempt to sign all commits
1564
-** with gpg. When disabled (the default), commits will
1565
-** be unsigned.
1566
-**
1567
-** diff-command External command to run when performing a diff.
1568
-** If undefined, the internal text diff will be used.
1569
-**
1570
-** dont-push Prevent this repository from pushing from client to
1571
-** server. Useful when setting up a private branch.
1572
-**
1573
-** editor Text editor command used for check-in comments.
1574
-**
1575
-** gdiff-command External command to run when performing a graphical
1576
-** diff. If undefined, text diff will be used.
1577
-**
1578
-** http-port The TCP/IP port number to use by the "server"
1579
-** and "ui" commands. Default: 8080
1580
-**
1581
-** ignore-glob The VALUE is a comma-separated list of GLOB patterns
1582
-** specifying files that the "extra" command will ignore.
1583
-** Example: *.o,*.obj,*.exe
1584
-**
1585
-** localauth If enabled, require that HTTP connections from
1586
-** 127.0.0.1 be authenticated by password. If
1587
-** false, all HTTP requests from localhost have
1588
-** unrestricted access to the repository.
1589
-**
1590
-** mtime-changes Use file modification times (mtimes) to detect when
1591
-** files have been modified. (Default "on".)
1592
-**
1593
-** pgp-command Command used to clear-sign manifests at check-in.
1594
-** The default is "gpg --clearsign -o ".
1595
-**
1596
-** proxy URL of the HTTP proxy. If undefined or "off" then
1597
-** the "http_proxy" environment variable is consulted.
1598
-** If the http_proxy environment variable is undefined
1599
-** then a direct HTTP connection is used.
1600
-**
1601
-** ssh-command Command used to talk to a remote machine with
1602
-** the "ssh://" protocol.
1603
-**
1604
-** web-browser A shell command used to launch your preferred
1605
-** web browser when given a URL as an argument.
1606
-** Defaults to "start" on windows, "open" on Mac,
1607
-** and "firefox" on Unix.
1549
+** auto-captcha If enabled, the Login page provides a button to
1550
+** fill in the captcha password. Default: on
1551
+**
1552
+** auto-shun If enabled, automatically pull the shunning list
1553
+** from a server to which the client autosyncs.
1554
+**
1555
+** autosync If enabled, automatically pull prior to commit
1556
+** or update and automatically push after commit or
1557
+** tag or branch creation. If the value is "pullonly"
1558
+** then only pull operations occur automatically.
1559
+**
1560
+** binary-glob The VALUE is a comma-separated list of GLOB patterns
1561
+** that should be treated as binary files for merging
1562
+** purposes. Example: *.xml
1563
+**
1564
+** clearsign When enabled, fossil will attempt to sign all commits
1565
+** with gpg. When disabled (the default), commits will
1566
+** be unsigned.
1567
+**
1568
+** diff-command External command to run when performing a diff.
1569
+** If undefined, the internal text diff will be used.
1570
+**
1571
+** dont-push Prevent this repository from pushing from client to
1572
+** server. Useful when setting up a private branch.
1573
+**
1574
+** editor Text editor command used for check-in comments.
1575
+**
1576
+** gdiff-command External command to run when performing a graphical
1577
+** diff. If undefined, text diff will be used.
1578
+**
1579
+** http-port The TCP/IP port number to use by the "server"
1580
+** and "ui" commands. Default: 8080
1581
+**
1582
+** ignore-glob The VALUE is a comma-separated list of GLOB patterns
1583
+** specifying files that the "extra" command will ignore.
1584
+** Example: *.o,*.obj,*.exe
1585
+**
1586
+** localauth If enabled, require that HTTP connections from
1587
+** 127.0.0.1 be authenticated by password. If
1588
+** false, all HTTP requests from localhost have
1589
+** unrestricted access to the repository.
1590
+**
1591
+** mtime-changes Use file modification times (mtimes) to detect when
1592
+** files have been modified. (Default "on".)
1593
+**
1594
+** pgp-command Command used to clear-sign manifests at check-in.
1595
+** The default is "gpg --clearsign -o ".
1596
+**
1597
+** proxy URL of the HTTP proxy. If undefined or "off" then
1598
+** the "http_proxy" environment variable is consulted.
1599
+** If the http_proxy environment variable is undefined
1600
+** then a direct HTTP connection is used.
1601
+**
1602
+** ssh-command Command used to talk to a remote machine with
1603
+** the "ssh://" protocol.
1604
+**
1605
+** web-browser A shell command used to launch your preferred
1606
+** web browser when given a URL as an argument.
1607
+** Defaults to "start" on windows, "open" on Mac,
1608
+** and "firefox" on Unix.
16081609
 */
16091610
 void setting_cmd(void){
16101611
 int i;
16111612
 int globalFlag = find_option("global","g",0)!=0;
16121613
 int unsetFlag = g.argv[1][0]=='u';
16131614
--- src/db.c
+++ src/db.c
@@ -1536,77 +1536,78 @@
1536 ** COMMAND: settings
1537 ** COMMAND: unset
1538 ** %fossil settings ?PROPERTY? ?VALUE? ?-global?
1539 ** %fossil unset PROPERTY ?-global?
1540 **
1541 ** The "settings" command with no arguments lists all properties and their
1542 ** values. With just a property name it shows the value of that property.
1543 ** With a value argument it changes the property for the current repository.
 
1544 **
1545 ** The "unset" command clears a property setting.
1546 **
1547 **
1548 ** auto-captcha If enabled, the Login page provides a button to
1549 ** fill in the captcha password. Default: on
1550 **
1551 ** auto-shun If enabled, automatically pull the shunning list
1552 ** from a server to which the client autosyncs.
1553 **
1554 ** autosync If enabled, automatically pull prior to commit
1555 ** or update and automatically push after commit or
1556 ** tag or branch creation. If the value is "pullonly"
1557 ** then only pull operations occur automatically.
1558 **
1559 ** binary-glob The VALUE is a comma-separated list of GLOB patterns
1560 ** that should be treated as binary files for merging
1561 ** purposes. Example: *.xml
1562 **
1563 ** clearsign When enabled, fossil will attempt to sign all commits
1564 ** with gpg. When disabled (the default), commits will
1565 ** be unsigned.
1566 **
1567 ** diff-command External command to run when performing a diff.
1568 ** If undefined, the internal text diff will be used.
1569 **
1570 ** dont-push Prevent this repository from pushing from client to
1571 ** server. Useful when setting up a private branch.
1572 **
1573 ** editor Text editor command used for check-in comments.
1574 **
1575 ** gdiff-command External command to run when performing a graphical
1576 ** diff. If undefined, text diff will be used.
1577 **
1578 ** http-port The TCP/IP port number to use by the "server"
1579 ** and "ui" commands. Default: 8080
1580 **
1581 ** ignore-glob The VALUE is a comma-separated list of GLOB patterns
1582 ** specifying files that the "extra" command will ignore.
1583 ** Example: *.o,*.obj,*.exe
1584 **
1585 ** localauth If enabled, require that HTTP connections from
1586 ** 127.0.0.1 be authenticated by password. If
1587 ** false, all HTTP requests from localhost have
1588 ** unrestricted access to the repository.
1589 **
1590 ** mtime-changes Use file modification times (mtimes) to detect when
1591 ** files have been modified. (Default "on".)
1592 **
1593 ** pgp-command Command used to clear-sign manifests at check-in.
1594 ** The default is "gpg --clearsign -o ".
1595 **
1596 ** proxy URL of the HTTP proxy. If undefined or "off" then
1597 ** the "http_proxy" environment variable is consulted.
1598 ** If the http_proxy environment variable is undefined
1599 ** then a direct HTTP connection is used.
1600 **
1601 ** ssh-command Command used to talk to a remote machine with
1602 ** the "ssh://" protocol.
1603 **
1604 ** web-browser A shell command used to launch your preferred
1605 ** web browser when given a URL as an argument.
1606 ** Defaults to "start" on windows, "open" on Mac,
1607 ** and "firefox" on Unix.
1608 */
1609 void setting_cmd(void){
1610 int i;
1611 int globalFlag = find_option("global","g",0)!=0;
1612 int unsetFlag = g.argv[1][0]=='u';
1613
--- src/db.c
+++ src/db.c
@@ -1536,77 +1536,78 @@
1536 ** COMMAND: settings
1537 ** COMMAND: unset
1538 ** %fossil settings ?PROPERTY? ?VALUE? ?-global?
1539 ** %fossil unset PROPERTY ?-global?
1540 **
1541 ** The "settings" command with no arguments lists all properties and
1542 ** their values. With just a property name it shows the value of that
1543 ** property. With a value argument it changes the property for the
1544 ** current repository.
1545 **
1546 ** The "unset" command clears a property setting.
1547 **
1548 **
1549 ** auto-captcha If enabled, the Login page provides a button to
1550 ** fill in the captcha password. Default: on
1551 **
1552 ** auto-shun If enabled, automatically pull the shunning list
1553 ** from a server to which the client autosyncs.
1554 **
1555 ** autosync If enabled, automatically pull prior to commit
1556 ** or update and automatically push after commit or
1557 ** tag or branch creation. If the value is "pullonly"
1558 ** then only pull operations occur automatically.
1559 **
1560 ** binary-glob The VALUE is a comma-separated list of GLOB patterns
1561 ** that should be treated as binary files for merging
1562 ** purposes. Example: *.xml
1563 **
1564 ** clearsign When enabled, fossil will attempt to sign all commits
1565 ** with gpg. When disabled (the default), commits will
1566 ** be unsigned.
1567 **
1568 ** diff-command External command to run when performing a diff.
1569 ** If undefined, the internal text diff will be used.
1570 **
1571 ** dont-push Prevent this repository from pushing from client to
1572 ** server. Useful when setting up a private branch.
1573 **
1574 ** editor Text editor command used for check-in comments.
1575 **
1576 ** gdiff-command External command to run when performing a graphical
1577 ** diff. If undefined, text diff will be used.
1578 **
1579 ** http-port The TCP/IP port number to use by the "server"
1580 ** and "ui" commands. Default: 8080
1581 **
1582 ** ignore-glob The VALUE is a comma-separated list of GLOB patterns
1583 ** specifying files that the "extra" command will ignore.
1584 ** Example: *.o,*.obj,*.exe
1585 **
1586 ** localauth If enabled, require that HTTP connections from
1587 ** 127.0.0.1 be authenticated by password. If
1588 ** false, all HTTP requests from localhost have
1589 ** unrestricted access to the repository.
1590 **
1591 ** mtime-changes Use file modification times (mtimes) to detect when
1592 ** files have been modified. (Default "on".)
1593 **
1594 ** pgp-command Command used to clear-sign manifests at check-in.
1595 ** The default is "gpg --clearsign -o ".
1596 **
1597 ** proxy URL of the HTTP proxy. If undefined or "off" then
1598 ** the "http_proxy" environment variable is consulted.
1599 ** If the http_proxy environment variable is undefined
1600 ** then a direct HTTP connection is used.
1601 **
1602 ** ssh-command Command used to talk to a remote machine with
1603 ** the "ssh://" protocol.
1604 **
1605 ** web-browser A shell command used to launch your preferred
1606 ** web browser when given a URL as an argument.
1607 ** Defaults to "start" on windows, "open" on Mac,
1608 ** and "firefox" on Unix.
1609 */
1610 void setting_cmd(void){
1611 int i;
1612 int globalFlag = find_option("global","g",0)!=0;
1613 int unsetFlag = g.argv[1][0]=='u';
1614
M src/diffcmd.c
+4 -3
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -359,17 +359,18 @@
359359
 ** the source check-in for the diff operation. If not specified, the
360360
 ** source check-in is the base check-in for the current check-out.
361361
 **
362362
 ** If the "--to VERSION" option appears, it specifies the check-in from
363363
 ** which the second version of the file or files is taken. If there is
364
-** no "--to" option then the (possibly edited) files in the current check-out
365
-** are used.
364
+** no "--to" option then the (possibly edited) files in the current
365
+** check-out are used.
366366
 **
367367
 ** The "-i" command-line option forces the use of the internal diff logic
368368
 ** rather than any external diff program that might be configured using
369369
 ** the <a>setting</a> command. If no external diff program is configured, then
370
-** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
370
+** the "-i" option is a no-op. The "-i" option converts "gdiff" into
371
+** "diff".
371372
 */
372373
 void diff_cmd(void){
373374
 int isGDiff; /* True for gdiff. False for normal diff */
374375
 int isInternDiff; /* True for internal diff */
375376
 const char *zFrom; /* Source version number */
376377
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -359,17 +359,18 @@
359 ** the source check-in for the diff operation. If not specified, the
360 ** source check-in is the base check-in for the current check-out.
361 **
362 ** If the "--to VERSION" option appears, it specifies the check-in from
363 ** which the second version of the file or files is taken. If there is
364 ** no "--to" option then the (possibly edited) files in the current check-out
365 ** are used.
366 **
367 ** The "-i" command-line option forces the use of the internal diff logic
368 ** rather than any external diff program that might be configured using
369 ** the <a>setting</a> command. If no external diff program is configured, then
370 ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
 
371 */
372 void diff_cmd(void){
373 int isGDiff; /* True for gdiff. False for normal diff */
374 int isInternDiff; /* True for internal diff */
375 const char *zFrom; /* Source version number */
376
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -359,17 +359,18 @@
359 ** the source check-in for the diff operation. If not specified, the
360 ** source check-in is the base check-in for the current check-out.
361 **
362 ** If the "--to VERSION" option appears, it specifies the check-in from
363 ** which the second version of the file or files is taken. If there is
364 ** no "--to" option then the (possibly edited) files in the current
365 ** check-out are used.
366 **
367 ** The "-i" command-line option forces the use of the internal diff logic
368 ** rather than any external diff program that might be configured using
369 ** the <a>setting</a> command. If no external diff program is configured, then
370 ** the "-i" option is a no-op. The "-i" option converts "gdiff" into
371 ** "diff".
372 */
373 void diff_cmd(void){
374 int isGDiff; /* True for gdiff. False for normal diff */
375 int isInternDiff; /* True for internal diff */
376 const char *zFrom; /* Source version number */
377
M src/main.c
+8 -2
--- src/main.c
+++ src/main.c
@@ -628,18 +628,26 @@
628628
 len = strlen(zSrc);
629629
 zDest = malloc(len+1);
630630
 for(src=dest=0;zSrc[src];){
631631
 if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){
632632
 src++; /* skip % for fossil argv[0] expansion */
633
+ }else if( zSrc[src]=='<' && strncmp(zSrc+src, "</a>", 3)==0 ){
634
+ src += 4;
635
+ zDest[dest++]='<';
636
+ zDest[dest++]='/';
637
+ zDest[dest++]='a';
638
+ zDest[dest++]='>';
639
+ zDest[dest++]='"';
633640
 }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){
634641
 /* found an internal command cross reference,
635642
 ** create an additional link
636643
 */
637644
 int start;
638645
639646
 len+=80;
640647
 zDest=realloc(zDest,len);
648
+ zDest[dest++]='"';
641649
 zDest[dest++]=zSrc[src++]; /* < */
642650
 zDest[dest++]=zSrc[src++]; /* a */
643651
 zDest[dest++]=' ';
644652
 zDest[dest++]='h';
645653
 zDest[dest++]='r';
@@ -660,15 +668,13 @@
660668
 for( src=start; zSrc[src] && zSrc[src]!='<'; ){
661669
 zDest[dest++]=zSrc[src++]; /* command name */
662670
 }
663671
 zDest[dest++]='"';
664672
 zDest[dest++]='>';
665
- zDest[dest++]='"';
666673
 for( src=start; zSrc[src] && zSrc[src]!='<'; ){
667674
 zDest[dest++]=zSrc[src++]; /* command name */
668675
 }
669
- zDest[dest++]='"';
670676
 }else{
671677
 zDest[dest++] = zSrc[src++];
672678
 }
673679
 }
674680
 zDest[dest] = 0;
675681
--- src/main.c
+++ src/main.c
@@ -628,18 +628,26 @@
628 len = strlen(zSrc);
629 zDest = malloc(len+1);
630 for(src=dest=0;zSrc[src];){
631 if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){
632 src++; /* skip % for fossil argv[0] expansion */
 
 
 
 
 
 
 
633 }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){
634 /* found an internal command cross reference,
635 ** create an additional link
636 */
637 int start;
638
639 len+=80;
640 zDest=realloc(zDest,len);
 
641 zDest[dest++]=zSrc[src++]; /* < */
642 zDest[dest++]=zSrc[src++]; /* a */
643 zDest[dest++]=' ';
644 zDest[dest++]='h';
645 zDest[dest++]='r';
@@ -660,15 +668,13 @@
660 for( src=start; zSrc[src] && zSrc[src]!='<'; ){
661 zDest[dest++]=zSrc[src++]; /* command name */
662 }
663 zDest[dest++]='"';
664 zDest[dest++]='>';
665 zDest[dest++]='"';
666 for( src=start; zSrc[src] && zSrc[src]!='<'; ){
667 zDest[dest++]=zSrc[src++]; /* command name */
668 }
669 zDest[dest++]='"';
670 }else{
671 zDest[dest++] = zSrc[src++];
672 }
673 }
674 zDest[dest] = 0;
675
--- src/main.c
+++ src/main.c
@@ -628,18 +628,26 @@
628 len = strlen(zSrc);
629 zDest = malloc(len+1);
630 for(src=dest=0;zSrc[src];){
631 if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){
632 src++; /* skip % for fossil argv[0] expansion */
633 }else if( zSrc[src]=='<' && strncmp(zSrc+src, "</a>", 3)==0 ){
634 src += 4;
635 zDest[dest++]='<';
636 zDest[dest++]='/';
637 zDest[dest++]='a';
638 zDest[dest++]='>';
639 zDest[dest++]='"';
640 }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){
641 /* found an internal command cross reference,
642 ** create an additional link
643 */
644 int start;
645
646 len+=80;
647 zDest=realloc(zDest,len);
648 zDest[dest++]='"';
649 zDest[dest++]=zSrc[src++]; /* < */
650 zDest[dest++]=zSrc[src++]; /* a */
651 zDest[dest++]=' ';
652 zDest[dest++]='h';
653 zDest[dest++]='r';
@@ -660,15 +668,13 @@
668 for( src=start; zSrc[src] && zSrc[src]!='<'; ){
669 zDest[dest++]=zSrc[src++]; /* command name */
670 }
671 zDest[dest++]='"';
672 zDest[dest++]='>';
 
673 for( src=start; zSrc[src] && zSrc[src]!='<'; ){
674 zDest[dest++]=zSrc[src++]; /* command name */
675 }
 
676 }else{
677 zDest[dest++] = zSrc[src++];
678 }
679 }
680 zDest[dest] = 0;
681
M src/merge.c
+4 -4
--- src/merge.c
+++ src/merge.c
@@ -40,15 +40,15 @@
4040
 ** file and directory names from the current checkout even if those
4141
 ** names might have been changed in the branch being merged in.
4242
 **
4343
 ** Other options:
4444
 **
45
-** --detail Show additional details of the merge
45
+** --detail Show additional details of the merge
4646
 **
47
-** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
48
-** and do not try to merge parallel changes. This
49
-** option overrides the "binary-glob" setting.
47
+** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
48
+** and do not try to merge parallel changes. This
49
+** option overrides the "binary-glob" setting.
5050
 */
5151
 void merge_cmd(void){
5252
 int vid; /* Current version */
5353
 int mid; /* Version we are merging against */
5454
 int pid; /* The pivot version - most recent common ancestor */
5555
--- src/merge.c
+++ src/merge.c
@@ -40,15 +40,15 @@
40 ** file and directory names from the current checkout even if those
41 ** names might have been changed in the branch being merged in.
42 **
43 ** Other options:
44 **
45 ** --detail Show additional details of the merge
46 **
47 ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
48 ** and do not try to merge parallel changes. This
49 ** option overrides the "binary-glob" setting.
50 */
51 void merge_cmd(void){
52 int vid; /* Current version */
53 int mid; /* Version we are merging against */
54 int pid; /* The pivot version - most recent common ancestor */
55
--- src/merge.c
+++ src/merge.c
@@ -40,15 +40,15 @@
40 ** file and directory names from the current checkout even if those
41 ** names might have been changed in the branch being merged in.
42 **
43 ** Other options:
44 **
45 ** --detail Show additional details of the merge
46 **
47 ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
48 ** and do not try to merge parallel changes. This
49 ** option overrides the "binary-glob" setting.
50 */
51 void merge_cmd(void){
52 int vid; /* Current version */
53 int mid; /* Version we are merging against */
54 int pid; /* The pivot version - most recent common ancestor */
55
M src/rebuild.c
+10 -8
--- src/rebuild.c
+++ src/rebuild.c
@@ -379,13 +379,13 @@
379379
 ** %fossil scrub [--verily] [--force] [REPOSITORY]
380380
 **
381381
 ** The command removes sensitive information (such as passwords) from a
382382
 ** repository so that the respository can be sent to an untrusted reader.
383383
 **
384
-** By default, only passwords are removed. However, if the --verily option
385
-** is added, then private branches, concealed email addresses, IP
386
-** addresses of correspondents, and similar privacy-sensitive fields
384
+** By default, only passwords are removed. However, if the --verily
385
+** option is added, then private branches, concealed email addresses,
386
+** IP addresses of correspondents, and similar privacy-sensitive fields
387387
 ** are also purged.
388388
 **
389389
 ** This command permanently deletes the scrubbed information. The effects
390390
 ** of this command are irreversible. Use with caution.
391391
 **
@@ -523,16 +523,18 @@
523523
 }
524524
525525
 /*
526526
 ** COMMAND: deconstruct
527527
 **
528
-** Usage %fossil deconstruct ?-R|--repository REPOSITORY? ?-L|--prefixlength N? DESTINATION
528
+** Usage: %fossil deconstruct ?-R|--repository REPOSITORY? \\
529
+** ?-L|--prefixlength N? DESTINATION
529530
 **
530
-** This command exports all artifacts of o given repository and
531
-** writes all artifacts to the file system. The DESTINATION directory
532
-** will be populated with subdirectories AA and files AA/BBBBBBBBB.., where
533
-** AABBBBBBBBB.. is the 40 character artifact ID, AA the first 2 characters.
531
+** This command exports all artifacts of o given repository and writes
532
+** all artifacts to the file system. The DESTINATION directory will be
533
+** populated with subdirectories AA and files AA/BBBBBBBBB.., where
534
+** AABBBBBBBBB.. is the 40 character artifact ID and AA the first 2
535
+** characters.
534536
 ** If -L|--prefixlength is given, the length (default 2) of the directory
535537
 ** prefix can be set to 0,1,..,9 characters.
536538
 */
537539
 void deconstruct_cmd(void){
538540
 const char *zDestDir;
539541
--- src/rebuild.c
+++ src/rebuild.c
@@ -379,13 +379,13 @@
379 ** %fossil scrub [--verily] [--force] [REPOSITORY]
380 **
381 ** The command removes sensitive information (such as passwords) from a
382 ** repository so that the respository can be sent to an untrusted reader.
383 **
384 ** By default, only passwords are removed. However, if the --verily option
385 ** is added, then private branches, concealed email addresses, IP
386 ** addresses of correspondents, and similar privacy-sensitive fields
387 ** are also purged.
388 **
389 ** This command permanently deletes the scrubbed information. The effects
390 ** of this command are irreversible. Use with caution.
391 **
@@ -523,16 +523,18 @@
523 }
524
525 /*
526 ** COMMAND: deconstruct
527 **
528 ** Usage %fossil deconstruct ?-R|--repository REPOSITORY? ?-L|--prefixlength N? DESTINATION
 
529 **
530 ** This command exports all artifacts of o given repository and
531 ** writes all artifacts to the file system. The DESTINATION directory
532 ** will be populated with subdirectories AA and files AA/BBBBBBBBB.., where
533 ** AABBBBBBBBB.. is the 40 character artifact ID, AA the first 2 characters.
 
534 ** If -L|--prefixlength is given, the length (default 2) of the directory
535 ** prefix can be set to 0,1,..,9 characters.
536 */
537 void deconstruct_cmd(void){
538 const char *zDestDir;
539
--- src/rebuild.c
+++ src/rebuild.c
@@ -379,13 +379,13 @@
379 ** %fossil scrub [--verily] [--force] [REPOSITORY]
380 **
381 ** The command removes sensitive information (such as passwords) from a
382 ** repository so that the respository can be sent to an untrusted reader.
383 **
384 ** By default, only passwords are removed. However, if the --verily
385 ** option is added, then private branches, concealed email addresses,
386 ** IP addresses of correspondents, and similar privacy-sensitive fields
387 ** are also purged.
388 **
389 ** This command permanently deletes the scrubbed information. The effects
390 ** of this command are irreversible. Use with caution.
391 **
@@ -523,16 +523,18 @@
523 }
524
525 /*
526 ** COMMAND: deconstruct
527 **
528 ** Usage: %fossil deconstruct ?-R|--repository REPOSITORY? \\
529 ** ?-L|--prefixlength N? DESTINATION
530 **
531 ** This command exports all artifacts of o given repository and writes
532 ** all artifacts to the file system. The DESTINATION directory will be
533 ** populated with subdirectories AA and files AA/BBBBBBBBB.., where
534 ** AABBBBBBBBB.. is the 40 character artifact ID and AA the first 2
535 ** characters.
536 ** If -L|--prefixlength is given, the length (default 2) of the directory
537 ** prefix can be set to 0,1,..,9 characters.
538 */
539 void deconstruct_cmd(void){
540 const char *zDestDir;
541
M src/sync.c
+8 -8
--- src/sync.c
+++ src/sync.c
@@ -162,12 +162,12 @@
162162
 ** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
163163
 ** is used.
164164
 **
165165
 ** The URL specified normally becomes the new "remote-url" used for
166166
 ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
167
-** the "--once" command-line option makes the URL a one-time-use URL that is
168
-** not saved.
167
+** the "--once" command-line option makes the URL a one-time-use URL
168
+** that is not saved.
169169
 **
170170
 ** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
171171
 */
172172
 void push_cmd(void){
173173
 process_sync_args();
@@ -187,18 +187,18 @@
187187
 **
188188
 ** If a user-id and password are required, specify them as follows:
189189
 **
190190
 ** http://userid:[email protected]:1234/path
191191
 **
192
-** If the URL is not specified, then the URL from the most recent successful
193
-** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
192
+** If the URL is not specified, then the URL from the most recent
193
+** successful <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
194194
 ** is used.
195195
 **
196196
 ** The URL specified normally becomes the new "remote-url" used for
197197
 ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
198
-** the "--once" command-line option makes the URL a one-time-use URL that is
199
-** not saved.
198
+** the "--once" command-line option makes the URL a one-time-use URL
199
+** that is not saved.
200200
 **
201201
 ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
202202
 */
203203
 void sync_cmd(void){
204204
 int syncFlags = process_sync_args();
@@ -212,12 +212,12 @@
212212
 **
213213
 ** Query and/or change the default server URL used by the <a>pull</a>,
214214
 ** <a>push</a>, and <a>sync</a> commands.
215215
 **
216216
 ** The remote-url is set automatically by a <a>clone</a> command or by any
217
-** <a>sync</a>, <a>push</a>, or <a>pull</a> command that specifies an
218
-** explicit URL. The default remote-url is used by auto-syncing and by
217
+** <a>sync</a>, <a>push</a>, or <a>pull</a> command that specifies an explicit
218
+** URL. The default remote-url is used by auto-syncing and by
219219
 ** <a>sync</a>, <a>push</a>, <a>pull</a> that omit the server URL.
220220
 **
221221
 ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
222222
 */
223223
 void remote_url_cmd(void){
224224
--- src/sync.c
+++ src/sync.c
@@ -162,12 +162,12 @@
162 ** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
163 ** is used.
164 **
165 ** The URL specified normally becomes the new "remote-url" used for
166 ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
167 ** the "--once" command-line option makes the URL a one-time-use URL that is
168 ** not saved.
169 **
170 ** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
171 */
172 void push_cmd(void){
173 process_sync_args();
@@ -187,18 +187,18 @@
187 **
188 ** If a user-id and password are required, specify them as follows:
189 **
190 ** http://userid:[email protected]:1234/path
191 **
192 ** If the URL is not specified, then the URL from the most recent successful
193 ** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
194 ** is used.
195 **
196 ** The URL specified normally becomes the new "remote-url" used for
197 ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
198 ** the "--once" command-line option makes the URL a one-time-use URL that is
199 ** not saved.
200 **
201 ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
202 */
203 void sync_cmd(void){
204 int syncFlags = process_sync_args();
@@ -212,12 +212,12 @@
212 **
213 ** Query and/or change the default server URL used by the <a>pull</a>,
214 ** <a>push</a>, and <a>sync</a> commands.
215 **
216 ** The remote-url is set automatically by a <a>clone</a> command or by any
217 ** <a>sync</a>, <a>push</a>, or <a>pull</a> command that specifies an
218 ** explicit URL. The default remote-url is used by auto-syncing and by
219 ** <a>sync</a>, <a>push</a>, <a>pull</a> that omit the server URL.
220 **
221 ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
222 */
223 void remote_url_cmd(void){
224
--- src/sync.c
+++ src/sync.c
@@ -162,12 +162,12 @@
162 ** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
163 ** is used.
164 **
165 ** The URL specified normally becomes the new "remote-url" used for
166 ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
167 ** the "--once" command-line option makes the URL a one-time-use URL
168 ** that is not saved.
169 **
170 ** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
171 */
172 void push_cmd(void){
173 process_sync_args();
@@ -187,18 +187,18 @@
187 **
188 ** If a user-id and password are required, specify them as follows:
189 **
190 ** http://userid:[email protected]:1234/path
191 **
192 ** If the URL is not specified, then the URL from the most recent
193 ** successful <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
194 ** is used.
195 **
196 ** The URL specified normally becomes the new "remote-url" used for
197 ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
198 ** the "--once" command-line option makes the URL a one-time-use URL
199 ** that is not saved.
200 **
201 ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
202 */
203 void sync_cmd(void){
204 int syncFlags = process_sync_args();
@@ -212,12 +212,12 @@
212 **
213 ** Query and/or change the default server URL used by the <a>pull</a>,
214 ** <a>push</a>, and <a>sync</a> commands.
215 **
216 ** The remote-url is set automatically by a <a>clone</a> command or by any
217 ** <a>sync</a>, <a>push</a>, or <a>pull</a> command that specifies an explicit
218 ** URL. The default remote-url is used by auto-syncing and by
219 ** <a>sync</a>, <a>push</a>, <a>pull</a> that omit the server URL.
220 **
221 ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
222 */
223 void remote_url_cmd(void){
224
M src/undo.c
+7 -7
--- src/undo.c
+++ src/undo.c
@@ -244,14 +244,14 @@
244244
 /*
245245
 ** COMMAND: undo
246246
 **
247247
 ** Usage: %fossil undo ?FILENAME...?
248248
 **
249
-** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a>
250
-** operation. If FILENAME is specified then restore the content of the
251
-** named file(s) but otherwise leave the <a>update</a>, <a>merge</a> or
252
-** <a>revert</a> in effect.
249
+** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation.
250
+** If FILENAME is specified then restore the content of the named
251
+** file(s) but otherwise leave the <a>update</a>, <a>merge</a> or <a>revert</a>
252
+** in effect.
253253
 **
254254
 ** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a>
255255
 ** stack is cleared by the commit and checkout commands.
256256
 */
257257
 void undo_cmd(void){
@@ -285,13 +285,13 @@
285285
 ** COMMAND: redo
286286
 **
287287
 ** Usage: %fossil redo ?FILENAME...?
288288
 **
289289
 ** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
290
-** undone by the <a>undo</a> command. If FILENAME is specified then restore the
291
-** changes associated with the named file(s) but otherwise leave the update
292
-** or merge undone.
290
+** undone by the <a>undo</a> command. If FILENAME is specified then restore
291
+** the changes associated with the named file(s) but otherwise leave the
292
+** update or merge undone.
293293
 **
294294
 ** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
295295
 ** is cleared by the <a>commit</a> and <a>checkout</a> commands.
296296
 */
297297
 void redo_cmd(void){
298298
--- src/undo.c
+++ src/undo.c
@@ -244,14 +244,14 @@
244 /*
245 ** COMMAND: undo
246 **
247 ** Usage: %fossil undo ?FILENAME...?
248 **
249 ** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a>
250 ** operation. If FILENAME is specified then restore the content of the
251 ** named file(s) but otherwise leave the <a>update</a>, <a>merge</a> or
252 ** <a>revert</a> in effect.
253 **
254 ** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a>
255 ** stack is cleared by the commit and checkout commands.
256 */
257 void undo_cmd(void){
@@ -285,13 +285,13 @@
285 ** COMMAND: redo
286 **
287 ** Usage: %fossil redo ?FILENAME...?
288 **
289 ** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
290 ** undone by the <a>undo</a> command. If FILENAME is specified then restore the
291 ** changes associated with the named file(s) but otherwise leave the update
292 ** or merge undone.
293 **
294 ** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
295 ** is cleared by the <a>commit</a> and <a>checkout</a> commands.
296 */
297 void redo_cmd(void){
298
--- src/undo.c
+++ src/undo.c
@@ -244,14 +244,14 @@
244 /*
245 ** COMMAND: undo
246 **
247 ** Usage: %fossil undo ?FILENAME...?
248 **
249 ** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation.
250 ** If FILENAME is specified then restore the content of the named
251 ** file(s) but otherwise leave the <a>update</a>, <a>merge</a> or <a>revert</a>
252 ** in effect.
253 **
254 ** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a>
255 ** stack is cleared by the commit and checkout commands.
256 */
257 void undo_cmd(void){
@@ -285,13 +285,13 @@
285 ** COMMAND: redo
286 **
287 ** Usage: %fossil redo ?FILENAME...?
288 **
289 ** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
290 ** undone by the <a>undo</a> command. If FILENAME is specified then restore
291 ** the changes associated with the named file(s) but otherwise leave the
292 ** update or merge undone.
293 **
294 ** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
295 ** is cleared by the <a>commit</a> and <a>checkout</a> commands.
296 */
297 void redo_cmd(void){
298
M src/zip.c
+2 -2
--- src/zip.c
+++ src/zip.c
@@ -376,12 +376,12 @@
376376
 /*
377377
 ** COMMAND: zip
378378
 **
379379
 ** Usage: %fossil zip VERSION OUTPUTFILE [--name DIRECTORYNAME]
380380
 **
381
-** Generate a ZIP archive for a specified version. If the --name option is
382
-** used, it argument becomes the name of the top-level directory in the
381
+** Generate a ZIP archive for a specified version. If the --name option
382
+** is used, it argument becomes the name of the top-level directory in the
383383
 ** resulting ZIP archive. If --name is omitted, the top-level directory
384384
 ** named is derived from the project name, the check-in date and time, and
385385
 ** the artifact ID of the check-in.
386386
 */
387387
 void baseline_zip_cmd(void){
388388
--- src/zip.c
+++ src/zip.c
@@ -376,12 +376,12 @@
376 /*
377 ** COMMAND: zip
378 **
379 ** Usage: %fossil zip VERSION OUTPUTFILE [--name DIRECTORYNAME]
380 **
381 ** Generate a ZIP archive for a specified version. If the --name option is
382 ** used, it argument becomes the name of the top-level directory in the
383 ** resulting ZIP archive. If --name is omitted, the top-level directory
384 ** named is derived from the project name, the check-in date and time, and
385 ** the artifact ID of the check-in.
386 */
387 void baseline_zip_cmd(void){
388
--- src/zip.c
+++ src/zip.c
@@ -376,12 +376,12 @@
376 /*
377 ** COMMAND: zip
378 **
379 ** Usage: %fossil zip VERSION OUTPUTFILE [--name DIRECTORYNAME]
380 **
381 ** Generate a ZIP archive for a specified version. If the --name option
382 ** is used, it argument becomes the name of the top-level directory in the
383 ** resulting ZIP archive. If --name is omitted, the top-level directory
384 ** named is derived from the project name, the check-in date and time, and
385 ** the artifact ID of the check-in.
386 */
387 void baseline_zip_cmd(void){
388

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button