# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1206901522 -7200
# Node ID 1a726377c3127c0c94f74740c6c7847971d64ac8
# Parent  f08662abdf3f3a4806e39bf64d208ea134857dc4# Parent  b8346ae5d64be473ed323eeb24d53277ac75e1fd
Merge with crew-stable

diff -r f08662abdf3f -r 1a726377c312 mercurial/commands.py
--- a/mercurial/commands.py	Sat Mar 29 21:15:54 2008 +0100
+++ b/mercurial/commands.py	Sun Mar 30 20:25:22 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 f08662abdf3f -r 1a726377c312 tests/test-pull-r
--- a/tests/test-pull-r	Sat Mar 29 21:15:54 2008 +0100
+++ b/tests/test-pull-r	Sun Mar 30 20:25:22 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 f08662abdf3f -r 1a726377c312 tests/test-pull-r.out
--- a/tests/test-pull-r.out	Sat Mar 29 21:15:54 2008 +0100
+++ b/tests/test-pull-r.out	Sun Mar 30 20:25:22 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