Fossil SCM

merged in [b1dd871c8e] from mgagnon.

stephan 2013-08-15 13:37 trunk merge

Commit 70a3f4ad21f8343958cd442c31a64565ce7412ca

Parent dbf71f828995df0…

2 files changed +14 +9 -5

M src/clone.c

+14

		--- src/clone.c
		+++ src/clone.c
		@@ -84,10 +84,24 @@
84	84	**
85	85	** Usage: %fossil clone ?OPTIONS? URL FILENAME
86	86	**
87	87	** Make a clone of a repository specified by URL in the local
88	88	** file named FILENAME.
	89	+**
	90	+** URL must be in one of the following form: ([...] mean optional)
	91	+** HTTP/HTTPS protocol:
	92	+** http[s]://[userid[:password]@]host[:port][/path]
	93	+**
	94	+** SSH protocol:
	95	+** ssh://[userid[:password]@]host[:port]/path/to/repo.fossil\\
	96	+** [?fossil=path/to/fossil.exe]
	97	+**
	98	+** Filesystem:
	99	+** [file://]path/to/repo.fossil
	100	+**
	101	+** Note: For ssh and filesystem, path must have an extra leading
	102	+** '/' to use an absolute path.
89	103	**
90	104	** By default, your current login name is used to create the default
91	105	** admin user. This can be overridden using the -A\|--admin-user
92	106	** parameter.
93	107	**
94	108

	--- src/clone.c
	+++ src/clone.c
	@@ -84,10 +84,24 @@
84	**
85	** Usage: %fossil clone ?OPTIONS? URL FILENAME
86	**
87	** Make a clone of a repository specified by URL in the local
88	** file named FILENAME.














89	**
90	** By default, your current login name is used to create the default
91	** admin user. This can be overridden using the -A\|--admin-user
92	** parameter.
93	**
94

	--- src/clone.c
	+++ src/clone.c
	@@ -84,10 +84,24 @@
84	**
85	** Usage: %fossil clone ?OPTIONS? URL FILENAME
86	**
87	** Make a clone of a repository specified by URL in the local
88	** file named FILENAME.
89	**
90	** URL must be in one of the following form: ([...] mean optional)
91	** HTTP/HTTPS protocol:
92	** http[s]://[userid[:password]@]host[:port][/path]
93	**
94	** SSH protocol:
95	** ssh://[userid[:password]@]host[:port]/path/to/repo.fossil\\
96	** [?fossil=path/to/fossil.exe]
97	**
98	** Filesystem:
99	** [file://]path/to/repo.fossil
100	**
101	** Note: For ssh and filesystem, path must have an extra leading
102	** '/' to use an absolute path.
103	**
104	** By default, your current login name is used to create the default
105	** admin user. This can be overridden using the -A\|--admin-user
106	** parameter.
107	**
108

M src/sync.c

+9 -5

		--- src/sync.c
		+++ src/sync.c
		@@ -135,10 +135,12 @@
135	135	** Usage: %fossil pull ?URL? ?options?
136	136	**
137	137	** Pull changes from a remote repository into the local repository.
138	138	** Use the "-R REPO" or "--repository REPO" command-line options
139	139	** to specify an alternative repository file.
	140	+**
	141	+** See clone usage for possible URL formats.
140	142	**
141	143	** If the URL is not specified, then the URL from the most recent
142	144	** clone, push, pull, remote-url, or sync command is used.
143	145	**
144	146	** The URL specified normally becomes the new "remote-url" used for
		@@ -164,10 +166,12 @@
164	166	** Usage: %fossil push ?URL? ?options?
165	167	**
166	168	** Push changes in the local repository over into a remote repository.
167	169	** Use the "-R REPO" or "--repository REPO" command-line options
168	170	** to specify an alternative repository file.
	171	+**
	172	+** See clone usage for possible URL formats.
169	173	**
170	174	** If the URL is not specified, then the URL from the most recent
171	175	** clone, push, pull, remote-url, or sync command is used.
172	176	**
173	177	** The URL specified normally becomes the new "remote-url" used for
		@@ -199,16 +203,14 @@
199	203	** Synchronize the local repository with a remote repository. This is
200	204	** the equivalent of running both "push" and "pull" at the same time.
201	205	** Use the "-R REPO" or "--repository REPO" command-line options
202	206	** to specify an alternative repository file.
203	207	**
204		-** If a user-id and password are required, specify them as follows:
	208	+** See clone usage for possible URL formats.
205	209	**
206		-** http://userid:[email protected]:1234/path
207		-**
208		-** If the URL is not specified, then the URL from the most recent successful
209		-** clone, push, pull, remote-url, or sync command is used.
	210	+** If the URL is not specified, then the URL from the most recent
	211	+** successful clone, push, pull, remote-url, or sync command is used.
210	212	**
211	213	** The URL specified normally becomes the new "remote-url" used for
212	214	** subsequent push, pull, and sync operations. However, the "--once"
213	215	** command-line option makes the URL a one-time-use URL that is not
214	216	** saved.
		@@ -239,10 +241,12 @@
239	241	**
240	242	** The remote-url is set automatically by a "clone" command or by any
241	243	** "sync", "push", or "pull" command that specifies an explicit URL.
242	244	** The default remote-url is used by auto-syncing and by "sync", "push",
243	245	** "pull" that omit the server URL.
	246	+**
	247	+** See clone usage for possible URL formats.
244	248	**
245	249	** See also: clone, push, pull, sync
246	250	*/
247	251	void remote_url_cmd(void){
248	252	char *zUrl;
249	253

	--- src/sync.c
	+++ src/sync.c
	@@ -135,10 +135,12 @@
135	** Usage: %fossil pull ?URL? ?options?
136	**
137	** Pull changes from a remote repository into the local repository.
138	** Use the "-R REPO" or "--repository REPO" command-line options
139	** to specify an alternative repository file.


140	**
141	** If the URL is not specified, then the URL from the most recent
142	** clone, push, pull, remote-url, or sync command is used.
143	**
144	** The URL specified normally becomes the new "remote-url" used for
	@@ -164,10 +166,12 @@
164	** Usage: %fossil push ?URL? ?options?
165	**
166	** Push changes in the local repository over into a remote repository.
167	** Use the "-R REPO" or "--repository REPO" command-line options
168	** to specify an alternative repository file.


169	**
170	** If the URL is not specified, then the URL from the most recent
171	** clone, push, pull, remote-url, or sync command is used.
172	**
173	** The URL specified normally becomes the new "remote-url" used for
	@@ -199,16 +203,14 @@
199	** Synchronize the local repository with a remote repository. This is
200	** the equivalent of running both "push" and "pull" at the same time.
201	** Use the "-R REPO" or "--repository REPO" command-line options
202	** to specify an alternative repository file.
203	**
204	** If a user-id and password are required, specify them as follows:
205	**
206	** http://userid:[email protected]:1234/path
207	**
208	** If the URL is not specified, then the URL from the most recent successful
209	** clone, push, pull, remote-url, or sync command is used.
210	**
211	** The URL specified normally becomes the new "remote-url" used for
212	** subsequent push, pull, and sync operations. However, the "--once"
213	** command-line option makes the URL a one-time-use URL that is not
214	** saved.
	@@ -239,10 +241,12 @@
239	**
240	** The remote-url is set automatically by a "clone" command or by any
241	** "sync", "push", or "pull" command that specifies an explicit URL.
242	** The default remote-url is used by auto-syncing and by "sync", "push",
243	** "pull" that omit the server URL.


244	**
245	** See also: clone, push, pull, sync
246	*/
247	void remote_url_cmd(void){
248	char *zUrl;
249

	--- src/sync.c
	+++ src/sync.c
	@@ -135,10 +135,12 @@
135	** Usage: %fossil pull ?URL? ?options?
136	**
137	** Pull changes from a remote repository into the local repository.
138	** Use the "-R REPO" or "--repository REPO" command-line options
139	** to specify an alternative repository file.
140	**
141	** See clone usage for possible URL formats.
142	**
143	** If the URL is not specified, then the URL from the most recent
144	** clone, push, pull, remote-url, or sync command is used.
145	**
146	** The URL specified normally becomes the new "remote-url" used for
	@@ -164,10 +166,12 @@
166	** Usage: %fossil push ?URL? ?options?
167	**
168	** Push changes in the local repository over into a remote repository.
169	** Use the "-R REPO" or "--repository REPO" command-line options
170	** to specify an alternative repository file.
171	**
172	** See clone usage for possible URL formats.
173	**
174	** If the URL is not specified, then the URL from the most recent
175	** clone, push, pull, remote-url, or sync command is used.
176	**
177	** The URL specified normally becomes the new "remote-url" used for
	@@ -199,16 +203,14 @@
203	** Synchronize the local repository with a remote repository. This is
204	** the equivalent of running both "push" and "pull" at the same time.
205	** Use the "-R REPO" or "--repository REPO" command-line options
206	** to specify an alternative repository file.
207	**
208	** See clone usage for possible URL formats.
209	**
210	** If the URL is not specified, then the URL from the most recent
211	** successful clone, push, pull, remote-url, or sync command is used.


212	**
213	** The URL specified normally becomes the new "remote-url" used for
214	** subsequent push, pull, and sync operations. However, the "--once"
215	** command-line option makes the URL a one-time-use URL that is not
216	** saved.
	@@ -239,10 +241,12 @@
241	**
242	** The remote-url is set automatically by a "clone" command or by any
243	** "sync", "push", or "pull" command that specifies an explicit URL.
244	** The default remote-url is used by auto-syncing and by "sync", "push",
245	** "pull" that omit the server URL.
246	**
247	** See clone usage for possible URL formats.
248	**
249	** See also: clone, push, pull, sync
250	*/
251	void remote_url_cmd(void){
252	char *zUrl;
253

Fossil SCM

Keyboard Shortcuts