Fossil

Check-in [ad29dc11]
Login

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

Overview
Comment:shorten command lines to 80 char
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wolfgangHelpCmd
Files: files | file ages | folders
SHA1:ad29dc11328e14a59221427c8c821a7274955e11
User & Date: wolfgang 2010-10-08 12:10:46
Context
2010-10-08
12:18
removed quotes from command cross references and add them in help command check-in: b3bf08cc user: wolfgang tags: wolfgangHelpCmd
12:10
shorten command lines to 80 char check-in: ad29dc11 user: wolfgang tags: wolfgangHelpCmd
12:02
added cross reference links to command line help in the gui check-in: b76a547f user: wolfgang tags: wolfgangHelpCmd
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
** If the "--to VERSION" option appears, it specifies the check-in from
** which the second version of the file or files is taken.  If there is
** no "--to" option then the (possibly edited) files in the current check-out
** are used.
**
** The "-i" command-line option forces the use of the internal diff logic
** rather than any external diff program that might be configured using
** the "<a>setting</a>" command.  If no external diff program is configured, then
** the "-i" option is a no-op.  The "-i" option converts "gdiff" into "diff".
*/
void diff_cmd(void){
  int isGDiff;               /* True for gdiff.  False for normal diff */
  int isInternDiff;          /* True for internal diff */
  const char *zFrom;         /* Source version number */
  const char *zTo;           /* Target version number */







|







362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
** If the "--to VERSION" option appears, it specifies the check-in from
** which the second version of the file or files is taken.  If there is
** no "--to" option then the (possibly edited) files in the current check-out
** are used.
**
** The "-i" command-line option forces the use of the internal diff logic
** rather than any external diff program that might be configured using
** the "<a>setting</a>" command. If no external diff program is configured, then
** the "-i" option is a no-op.  The "-i" option converts "gdiff" into "diff".
*/
void diff_cmd(void){
  int isGDiff;               /* True for gdiff.  False for normal diff */
  int isInternDiff;          /* True for internal diff */
  const char *zFrom;         /* Source version number */
  const char *zTo;           /* Target version number */

Changes to src/sync.c.

130
131
132
133
134
135
136
137

138
139
140
141
142
143
144
...
154
155
156
157
158
159
160
161

162
163
164
165
166
167
168
169
170
171
172
173
...
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191

192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
** Usage: %fossil pull ?URL? ?options?
**
** Pull changes from a remote repository into the local repository.
** Use the "-R REPO" or "--repository REPO" command-line options
** to specify an alternative repository file.
**
** If the URL is not specified, then the URL from the most recent
** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command is used.

**
** The URL specified normally becomes the new "remote-url" used for
** subsequent push, pull, and sync operations.  However, the "--once"
** command-line option makes the URL a one-time-use URL that is not
** saved.
**
** See also: <a>clone</a>, <a>push</a>, <A>sync</a>, <a>remote-url</a>
................................................................................
** Usage: %fossil push ?URL? ?options?
**
** Push changes in the local repository over into a remote repository.
** Use the "-R REPO" or "--repository REPO" command-line options
** to specify an alternative repository file.
**
** If the URL is not specified, then the URL from the most recent
** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command is used.

**
** The URL specified normally becomes the new "remote-url" used for
** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations.  However, the "--once"
** command-line option makes the URL a one-time-use URL that is not
** saved.
**
** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
*/
void push_cmd(void){
  process_sync_args();
  client_sync(1,0,0,0,0);
}
................................................................................

/*
** COMMAND: sync
**
** Usage: %fossil sync ?URL? ?options?
**
** Synchronize the local repository with a remote repository.  This is
** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same time.
** Use the "-R REPO" or "--repository REPO" command-line options
** to specify an alternative repository file.
**
** If a user-id and password are required, specify them as follows:
**
**     http://userid:password@www.domain.com:1234/path
**
** If the URL is not specified, then the URL from the most recent successful
** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command is used.

**
** The URL specified normally becomes the new "remote-url" used for
** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations.  However, the "--once"
** command-line option makes the URL a one-time-use URL that is not
** saved.
**
** See also:  <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
*/
void sync_cmd(void){
  int syncFlags = process_sync_args();
  client_sync(1,1,0,syncFlags,0);
}

/*
** COMMAND: remote-url
**
** Usage: %fossil remote-url ?URL|off?
**
** Query and/or change the default server URL used by the "<a>pull</a>", "<a>push</a>",
** and "<a>sync</a>" commands.
**
** The remote-url is set automatically by a "<a>clone</a>" command or by any
** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an explicit URL.
** The default remote-url is used by auto-syncing and by "<a>sync</a>", "<a>push</a>",
** "<a>pull</a>" that omit the server URL.
**
** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
*/
void remote_url_cmd(void){
  char *zUrl;
  db_find_and_open_repository(1);
  if( g.argc!=2 && g.argc!=3 ){







|
>







 







|
>


|
|
|







 







|
|







|
>


|
|
|













|
|


|
|
|







130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
...
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
...
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
** Usage: %fossil pull ?URL? ?options?
**
** Pull changes from a remote repository into the local repository.
** Use the "-R REPO" or "--repository REPO" command-line options
** to specify an alternative repository file.
**
** If the URL is not specified, then the URL from the most recent
** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command
** is used.
**
** The URL specified normally becomes the new "remote-url" used for
** subsequent push, pull, and sync operations.  However, the "--once"
** command-line option makes the URL a one-time-use URL that is not
** saved.
**
** See also: <a>clone</a>, <a>push</a>, <A>sync</a>, <a>remote-url</a>
................................................................................
** Usage: %fossil push ?URL? ?options?
**
** Push changes in the local repository over into a remote repository.
** Use the "-R REPO" or "--repository REPO" command-line options
** to specify an alternative repository file.
**
** If the URL is not specified, then the URL from the most recent
** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command
** is used.
**
** The URL specified normally becomes the new "remote-url" used for
** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations.  However,
** the "--once" command-line option makes the URL a one-time-use URL that is
** not saved.
**
** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
*/
void push_cmd(void){
  process_sync_args();
  client_sync(1,0,0,0,0);
}
................................................................................

/*
** COMMAND: sync
**
** Usage: %fossil sync ?URL? ?options?
**
** Synchronize the local repository with a remote repository.  This is
** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same
** time. Use the "-R REPO" or "--repository REPO" command-line options
** to specify an alternative repository file.
**
** If a user-id and password are required, specify them as follows:
**
**     http://userid:password@www.domain.com:1234/path
**
** If the URL is not specified, then the URL from the most recent successful
** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command
** is used.
**
** The URL specified normally becomes the new "remote-url" used for
** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations.  However,
** the "--once" command-line option makes the URL a one-time-use URL that is
** not saved.
**
** See also:  <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
*/
void sync_cmd(void){
  int syncFlags = process_sync_args();
  client_sync(1,1,0,syncFlags,0);
}

/*
** COMMAND: remote-url
**
** Usage: %fossil remote-url ?URL|off?
**
** Query and/or change the default server URL used by the "<a>pull</a>",
** "<a>push</a>", and "<a>sync</a>" commands.
**
** The remote-url is set automatically by a "<a>clone</a>" command or by any
** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an
** explicit URL. The default remote-url is used by auto-syncing and by
** "<a>sync</a>", "<a>push</a>", "<a>pull</a>" that omit the server URL.
**
** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
*/
void remote_url_cmd(void){
  char *zUrl;
  db_find_and_open_repository(1);
  if( g.argc!=2 && g.argc!=3 ){

Changes to src/undo.c.

242
243
244
245
246
247
248
249
250

251
252
253
254
255
256
257
258
259
260
261
...
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
}

/*
** COMMAND: undo
**
** Usage: %fossil undo ?FILENAME...?
**
** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation.  If FILENAME is
** specified then restore the content of the named file(s) but otherwise

** leave the <a>update</a> or <a>merge</a> or <a>revert</a> in effect.
**
** A single level of undo/<a>redo</a> is supported.  The undo/<a>redo</a> stack
** is cleared by the commit and checkout commands.
*/
void undo_cmd(void){
  int undo_available;
  db_must_be_within_tree();
  db_begin_transaction();
  undo_available = db_lget_int("undo_available", 0);
  if( g.argc==2 ){
................................................................................
}

/*
** COMMAND: redo
**
** Usage: %fossil redo ?FILENAME...?
**
** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been undone
** by the <a>undo</a> command.  If FILENAME is specified then restore the changes
** associated with the named file(s) but otherwise leave the update
** or merge undone.
**
** A single level of <a>undo</a>/redo is supported.  The <a>undo</a>/redo stack
** is cleared by the <a>commit</a> and <a>checkout</a> commands.
*/
void redo_cmd(void){
  int undo_available;







|
|
>
|

|
|







 







|
|
|







242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
...
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
}

/*
** COMMAND: undo
**
** Usage: %fossil undo ?FILENAME...?
**
** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a>
** operation.  If FILENAME is specified then restore the content of the
** named file(s) but otherwise leave the <a>update</a>, <a>merge</a> or
** <a>revert</a> in effect.
**
** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a>
** stack is cleared by the commit and checkout commands.
*/
void undo_cmd(void){
  int undo_available;
  db_must_be_within_tree();
  db_begin_transaction();
  undo_available = db_lget_int("undo_available", 0);
  if( g.argc==2 ){
................................................................................
}

/*
** COMMAND: redo
**
** Usage: %fossil redo ?FILENAME...?
**
** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been
** undone by the <a>undo</a> command. If FILENAME is specified then restore the
** changes associated with the named file(s) but otherwise leave the update
** or merge undone.
**
** A single level of <a>undo</a>/redo is supported.  The <a>undo</a>/redo stack
** is cleared by the <a>commit</a> and <a>checkout</a> commands.
*/
void redo_cmd(void){
  int undo_available;