Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: choose a legal shelve name when no name is passed (issue5112)
authorPulkit Goyal <7895pulkit@gmail.com>
Thu, 22 Dec 2016 19:35:30 +0530
changeset 30671 64a75655b988
parent 30670 07fa9765b821
child 30672 0eb4b3d38d5f
shelve: choose a legal shelve name when no name is passed (issue5112) Currently if our branch name contains '\' or starts with '.', shelve chooses an illegal shelve name. This behaviour is not good as it itself is choosing something which it won't accept further. We can raise errors if user passes a name which is illegal. After this patch, if '\' is contained in branch name or bookmark name, it will be replaced by '_' while choosing a shelve name and if they starts with '.', the first '.' is replaced by '_'.
hgext/shelve.py file | annotate | diff | comparison | revisions
tests/test-shelve.t file | annotate | diff | comparison | revisions 
--- a/hgext/shelve.py	Thu Dec 22 23:27:32 2016 +0530
+++ b/hgext/shelve.py	Thu Dec 22 19:35:30 2016 +0530
@@ -265,11 +265,22 @@
     label = repo._activebookmark or parent.branch() or 'default'
     # slashes aren't allowed in filenames, therefore we rename it
     label = label.replace('/', '_')
+    label = label.replace('\\', '_')
+    # filenames must not start with '.' as it should not be hidden
+    if label.startswith('.'):
+        label = label.replace('.', '_', 1)
 
     if name:
         if shelvedfile(repo, name, patchextension).exists():
             e = _("a shelved change named '%s' already exists") % name
             raise error.Abort(e)
+
+        # ensure we are not creating a subdirectory or a hidden file
+        if '/' in name or '\\' in name:
+            raise error.Abort(_('shelved change names can not contain slashes'))
+        if name.startswith('.'):
+            raise error.Abort(_("shelved change names can not start with '.'"))
+
     else:
         for n in gennames():
             if not shelvedfile(repo, n, patchextension).exists():
@@ -278,11 +289,6 @@
         else:
             raise error.Abort(_("too many shelved changes named '%s'") % label)
 
-    # 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'))
-    if name.startswith('.'):
-        raise error.Abort(_("shelved change names may not start with '.'"))
     return name
 
 def mutableancestors(ctx):
--- a/tests/test-shelve.t	Thu Dec 22 23:27:32 2016 +0530
+++ b/tests/test-shelve.t	Thu Dec 22 19:35:30 2016 +0530
@@ -106,13 +106,13 @@
 when we are given a name
 
   $ hg shelve -n foo/bar
-  abort: shelved change names may not contain slashes
+  abort: shelved change names can not contain slashes
   [255]
   $ hg shelve -n .baz
-  abort: shelved change names may not start with '.'
+  abort: shelved change names can not start with '.'
   [255]
   $ hg shelve -n foo\\bar
-  abort: shelved change names may not contain slashes
+  abort: shelved change names can not contain slashes
   [255]
 
 when shelve has to choose itself
@@ -125,13 +125,13 @@
   $ hg branch .x -q
   $ hg commit -q -m "Branch commit 1"
   $ hg shelve
-  abort: shelved change names may not start with '.'
-  [255]
+  nothing changed
+  [1]
   $ hg branch x\\y -q
   $ hg commit -q -m "Branch commit 2"
   $ hg shelve
-  abort: shelved change names may not contain slashes
-  [255]
+  nothing changed
+  [1]
 
 cleaning the branches made for name checking tests
mercurial