Re: git push/pull

[Fabian Ezequiel Gallina <galli.87@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

2009/12/8 Stefan Monnier <monnier@iro.umontreal.ca>:
>> Stefan, two diffs are attached in this reply.
>
> Thanks.  See comments below.
>

Hi Stefan, thanks for your feedback.

Attached is the diff with the corrections you proposed. I also removed
the hacky call to `message' in favor of the standard vc behavior to
display command status only on errors.


Regards,
-- 
Fabián E. Gallina
http://www.from-the-cloud.com

[-- Attachment #2: vc.el.diff --]
[-- Type: text/plain, Size: 830 bytes --]

diff --git a/lisp/vc.el b/lisp/vc.el
index 9a71286..c940d1d 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1188,6 +1188,22 @@ merge in the changes into your working copy."
 (declare-function vc-dir-move-to-goal-column "vc-dir" ())
 
 ;;;###autoload
+(defun vc-pull ()
+  "Merges changes between branches."
+  (interactive)
+  (vc-ensure-vc-buffer)
+  (let ((backend (vc-backend buffer-file-name)))    
+    (vc-call-backend backend 'pull)))
+
+;;;###autoload
+(defun vc-push ()
+  "Pushes commits to some branch."
+  (interactive)
+  (vc-ensure-vc-buffer)
+  (let ((backend (vc-backend buffer-file-name)))
+    (vc-call-backend backend 'push)))
+
+;;;###autoload
 (defun vc-register (&optional set-revision vc-fileset comment)
   "Register into a version control system.
 If VC-FILESET is given, register the files in that fileset.

[-- Attachment #3: vc-git.el.diff --]
[-- Type: text/plain, Size: 2496 bytes --]

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 69e8614..6f60cb2 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -490,6 +490,51 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 ;;; STATE-CHANGING FUNCTIONS
 
+(defun vc-git--do-push-pull (operation)
+  "Calls the command git OPERATION. OPERATION could be 'push or 'pull."
+  (let* ((default-refspec (vc-git-working-revision buffer-file-name))
+         (available-repos
+          (let ((table (list ".")))
+            (with-temp-buffer
+              (vc-git-command t nil nil "for-each-ref" "--format=%(refname)")
+              (goto-char (point-min))
+              (while (re-search-forward "^refs/remotes/\\(.*\\)/.*$" nil t)
+                (push (match-string 1) table)))
+            table))
+         (default-repo (nth 0 available-repos))
+         (current-repo
+          (completing-read (format "Repository (default %s): " default-repo)
+                           available-repos nil 'confirm nil nil default-repo))
+         (available-refspecs
+          (let ((table (list "HEAD"))
+                (ref-regexp))
+            (with-temp-buffer
+              (vc-git-command t nil nil "for-each-ref" "--format=%(refname)")
+              (setq ref-regexp
+                    (format (if (and (not (equal "." current-repo))
+                                     (equal vc-git-push-pull-perform 'pull))
+                                "^refs/\\(remotes/%s\\|tags\\)/\\([^\n]+\\).*$"
+                              "^refs/\\(remotes\\|heads\\|tags\\)/\\(%s/[^\n]+\\|[^\n]+\\).*$")
+                            (regexp-quote current-repo)))
+              (goto-char (point-min))
+              (while (re-search-forward ref-regexp nil t)
+                (push (match-string 2) table)))
+            table))
+         (current-refspec
+          (completing-read (format "Branch (default %s): " default-refspec)
+                           available-refspecs nil 'confirm nil nil 
+                           default-refspec))
+         (command (prin1-to-string operation))) 
+    (vc-git-command nil 0 nil command current-repo current-refspec)))
+
+(defun vc-git-push ()
+  "Update remote refs along with associated objects."
+  (vc-git--do-push-pull 'push))
+
+(defun vc-git-pull ()
+  "Fetch from and merge with another repository or a local branch."
+  (vc-git--do-push-pull 'pull))
+
 (defun vc-git-create-repo ()
   "Create a new Git repository."
   (vc-git-command nil 0 nil "init"))