From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Re: A request: Moving away from ChangeLog Date: Fri, 21 May 2010 16:32:19 +0200 Message-ID: <674A39F8-2D3A-4EDB-9296-872559E39756@gmail.com> References: <2151275B-C80E-4B40-9022-8C9054020163@gmail.com> <469766F9-7C25-4792-A203-B241C22E2ED5@gmail.com> <94D31A4E-B262-4E06-AE2A-9C3D43145CAC@gmail.com> <7D47FD95-8C8D-4540-864A-D2C76B998A52@gmail.com> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=48828 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFTH4-0008O1-Us for emacs-orgmode@gnu.org; Fri, 21 May 2010 10:32:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFTH0-0002nj-1k for emacs-orgmode@gnu.org; Fri, 21 May 2010 10:32:30 -0400 Received: from mail-ew0-f216.google.com ([209.85.219.216]:57378) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFTGx-0002nF-Ix for emacs-orgmode@gnu.org; Fri, 21 May 2010 10:32:25 -0400 Received: by ewy8 with SMTP id 8so238190ewy.8 for ; Fri, 21 May 2010 07:32:22 -0700 (PDT) In-Reply-To: <7D47FD95-8C8D-4540-864A-D2C76B998A52@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: John Wiegley Cc: emacs-orgmode Mode On May 21, 2010, at 2:50 PM, John Wiegley wrote: > On May 21, 2010, at 8:15 AM, Carsten Dominik wrote: > >> Can I have a look at one of those ChangeLog files created with the >> script? Just to get the idea? Do we need to do something special >> in the git commit message? > > Below is output from running "git changelog HEAD~15.. -- lisp". It > can identify the files that changed automatically, but not > functions; such information has to be present in the commit > description. > > I propose the following standard for commit entries, around which I > can adapt the script for future entries. This standard is based on > the one found in the git-commit man page: > > Line 1 is a <50 character short description > > Line 3 starts a 72-column full commit entry, formatted just like a > ChangeLog entry, but without leading whitespace or '*'. If a changed > file is mentioned, the mention isn't repeated by git-changelog; but > if it's not mentioned, it gets added automatically to the generated > ChangeLog. > > Further, I will change the tool to pay attention to relative > directory > names so that when we generate log entries for "lisp", no "lisp/" > prefixes are given to any auto-added filenames. Well, now I am getting really annoyed - with myself. This is such an obvious, beautiful solution. Why I did not think of this several year ago is beyond me. Lets do it like this. Tassilo (separate message) does have a point though, that it would be good to b able to use the ChangeLog tools to create the ChangeLog-like entry. On the other hand, the information about the committer is something that would be really duplicate. We need to think about a good solution here. One possibility would be the following: We use .gitignore to exclude ChangeLog from git processing. His would mean that this file becomes some kind of scratch file. You could use it to create the ChangeLog entries in the normal way, using the existing Emacs functionality. Then, when you are ready to commit, you cut and paste into the commit message buffer. We could even make a command for this, and apply any wanted formatting like what John was proposing (removing the committer line and indentation)... I think that this is not a bad idea, because normally you will not have the commit message buffer open while working on your patch - so collecting ChangeLog info in a scratch file sounds like a useful idea to me. Other ideas? - Carsten > > John > > 2010-05-21 John Wiegley > > * lisp/ChangeLog, lisp/org.el: Revert "org.el > (org-remove-inline-images): Call `clear-image-cache'." > > This reverts commit 0c42220ca025269e39f20191bc3e10d6b55d02ac. > > 2010-05-21 Carsten Dominik > > * lisp/ChangeLog, lisp/org.el: Document the match groups > of org-emph-re > > 2010-05-20 Bernt Hansen > > * lisp/ChangeLog, lisp/org-clock.el: Set `org-clock-clocking-in' > to t before `org-clock-out' > > 2010-05-20 Russell Adams > > * lisp/ChangeLog, lisp/org.el: org.el (org-remove-inline-images): > Call `clear-image-cache'. > > 2010-05-20 Bastien Guerry > > * lisp/org-timer.el: Use the type "number" for the new > variable org-timer-default-timer > > 2010-05-20 Bastien Guerry > > * lisp/ChangeLog, lisp/org-timer.el: Define and use a new > variable: org-timer-default-timer > > This variable defaults to nil. When non-nil, this is the default > value when the user is prompted for a timer. > > This patch also improves org-timer-set-timer so that the user can > replace the current timer by a new one. > > 2010-05-06 Thomas Morgan > > * lisp/org-agenda.el: Persistent filters in Org mode > > Hello, Org mode hackers, > > This patch defines a variable `org-agenda-persistent-filters'. > When it is set, filters persist from one agenda view to the next. > > I've found this convenient when using tags for contexts like @home, > @net, etc., some of which commonly remain applicable for a while. > > Thanks, > Thomas > > From 052ef9205845c78cb24d6fea8f89484bbe12a528 Mon Sep 17 00:00:00 > 2001 > From: Thomas Morgan > Date: Fri, 23 Apr 2010 11:48:03 +0200 > Subject: [PATCH] New option `org-agenda-persistent-filters'. > When set, keep filters from one agenda view to the next. > > 2010-05-20 Carsten Dominik > > * lisp/ChangeLog, lisp/org.el: Hide subtree before exposing > the headings with `C-c C-k' > > Proposed by Ali Tofigh. > > Now `C-c C-k' always creates the same view, independent of what the > subtree visibility was before. > > 2010-05-19 David Maus > > * lisp/ChangeLog, lisp/org.el: Remove empty property drawers > in cloned subtrees. > > 2010-05-19 David Maus > > * lisp/ChangeLog, lisp/org.el: Provide customization variable > `org-clone-delete-id'. > > When non-nil, clones of a subtree don't inherit the ID property. > Otherwise they do and it will be set to a new unique identifier. > > 2010-05-19 David Maus > > * lisp/ChangeLog, lisp/org.el: Maybe create ID property in > cloned subtrees. > > 2010-05-19 Carsten Dominik > > * lisp/org.el: Add Anthony Lander's org-mac-link-grabber.el > > 2010-05-19 Carsten Dominik > > * lisp/ChangeLog, lisp/org.el: Fix empty-line problem after > repeating entry > > Tom writes: > > > if I have a heading like this: > > > > > > ** TODO test task > > stuff > > SCHEDULED: <2010-05-15 Sat 07:35 +1d> > > > > > > Then an empty line is inserted below the heading (before "stuff") > if > > org-indent-mode is on and logging is set like this: > > > > > > (setq org-log-repeat nil) > > (setq org-log-done 'time) > > > > > > > > I tested it with a clean config using only the settings above. > > 2010-05-19 Carsten Dominik > > * lisp/ChangeLog, lisp/org.el: Merge branch 'master' of > git+ssh://repo.or.cz/srv/git/org-mode > > Conflicts: > lisp/ChangeLog > > 2010-05-19 Bastien Guerry > > * lisp/ChangeLog, lisp/org.el: Fix `org-refile-cache-get' > error. > > This patch fixes the problem first reported by Tassilo Horn in > [mid:87y6fhxc47.fsf@thinkpad.tsdh.de]. Problem was that > `org-refile-cache-get' returned an invalid refile target table after > the refile cache was cleared. > > - Carsten