{"thread":{"id":"11070","subject":"[PATCH] Adding menu for Emacs git.el","startedAt":"2007-11-30T19:29:08Z","lastAt":"2007-12-11T16:27:42Z","messageCount":8,"participants":["=?utf-8?q?R=C3=A9mi=20Vanicat?=","Alexandre Julliard","Remi Vanicat","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"61520","messageId":"87mysvfr7e.dlv@vanicat.homelinux.org","threadId":"11070","inReplyTo":null,"subject":"[PATCH] Adding menu for Emacs git.el","fromName":"=?utf-8?q?R=C3=A9mi=20Vanicat?=","fromEmail":"vanicat@debian.org","sentAt":"2007-11-30T19:29:08Z","receivedAt":"2007-11-30T19:29:08Z","isPatch":true,"sender":{"key":"vanicat@debian.org","avatar":"https://gravatar.com/avatar/cd491a7f4c221349809a60f88fc21326b97cce2a705e318898aa74851db92409?d=mp&s=160"},"body":"Adding three menu to the git-status-mode of git.el : One for marking\nand unmarking, one for every thing you need when you have a conflict,\nand a last one for all the rest.\n\nSigned-off-by: Rémi Vanicat <vanicat@debian.org>\n---\nThis use easymenu.\n\n contrib/emacs/git.el |   46 +++++++++++++++++++++++++++++++++++++++++++++-\n 1 files changed, 45 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex e147da0..f41b2ef 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -1297,7 +1297,51 @@ Return the list of files that haven't been handled.\"\n     (define-key toggle-map \"i\" 'git-toggle-show-ignored)\n     (define-key toggle-map \"k\" 'git-toggle-show-unknown)\n     (define-key toggle-map \"m\" 'git-toggle-all-marks)\n-    (setq git-status-mode-map map)))\n+    (setq git-status-mode-map map))\n+  (easy-menu-define git-menu-mark git-status-mode-map\n+    \"Git Merge Menu\"\n+    `(\"Merge\"\n+      [\"Next Unmerged File\" git-next-unmerged-file t]\n+      [\"Prev Unmerged File\" git-prev-unmerged-file t]\n+      [\"Mark as Resolved\" git-resolve-file t]\n+      [\"Interctive Merge File\" git-find-file-imerge t]\n+      [\"Diff Against Common Base File\" git-diff-file-base t]\n+      [\"Diff Combined\" git-diff-file-combined t]\n+      [\"Diff Against Merge Head\" git-diff-file-merge-head t]\n+      [\"Diff Against Mine\" git-diff-file-mine t]\n+      [\"Diff Against Other\" git-diff-file-other t]))\n+  (easy-menu-define git-menu-mark git-status-mode-map\n+    \"Git Mark Menu\"\n+    `(\"Mark\"\n+      [\"Mark File\" git-mark-file t]\n+      [\"Mark All\" git-mark-all t]\n+      [\"Unmark File\" git-unmark-file t]\n+      [\"Unmark All\" git-unmark-all t]\n+      [\"Toggle All Mark\" git-toggle-all-marks t]))\n+  (easy-menu-define git-menu git-status-mode-map\n+    \"Git Menu.\" \n+    `(\"Git\"\n+      [\"Refresh\" git-refresh-status t]\n+      [\"Commit\" git-commit-file t]\n+      \"--------\"\n+      [\"Add File\" git-add-file t]\n+      [\"Revert File\" git-revert-file t]\n+      [\"Ignore File\" git-ignore-file t]\n+      [\"Remove File\" git-remove-file t]\n+      \"--------\"\n+      [\"Find File\" git-find-file t]\n+      [\"View File\" git-view-file t]\n+      [\"Diff File\" git-diff-file t]\n+      [\"Interctive Diff File\" git-diff-file-idiff t]\n+      [\"Log\" git-log-file t]\n+      \"--------\"\n+      [\"Quit\" git-status-quit t]\n+      \"--------\"\n+      [\"Show Uptodate\" git-toggle-show-uptodate :style toggle :selected git-show-uptodate]\n+      [\"Toggle Show Ignored\" git-toggle-show-ignored :style toggle :selected git-show-ignored]\n+      [\"Toggle Show Unknown\" git-toggle-show-unknown :style toggle :selected git-show-unknown]))\n+    \n+)\n \n ;; git mode should only run in the *git status* buffer\n (put 'git-status-mode 'mode-class 'special)\n-- \n1.5.3.6\n"},{"id":"61668","messageId":"87fxylos4o.fsf@wine.dyndns.org","threadId":"11070","inReplyTo":"87mysvfr7e.dlv@vanicat.homelinux.org","subject":"Re: [PATCH] Adding menu for Emacs git.el","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2007-12-02T18:42:31Z","receivedAt":"2007-12-02T18:42:31Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"\"=?utf-8?q?R=C3=A9mi=20Vanicat?=\" <vanicat@debian.org>, Remi Vanicat\n<vanicat@debian.org> writes:\n\n> Adding three menu to the git-status-mode of git.el : One for marking\n> and unmarking, one for every thing you need when you have a conflict,\n> and a last one for all the rest.\n>\n> Signed-off-by: Rémi Vanicat <vanicat@debian.org>\n\nIt looks good to me. A couple of minor details:\n\n> +      [\"Interctive Diff File\" git-diff-file-idiff t]\n\nThere's a typo here.\n\n> +      [\"Show Uptodate\" git-toggle-show-uptodate :style toggle :selected git-show-uptodate]\n> +      [\"Toggle Show Ignored\" git-toggle-show-ignored :style toggle :selected git-show-ignored]\n> +      [\"Toggle Show Unknown\" git-toggle-show-unknown :style toggle :selected git-show-unknown]))\n\nI'd get rid of 'Toggle' on the last two for consistency.\n\nBTW do you have a copyright assignment for Emacs?\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"61731","messageId":"877ijwfh6z.dlv@vanicat.homelinux.org","threadId":"11070","inReplyTo":"87fxylos4o.fsf@wine.dyndns.org","subject":"Re: [PATCH] Adding menu for Emacs git.el","fromName":"Remi Vanicat","fromEmail":"vanicat@debian.org","sentAt":"2007-12-03T06:03:32Z","receivedAt":"2007-12-03T06:03:32Z","isPatch":true,"sender":{"key":"vanicat@debian.org","avatar":"https://gravatar.com/avatar/cd491a7f4c221349809a60f88fc21326b97cce2a705e318898aa74851db92409?d=mp&s=160"},"body":"\nAdding three menus to the git-status-mode of git.el : One for marking\nand unmarking, one for what you do when you have a conflict, and the\nother one for all the rest.\n\nSigned-off-by: Rémi Vanicat <vanicat@debian.org>\n---\n\nAlexandre Julliard <julliard@winehq.org> writes:\n\n> \"=?utf-8?q?R=C3=A9mi=20Vanicat?=\" <vanicat@debian.org>, Remi Vanicat\n> <vanicat@debian.org> writes:\n>\n>> Adding three menu to the git-status-mode of git.el : One for marking\n>> and unmarking, one for every thing you need when you have a conflict,\n>> and a last one for all the rest.\n>>\n>> Signed-off-by: Rémi Vanicat <vanicat@debian.org>\n>\n> It looks good to me. A couple of minor details:\n\nHere is the corrected patch\n[...]\n\n> BTW do you have a copyright assignment for Emacs?\nNo, should I seek one ?\n\n contrib/emacs/git.el |   48 ++++++++++++++++++++++++++++++++++++++++++++++--\n 1 files changed, 46 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex e147da0..1db7698 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -49,7 +49,7 @@\n (eval-when-compile (require 'cl))\n (require 'ewoc)\n (require 'log-edit)\n-\n+(require 'easymenu)\n \n ;;;; Customizations\n ;;;; ------------------------------------------------------------\n@@ -1297,7 +1297,51 @@ Return the list of files that haven't been handled.\"\n     (define-key toggle-map \"i\" 'git-toggle-show-ignored)\n     (define-key toggle-map \"k\" 'git-toggle-show-unknown)\n     (define-key toggle-map \"m\" 'git-toggle-all-marks)\n-    (setq git-status-mode-map map)))\n+    (setq git-status-mode-map map))\n+  (easy-menu-define git-menu-mark git-status-mode-map\n+    \"Git Merge Menu\"\n+    `(\"Merge\"\n+      [\"Next Unmerged File\" git-next-unmerged-file t]\n+      [\"Prev Unmerged File\" git-prev-unmerged-file t]\n+      [\"Mark as Resolved\" git-resolve-file t]\n+      [\"Interactive Merge File\" git-find-file-imerge t]\n+      [\"Diff Against Common Base File\" git-diff-file-base t]\n+      [\"Diff Combined\" git-diff-file-combined t]\n+      [\"Diff Against Merge Head\" git-diff-file-merge-head t]\n+      [\"Diff Against Mine\" git-diff-file-mine t]\n+      [\"Diff Against Other\" git-diff-file-other t]))\n+  (easy-menu-define git-menu-mark git-status-mode-map\n+    \"Git Mark Menu\"\n+    `(\"Mark\"\n+      [\"Mark File\" git-mark-file t]\n+      [\"Mark All\" git-mark-all t]\n+      [\"Unmark File\" git-unmark-file t]\n+      [\"Unmark All\" git-unmark-all t]\n+      [\"Toggle All Mark\" git-toggle-all-marks t]))\n+  (easy-menu-define git-menu git-status-mode-map\n+    \"Git Menu.\" \n+    `(\"Git\"\n+      [\"Refresh\" git-refresh-status t]\n+      [\"Commit\" git-commit-file t]\n+      \"--------\"\n+      [\"Add File\" git-add-file t]\n+      [\"Revert File\" git-revert-file t]\n+      [\"Ignore File\" git-ignore-file t]\n+      [\"Remove File\" git-remove-file t]\n+      \"--------\"\n+      [\"Find File\" git-find-file t]\n+      [\"View File\" git-view-file t]\n+      [\"Diff File\" git-diff-file t]\n+      [\"Interctive Diff File\" git-diff-file-idiff t]\n+      [\"Log\" git-log-file t]\n+      \"--------\"\n+      [\"Quit\" git-status-quit t]\n+      \"--------\"\n+      [\"Show Uptodate\" git-toggle-show-uptodate :style toggle :selected git-show-uptodate]\n+      [\"Show Ignored\" git-toggle-show-ignored :style toggle :selected git-show-ignored]\n+      [\"Show Unknown\" git-toggle-show-unknown :style toggle :selected git-show-unknown]))\n+    \n+)\n \n ;; git mode should only run in the *git status* buffer\n (put 'git-status-mode 'mode-class 'special)\n-- \n1.5.3.6\n"},{"id":"61789","messageId":"87ir3f4s76.fsf@wine.dyndns.org","threadId":"11070","inReplyTo":"877ijwfh6z.dlv@vanicat.homelinux.org","subject":"Re: [PATCH] Adding menu for Emacs git.el","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2007-12-03T17:13:33Z","receivedAt":"2007-12-03T17:13:33Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Remi Vanicat <vanicat@debian.org> writes:\n\n> Here is the corrected patch\n> [...]\n>\n>> BTW do you have a copyright assignment for Emacs?\n> No, should I seek one ?\n\nIt's not necessary right now, but I'm hoping that git.el will eventually\nbe merged into the main Emacs tree, and at that point we'll need a\ncopyright assignment from you.\n\n> +      [\"Interctive Diff File\" git-diff-file-idiff t]\n\nThe typo is still here.\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"61819","messageId":"87mysr32ux.dlv_-_@vanicat.homelinux.org","threadId":"11070","inReplyTo":"87ir3f4s76.fsf@wine.dyndns.org","subject":"[PATCH v3] Adding menus for Emacs git.el","fromName":"Remi Vanicat","fromEmail":"vanicat@debian.org","sentAt":"2007-12-03T21:06:14Z","receivedAt":"2007-12-03T21:06:14Z","isPatch":true,"sender":{"key":"vanicat@debian.org","avatar":"https://gravatar.com/avatar/cd491a7f4c221349809a60f88fc21326b97cce2a705e318898aa74851db92409?d=mp&s=160"},"body":"Adding three menus to the git-status-mode of git.el : One for marking\nand unmarking, one for what you do when you have a conflict, and the\nother one for all the rest.\n---\nAlexandre Julliard <julliard@winehq.org> writes:\n\n> Remi Vanicat <vanicat@debian.org> writes:\n>> +      [\"Interctive Diff File\" git-diff-file-idiff t]\n>\n> The typo is still here.\n\nPff, The typo was in two place, and I forgot to check this... \n\nThis time, I have run a spell checker on every menu entries, to be\nsure. \n contrib/emacs/git.el |   48 ++++++++++++++++++++++++++++++++++++++++++++++--\n 1 files changed, 46 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex e147da0..7fbea55 100644\n     (define-key toggle-map \"i\" 'git-toggle-show-ignored)\n     (define-key toggle-map \"k\" 'git-toggle-show-unknown)\n     (define-key toggle-map \"m\" 'git-toggle-all-marks)\n-    (setq git-status-mode-map map)))\n+    (setq git-status-mode-map map))\n+  (easy-menu-define git-menu-mark git-status-mode-map\n+    \"Git Merge Menu\"\n+    `(\"Merge\"\n+      [\"Next Unmerged File\" git-next-unmerged-file t]\n+      [\"Prev Unmerged File\" git-prev-unmerged-file t]\n+      [\"Mark as Resolved\" git-resolve-file t]\n+      [\"Interactive Merge File\" git-find-file-imerge t]\n+      [\"Diff Against Common Base File\" git-diff-file-base t]\n+      [\"Diff Combined\" git-diff-file-combined t]\n+      [\"Diff Against Merge Head\" git-diff-file-merge-head t]\n+      [\"Diff Against Mine\" git-diff-file-mine t]\n+      [\"Diff Against Other\" git-diff-file-other t]))\n+  (easy-menu-define git-menu-mark git-status-mode-map\n+    \"Git Mark Menu\"\n+    `(\"Mark\"\n+      [\"Mark File\" git-mark-file t]\n+      [\"Mark All\" git-mark-all t]\n+      [\"Unmark File\" git-unmark-file t]\n+      [\"Unmark All\" git-unmark-all t]\n+      [\"Toggle All Mark\" git-toggle-all-marks t]))\n+  (easy-menu-define git-menu git-status-mode-map\n+    \"Git Menu.\" \n+    `(\"Git\"\n+      [\"Refresh\" git-refresh-status t]\n+      [\"Commit\" git-commit-file t]\n+      \"--------\"\n+      [\"Add File\" git-add-file t]\n+      [\"Revert File\" git-revert-file t]\n+      [\"Ignore File\" git-ignore-file t]\n+      [\"Remove File\" git-remove-file t]\n+      \"--------\"\n+      [\"Find File\" git-find-file t]\n+      [\"View File\" git-view-file t]\n+      [\"Diff File\" git-diff-file t]\n+      [\"Interactive Diff File\" git-diff-file-idiff t]\n+      [\"Log\" git-log-file t]\n+      \"--------\"\n+      [\"Quit\" git-status-quit t]\n+      \"--------\"\n+      [\"Show Uptodate\" git-toggle-show-uptodate :style toggle :selected git-show-uptodate]\n+      [\"Show Ignored\" git-toggle-show-ignored :style toggle :selected git-show-ignored]\n+      [\"Show Unknown\" git-toggle-show-unknown :style toggle :selected git-show-unknown]))\n+    \n+)\n \n ;; git mode should only run in the *git status* buffer\n (put 'git-status-mode 'mode-class 'special)\n-- \n1.5.3.6\n"},{"id":"62665","messageId":"7vhciphh4k.fsf@gitster.siamese.dyndns.org","threadId":"11070","inReplyTo":"877ijwfh6z.dlv@vanicat.homelinux.org","subject":"Re: [PATCH] Adding menu for Emacs git.el","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-12-11T06:36:59Z","receivedAt":"2007-12-11T06:36:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Remi Vanicat <vanicat@debian.org> writes:\n\n> Adding three menus to the git-status-mode of git.el : One for marking\n> and unmarking, one for what you do when you have a conflict, and the\n> other one for all the rest.\n>\n> Signed-off-by: Rémi Vanicat <vanicat@debian.org>\n> ---\n>\n> Alexandre Julliard <julliard@winehq.org> writes:\n>\n>> \"=?utf-8?q?R=C3=A9mi=20Vanicat?=\" <vanicat@debian.org>, Remi Vanicat\n>> <vanicat@debian.org> writes:\n>>\n>>> Adding three menu to the git-status-mode of git.el : One for marking\n>>> and unmarking, one for every thing you need when you have a conflict,\n>>> and a last one for all the rest.\n>>>\n>>> Signed-off-by: Rémi Vanicat <vanicat@debian.org>\n>>\n>> It looks good to me. A couple of minor details:\n>\n> Here is the corrected patch\n> [...]\n>\n>> BTW do you have a copyright assignment for Emacs?\n> No, should I seek one ?\n\nAlex, what is the current status of this patch?\n"},{"id":"62711","messageId":"878x41idvb.fsf@wine.dyndns.org","threadId":"11070","inReplyTo":"7vhciphh4k.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Adding menu for Emacs git.el","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2007-12-11T13:02:00Z","receivedAt":"2007-12-11T13:02:00Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Alex, what is the current status of this patch?\n\nPatch v3 looked good but the patch file was corrupted. Here's the latest\nversion, I have moved things around a bit to use only one menu and to be\nmore similar to pcl-cvs.\n\nFrom 0a67dfc88a8bbf479c37ba76521ebe39fa67f577 Mon Sep 17 00:00:00 2001\nFrom: Alexandre Julliard <julliard@winehq.org>\nDate: Tue, 11 Dec 2007 13:56:09 +0100\nSubject: [PATCH] git.el: Added a menu for git-status-mode.\nMIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n\nOriginally written by Rémi Vanicat, I just changed the layout a little.\n\nSigned-off-by: Rémi Vanicat <vanicat@debian.org>\nSigned-off-by: Alexandre Julliard <julliard@winehq.org>\n---\n contrib/emacs/git.el |   43 ++++++++++++++++++++++++++++++++++++++++++-\n 1 files changed, 42 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex e147da0..ae58f1c 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -49,6 +49,7 @@\n (eval-when-compile (require 'cl))\n (require 'ewoc)\n (require 'log-edit)\n+(require 'easymenu)\n \n \n ;;;; Customizations\n@@ -1297,7 +1298,47 @@ Return the list of files that haven't been handled.\"\n     (define-key toggle-map \"i\" 'git-toggle-show-ignored)\n     (define-key toggle-map \"k\" 'git-toggle-show-unknown)\n     (define-key toggle-map \"m\" 'git-toggle-all-marks)\n-    (setq git-status-mode-map map)))\n+    (setq git-status-mode-map map))\n+  (easy-menu-define git-menu git-status-mode-map\n+    \"Git Menu\"\n+    `(\"Git\"\n+      [\"Refresh\" git-refresh-status t]\n+      [\"Commit\" git-commit-file t]\n+      (\"Merge\"\n+        [\"Next Unmerged File\" git-next-unmerged-file t]\n+        [\"Prev Unmerged File\" git-prev-unmerged-file t]\n+        [\"Mark as Resolved\" git-resolve-file t]\n+        [\"Interactive Merge File\" git-find-file-imerge t]\n+        [\"Diff Against Common Base File\" git-diff-file-base t]\n+        [\"Diff Combined\" git-diff-file-combined t]\n+        [\"Diff Against Merge Head\" git-diff-file-merge-head t]\n+        [\"Diff Against Mine\" git-diff-file-mine t]\n+        [\"Diff Against Other\" git-diff-file-other t])\n+      \"--------\"\n+      [\"Add File\" git-add-file t]\n+      [\"Revert File\" git-revert-file t]\n+      [\"Ignore File\" git-ignore-file t]\n+      [\"Remove File\" git-remove-file t]\n+      \"--------\"\n+      [\"Find File\" git-find-file t]\n+      [\"View File\" git-view-file t]\n+      [\"Diff File\" git-diff-file t]\n+      [\"Interactive Diff File\" git-diff-file-idiff t]\n+      [\"Log\" git-log-file t]\n+      \"--------\"\n+      [\"Mark\" git-mark-file t]\n+      [\"Mark All\" git-mark-all t]\n+      [\"Unmark\" git-unmark-file t]\n+      [\"Unmark All\" git-unmark-all t]\n+      [\"Toggle All Marks\" git-toggle-all-marks t]\n+      [\"Hide Handled Files\" git-remove-handled t]\n+      \"--------\"\n+      [\"Show Uptodate Files\" git-toggle-show-uptodate :style toggle :selected git-show-uptodate]\n+      [\"Show Ignored Files\" git-toggle-show-ignored :style toggle :selected git-show-ignored]\n+      [\"Show Unknown Files\" git-toggle-show-unknown :style toggle :selected git-show-unknown]\n+      \"--------\"\n+      [\"Quit\" git-status-quit t])))\n+\n \n ;; git mode should only run in the *git status* buffer\n (put 'git-status-mode 'mode-class 'special)\n-- \n1.5.3.7.959.gdf7e-dirty\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"},{"id":"62743","messageId":"6b8a91420712110827q320fbe00t100547f22504143@mail.gmail.com","threadId":"11070","inReplyTo":"878x41idvb.fsf@wine.dyndns.org","subject":"Re: [PATCH] Adding menu for Emacs git.el","fromName":"Remi Vanicat","fromEmail":"vanicat@debian.org","sentAt":"2007-12-11T16:27:42Z","receivedAt":"2007-12-11T16:27:42Z","isPatch":true,"sender":{"key":"vanicat@debian.org","avatar":"https://gravatar.com/avatar/cd491a7f4c221349809a60f88fc21326b97cce2a705e318898aa74851db92409?d=mp&s=160"},"body":"2007/12/11, Alexandre Julliard <julliard@winehq.org>:\n> Junio C Hamano <gitster@pobox.com> writes:\n>\n> > Alex, what is the current status of this patch?\n>\n> Patch v3 looked good but the patch file was corrupted. Here's the latest\n> version, I have moved things around a bit to use only one menu and to be\n> more similar to pcl-cvs.\n>\n\nIt look good\n"}]}