##// END OF EJS Templates
change some repo messages in small ways....
Vadim Gelfer -
r2473:30c267cb default
parent child Browse files
Show More
@@ -2151,7 +2151,6 b' def pull(ui, repo, source="default", **o'
2151 with the --ssh command line option.
2151 with the --ssh command line option.
2152 """
2152 """
2153 source = ui.expandpath(source)
2153 source = ui.expandpath(source)
2154 ui.status(_('pulling from %s\n') % (source))
2155
2154
2156 if opts['ssh']:
2155 if opts['ssh']:
2157 ui.setconfig("ui", "ssh", opts['ssh'])
2156 ui.setconfig("ui", "ssh", opts['ssh'])
@@ -2159,6 +2158,7 b' def pull(ui, repo, source="default", **o'
2159 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2158 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2160
2159
2161 other = hg.repository(ui, source)
2160 other = hg.repository(ui, source)
2161 ui.status(_('pulling from %s\n') % (source))
2162 revs = None
2162 revs = None
2163 if opts['rev'] and not other.local():
2163 if opts['rev'] and not other.local():
2164 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
2164 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
@@ -2190,7 +2190,6 b' def push(ui, repo, dest="default-push", '
2190 about ssh:// URLs.
2190 about ssh:// URLs.
2191 """
2191 """
2192 dest = ui.expandpath(dest)
2192 dest = ui.expandpath(dest)
2193 ui.status('pushing to %s\n' % (dest))
2194
2193
2195 if opts['ssh']:
2194 if opts['ssh']:
2196 ui.setconfig("ui", "ssh", opts['ssh'])
2195 ui.setconfig("ui", "ssh", opts['ssh'])
@@ -2198,6 +2197,7 b' def push(ui, repo, dest="default-push", '
2198 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2197 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2199
2198
2200 other = hg.repository(ui, dest)
2199 other = hg.repository(ui, dest)
2200 ui.status('pushing to %s\n' % (dest))
2201 revs = None
2201 revs = None
2202 if opts['rev']:
2202 if opts['rev']:
2203 revs = [repo.lookup(rev) for rev in opts['rev']]
2203 revs = [repo.lookup(rev) for rev in opts['rev']]
@@ -18,7 +18,7 b' class sshrepository(remoterepository):'
18
18
19 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path)
19 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path)
20 if not m:
20 if not m:
21 raise hg.RepoError(_("couldn't parse destination %s") % path)
21 raise hg.RepoError(_("couldn't parse location %s") % path)
22
22
23 self.user = m.group(2)
23 self.user = m.group(2)
24 self.host = m.group(3)
24 self.host = m.group(3)
General Comments 0
You need to be logged in to leave comments. Login now