Mercurial > hg > gitserve
changeset 2473:30c267cb4c2f
change some repo messages in small ways.
move "pushing" and "pulling" after repo create so error message and exit
happens before messages printed.
fix sshrepo parse error message.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Wed, 21 Jun 2006 09:15:42 -0700 |
| parents | e6ec81a8feea |
| children | 1e32e2fe8a67 |
| files | mercurial/commands.py mercurial/sshrepo.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Jun 21 09:14:36 2006 -0700 +++ b/mercurial/commands.py Wed Jun 21 09:15:42 2006 -0700 @@ -2151,7 +2151,6 @@ with the --ssh command line option. """ source = ui.expandpath(source) - ui.status(_('pulling from %s\n') % (source)) if opts['ssh']: ui.setconfig("ui", "ssh", opts['ssh']) @@ -2159,6 +2158,7 @@ ui.setconfig("ui", "remotecmd", opts['remotecmd']) other = hg.repository(ui, source) + ui.status(_('pulling from %s\n') % (source)) revs = None if opts['rev'] and not other.local(): raise util.Abort(_("pull -r doesn't work for remote repositories yet")) @@ -2190,7 +2190,6 @@ about ssh:// URLs. """ dest = ui.expandpath(dest) - ui.status('pushing to %s\n' % (dest)) if opts['ssh']: ui.setconfig("ui", "ssh", opts['ssh']) @@ -2198,6 +2197,7 @@ ui.setconfig("ui", "remotecmd", opts['remotecmd']) other = hg.repository(ui, dest) + ui.status('pushing to %s\n' % (dest)) revs = None if opts['rev']: revs = [repo.lookup(rev) for rev in opts['rev']]
--- a/mercurial/sshrepo.py Wed Jun 21 09:14:36 2006 -0700 +++ b/mercurial/sshrepo.py Wed Jun 21 09:15:42 2006 -0700 @@ -18,7 +18,7 @@ m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path) if not m: - raise hg.RepoError(_("couldn't parse destination %s") % path) + raise hg.RepoError(_("couldn't parse location %s") % path) self.user = m.group(2) self.host = m.group(3)