# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1206901895 -7200
# Node ID 47f4a47161b4e11ffec991e9c56e67016327425e
# Parent  3f5f23ba18bcb37a9bc4b69f08ce477f1ecad8e0# Parent  1a726377c3127c0c94f74740c6c7847971d64ac8
merge with crew

diff -r 3f5f23ba18bc -r 47f4a47161b4 mercurial/commands.py
--- a/mercurial/commands.py	Sun Mar 30 20:21:57 2008 +0200
+++ b/mercurial/commands.py	Sun Mar 30 20:31:35 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
@@ -2045,7 +2045,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)
diff -r 3f5f23ba18bc -r 47f4a47161b4 tests/test-pull-r
--- a/tests/test-pull-r	Sun Mar 30 20:21:57 2008 +0200
+++ b/tests/test-pull-r	Sun Mar 30 20:31:35 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
diff -r 3f5f23ba18bc -r 47f4a47161b4 tests/test-pull-r.out
--- a/tests/test-pull-r.out	Sun Mar 30 20:21:57 2008 +0200
+++ b/tests/test-pull-r.out	Sun Mar 30 20:31:35 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