diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-28 22:12:32 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-28 22:12:32 -0500 |
| commit | 659114fdba7d5ea14541cdc713c7f9745eb93c46 (patch) | |
| tree | 32cbb5f428dc239902df39d7869377b85e2338fb /lisp/vc/vc.el | |
| parent | bc68bd3998b317499fb5df713470f78fbdf3a78d (diff) | |
| download | emacs-659114fdba7d5ea14541cdc713c7f9745eb93c46.tar.gz | |
Rudimentary support for vc-pull and vc-merge in Git and Mercurial.
* lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
the other way around.
* lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
(vc-git-merge-branch): New functions.
(vc-git-history): New var.
* lisp/vc/vc-hg.el (vc-hg-history): New var.
(vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
(vc-hg-merge-branch): New function.
Diffstat (limited to 'lisp/vc/vc.el')
| -rw-r--r-- | lisp/vc/vc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 7f11a4b3333..be0f568d304 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2297,7 +2297,7 @@ depending on the underlying version-control system." (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1") ;;;###autoload -(defun vc-update (&optional arg) +(defun vc-pull (&optional arg) "Update the current fileset or branch. On a distributed version control system, this runs a \"pull\" operation to update the current branch, prompting for an argument @@ -2337,7 +2337,7 @@ tip revision are merged into the working file." (error "VC update is unsupported for `%s'" backend))))) ;;;###autoload -(defalias 'vc-pull 'vc-update) +(defalias 'vc-update 'vc-pull) (defun vc-version-backup-file (file &optional rev) "Return name of backup file for revision REV of FILE. |