From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH 2/2] emacs: Add interface for comparing generations. Date: Sun, 02 Nov 2014 18:59:55 +0100 Message-ID: <871tplmqjo.fsf@gnu.org> References: <87bnopu9te.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkzRI-00014j-N9 for guix-devel@gnu.org; Sun, 02 Nov 2014 12:59:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkzR9-0002Pa-Lu for guix-devel@gnu.org; Sun, 02 Nov 2014 12:59:44 -0500 Received: from hera.aquilenet.fr ([2a01:474::1]:44067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkzR9-0002PP-Ef for guix-devel@gnu.org; Sun, 02 Nov 2014 12:59:35 -0500 In-Reply-To: <87bnopu9te.fsf@gmail.com> (Alex Kost's message of "Sun, 02 Nov 2014 14:21:49 +0300") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Alex Kost Cc: guix-devel@gnu.org Alex Kost skribis: > In short, now (with this patch) after marking 2 generations (by pressing > "m" in a =E2=80=9Cgeneration-list=E2=80=9D buffer), you can perform diff/= ediff on > generation packages or manifests. Thanks to Ludovic for the idea. I just tried it, and I like it! There are cases where the output of =E2=80=98=3D=E2=80=99 is slightly confu= sing: the buffers being compared don=E2=80=99t include the directory name of the pack= ages, so, when packages have been upgraded (different directory names, but same version), it just says =E2=80=9Cno differences.=E2=80=9D Perhaps the fix would be to add the directory names in the buffers being diffed, in a format similar to that of =E2=80=98guix package -I=E2=80=99? I have another case where C-u =3D shows that the only difference is the addition of one package, but =3D shows a diff with only minuses, as if everything had been removed. Any idea what could be wrong? > +++ b/doc/emacs.texi > @@ -239,6 +239,21 @@ Mark the current generation for deletion (with prefi= x, mark all > generations). > @item x > Execute actions on the marked generations---i.e., delete generations. > +@item e > +Run Ediff (@pxref{Top,,, ediff, Ediff}) on package outputs installed in > +the 2 marked generations. With prefix argument, run Ediff on manifests > +of the marked generations. > +@item D > +@itemx =3D > +Run Diff (@pxref{Diff Mode,,, emacs, The Emacs Editor}) on package > +outputs installed in the 2 marked generations. With prefix argument, > +run Diff on manifests of the marked generations. > +@item + > +List package outputs added to the latest marked generation comparing > +with another marked generation. > +@item - > +List package outputs removed from the latest marked generation comparing > +with another marked generation. Likewise, =E2=80=98u=E2=80=99 (for =E2=80=98upgraded=E2=80=99) could be add= ed (possibly in a future patch.) Also, s/The Emacs Editor/GNU Emacs Manual/, which is the real title of the Emacs manual as it appears in the texi source. Thanks, Ludo=E2=80=99.