From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 21 Jul 2014 01:25:59 +0000 (-0400)
Subject: * lisp/vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset.
X-Git-Tag: emacs-25.0.90~2636^3~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3241dc268ef235008cd226b7c2a7f12e6fae20da;p=emacs.git

* lisp/vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2024ac9b6..518e5ba1a6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset.
+
 2014-07-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* xt-mouse.el (xterm-mouse-event): Don't assume last-click is non-nil
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 0730a9c72ce..4693998dfaf 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -1132,11 +1132,12 @@ stream.  Standard error output is discarded."
                   (file &optional keep noquery reset-vc-info))
 
 (defun vc-bzr-shelve (name)
-  "Create a shelve."
+  "Shelve the changes of the selected files."
   (interactive "sShelf name: ")
-  (let ((root (vc-bzr-root default-directory)))
+  (let ((root (vc-bzr-root default-directory))
+        (fileset (vc-deduce-fileset)))
     (when root
-      (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name)
+      (vc-bzr-command "shelve" nil 0 (nth 1 fileset) "--all" "-m" name)
       (vc-resynch-buffer root t t))))
 
 (defun vc-bzr-shelve-show (name)