Re: git push/pull

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

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

2009/12/5 Stefan Monnier <monnier@iro.umontreal.ca>:
>> Below is the code, I sure there is a lot of room for improvement since
>> I consider an Emacs LISP newbie myself, but I guess is a good starting
>> point for a better implementation.
>
> I'll let git users decide whether they like your specific choices, but
> what I'd want on my side is to add support for it directly in vc.el
> (i.e. have `vc-push' and `vc-pull' commands which then delegate the
> core of the work to the backends.  You don't have to implement any
> other backend than Git).
>

Stefan, two diffs are attached in this reply.

The first adds vc-pull and vc-push to vc.el. I'm not sure if I'm
missing something in their definitions since I looked at the vc
package very quickly.

The second diff adds vc-git-push and vc-git-pull to vc-git.el. I
modified the how the completions are computed so they render the same
as when you try the git autocompletion from the terminal.

I played around a bit with these changes and seems to work OK.


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

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

diff --git a/lisp/vc.el b/lisp/vc.el
index cd9f11b..5519ff6 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -884,7 +884,7 @@ Within directories, only files already under version control are noticed."
 				    state-model-only-files)
   "Deduce a set of files and a backend to which to apply an operation.
 
-Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL).
+Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL.
 If we're in VC-dir mode, the fileset is the list of marked files.
 Otherwise, if we're looking at a buffer visiting a version-controlled file,
 the fileset is a singleton containing this file.
@@ -1185,6 +1185,26 @@ 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)))
+    (if (not (vc-find-backend-function backend 'pull))
+        (error "Sorry, pull is not implemented for %s" backend)
+      (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)))
+    (if (not (vc-find-backend-function backend 'push))
+        (error "Sorry, push is not implemented for %s" backend)
+      (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: 3494 bytes --]

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index a33a0f5..bb95b70 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -489,6 +489,80 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 
 ;;; STATE-CHANGING FUNCTIONS
 
+(defvar vc-git-push-pull-perform 'pull
+  "The git command `vc-git--do-push-pull' should execute")
+
+(defun vc-git--do-push-pull (repository refspec)
+  "Calls git push/pull with REPOSITORY and REFSPEC as parameters.
+
+The decision of using push or pull is beign made depending the
+value of `vc-git-push-pull-perform'."
+  (interactive
+   (let ((default-refspec (vc-git-working-revision buffer-file-name))
+         (default-repo)
+         (available-repos)
+         (available-refspecs)
+         (current-repo)
+         (current-refspec))
+     (setq 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))
+     (setq default-repo (nth 0 available-repos))
+     (setq current-repo
+           (completing-read (format "Repository (default %s): " default-repo)
+                            available-repos nil 'confirm nil nil default-repo))
+     (setq available-refspecs
+           (let ((table (list "HEAD"))
+                 (ref-regexp))
+             (with-temp-buffer
+               (vc-git-command t nil nil "for-each-ref" "--format=%(refname)")
+               (if (and (not (equal "." current-repo))
+                        (equal vc-git-push-pull-perform 'pull))
+                   (setq ref-regexp (concat
+                                     "^refs/\\(remotes/"
+                                     (regexp-quote current-repo)
+                                     "\\|tags\\)/\\([^\n]+\\).*$"))
+                 (setq ref-regexp (concat
+                                   "^refs/\\(remotes\\|heads\\|tags\\)/\\("
+                                   (regexp-quote current-repo)
+                                   "/[^\n]+\\|[^\n]+\\).*$")))
+               (goto-char (point-min))
+               (while (re-search-forward
+                       ref-regexp
+                       nil t)
+                 (push (match-string 2) table)))
+             table))
+     (setq current-refspec
+           (completing-read (format "Branch (default %s): " default-refspec)
+                            available-refspecs nil 'confirm nil nil
+                            default-refspec))
+     (list current-repo current-refspec)))
+  (let ((buffer (current-buffer))
+        (command-buffer-name "*vc-push-pull*"))
+    (vc-git-command
+     command-buffer-name 0 nil
+     (prin1-to-string vc-git-push-pull-perform) repository refspec)
+    (set-buffer command-buffer-name)
+    (message (buffer-string))
+    (set-buffer buffer)))
+
+(defun vc-git-push ()
+  "Update remote refs along with associated objects."
+  (interactive)
+  (setq vc-git-push-pull-perform 'push)
+  (call-interactively 'vc-git--do-push-pull))
+
+(defun vc-git-pull ()
+  "Fetch from and merge with another repository or a local branch."
+  (interactive)
+  (setq vc-git-push-pull-perform 'pull)
+  (call-interactively 'vc-git--do-push-pull))
+
 (defun vc-git-create-repo ()
   "Create a new Git repository."
   (vc-git-command nil 0 nil "init"))