aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-07-20 21:25:59 -0400
committerStefan Monnier2014-07-20 21:25:59 -0400
commit3241dc268ef235008cd226b7c2a7f12e6fae20da (patch)
treef4fe2342e082aa46d30f7a8dee3c63b6699f9437
parenta1edea0c88ac69acc1b386a67859a674dd5af5aa (diff)
downloademacs-3241dc268ef235008cd226b7c2a7f12e6fae20da.tar.gz
emacs-3241dc268ef235008cd226b7c2a7f12e6fae20da.zip
* lisp/vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/vc-bzr.el7
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2024ac9b6..518e5ba1a6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-07-21 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset.
4
12014-07-19 Stefan Monnier <monnier@iro.umontreal.ca> 52014-07-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * xt-mouse.el (xterm-mouse-event): Don't assume last-click is non-nil 7 * 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."
1132 (file &optional keep noquery reset-vc-info)) 1132 (file &optional keep noquery reset-vc-info))
1133 1133
1134(defun vc-bzr-shelve (name) 1134(defun vc-bzr-shelve (name)
1135 "Create a shelve." 1135 "Shelve the changes of the selected files."
1136 (interactive "sShelf name: ") 1136 (interactive "sShelf name: ")
1137 (let ((root (vc-bzr-root default-directory))) 1137 (let ((root (vc-bzr-root default-directory))
1138 (fileset (vc-deduce-fileset)))
1138 (when root 1139 (when root
1139 (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name) 1140 (vc-bzr-command "shelve" nil 0 (nth 1 fileset) "--all" "-m" name)
1140 (vc-resynch-buffer root t t)))) 1141 (vc-resynch-buffer root t t))))
1141 1142
1142(defun vc-bzr-shelve-show (name) 1143(defun vc-bzr-shelve-show (name)