Fossil SCM
shorten command lines to 80 char
Commit
ad29dc11328e14a59221427c8c821a7274955e11
Parent
b76a547f1aa1336…
3 files changed
+1
-1
+19
-16
+9
-8
+1
-1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -364,11 +364,11 @@ | ||
| 364 | 364 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 365 | 365 | ** are used. |
| 366 | 366 | ** |
| 367 | 367 | ** The "-i" command-line option forces the use of the internal diff logic |
| 368 | 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 | |
| 369 | +** the "<a>setting</a>" command. If no external diff program is configured, then | |
| 370 | 370 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 371 | 371 | */ |
| 372 | 372 | void diff_cmd(void){ |
| 373 | 373 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 374 | 374 | int isInternDiff; /* True for internal diff */ |
| 375 | 375 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -364,11 +364,11 @@ | |
| 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 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -364,11 +364,11 @@ | |
| 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 |
+19
-16
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -132,11 +132,12 @@ | ||
| 132 | 132 | ** Pull changes from a remote repository into the local repository. |
| 133 | 133 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 134 | 134 | ** to specify an alternative repository file. |
| 135 | 135 | ** |
| 136 | 136 | ** If the URL is not specified, then the URL from the most recent |
| 137 | -** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command is used. | |
| 137 | +** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command | |
| 138 | +** is used. | |
| 138 | 139 | ** |
| 139 | 140 | ** The URL specified normally becomes the new "remote-url" used for |
| 140 | 141 | ** subsequent push, pull, and sync operations. However, the "--once" |
| 141 | 142 | ** command-line option makes the URL a one-time-use URL that is not |
| 142 | 143 | ** saved. |
| @@ -156,16 +157,17 @@ | ||
| 156 | 157 | ** Push changes in the local repository over into a remote repository. |
| 157 | 158 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 158 | 159 | ** to specify an alternative repository file. |
| 159 | 160 | ** |
| 160 | 161 | ** If the URL is not specified, then the URL from the most recent |
| 161 | -** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command is used. | |
| 162 | +** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command | |
| 163 | +** is used. | |
| 162 | 164 | ** |
| 163 | 165 | ** The URL specified normally becomes the new "remote-url" used for |
| 164 | -** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once" | |
| 165 | -** command-line option makes the URL a one-time-use URL that is not | |
| 166 | -** saved. | |
| 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. | |
| 167 | 169 | ** |
| 168 | 170 | ** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a> |
| 169 | 171 | */ |
| 170 | 172 | void push_cmd(void){ |
| 171 | 173 | process_sync_args(); |
| @@ -177,25 +179,26 @@ | ||
| 177 | 179 | ** COMMAND: sync |
| 178 | 180 | ** |
| 179 | 181 | ** Usage: %fossil sync ?URL? ?options? |
| 180 | 182 | ** |
| 181 | 183 | ** Synchronize the local repository with a remote repository. This is |
| 182 | -** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same time. | |
| 183 | -** Use the "-R REPO" or "--repository REPO" command-line options | |
| 184 | +** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same | |
| 185 | +** time. Use the "-R REPO" or "--repository REPO" command-line options | |
| 184 | 186 | ** to specify an alternative repository file. |
| 185 | 187 | ** |
| 186 | 188 | ** If a user-id and password are required, specify them as follows: |
| 187 | 189 | ** |
| 188 | 190 | ** http://userid:[email protected]:1234/path |
| 189 | 191 | ** |
| 190 | 192 | ** If the URL is not specified, then the URL from the most recent successful |
| 191 | -** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command is used. | |
| 193 | +** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command | |
| 194 | +** is used. | |
| 192 | 195 | ** |
| 193 | 196 | ** The URL specified normally becomes the new "remote-url" used for |
| 194 | -** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once" | |
| 195 | -** command-line option makes the URL a one-time-use URL that is not | |
| 196 | -** saved. | |
| 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. | |
| 197 | 200 | ** |
| 198 | 201 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a> |
| 199 | 202 | */ |
| 200 | 203 | void sync_cmd(void){ |
| 201 | 204 | int syncFlags = process_sync_args(); |
| @@ -205,17 +208,17 @@ | ||
| 205 | 208 | /* |
| 206 | 209 | ** COMMAND: remote-url |
| 207 | 210 | ** |
| 208 | 211 | ** Usage: %fossil remote-url ?URL|off? |
| 209 | 212 | ** |
| 210 | -** Query and/or change the default server URL used by the "<a>pull</a>", "<a>push</a>", | |
| 211 | -** and "<a>sync</a>" commands. | |
| 213 | +** Query and/or change the default server URL used by the "<a>pull</a>", | |
| 214 | +** "<a>push</a>", and "<a>sync</a>" commands. | |
| 212 | 215 | ** |
| 213 | 216 | ** The remote-url is set automatically by a "<a>clone</a>" command or by any |
| 214 | -** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an explicit URL. | |
| 215 | -** The default remote-url is used by auto-syncing and by "<a>sync</a>", "<a>push</a>", | |
| 216 | -** "<a>pull</a>" that omit the server URL. | |
| 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. | |
| 217 | 220 | ** |
| 218 | 221 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a> |
| 219 | 222 | */ |
| 220 | 223 | void remote_url_cmd(void){ |
| 221 | 224 | char *zUrl; |
| 222 | 225 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -132,11 +132,12 @@ | |
| 132 | ** Pull changes from a remote repository into the local repository. |
| 133 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 134 | ** to specify an alternative repository file. |
| 135 | ** |
| 136 | ** If the URL is not specified, then the URL from the most recent |
| 137 | ** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command is used. |
| 138 | ** |
| 139 | ** The URL specified normally becomes the new "remote-url" used for |
| 140 | ** subsequent push, pull, and sync operations. However, the "--once" |
| 141 | ** command-line option makes the URL a one-time-use URL that is not |
| 142 | ** saved. |
| @@ -156,16 +157,17 @@ | |
| 156 | ** Push changes in the local repository over into a remote repository. |
| 157 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 158 | ** to specify an alternative repository file. |
| 159 | ** |
| 160 | ** If the URL is not specified, then the URL from the most recent |
| 161 | ** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command is used. |
| 162 | ** |
| 163 | ** The URL specified normally becomes the new "remote-url" used for |
| 164 | ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once" |
| 165 | ** command-line option makes the URL a one-time-use URL that is not |
| 166 | ** saved. |
| 167 | ** |
| 168 | ** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a> |
| 169 | */ |
| 170 | void push_cmd(void){ |
| 171 | process_sync_args(); |
| @@ -177,25 +179,26 @@ | |
| 177 | ** COMMAND: sync |
| 178 | ** |
| 179 | ** Usage: %fossil sync ?URL? ?options? |
| 180 | ** |
| 181 | ** Synchronize the local repository with a remote repository. This is |
| 182 | ** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same time. |
| 183 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 184 | ** to specify an alternative repository file. |
| 185 | ** |
| 186 | ** If a user-id and password are required, specify them as follows: |
| 187 | ** |
| 188 | ** http://userid:[email protected]:1234/path |
| 189 | ** |
| 190 | ** If the URL is not specified, then the URL from the most recent successful |
| 191 | ** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command is used. |
| 192 | ** |
| 193 | ** The URL specified normally becomes the new "remote-url" used for |
| 194 | ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once" |
| 195 | ** command-line option makes the URL a one-time-use URL that is not |
| 196 | ** saved. |
| 197 | ** |
| 198 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a> |
| 199 | */ |
| 200 | void sync_cmd(void){ |
| 201 | int syncFlags = process_sync_args(); |
| @@ -205,17 +208,17 @@ | |
| 205 | /* |
| 206 | ** COMMAND: remote-url |
| 207 | ** |
| 208 | ** Usage: %fossil remote-url ?URL|off? |
| 209 | ** |
| 210 | ** Query and/or change the default server URL used by the "<a>pull</a>", "<a>push</a>", |
| 211 | ** and "<a>sync</a>" commands. |
| 212 | ** |
| 213 | ** The remote-url is set automatically by a "<a>clone</a>" command or by any |
| 214 | ** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an explicit URL. |
| 215 | ** The default remote-url is used by auto-syncing and by "<a>sync</a>", "<a>push</a>", |
| 216 | ** "<a>pull</a>" that omit the server URL. |
| 217 | ** |
| 218 | ** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a> |
| 219 | */ |
| 220 | void remote_url_cmd(void){ |
| 221 | char *zUrl; |
| 222 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -132,11 +132,12 @@ | |
| 132 | ** Pull changes from a remote repository into the local repository. |
| 133 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 134 | ** to specify an alternative repository file. |
| 135 | ** |
| 136 | ** If the URL is not specified, then the URL from the most recent |
| 137 | ** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command |
| 138 | ** is used. |
| 139 | ** |
| 140 | ** The URL specified normally becomes the new "remote-url" used for |
| 141 | ** subsequent push, pull, and sync operations. However, the "--once" |
| 142 | ** command-line option makes the URL a one-time-use URL that is not |
| 143 | ** saved. |
| @@ -156,16 +157,17 @@ | |
| 157 | ** Push changes in the local repository over into a remote repository. |
| 158 | ** Use the "-R REPO" or "--repository REPO" command-line options |
| 159 | ** to specify an alternative repository file. |
| 160 | ** |
| 161 | ** If the URL is not specified, then the URL from the most recent |
| 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(); |
| @@ -177,25 +179,26 @@ | |
| 179 | ** COMMAND: sync |
| 180 | ** |
| 181 | ** Usage: %fossil sync ?URL? ?options? |
| 182 | ** |
| 183 | ** Synchronize the local repository with a remote repository. This is |
| 184 | ** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same |
| 185 | ** time. Use the "-R REPO" or "--repository REPO" command-line options |
| 186 | ** to specify an alternative repository file. |
| 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(); |
| @@ -205,17 +208,17 @@ | |
| 208 | /* |
| 209 | ** COMMAND: remote-url |
| 210 | ** |
| 211 | ** Usage: %fossil remote-url ?URL|off? |
| 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 | char *zUrl; |
| 225 |
+9
-8
| --- src/undo.c | ||
| +++ src/undo.c | ||
| @@ -244,16 +244,17 @@ | ||
| 244 | 244 | /* |
| 245 | 245 | ** COMMAND: undo |
| 246 | 246 | ** |
| 247 | 247 | ** Usage: %fossil undo ?FILENAME...? |
| 248 | 248 | ** |
| 249 | -** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation. If FILENAME is | |
| 250 | -** specified then restore the content of the named file(s) but otherwise | |
| 251 | -** leave the <a>update</a> or <a>merge</a> or <a>revert</a> in effect. | |
| 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. | |
| 252 | 253 | ** |
| 253 | -** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a> stack | |
| 254 | -** is cleared by the commit and checkout commands. | |
| 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. | |
| 255 | 256 | */ |
| 256 | 257 | void undo_cmd(void){ |
| 257 | 258 | int undo_available; |
| 258 | 259 | db_must_be_within_tree(); |
| 259 | 260 | db_begin_transaction(); |
| @@ -283,13 +284,13 @@ | ||
| 283 | 284 | /* |
| 284 | 285 | ** COMMAND: redo |
| 285 | 286 | ** |
| 286 | 287 | ** Usage: %fossil redo ?FILENAME...? |
| 287 | 288 | ** |
| 288 | -** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been undone | |
| 289 | -** by the <a>undo</a> command. If FILENAME is specified then restore the changes | |
| 290 | -** associated with the named file(s) but otherwise leave the update | |
| 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 | |
| 291 | 292 | ** or merge undone. |
| 292 | 293 | ** |
| 293 | 294 | ** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack |
| 294 | 295 | ** is cleared by the <a>commit</a> and <a>checkout</a> commands. |
| 295 | 296 | */ |
| 296 | 297 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -244,16 +244,17 @@ | |
| 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. If FILENAME is |
| 250 | ** specified then restore the content of the named file(s) but otherwise |
| 251 | ** leave the <a>update</a> or <a>merge</a> or <a>revert</a> in effect. |
| 252 | ** |
| 253 | ** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a> stack |
| 254 | ** is cleared by the commit and checkout commands. |
| 255 | */ |
| 256 | void undo_cmd(void){ |
| 257 | int undo_available; |
| 258 | db_must_be_within_tree(); |
| 259 | db_begin_transaction(); |
| @@ -283,13 +284,13 @@ | |
| 283 | /* |
| 284 | ** COMMAND: redo |
| 285 | ** |
| 286 | ** Usage: %fossil redo ?FILENAME...? |
| 287 | ** |
| 288 | ** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been undone |
| 289 | ** by the <a>undo</a> command. If FILENAME is specified then restore the changes |
| 290 | ** associated with the named file(s) but otherwise leave the update |
| 291 | ** or merge undone. |
| 292 | ** |
| 293 | ** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack |
| 294 | ** is cleared by the <a>commit</a> and <a>checkout</a> commands. |
| 295 | */ |
| 296 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -244,16 +244,17 @@ | |
| 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){ |
| 258 | int undo_available; |
| 259 | db_must_be_within_tree(); |
| 260 | db_begin_transaction(); |
| @@ -283,13 +284,13 @@ | |
| 284 | /* |
| 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 |