comparison mercurial/commands.py @ 3563:db946221a58a

Some clarifications for pull/push protocols: - List file:// and static-http:// - Mention that you can pull from bundle files - List http and https as valid push targets, but emphasize that this feature has to be enabled.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 27 Oct 2006 15:56:34 +0200
parents e1508621e9ef
children eda9e7c9300d
comparison
equal deleted inserted replaced
3562:88b4755fa48f 3563:db946221a58a
2113 or URL and adds them to the local repository. By default, this 2113 or URL and adds them to the local repository. By default, this
2114 does not update the copy of the project in the working directory. 2114 does not update the copy of the project in the working directory.
2115 2115
2116 Valid URLs are of the form: 2116 Valid URLs are of the form:
2117 2117
2118 local/filesystem/path 2118 local/filesystem/path (or file://local/filesystem/path)
2119 http://[user@]host[:port]/[path] 2119 http://[user@]host[:port]/[path]
2120 https://[user@]host[:port]/[path] 2120 https://[user@]host[:port]/[path]
2121 ssh://[user@]host[:port]/[path] 2121 ssh://[user@]host[:port]/[path]
2122 static-http://host[:port]/[path]
2123
2124 Paths in the local filesystem can either point to Mercurial
2125 repositories or to bundle files (as created by 'hg bundle' or
2126 'hg incoming --bundle'). The static-http:// protocol, albeit slow,
2127 allows access to a Mercurial repository where you simply use a web
2128 server to publish the .hg directory as static content.
2122 2129
2123 Some notes about using SSH with Mercurial: 2130 Some notes about using SSH with Mercurial:
2124 - SSH requires an accessible shell account on the destination machine 2131 - SSH requires an accessible shell account on the destination machine
2125 and a copy of hg in the remote path or specified with as remotecmd. 2132 and a copy of hg in the remote path or specified with as remotecmd.
2126 - path is relative to the remote user's home directory by default. 2133 - path is relative to the remote user's home directory by default.
2164 increase the number of remote heads. This generally indicates the 2171 increase the number of remote heads. This generally indicates the
2165 the client has forgotten to sync and merge before pushing. 2172 the client has forgotten to sync and merge before pushing.
2166 2173
2167 Valid URLs are of the form: 2174 Valid URLs are of the form:
2168 2175
2169 local/filesystem/path 2176 local/filesystem/path (or file://local/filesystem/path)
2170 ssh://[user@]host[:port]/[path] 2177 ssh://[user@]host[:port]/[path]
2178 http://[user@]host[:port]/[path]
2179 https://[user@]host[:port]/[path]
2171 2180
2172 Look at the help text for the pull command for important details 2181 Look at the help text for the pull command for important details
2173 about ssh:// URLs. 2182 about ssh:// URLs.
2174 2183
2175 Pushing to http:// and https:// URLs is possible, too, if this 2184 Pushing to http:// and https:// URLs is only possible, if this
2176 feature is enabled on the remote Mercurial server. 2185 feature is explicitly enabled on the remote Mercurial server.
2177 """ 2186 """
2178 dest = ui.expandpath(dest or 'default-push', dest or 'default') 2187 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2179 setremoteconfig(ui, opts) 2188 setremoteconfig(ui, opts)
2180 2189
2181 other = hg.repository(ui, dest) 2190 other = hg.repository(ui, dest)