From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 03 10:01:59 2012 Received: (at submit) by debbugs.gnu.org; 3 Dec 2012 15:01:59 +0000 Received: from localhost ([127.0.0.1]:51602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TfXWw-0001AZ-Ap for submit@debbugs.gnu.org; Mon, 03 Dec 2012 10:01:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36822) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TfXWt-0001AR-BP for submit@debbugs.gnu.org; Mon, 03 Dec 2012 10:01:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfXUQ-0004pj-VR for submit@debbugs.gnu.org; Mon, 03 Dec 2012 09:59:32 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:58416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfXUQ-0004pQ-RT for submit@debbugs.gnu.org; Mon, 03 Dec 2012 09:59:22 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfXUP-00053Q-OI for bug-gnu-emacs@gnu.org; Mon, 03 Dec 2012 09:59:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfXUG-0004ds-3w for bug-gnu-emacs@gnu.org; Mon, 03 Dec 2012 09:59:21 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfXUF-0004dn-Tz for bug-gnu-emacs@gnu.org; Mon, 03 Dec 2012 09:59:12 -0500 Received: by mail-pa0-f41.google.com with SMTP id bj3so1898372pad.0 for ; Mon, 03 Dec 2012 06:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version:content-type; bh=zlk0X3bfbzouJTe0eXBwyR066nQZTiNl8xHdAdfVZKE=; b=NajhLxUTQP6XxKpLWZf4uGfoyAj5qbZdmropHsD+lpK7xI52A97MpLPHqnAJ51hGZP wWiACMNOjLTqv5LHVwCZU0vDGo87x2QeyIC/4u3tIS1JqpTE6XMBeOTDAh/vcGsPkyPZ rytOg8CWgAMtODCnqejQADl1i5hiOTllm+5a07c8+c/elZ94vxw/F+SMw+UqI1udDs+W L2+bUsXuVMh8e1rMxzHWAoyI5Qd1VrMMNpVCAhIkltu/CVyepYHUZaiETDOvTf8xSRvy y5qkEWWLSGZ3iE+QVfO+tCnae8iVOcITizPY9RMgph5jK80Dern++rqJO2/TzJOQrGJo ccCg== Received: by 10.68.237.6 with SMTP id uy6mr29238410pbc.147.1354546750909; Mon, 03 Dec 2012 06:59:10 -0800 (PST) Received: from debian-6.05 ([115.241.4.81]) by mx.google.com with ESMTPS id k2sm4525456paw.24.2012.12.03.06.59.07 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 06:59:09 -0800 (PST) From: Jambunathan K To: bug-gnu-emacs@gnu.org Subject: 24.3.50; vc-dir: Unify git stashing and bzr shelving Date: Mon, 03 Dec 2012 20:31:56 +0530 Message-ID: <8738zn2n8b.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.1 (------) "Works-for-me" changes in my .emacs to uniformly shelf/unshelve changes in git and bzr backends. You can install the following changes and in a *vc-dir* (git/bzr) buffer you can do f s => stash f S => snapshot f p => pop The patch uses `vc-call-backend' for each of the above operations. There is also a `vc-stash-name' function to get the latest stash name. The changes for "works-for-me". It would be good to have "works-for-all" equivalent of this functionality in vanilla Emacs. ---------------------------------------------------------------------- ;; Unify git stashing and bzr shelving ;; Put stash related operations on a `f' prefix. (defvar vc-dir-stash-map (let ((map (make-sparse-keymap))) (define-key map "s" 'vc-stash) (define-key map "S" 'vc-stash-snapshot) (define-key map "p" 'vc-stash-pop) map)) (fset 'vc-dir-stash-map vc-dir-stash-map) (add-hook 'vc-dir-mode-hook (lambda () (define-key vc-dir-mode-map "f" 'vc-dir-stash-map))) ;; Generic vc-stash callbacks. (require 'vc) (defun vc-stash (name) "Stash current working tree." (interactive "sName: ") (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef (backend (car vc-fileset)) (files (cadr vc-fileset))) (vc-call-backend backend 'stash name))) (defun vc-stash-snapshot () "Take a snapshot of working tree." (interactive) (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef (backend (car vc-fileset)) (files (cadr vc-fileset))) (vc-call-backend backend 'stash-snapshot))) (defun vc-stash-pop () "Pop newest stash." (interactive) (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef (backend (car vc-fileset)) (files (cadr vc-fileset)) (name (vc-stash-name))) (when name (vc-call-backend backend 'stash-pop name)))) (defun vc-stash-name () "Name of the stash on top." (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef (backend (car vc-fileset)) (files (cadr vc-fileset))) (vc-call-backend backend 'stash-name))) ;; Bzr vc-stash callbacks. (defalias 'vc-bzr-stash 'vc-bzr-shelve) (defalias 'vc-bzr-stash-snapshot 'vc-bzr-shelve-snapshot) (defalias 'vc-bzr-stash-apply 'vc-bzr-shelve-apply) (defun vc-bzr-stash-name () (let* ((name (car (vc-bzr-shelve-list))) (id (when (and name (string-match "^ +\\([0-9]+\\):" name)) (match-string 1 name)))) id)) (defun vc-bzr-stash-pop (name) (interactive) (vc-bzr-shelve-apply name)) ;; Git vc-stash callbacks. (defun vc-git-stash-name () (let* ((name (car (vc-git-stash-list))) (id (when (and name (string-match "^ +\\({[0-9]+}\\):" name)) (match-string 1 name)))) (format "stash@%s" id))) In GNU Emacs 24.3.50.8 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars) of 2012-12-03 on debian-6.05 Bzr revision: 111072 cyd@gnu.org-20121203062306-87uj2za1hu2dynaj Windowing system distributor `The X.Org Foundation', version 11.0.10707000 Important settings: value of $LANG: en_IN locale-coding-system: iso-latin-1-unix default enable-multibyte-characters: t From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 20 22:22:44 2012 Received: (at 13069) by debbugs.gnu.org; 21 Dec 2012 03:22:45 +0000 Received: from localhost ([127.0.0.1]:53226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TltC7-0002i8-U5 for submit@debbugs.gnu.org; Thu, 20 Dec 2012 22:22:44 -0500 Received: from mail-da0-f47.google.com ([209.85.210.47]:55247) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TltC6-0002i1-23 for 13069@debbugs.gnu.org; Thu, 20 Dec 2012 22:22:42 -0500 Received: by mail-da0-f47.google.com with SMTP id s35so1842021dak.34 for <13069@debbugs.gnu.org>; Thu, 20 Dec 2012 19:22:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=1fpFt9J/HfZs72mrfs12IBR2JG/a7bbybRJAU5kPAZY=; b=pWwi8vZQjY8VHz6K7F0Vjag/984m0dZVceWmxrQ1PQwEYaHqhFY7pgnOS08nPQVQrE PjRcAwNT7Cyhe0halskIR9YB3FmuO5CBVs5Yb53amxURX/VVLpvDBCUbgl1wwEyy1Ywi eU8Lty3AyCYoxYlK7Eyd0wvLnX/QJqbOFa2PJYgJpClpffsC5dftTEMlDhHHpTmVzeUb 6wL9gkr6IL5zVS6kzOn/wpaWxgt82ghjaqUmLCuSA1/VehxEDIsshWUh1RjbVNr/TyFD agDpT8SLzelU3iqnSSi1PREpAlfxEULNZa5X2KNKOP2yd6QTXuktx9K1ZcttB4hddbxj sdLA== X-Received: by 10.68.251.136 with SMTP id zk8mr35405975pbc.82.1356060150228; Thu, 20 Dec 2012 19:22:30 -0800 (PST) Received: from ulysses ([155.69.18.203]) by mx.google.com with ESMTPS id gq10sm6117421pbc.54.2012.12.20.19.22.26 (version=SSLv3 cipher=OTHER); Thu, 20 Dec 2012 19:22:28 -0800 (PST) From: Chong Yidong To: Jambunathan K Subject: Re: bug#13069: 24.3.50; vc-dir: Unify git stashing and bzr shelving References: <8738zn2n8b.fsf@gmail.com> Date: Fri, 21 Dec 2012 11:22:23 +0800 In-Reply-To: <8738zn2n8b.fsf@gmail.com> (Jambunathan K.'s message of "Mon, 03 Dec 2012 20:31:56 +0530") Message-ID: <878v8sozrk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 13069 Cc: 13069@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.2 (-) Jambunathan K writes: > "Works-for-me" changes in my .emacs to uniformly shelf/unshelve changes > in git and bzr backends. > > The patch uses `vc-call-backend' for each of the above operations. > There is also a `vc-stash-name' function to get the latest stash name. > > The changes for "works-for-me". It would be good to have > "works-for-all" equivalent of this functionality in vanilla Emacs. To reduce ambiguity, could you please submit this as a proper patch against vc-dir.el? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 20 23:22:18 2012 Received: (at 13069) by debbugs.gnu.org; 21 Dec 2012 04:22:18 +0000 Received: from localhost ([127.0.0.1]:53295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tlu7m-0005xW-AQ for submit@debbugs.gnu.org; Thu, 20 Dec 2012 23:22:18 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.182]:8067) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tlu7k-0005xP-KF for 13069@debbugs.gnu.org; Thu, 20 Dec 2012 23:22:17 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ai0FAG6Zu09FxLDj/2dsb2JhbABEsEiDSYEIghYBBVYjEAs0EhQYDSSIIboJkEQDiEKacYFYgwc X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="210479643" Received: from 69-196-176-227.dsl.teksavvy.com (HELO pastel.home) ([69.196.176.227]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 20 Dec 2012 23:22:03 -0500 Received: by pastel.home (Postfix, from userid 20848) id 99D6058EA5; Thu, 20 Dec 2012 23:22:03 -0500 (EST) From: Stefan Monnier To: Jambunathan K Subject: Re: bug#13069: 24.3.50; vc-dir: Unify git stashing and bzr shelving Message-ID: References: <8738zn2n8b.fsf@gmail.com> Date: Thu, 20 Dec 2012 23:22:03 -0500 In-Reply-To: <8738zn2n8b.fsf@gmail.com> (Jambunathan K.'s message of "Mon, 03 Dec 2012 20:31:56 +0530") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 13069 Cc: 13069@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -0.0 (/) > (defun vc-stash (name) > "Stash current working tree." > (interactive "sName: ") > (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef > (backend (car vc-fileset)) > (files (cadr vc-fileset))) > (vc-call-backend backend 'stash name))) I think we should pass `files' as well. > "Take a snapshot of working tree." Not sure what this means, really. Especially since the doc of "bzr shelve --all" is not clear either about what it does (IOW in what way is it different from "bzr shelve"). > (defun vc-stash-pop () > "Pop newest stash." > (interactive) > (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef > (backend (car vc-fileset)) > (files (cadr vc-fileset)) > (name (vc-stash-name))) > (when name > (vc-call-backend backend 'stash-pop name)))) I don't think we should impose a stack discipline. I.e. vc-stash-name should be replaced by vc-stash-list and then vc-stash-pop should ask the user to choose among one of the stashes. Also the stash-pop method should take an extra arg to control whether or not the stash should be thrown away after application. And maybe we shouldn't have a stash-pop at all and instead of stash-apply and stash-remove, since we'll need stash-remove anyway in order to allow deleting a stash without applying it. Stefan From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 14 23:04:51 2013 Received: (at 13069-done) by debbugs.gnu.org; 15 Nov 2013 04:04:51 +0000 Received: from localhost ([127.0.0.1]:53042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VhAeJ-0008MN-30 for submit@debbugs.gnu.org; Thu, 14 Nov 2013 23:04:51 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:53375) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VhAeH-0008M7-Ta for 13069-done@debbugs.gnu.org; Thu, 14 Nov 2013 23:04:50 -0500 Received: by mail-pa0-f53.google.com with SMTP id kq14so3042294pab.40 for <13069-done@debbugs.gnu.org>; Thu, 14 Nov 2013 20:04:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type; bh=79tE9GFw982wA0VIOKe73HcTkDMZt0x99ZN6pZtaU+w=; b=tiCxQxL1Q2x6XSAGGzYNr22SI0W0IYUDUYvpRh/zuYR3EY3ZJYoKRn1RASydxPT3QL +5MgBqd/B37wfEB9sEmgdHdAK5Q+UM8dhKhcMKdedlk1jZw72XIsHvLlGevPTh+skXPg jNbdY6OBeAqPw8ZtmWfkeswXZ0tG/0Hj2wEoh0cOOvhOPXNybrYYs1gE/UV43o6kceLd bpM9pVkrkObOSBLn4LTOFiq7VvGAHHZhO7a+lyHsThFIFQegI5S7jDmTiCVAIOtZTCpE l4EJcPJA6EjyTlOU6rIES/1zQPrxMgd+E6sBK3/d+B4EOeTUYvEIybShe4C3jtocKulr +/SA== X-Received: by 10.66.122.100 with SMTP id lr4mr4866908pab.164.1384488284315; Thu, 14 Nov 2013 20:04:44 -0800 (PST) Received: from debian-6.05 ([101.63.165.167]) by mx.google.com with ESMTPSA id vk17sm1455697pab.5.2013.11.14.20.04.39 for <13069-done@debbugs.gnu.org> (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 14 Nov 2013 20:04:43 -0800 (PST) From: Jambunathan K To: 13069-done@debbugs.gnu.org Subject: Re: bug#13069: 24.3.50; vc-dir: Unify git stashing and bzr shelving References: <8738zn2n8b.fsf@gmail.com> Date: Tue, 01 Jan 2002 06:07:41 +0530 In-Reply-To: <8738zn2n8b.fsf@gmail.com> (Jambunathan K.'s message of "Mon, 03 Dec 2012 20:31:56 +0530") Message-ID: <87ofkex5wq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.4 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: As OP, closing it. [...] Content analysis details: (1.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.53 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kjambunathan[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid X-Debbugs-Envelope-To: 13069-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.4 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: As OP, closing it. [...] Content analysis details: (1.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.53 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kjambunathan[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid As OP, closing it. From unknown Sun Aug 17 10:17:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 13 Dec 2013 12:24:25 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator