update dvc

This commit is contained in:
Kai Tetzlaff 2012-01-16 22:53:00 +01:00
parent a7b68b6289
commit b9a2b629e1

View File

@ -1,6 +1,6 @@
;;; bzr.el --- Support for Bazaar 2 in DVC ;;; bzr.el --- Support for Bazaar 2 in DVC
;; Copyright (C) 2005-2009 by all contributors ;; Copyright (C) 2005-2012 by all contributors
;; Author: Matthieu Moy <Matthieu.Moy@imag.fr> ;; Author: Matthieu Moy <Matthieu.Moy@imag.fr>
;; Contributions from: ;; Contributions from:
@ -170,6 +170,21 @@ When called with a prefix argument, add the --remember option"
(message "bzr push finished => %s" (message "bzr push finished => %s"
(concat (dvc-buffer-content error) (dvc-buffer-content output)))))) (concat (dvc-buffer-content error) (dvc-buffer-content output))))))
;;;###autoload
(defun bzr-upload (&optional repo-path)
"Run bzr upload. This command requires the bzr-upload plugin
When called with a prefix argument, add the --remember option"
(interactive (list (read-string (format "Upload %sto bzr working copy: "
(if current-prefix-arg "--remember " "")))))
(when (string= repo-path "")
(setq repo-path nil))
(dvc-run-dvc-async 'bzr (list "upload" repo-path (when current-prefix-arg "--remember"))
:finished
(dvc-capturing-lambda
(output error status arguments)
(message "bzr upload finished => %s"
(concat (dvc-buffer-content error) (dvc-buffer-content output))))))
;;;###autoload ;;;###autoload
(defun bzr-merge (&optional repo-path) (defun bzr-merge (&optional repo-path)
"Run bzr merge." "Run bzr merge."