Fossil SCM

Update "help" comments for clone, push, pull, sync, and remote-url commands.

drh 2009-09-04 20:19 trunk

Commit 6a407335312c1350144d6231caedb271d93cd145

Parent d1b948b0c73f24c…

1 file changed +26 -22

M src/sync.c

+26 -22

		--- src/sync.c
		+++ src/sync.c
		@@ -101,26 +101,16 @@
101	101	/*
102	102	** COMMAND: pull
103	103	**
104	104	** Usage: %fossil pull ?URL? ?-R\|--respository REPOSITORY?
105	105	**
106		-** Pull changes in a remote repository into the local repository.
107		-** The repository is identified by the -R or --repository option.
108		-** If there is no such option then the open repository is used.
109		-** The URL of the remote server is specified on the command line
110		-** If no URL is specified then the URL used by the most recent
111		-** "pull", "push", or "sync" command is used.
112		-**
113		-** The URL is of the following form:
114		-**
115		-** http://USER@HOST:PORT/PATH
116		-**
117		-** The "USER@" and ":PORT" substrings are optional.
118		-** The "USER" substring specifies the login user. You will be
119		-** prompted for the password on the command-line. The PORT
120		-** specifies the TCP port of the server. The default port is
121		-** 80.
	106	+** Pull changes from a remote repository into the local repository.
	107	+**
	108	+** If the URL is not specified, then the URL from the most recent
	109	+** clone, push, pull, remote-url, or sync command is used.
	110	+**
	111	+** See also: clone, push, sync, remote-url
122	112	*/
123	113	void pull_cmd(void){
124	114	process_sync_args();
125	115	client_sync(0,1,0,0,0);
126	116	}
		@@ -129,11 +119,15 @@
129	119	** COMMAND: push
130	120	**
131	121	** Usage: %fossil push ?URL? ?-R\|--repository REPOSITORY?
132	122	**
133	123	** Push changes in the local repository over into a remote repository.
134		-** See the "pull" command for additional information.
	124	+**
	125	+** If the URL is not specified, then the URL from the most recent
	126	+** clone, push, pull, remote-url, or sync command is used.
	127	+**
	128	+** See also: clone, pull, sync, remote-url
135	129	*/
136	130	void push_cmd(void){
137	131	process_sync_args();
138	132	client_sync(1,0,0,0,0);
139	133	}
		@@ -144,11 +138,19 @@
144	138	**
145	139	** Usage: %fossil sync ?URL? ?-R\|--repository REPOSITORY?
146	140	**
147	141	** Synchronize the local repository with a remote repository. This is
148	142	** the equivalent of running both "push" and "pull" at the same time.
149		-** See the "pull" command for additional information.
	143	+**
	144	+** If a user-id and password are required, specify them as follows:
	145	+**
	146	+** http://userid:[email protected]:1234/path
	147	+**
	148	+** If the URL is not specified, then the URL from the most recent successful
	149	+** clone, push, pull, remote-url, or sync command is used.
	150	+**
	151	+** See also: clone, push, pull, remote-url
150	152	*/
151	153	void sync_cmd(void){
152	154	process_sync_args();
153	155	client_sync(1,1,0,0,0);
154	156	}
		@@ -156,20 +158,22 @@
156	158	/*
157	159	** COMMAND: remote-url
158	160	**
159	161	** Usage: %fossil remote-url ?URL\|off? --show-pw
160	162	**
161		-** Query and optional change the default server named used for syncing
162		-** the current check-out.
	163	+** Query and/or change the default server URL used by the "pull", "push",
	164	+** and "sync" commands.
163	165	**
164		-** The userid and password are stripped from the URL and are not printed
165		-** unless the --show-pw option is used on the command-line.
	166	+** The userid and password are of the URL are not printed unless
	167	+** the --show-pw option is used on the command-line.
166	168	**
167	169	** The remote-url is set automatically by a "clone" command or by any
168	170	** "sync", "push", or "pull" command that specifies an explicit URL.
169	171	** The default remote-url is used by auto-syncing and by "sync", "push",
170	172	** "pull" that omit the server URL.
	173	+**
	174	+** See also: clone, push, pull, sync
171	175	*/
172	176	void remote_url_cmd(void){
173	177	char *zUrl;
174	178	int showPw = find_option("show-pw",0,0)!=0;
175	179	db_find_and_open_repository(1);
176	180

	--- src/sync.c
	+++ src/sync.c
	@@ -101,26 +101,16 @@
101	/*
102	** COMMAND: pull
103	**
104	** Usage: %fossil pull ?URL? ?-R\|--respository REPOSITORY?
105	**
106	** Pull changes in a remote repository into the local repository.
107	** The repository is identified by the -R or --repository option.
108	** If there is no such option then the open repository is used.
109	** The URL of the remote server is specified on the command line
110	** If no URL is specified then the URL used by the most recent
111	** "pull", "push", or "sync" command is used.
112	**
113	** The URL is of the following form:
114	**
115	** http://USER@HOST:PORT/PATH
116	**
117	** The "USER@" and ":PORT" substrings are optional.
118	** The "USER" substring specifies the login user. You will be
119	** prompted for the password on the command-line. The PORT
120	** specifies the TCP port of the server. The default port is
121	** 80.
122	*/
123	void pull_cmd(void){
124	process_sync_args();
125	client_sync(0,1,0,0,0);
126	}
	@@ -129,11 +119,15 @@
129	** COMMAND: push
130	**
131	** Usage: %fossil push ?URL? ?-R\|--repository REPOSITORY?
132	**
133	** Push changes in the local repository over into a remote repository.
134	** See the "pull" command for additional information.




135	*/
136	void push_cmd(void){
137	process_sync_args();
138	client_sync(1,0,0,0,0);
139	}
	@@ -144,11 +138,19 @@
144	**
145	** Usage: %fossil sync ?URL? ?-R\|--repository REPOSITORY?
146	**
147	** Synchronize the local repository with a remote repository. This is
148	** the equivalent of running both "push" and "pull" at the same time.
149	** See the "pull" command for additional information.








150	*/
151	void sync_cmd(void){
152	process_sync_args();
153	client_sync(1,1,0,0,0);
154	}
	@@ -156,20 +158,22 @@
156	/*
157	** COMMAND: remote-url
158	**
159	** Usage: %fossil remote-url ?URL\|off? --show-pw
160	**
161	** Query and optional change the default server named used for syncing
162	** the current check-out.
163	**
164	** The userid and password are stripped from the URL and are not printed
165	** unless the --show-pw option is used on the command-line.
166	**
167	** The remote-url is set automatically by a "clone" command or by any
168	** "sync", "push", or "pull" command that specifies an explicit URL.
169	** The default remote-url is used by auto-syncing and by "sync", "push",
170	** "pull" that omit the server URL.


171	*/
172	void remote_url_cmd(void){
173	char *zUrl;
174	int showPw = find_option("show-pw",0,0)!=0;
175	db_find_and_open_repository(1);
176

	--- src/sync.c
	+++ src/sync.c
	@@ -101,26 +101,16 @@
101	/*
102	** COMMAND: pull
103	**
104	** Usage: %fossil pull ?URL? ?-R\|--respository REPOSITORY?
105	**
106	** Pull changes from a remote repository into the local repository.
107	**
108	** If the URL is not specified, then the URL from the most recent
109	** clone, push, pull, remote-url, or sync command is used.
110	**
111	** See also: clone, push, sync, remote-url










112	*/
113	void pull_cmd(void){
114	process_sync_args();
115	client_sync(0,1,0,0,0);
116	}
	@@ -129,11 +119,15 @@
119	** COMMAND: push
120	**
121	** Usage: %fossil push ?URL? ?-R\|--repository REPOSITORY?
122	**
123	** Push changes in the local repository over into a remote repository.
124	**
125	** If the URL is not specified, then the URL from the most recent
126	** clone, push, pull, remote-url, or sync command is used.
127	**
128	** See also: clone, pull, sync, remote-url
129	*/
130	void push_cmd(void){
131	process_sync_args();
132	client_sync(1,0,0,0,0);
133	}
	@@ -144,11 +138,19 @@
138	**
139	** Usage: %fossil sync ?URL? ?-R\|--repository REPOSITORY?
140	**
141	** Synchronize the local repository with a remote repository. This is
142	** the equivalent of running both "push" and "pull" at the same time.
143	**
144	** If a user-id and password are required, specify them as follows:
145	**
146	** http://userid:[email protected]:1234/path
147	**
148	** If the URL is not specified, then the URL from the most recent successful
149	** clone, push, pull, remote-url, or sync command is used.
150	**
151	** See also: clone, push, pull, remote-url
152	*/
153	void sync_cmd(void){
154	process_sync_args();
155	client_sync(1,1,0,0,0);
156	}
	@@ -156,20 +158,22 @@
158	/*
159	** COMMAND: remote-url
160	**
161	** Usage: %fossil remote-url ?URL\|off? --show-pw
162	**
163	** Query and/or change the default server URL used by the "pull", "push",
164	** and "sync" commands.
165	**
166	** The userid and password are of the URL are not printed unless
167	** the --show-pw option is used on the command-line.
168	**
169	** The remote-url is set automatically by a "clone" command or by any
170	** "sync", "push", or "pull" command that specifies an explicit URL.
171	** The default remote-url is used by auto-syncing and by "sync", "push",
172	** "pull" that omit the server URL.
173	**
174	** See also: clone, push, pull, sync
175	*/
176	void remote_url_cmd(void){
177	char *zUrl;
178	int showPw = find_option("show-pw",0,0)!=0;
179	db_find_and_open_repository(1);
180

Fossil SCM

Keyboard Shortcuts