From mboxrd@z Thu Jan 1 00:00:00 1970 From: David =?utf-8?q?K=C3=A5gedal?= Subject: [StGit PATCH 06/17] Emacs mode: Let "P" push or pop patch at point Date: Fri, 14 Dec 2007 11:57:31 +0100 Message-ID: <20071214105724.18066.2112.stgit@krank> References: <20071214105238.18066.23281.stgit@krank> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: catalin.marinas@gmail.com, git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Dec 14 11:58:54 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1J38Fm-0001Hm-0E for gcvg-git-2@gmane.org; Fri, 14 Dec 2007 11:58:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762122AbXLNK5Q convert rfc822-to-quoted-printable (ORCPT ); Fri, 14 Dec 2007 05:57:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763133AbXLNK5Q (ORCPT ); Fri, 14 Dec 2007 05:57:16 -0500 Received: from mail.lysator.liu.se ([130.236.254.3]:51828 "EHLO mail.lysator.liu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761799AbXLNK5P (ORCPT ); Fri, 14 Dec 2007 05:57:15 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id C837A200A217; Fri, 14 Dec 2007 11:57:13 +0100 (CET) Received: from mail.lysator.liu.se ([127.0.0.1]) by localhost (lenin.lysator.liu.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 30527-01-25; Fri, 14 Dec 2007 11:57:13 +0100 (CET) Received: from krank (dns.vtab.com [62.20.90.195]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTP id 7FD2B200A1E8; Fri, 14 Dec 2007 11:57:13 +0100 (CET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by krank (Postfix) with ESMTP id E97357B406D; Fri, 14 Dec 2007 11:57:31 +0100 (CET) In-Reply-To: <20071214105238.18066.23281.stgit@krank> User-Agent: StGIT/0.13 X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at lysator.liu.se Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: Karl Hasselstr=C3=B6m When the user presses "P", push or pop the patch at point depending on whether it's applied or unapplied. Signed-off-by: Karl Hasselstr=C3=B6m Signed-off-by: David K=C3=A5gedal --- contrib/stgit.el | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/contrib/stgit.el b/contrib/stgit.el index 17b5d6b..d371e71 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -82,6 +82,7 @@ Argument DIR is the repository path." (define-key stgit-mode-map "r" 'stgit-rename) (define-key stgit-mode-map ">" 'stgit-push-next) (define-key stgit-mode-map "<" 'stgit-pop-next) + (define-key stgit-mode-map "P" 'stgit-push-or-pop) (define-key stgit-mode-map "=3D" 'stgit-show)) =20 (defun stgit-mode () @@ -138,6 +139,21 @@ Commands: (stgit-capture-output nil (stgit-run "pop")) (stgit-refresh)) =20 +(defun stgit-applied-at-point () + "Is the patch on the current line applied?" + (save-excursion + (beginning-of-line) + (looking-at "[>+]"))) + +(defun stgit-push-or-pop () + "Push or pop the patch on the current line" + (interactive) + (let ((patch (stgit-patch-at-point)) + (applied (stgit-applied-at-point))) + (stgit-capture-output nil + (stgit-run (if applied "pop" "push") patch)) + (stgit-refresh))) + (defun stgit-show () "Show the patch on the current line" (interactive)