From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Fabian Ezequiel Gallina Newsgroups: gmane.emacs.devel Subject: Re: git push/pull Date: Sun, 6 Dec 2009 16:21:25 -0300 Message-ID: <9de1a5ef0912061121l2e4645c7q6ff334d57e4ec3bf@mail.gmail.com> References: <9de1a5ef0912050009i59707986gb177505e04975e1b@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=0016e6d7852e370a0b047a143fd1 X-Trace: ger.gmane.org 1260127302 24443 80.91.229.12 (6 Dec 2009 19:21:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 6 Dec 2009 19:21:42 +0000 (UTC) Cc: Emacs-Devel devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 06 20:21:35 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NHMfm-0007UE-FK for ged-emacs-devel@m.gmane.org; Sun, 06 Dec 2009 20:21:34 +0100 Original-Received: from localhost ([127.0.0.1]:44364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHMfl-00028Y-FX for ged-emacs-devel@m.gmane.org; Sun, 06 Dec 2009 14:21:33 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHMfg-00028L-Eo for emacs-devel@gnu.org; Sun, 06 Dec 2009 14:21:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHMff-000281-KT for emacs-devel@gnu.org; Sun, 06 Dec 2009 14:21:27 -0500 Original-Received: from [199.232.76.173] (port=56160 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHMff-00027y-FK for emacs-devel@gnu.org; Sun, 06 Dec 2009 14:21:27 -0500 Original-Received: from ey-out-1920.google.com ([74.125.78.148]:13111) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHMfe-0000xP-W2 for emacs-devel@gnu.org; Sun, 06 Dec 2009 14:21:27 -0500 Original-Received: by ey-out-1920.google.com with SMTP id 4so236194eyg.34 for ; Sun, 06 Dec 2009 11:21:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=48RxSFZzWlPjE8aDwsxfScmAzdibAOARgGvgo4OMSxA=; b=kAdNy5/Zkyv0TfYwwJrXV829jqxppOjKxZ6tFp3MhFGlhl06r6PCBaqrvaLErMb9Ux HVvSTF9W3LTq/hrKgxmajj1B1/nAbjAMKkjLqBzp+wmHI+lzMDM+PoqDG4c4azDc+7TS Bg7PJNtZB3GwmlOOkvBOwim1dmCcfuZyYpvVo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=NPDPhe34QoR13cZytkbnIL21XkLo5rfH/mzSmK0a3oXbIUoqbSnBUdq2+ZJGj9WLtV 3rBPxqOG1FBLv8AoX1N1FzM8MmwnwD8j8j5dgLwhImj6bVtsm44ZRiZ88Mx9VLUSN7vk 0sySFpozecEoz3N/QEOcbumGiRdj2mwu6MuiE= Original-Received: by 10.216.87.144 with SMTP id y16mr1927882wee.95.1260127285348; Sun, 06 Dec 2009 11:21:25 -0800 (PST) In-Reply-To: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:118342 Archived-At: --0016e6d7852e370a0b047a143fd1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 2009/12/5 Stefan Monnier : >> 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. =A0You 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, --=20 Fabi=E1n E. Gallina http://www.from-the-cloud.com --0016e6d7852e370a0b047a143fd1 Content-Type: text/plain; charset=US-ASCII; name="vc.el.diff" Content-Disposition: attachment; filename="vc.el.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g2w6ukov0 ZGlmZiAtLWdpdCBhL2xpc3AvdmMuZWwgYi9saXNwL3ZjLmVsCmluZGV4IGNkOWYxMWIuLjU1MTlm ZjYgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMuZWwKKysrIGIvbGlzcC92Yy5lbApAQCAtODg0LDcgKzg4 NCw3IEBAIFdpdGhpbiBkaXJlY3Rvcmllcywgb25seSBmaWxlcyBhbHJlYWR5IHVuZGVyIHZlcnNp b24gY29udHJvbCBhcmUgbm90aWNlZC4iCiAJCQkJICAgIHN0YXRlLW1vZGVsLW9ubHktZmlsZXMp CiAgICJEZWR1Y2UgYSBzZXQgb2YgZmlsZXMgYW5kIGEgYmFja2VuZCB0byB3aGljaCB0byBhcHBs eSBhbiBvcGVyYXRpb24uCiAKLVJldHVybiAoQkFDS0VORCBGSUxFU0VUIEZJTEVTRVQtT05MWS1G SUxFUyBTVEFURSBDSEVDS09VVC1NT0RFTCkuCitSZXR1cm4gKEJBQ0tFTkQgRklMRVNFVCBGSUxF U0VULU9OTFktRklMRVMgU1RBVEUgQ0hFQ0tPVVQtTU9ERUwuCiBJZiB3ZSdyZSBpbiBWQy1kaXIg bW9kZSwgdGhlIGZpbGVzZXQgaXMgdGhlIGxpc3Qgb2YgbWFya2VkIGZpbGVzLgogT3RoZXJ3aXNl LCBpZiB3ZSdyZSBsb29raW5nIGF0IGEgYnVmZmVyIHZpc2l0aW5nIGEgdmVyc2lvbi1jb250cm9s bGVkIGZpbGUsCiB0aGUgZmlsZXNldCBpcyBhIHNpbmdsZXRvbiBjb250YWluaW5nIHRoaXMgZmls ZS4KQEAgLTExODUsNiArMTE4NSwyNiBAQCBtZXJnZSBpbiB0aGUgY2hhbmdlcyBpbnRvIHlvdXIg d29ya2luZyBjb3B5LiIKIChkZWNsYXJlLWZ1bmN0aW9uIHZjLWRpci1tb3ZlLXRvLWdvYWwtY29s dW1uICJ2Yy1kaXIiICgpKQogCiA7OzsjIyNhdXRvbG9hZAorKGRlZnVuIHZjLXB1bGwgKCkKKyAg Ik1lcmdlcyBjaGFuZ2VzIGJldHdlZW4gYnJhbmNoZXMuIgorICAoaW50ZXJhY3RpdmUpCisgICh2 Yy1lbnN1cmUtdmMtYnVmZmVyKQorICAobGV0ICgoYmFja2VuZCAodmMtYmFja2VuZCBidWZmZXIt ZmlsZS1uYW1lKSkpCisgICAgKGlmIChub3QgKHZjLWZpbmQtYmFja2VuZC1mdW5jdGlvbiBiYWNr ZW5kICdwdWxsKSkKKyAgICAgICAgKGVycm9yICJTb3JyeSwgcHVsbCBpcyBub3QgaW1wbGVtZW50 ZWQgZm9yICVzIiBiYWNrZW5kKQorICAgICAgKHZjLWNhbGwtYmFja2VuZCBiYWNrZW5kICdwdWxs KSkpKQorCis7OzsjIyNhdXRvbG9hZAorKGRlZnVuIHZjLXB1c2ggKCkKKyAgIlB1c2hlcyBjb21t aXRzIHRvIHNvbWUgYnJhbmNoLiIKKyAgKGludGVyYWN0aXZlKQorICAodmMtZW5zdXJlLXZjLWJ1 ZmZlcikKKyAgKGxldCAoKGJhY2tlbmQgKHZjLWJhY2tlbmQgYnVmZmVyLWZpbGUtbmFtZSkpKQor ICAgIChpZiAobm90ICh2Yy1maW5kLWJhY2tlbmQtZnVuY3Rpb24gYmFja2VuZCAncHVzaCkpCisg ICAgICAgIChlcnJvciAiU29ycnksIHB1c2ggaXMgbm90IGltcGxlbWVudGVkIGZvciAlcyIgYmFj a2VuZCkKKyAgICAgICh2Yy1jYWxsLWJhY2tlbmQgYmFja2VuZCAncHVzaCkpKSkKKworOzs7IyMj YXV0b2xvYWQKIChkZWZ1biB2Yy1yZWdpc3RlciAoJm9wdGlvbmFsIHNldC1yZXZpc2lvbiB2Yy1m aWxlc2V0IGNvbW1lbnQpCiAgICJSZWdpc3RlciBpbnRvIGEgdmVyc2lvbiBjb250cm9sIHN5c3Rl bS4KIElmIFZDLUZJTEVTRVQgaXMgZ2l2ZW4sIHJlZ2lzdGVyIHRoZSBmaWxlcyBpbiB0aGF0IGZp bGVzZXQuCg== --0016e6d7852e370a0b047a143fd1 Content-Type: text/plain; charset=US-ASCII; name="vc-git.el.diff" Content-Disposition: attachment; filename="vc-git.el.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g2w6uqan1 ZGlmZiAtLWdpdCBhL2xpc3AvdmMtZ2l0LmVsIGIvbGlzcC92Yy1naXQuZWwKaW5kZXggYTMzYTBm NS4uYmI5NWI3MCAxMDA2NDQKLS0tIGEvbGlzcC92Yy1naXQuZWwKKysrIGIvbGlzcC92Yy1naXQu ZWwKQEAgLTQ4OSw2ICs0ODksODAgQEAgSWYgbmlsLCB1c2UgdGhlIHZhbHVlIG9mIGB2Yy1kaWZm LXN3aXRjaGVzJy4gIElmIHQsIHVzZSBubyBzd2l0Y2hlcy4iCiAKIDs7OyBTVEFURS1DSEFOR0lO RyBGVU5DVElPTlMKIAorKGRlZnZhciB2Yy1naXQtcHVzaC1wdWxsLXBlcmZvcm0gJ3B1bGwKKyAg IlRoZSBnaXQgY29tbWFuZCBgdmMtZ2l0LS1kby1wdXNoLXB1bGwnIHNob3VsZCBleGVjdXRlIikK KworKGRlZnVuIHZjLWdpdC0tZG8tcHVzaC1wdWxsIChyZXBvc2l0b3J5IHJlZnNwZWMpCisgICJD YWxscyBnaXQgcHVzaC9wdWxsIHdpdGggUkVQT1NJVE9SWSBhbmQgUkVGU1BFQyBhcyBwYXJhbWV0 ZXJzLgorCitUaGUgZGVjaXNpb24gb2YgdXNpbmcgcHVzaCBvciBwdWxsIGlzIGJlaWduIG1hZGUg ZGVwZW5kaW5nIHRoZQordmFsdWUgb2YgYHZjLWdpdC1wdXNoLXB1bGwtcGVyZm9ybScuIgorICAo aW50ZXJhY3RpdmUKKyAgIChsZXQgKChkZWZhdWx0LXJlZnNwZWMgKHZjLWdpdC13b3JraW5nLXJl dmlzaW9uIGJ1ZmZlci1maWxlLW5hbWUpKQorICAgICAgICAgKGRlZmF1bHQtcmVwbykKKyAgICAg ICAgIChhdmFpbGFibGUtcmVwb3MpCisgICAgICAgICAoYXZhaWxhYmxlLXJlZnNwZWNzKQorICAg ICAgICAgKGN1cnJlbnQtcmVwbykKKyAgICAgICAgIChjdXJyZW50LXJlZnNwZWMpKQorICAgICAo c2V0cSBhdmFpbGFibGUtcmVwb3MKKyAgICAgICAgICAgKGxldCAoKHRhYmxlIChsaXN0ICIuIikp KQorICAgICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgICAgICAgICAodmMtZ2l0 LWNvbW1hbmQgdCBuaWwgbmlsICJmb3ItZWFjaC1yZWYiICItLWZvcm1hdD0lKHJlZm5hbWUpIikK KyAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAgICAgICAgICAo d2hpbGUgKHJlLXNlYXJjaC1mb3J3YXJkICJecmVmcy9yZW1vdGVzL1xcKFteL10rXFwpLiokIiBu aWwgdCkKKyAgICAgICAgICAgICAgICAgKHB1c2ggKG1hdGNoLXN0cmluZyAxKSB0YWJsZSkpKQor ICAgICAgICAgICAgIHRhYmxlKSkKKyAgICAgKHNldHEgZGVmYXVsdC1yZXBvIChudGggMCBhdmFp bGFibGUtcmVwb3MpKQorICAgICAoc2V0cSBjdXJyZW50LXJlcG8KKyAgICAgICAgICAgKGNvbXBs ZXRpbmctcmVhZCAoZm9ybWF0ICJSZXBvc2l0b3J5IChkZWZhdWx0ICVzKTogIiBkZWZhdWx0LXJl cG8pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlLXJlcG9zIG5pbCAnY29u ZmlybSBuaWwgbmlsIGRlZmF1bHQtcmVwbykpCisgICAgIChzZXRxIGF2YWlsYWJsZS1yZWZzcGVj cworICAgICAgICAgICAobGV0ICgodGFibGUgKGxpc3QgIkhFQUQiKSkKKyAgICAgICAgICAgICAg ICAgKHJlZi1yZWdleHApKQorICAgICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAg ICAgICAgICAodmMtZ2l0LWNvbW1hbmQgdCBuaWwgbmlsICJmb3ItZWFjaC1yZWYiICItLWZvcm1h dD0lKHJlZm5hbWUpIikKKyAgICAgICAgICAgICAgIChpZiAoYW5kIChub3QgKGVxdWFsICIuIiBj dXJyZW50LXJlcG8pKQorICAgICAgICAgICAgICAgICAgICAgICAgKGVxdWFsIHZjLWdpdC1wdXNo LXB1bGwtcGVyZm9ybSAncHVsbCkpCisgICAgICAgICAgICAgICAgICAgKHNldHEgcmVmLXJlZ2V4 cCAoY29uY2F0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIl5yZWZzL1xc KHJlbW90ZXMvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChyZWdleHAt cXVvdGUgY3VycmVudC1yZXBvKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJcXHx0YWdzXFwpL1xcKFteXG5dK1xcKS4qJCIpKQorICAgICAgICAgICAgICAgICAoc2V0cSBy ZWYtcmVnZXhwIChjb25jYXQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIl5y ZWZzL1xcKHJlbW90ZXNcXHxoZWFkc1xcfHRhZ3NcXCkvXFwoIgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAocmVnZXhwLXF1b3RlIGN1cnJlbnQtcmVwbykKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIi9bXlxuXStcXHxbXlxuXStcXCkuKiQiKSkpCisgICAg ICAgICAgICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQorICAgICAgICAgICAgICAgKHdoaWxl IChyZS1zZWFyY2gtZm9yd2FyZAorICAgICAgICAgICAgICAgICAgICAgICByZWYtcmVnZXhwCisg ICAgICAgICAgICAgICAgICAgICAgIG5pbCB0KQorICAgICAgICAgICAgICAgICAocHVzaCAobWF0 Y2gtc3RyaW5nIDIpIHRhYmxlKSkpCisgICAgICAgICAgICAgdGFibGUpKQorICAgICAoc2V0cSBj dXJyZW50LXJlZnNwZWMKKyAgICAgICAgICAgKGNvbXBsZXRpbmctcmVhZCAoZm9ybWF0ICJCcmFu Y2ggKGRlZmF1bHQgJXMpOiAiIGRlZmF1bHQtcmVmc3BlYykKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhdmFpbGFibGUtcmVmc3BlY3MgbmlsICdjb25maXJtIG5pbCBuaWwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkZWZhdWx0LXJlZnNwZWMpKQorICAgICAobGlzdCBjdXJyZW50 LXJlcG8gY3VycmVudC1yZWZzcGVjKSkpCisgIChsZXQgKChidWZmZXIgKGN1cnJlbnQtYnVmZmVy KSkKKyAgICAgICAgKGNvbW1hbmQtYnVmZmVyLW5hbWUgIip2Yy1wdXNoLXB1bGwqIikpCisgICAg KHZjLWdpdC1jb21tYW5kCisgICAgIGNvbW1hbmQtYnVmZmVyLW5hbWUgMCBuaWwKKyAgICAgKHBy aW4xLXRvLXN0cmluZyB2Yy1naXQtcHVzaC1wdWxsLXBlcmZvcm0pIHJlcG9zaXRvcnkgcmVmc3Bl YykKKyAgICAoc2V0LWJ1ZmZlciBjb21tYW5kLWJ1ZmZlci1uYW1lKQorICAgIChtZXNzYWdlIChi dWZmZXItc3RyaW5nKSkKKyAgICAoc2V0LWJ1ZmZlciBidWZmZXIpKSkKKworKGRlZnVuIHZjLWdp dC1wdXNoICgpCisgICJVcGRhdGUgcmVtb3RlIHJlZnMgYWxvbmcgd2l0aCBhc3NvY2lhdGVkIG9i amVjdHMuIgorICAoaW50ZXJhY3RpdmUpCisgIChzZXRxIHZjLWdpdC1wdXNoLXB1bGwtcGVyZm9y bSAncHVzaCkKKyAgKGNhbGwtaW50ZXJhY3RpdmVseSAndmMtZ2l0LS1kby1wdXNoLXB1bGwpKQor CisoZGVmdW4gdmMtZ2l0LXB1bGwgKCkKKyAgIkZldGNoIGZyb20gYW5kIG1lcmdlIHdpdGggYW5v dGhlciByZXBvc2l0b3J5IG9yIGEgbG9jYWwgYnJhbmNoLiIKKyAgKGludGVyYWN0aXZlKQorICAo c2V0cSB2Yy1naXQtcHVzaC1wdWxsLXBlcmZvcm0gJ3B1bGwpCisgIChjYWxsLWludGVyYWN0aXZl bHkgJ3ZjLWdpdC0tZG8tcHVzaC1wdWxsKSkKKwogKGRlZnVuIHZjLWdpdC1jcmVhdGUtcmVwbyAo KQogICAiQ3JlYXRlIGEgbmV3IEdpdCByZXBvc2l0b3J5LiIKICAgKHZjLWdpdC1jb21tYW5kIG5p bCAwIG5pbCAiaW5pdCIpKQo= --0016e6d7852e370a0b047a143fd1--