[PATCH 4 of 5] shelve: use `shelf`

[timeless at mozdev.org]

# HG changeset patch
# User timeless at mozdev.org
# Date 1444806915 14400
#      Wed Oct 14 03:15:15 2015 -0400
# Node ID cbe944c94864c2bdc303ed19e387de4b94c6383e
# Parent  31bdbd8519204c15d79d92a8290bc2f48eba8914
shelve: use `shelf`

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -90,7 +90,7 @@
         except IOError as err:
             if err.errno != errno.ENOENT:
                 raise
-            raise error.Abort(_("shelved change '%s' not found") % self.name)
+            raise error.Abort(_("shelf '%s' not found") % self.name)
 
     def applybundle(self):
         fp = self.opener()
@@ -290,7 +290,7 @@
 
         if name:
             if shelvedfile(repo, name, 'hg').exists():
-                raise error.Abort(_("a shelved change named '%s' already exists"
+                raise error.Abort(_("a shelf named '%s' already exists"
                                    ) % name)
         else:
             for n in gennames():
@@ -303,9 +303,9 @@
 
         # ensure we are not creating a subdirectory or a hidden file
         if '/' in name or '\\' in name:
-            raise error.Abort(_('shelved change names may not contain slashes'))
+            raise error.Abort(_('shelf names may not contain slashes'))
         if name.startswith('.'):
-            raise error.Abort(_("shelved change names may not start with '.'"))
+            raise error.Abort(_("shelf names may not start with '.'"))
         interactive = opts.get('interactive', False)
 
         def interactivecommitfunc(ui, repo, *pats, **opts):
@@ -369,7 +369,7 @@
     except OSError as err:
         if err.errno != errno.ENOENT:
             raise
-        raise error.Abort(_("shelved change '%s' not found") % name)
+        raise error.Abort(_("shelf '%s' not found") % name)
     finally:
         lockmod.release(wlock)
 
@@ -638,7 +638,7 @@
         basename = shelved[0]
 
     if not shelvedfile(repo, basename, 'patch').exists():
-        raise error.Abort(_("shelved change '%s' not found") % basename)
+        raise error.Abort(_("shelf '%s' not found") % basename)
 
     oldquiet = ui.quiet
     wlock = lock = tr = None