Show More
@@ -79,7 +79,7 b' Network support:' | |||||
79 | foo$ hg serve -n "My repo" -p 80 |
|
79 | foo$ hg serve -n "My repo" -p 80 | |
80 |
|
80 | |||
81 | # merge changes from a remote machine |
|
81 | # merge changes from a remote machine | |
82 |
bar$ hg merge h |
|
82 | bar$ hg merge http://foo/ | |
83 | bar$ hg co # checkout the result |
|
83 | bar$ hg co # checkout the result | |
84 |
|
84 | |||
85 | # Set up a CGI server on your webserver |
|
85 | # Set up a CGI server on your webserver |
@@ -812,7 +812,7 b' class localrepository:' | |||||
812 |
|
812 | |||
813 | class remoterepository: |
|
813 | class remoterepository: | |
814 | def __init__(self, ui, path): |
|
814 | def __init__(self, ui, path): | |
815 | self.url = path.replace("hg://", "http://", 1) |
|
815 | self.url = path | |
816 | self.ui = ui |
|
816 | self.ui = ui | |
817 |
|
817 | |||
818 | def do_cmd(self, cmd, **args): |
|
818 | def do_cmd(self, cmd, **args): | |
@@ -847,8 +847,12 b' class remoterepository:' | |||||
847 | yield zd.decompress(d) |
|
847 | yield zd.decompress(d) | |
848 |
|
848 | |||
849 | def repository(ui, path=None, create=0): |
|
849 | def repository(ui, path=None, create=0): | |
|
850 | if path and path[:7] == "http://": | |||
|
851 | return remoterepository(ui, path) | |||
850 | if path and path[:5] == "hg://": |
|
852 | if path and path[:5] == "hg://": | |
851 | return remoterepository(ui, path) |
|
853 | return remoterepository(ui, path.replace("hg://", "http://")) | |
|
854 | if path and path[:11] == "old-http://": | |||
|
855 | return localrepository(ui, path.replace("old-http://", "http://")) | |||
852 | else: |
|
856 | else: | |
853 | return localrepository(ui, path, create) |
|
857 | return localrepository(ui, path, create) | |
854 |
|
858 |
General Comments 0
You need to be logged in to leave comments.
Login now