* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
@ 2012-11-20 18:06 Alfred M. Szmidt
2012-11-20 18:30 ` Glenn Morris
0 siblings, 1 reply; 9+ messages in thread
From: Alfred M. Szmidt @ 2012-11-20 18:06 UTC (permalink / raw)
To: 12946
It would be useful if log-edit-insert-changelog would add a
`description line' from ChangeLog, that is the first line right before
date/author. For example doing the following:
1) Opened a random file under VC.
2) Do M-x add-change-log-entry-other-window, and add something like
2012-11-16 Alfred M. Szmidt <ams@gnu.org>
This is a deccription line.
* random-file: New file.
3) Save ChangeLog
4) Save random file.
5) M-x vc-dir
6) Mark random file and ChangeLog.
7) M-x vc-next-action
8) In *vc-log*, M-x log-edit-insert-changelog.
Will result in either noting showing up in *vc-log*, or you get,
* random-file: New file.
What would be useful is that you got the description line inserted
instead, with nothing following it. This is common practise when
working with various distributed version control systems where the
commit entry only contains a brief description of the change, and the
ChangeLog contains the detailed information.
In GNU Emacs 23.2.1 (x86_64-pc-linux-gnu, GTK+ Version 2.20.1)
of 2010-12-11 on brahms, modified by Debian
Windowing system distributor `The X.Org Foundation', version 11.0.10707000
configured using `configure '--build' 'x86_64-linux-gnu' '--build' 'x86_64-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs23:/etc/emacs:/usr/local/share/emacs/23.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.2/site-lisp:/usr/share/emacs/site-lisp:/usr/share/emacs/23.2/leim' '--with-x=yes' '--with-x-toolkit=gtk' '--with-toolkit-scroll-bars' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-DDEBIAN -g -O2' 'LDFLAGS=-g' 'CPPFLAGS=''
Important settings:
value of $LC_ALL: nil
value of $LC_COLLATE: nil
value of $LC_CTYPE: nil
value of $LC_MESSAGES: nil
value of $LC_MONETARY: nil
value of $LC_NUMERIC: nil
value of $LC_TIME: nil
value of $LANG: C
value of $XMODIFIERS: nil
locale-coding-system: nil
default enable-multibyte-characters: t
Major mode: Fundamental
Minor modes in effect:
shell-dirtrack-mode: t
tooltip-mode: t
mouse-wheel-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
blink-cursor-mode: t
auto-encryption-mode: t
auto-compression-mode: t
line-number-mode: t
transient-mark-mode: t
abbrev-mode: t
Recent input:
e a d , C-k C-k C-k SPC t h i s SPC i s <M-backspace>
<M-backspace> w i t h SPC n o t h i n g SPC f o l l
o w i n g SPC i t . M-q SPC SPC T h i s SPC i s SPC
c o m m o n SPC p r a c t i s e SPC w h e n SPC w o
r k i n g SPC w i t h SPC v a r i o u s SPC d i s t
s <backspace> <M-backspace> d i s t r i b u t e d SPC
v e r s i o n SPC c o n t r o l SPC s y s t e m s .
<backspace> SPC w h e r e SPC t h e SPC c o m m i t
SPC e n t r y SPC o n l y SPC c o n t a i n s SPC a
SPC b r i e f SPC d e s c r i p t i o n SPC o f SPC
t h e SPC c h a n g e , SPC a n d SPC t h e SPC C h
a n g e L o g SPC c o n t a i n s SPC t h e SPC d e
t a i l e d SPC i n f o r m a t i o n . <escape> q
C-x h M-w C-x b C-g C-x C-g M-x r e p o t <tab> <backspace>
<backspace> <backspace> <backspace> <backspace> C-g
C-g M-x r e p o r t - b <tab> <return>
Recent messages:
Mark set [3 times]
Auto-saving...done
Mark set
Ispell process killed
Computing summary lines...done
(No new mail has arrived)
Computing summary lines...done
0 new messages read
Mark set [5 times]
Quit [2 times]
Quit
Load-path shadows:
~/paredit hides /usr/share/emacs23/site-lisp/paredit-el/paredit
/usr/share/emacs/23.2/site-lisp/debian-startup hides /usr/share/emacs/site-lisp/debian-startup
~/loaddefs hides /usr/share/emacs/23.2/lisp/loaddefs
/usr/share/emacs23/site-lisp/dictionaries-common/ispell hides /usr/share/emacs/23.2/lisp/textmodes/ispell
/usr/share/emacs23/site-lisp/dictionaries-common/flyspell hides /usr/share/emacs/23.2/lisp/textmodes/flyspell
/usr/share/emacs23/site-lisp/emms/tq hides /usr/share/emacs/23.2/lisp/emacs-lisp/tq
Features:
(shadow emacsbug rfc822 vc-rcs mailalias net-utils mail-queue sendmail
battery mule-util cal-move dabbrev animate slime-banner slime-asdf
slime-fancy slime-fontifying-fu slime-package-fu slime-references
slime-scratch slime-presentations slime-fuzzy slime-fancy-inspector
slime-c-p-c slime-editing-commands slime-autodoc slime-parse
slime-repl slime apropos hideshow hyperspec thingatpt browse-url cl
cl-19 ispell pp grep compile pcmpl-unix help-mode multi-isearch org-wl
org-w3m org-vm org-rmail org-mhe org-mew org-irc org-jsinfo org-infojs
org-html org-exp org-exp-blocks org-agenda org-info org-gnus
org-bibtex org-bbdb org byte-opt bytecomp byte-compile org-footnote
org-src org-list org-faces org-compat org-macs noutline outline
easy-mmode sgml-mode dired-x dired-aux dired rmailout rmailsum rmail
mail-utils ansi-color em-unix pcomplete em-term term disp-table ehelp
electric em-script em-prompt em-ls em-hist em-pred em-glob em-dirs
em-cmpl em-basic esh-opt em-banner em-alias esh-var esh-io esh-cmd
esh-ext esh-proc esh-arg eldoc esh-groups eshell esh-module esh-mode
esh-util conf-mode newcomment tramp-imap assoc tramp-gw tramp-fish
tramp-smb tramp-cache tramp-ftp tramp-cmds tramp auth-source gnus-util
netrc advice advice-preload shell comint ring password-cache
format-spec tramp-compat trampver view cal-china lunar solar cal-dst
cal-bahai cal-islam cal-hebrew holidays hol-loaddefs appt diary-lib
diary-loaddefs cal-menu easymenu calendar cal-loaddefs time-date
regexp-opt autoload help-fns slime-autoloads emms-auto tooltip
ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd font-setting
tool-bar dnd fontset image fringe lisp-mode register page menu-bar
rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock
syntax facemenu font-core frame cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button
minibuffer faces cus-face files text-properties overlay md5 base64
format env code-pages mule custom widget hashtable-print-readable
backquote make-network-process dbusbind system-font-setting
font-render-setting gtk x-toolkit x multi-tty emacs)
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 18:06 bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file Alfred M. Szmidt
@ 2012-11-20 18:30 ` Glenn Morris
2012-11-20 18:53 ` Alfred M. Szmidt
2012-11-20 20:19 ` Stefan Monnier
0 siblings, 2 replies; 9+ messages in thread
From: Glenn Morris @ 2012-11-20 18:30 UTC (permalink / raw)
To: ams; +Cc: 12946
Alfred M. Szmidt wrote:
> 2012-11-16 Alfred M. Szmidt <ams@gnu.org>
>
> This is a deccription line.
>
> * random-file: New file.
If you don't use a blank line between the two, you get
This is a description line.
* random-file: New file.
in the log buffer, which seems fine to me. You can easily kill all but
the first line if you don't want it.
http://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html#Style-of-Change-Logs
says not to put blank lines between related entries (essentially, IMO).
(Maybe it should be updated for the practise of adding a leading summary.)
> * random-file: New file.
>
> What would be useful is that you got the description line inserted
> instead, with nothing following it. This is common practise when
> working with various distributed version control systems where the
> commit entry only contains a brief description of the change, and the
> ChangeLog contains the detailed information.
Really? I got the impression the trend was to generate ChangeLogs from
commit logs.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 18:30 ` Glenn Morris
@ 2012-11-20 18:53 ` Alfred M. Szmidt
2012-11-20 18:58 ` Glenn Morris
2012-11-20 20:19 ` Stefan Monnier
1 sibling, 1 reply; 9+ messages in thread
From: Alfred M. Szmidt @ 2012-11-20 18:53 UTC (permalink / raw)
To: Glenn Morris; +Cc: 12946
Alfred M. Szmidt wrote:
> 2012-11-16 Alfred M. Szmidt <ams@gnu.org>
>
> This is a deccription line.
>
> * random-file: New file.
If you don't use a blank line between the two, you get
This is a description line.
* random-file: New file.
in the log buffer, which seems fine to me. You can easily kill all
but the first line if you don't want it.
http://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html#Style-of-Change-Logs
says not to put blank lines between related entries (essentially,
IMO). (Maybe it should be updated for the practise of adding a
leading summary.)
Interesting; this might make me change how I do things. I've always
done one ChangeLog entry per related entry. Though, I think it would
be useful if there was some variable at least, that would only put in
the description line.
> * random-file: New file.
>
> What would be useful is that you got the description line
> inserted instead, with nothing following it. This is common
> practise when working with various distributed version control
> systems where the commit entry only contains a brief description
> of the change, and the ChangeLog contains the detailed
> information.
Really? I got the impression the trend was to generate ChangeLogs
from commit logs.
Well, there are two camps, those who keep ChangeLog entries in commit
message, and those who don't. Those who don't put a short summary in
the commit message. At least from my limited observations. E.g. in
Emacs it tends to be short summaries in the commit message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 18:53 ` Alfred M. Szmidt
@ 2012-11-20 18:58 ` Glenn Morris
2012-11-20 20:27 ` Alfred M. Szmidt
0 siblings, 1 reply; 9+ messages in thread
From: Glenn Morris @ 2012-11-20 18:58 UTC (permalink / raw)
To: ams; +Cc: 12946
Alfred M. Szmidt wrote:
> E.g. in Emacs it tends to be short summaries in the commit message.
?
AFAICS, it is the same as the ChangeLog in almost every case.
This is certainly how it is _supposed_ to be, AFAIK.
A random browse of http://lists.gnu.org/archive/html/emacs-diffs/2012-11/
seems to support this.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 18:30 ` Glenn Morris
2012-11-20 18:53 ` Alfred M. Szmidt
@ 2012-11-20 20:19 ` Stefan Monnier
2012-11-20 20:29 ` Alfred M. Szmidt
2012-11-20 20:46 ` Glenn Morris
1 sibling, 2 replies; 9+ messages in thread
From: Stefan Monnier @ 2012-11-20 20:19 UTC (permalink / raw)
To: Glenn Morris; +Cc: ams, 12946
>> This is a deccription line.
>>
>> * random-file: New file.
> If you don't use a blank line between the two, you get
Ah, indeed that's the difference between his use case and what I do
every day.
It would be good to change log-edit-insert-changelog so that it
inserts "everything between the date headers".
Stefan
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 18:58 ` Glenn Morris
@ 2012-11-20 20:27 ` Alfred M. Szmidt
0 siblings, 0 replies; 9+ messages in thread
From: Alfred M. Szmidt @ 2012-11-20 20:27 UTC (permalink / raw)
To: Glenn Morris; +Cc: 12946
> E.g. in Emacs it tends to be short summaries in the commit message.
?
AFAICS, it is the same as the ChangeLog in almost every case.
This is certainly how it is _supposed_ to be, AFAIK.
A random browse of http://lists.gnu.org/archive/html/emacs-diffs/2012-11/
seems to support this.
I stand corrected, it seems that I never looked close enough and only
noticed the subject line. Thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 20:19 ` Stefan Monnier
@ 2012-11-20 20:29 ` Alfred M. Szmidt
2012-11-20 20:46 ` Glenn Morris
1 sibling, 0 replies; 9+ messages in thread
From: Alfred M. Szmidt @ 2012-11-20 20:29 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 12946
>> This is a deccription line.
>>
>> * random-file: New file.
> If you don't use a blank line between the two, you get
Ah, indeed that's the difference between his use case and what I do
every day.
It would be good to change log-edit-insert-changelog so that it
inserts "everything between the date headers".
That would be nice, I could live with the additional data that is
inserted if it worked like that (using some variable to tweak it).
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 20:19 ` Stefan Monnier
2012-11-20 20:29 ` Alfred M. Szmidt
@ 2012-11-20 20:46 ` Glenn Morris
2012-11-21 13:48 ` Stefan Monnier
1 sibling, 1 reply; 9+ messages in thread
From: Glenn Morris @ 2012-11-20 20:46 UTC (permalink / raw)
To: Stefan Monnier; +Cc: ams, 12946
Stefan Monnier wrote:
> It would be good to change log-edit-insert-changelog so that it
> inserts "everything between the date headers".
Compared to the current approach:
search the ChangeLog entry for paragraphs containing the names of
the files we're checking in
this will add irrelevant stuff in the common case of "make several
unrelated commits to different files in the same day, with ChangeLog
entries separated by blank lines".
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file
2012-11-20 20:46 ` Glenn Morris
@ 2012-11-21 13:48 ` Stefan Monnier
0 siblings, 0 replies; 9+ messages in thread
From: Stefan Monnier @ 2012-11-21 13:48 UTC (permalink / raw)
To: Glenn Morris; +Cc: ams, 12946
>> It would be good to change log-edit-insert-changelog so that it
>> inserts "everything between the date headers".
> Compared to the current approach:
> search the ChangeLog entry for paragraphs containing the names of
> the files we're checking in
> this will add irrelevant stuff in the common case of "make several
> unrelated commits to different files in the same day, with ChangeLog
> entries separated by blank lines".
Yes, sorry for being unclear. I meant to only provide the new behavior
based on some config setting (we could either extend
log-edit-changelog-full-paragraphs with more options, or add a new var).
Stefan
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-11-21 13:48 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-20 18:06 bug#12946: 23.2; log-edit-insert-changelog not inserting a description line from ChangeLog file Alfred M. Szmidt
2012-11-20 18:30 ` Glenn Morris
2012-11-20 18:53 ` Alfred M. Szmidt
2012-11-20 18:58 ` Glenn Morris
2012-11-20 20:27 ` Alfred M. Szmidt
2012-11-20 20:19 ` Stefan Monnier
2012-11-20 20:29 ` Alfred M. Szmidt
2012-11-20 20:46 ` Glenn Morris
2012-11-21 13:48 ` Stefan Monnier
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).