--- a/mercurial/commands.py Sat Mar 29 12:39:47 2008 -0500
+++ b/mercurial/commands.py Tue Apr 01 08:33:17 2008 +0200
@@ -6,7 +6,7 @@
# of the GNU General Public License, incorporated herein by reference.
from node import hex, nullid, nullrev, short
-from repo import RepoError
+from repo import RepoError, NoCapability
from i18n import _
import os, re, sys, urllib
import hg, util, revlog, bundlerepo, extensions, copies
@@ -2048,7 +2048,7 @@
if revs:
try:
revs = [other.lookup(rev) for rev in revs]
- except repo.NoCapability:
+ except NoCapability:
error = _("Other repository doesn't support revision lookup, "
"so a rev cannot be specified.")
raise util.Abort(error)
--- a/mercurial/localrepo.py Sat Mar 29 12:39:47 2008 -0500
+++ b/mercurial/localrepo.py Tue Apr 01 08:33:17 2008 +0200
@@ -2075,7 +2075,7 @@
l = fp.readline()
try:
total_files, total_bytes = map(int, l.split(' ', 1))
- except ValueError, TypeError:
+ except (ValueError, TypeError):
raise util.UnexpectedOutput(
_('Unexpected response from remote server:'), l)
self.ui.status(_('%d files to transfer, %s of data\n') %
--- a/tests/test-convert-svn-tags Sat Mar 29 12:39:47 2008 -0500
+++ b/tests/test-convert-svn-tags Tue Apr 01 08:33:17 2008 +0200
@@ -72,5 +72,5 @@
echo % convert without tags
hg convert --datesort --config convert.svn.tags= $svnurl A-notags-hg
-hg -R a-notags-hg tags -q
+hg -R A-notags-hg tags -q
--- a/tests/test-pull-r Sat Mar 29 12:39:47 2008 -0500
+++ b/tests/test-pull-r Tue Apr 01 08:33:17 2008 +0200
@@ -14,6 +14,9 @@
hg init copy
cd copy
+echo '% pull a missing revision'
+hg pull -qr missing ../repo
+
echo '% pull -r 0'
hg pull -qr 0 ../repo
hg log
--- a/tests/test-pull-r.out Sat Mar 29 12:39:47 2008 -0500
+++ b/tests/test-pull-r.out Tue Apr 01 08:33:17 2008 +0200
@@ -15,6 +15,8 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo
+% pull a missing revision
+abort: unknown revision 'missing'!
% pull -r 0
changeset: 0:bbd179dfa0a7
tag: tip