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: Mon, 03 Nov 2014 23:22:05 +0100 Message-ID: <878ujr9b76.fsf@gnu.org> References: <87bnopu9te.fsf@gmail.com> <871tplmqjo.fsf@gnu.org> <8761exteu3.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]:46001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlQ0V-0006aU-Qj for guix-devel@gnu.org; Mon, 03 Nov 2014 17:21:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlQ0P-00041U-K1 for guix-devel@gnu.org; Mon, 03 Nov 2014 17:21:51 -0500 Received: from hera.aquilenet.fr ([2a01:474::1]:45874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlQ0P-0003yj-9I for guix-devel@gnu.org; Mon, 03 Nov 2014 17:21:45 -0500 In-Reply-To: <8761exteu3.fsf@gmail.com> (Alex Kost's message of "Mon, 03 Nov 2014 01:31:00 +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: > Ludovic Court=C3=A8s (2014-11-02 20:59 +0300) wrote: > >> 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 dif= f/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 co= nfusing: the >> buffers being compared don=E2=80=99t include the directory name of the p= ackages, >> 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? > > Indeed, I added the store paths, thanks (the modified patch is attached). Nice! >> 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? I can=E2=80=99t seem to reproduce that problem. I must have messed things = up before, sorry for the noise. >> Also, s/The Emacs Editor/GNU Emacs Manual/, which is the real title of >> the Emacs manual as it appears in the texi source. > > Oh, I thought it should be the title which appears in the info (I mean > the first line in the Top node). > > Perhaps "s/The Emacs Editor/The GNU Emacs Manual/"? As it's the most > common (but not the one) variant in the Emacs Lisp manual, for example he= re: > OK (I think they should add =E2=80=9CThe=E2=80=9D in emacs.texi.) > Also I used "The Emacs Editor" several times in =E2=80=9Cemacs.texi=E2=80= =9D. Should I > replace all instances in this patch or make a separate commit for that? Yes, please. > Just out of curiosity. Do you usually prefer "diff" over "ediff"? > (I find the latter much convenient) The default behavior for ediff is to create another frame for control, and that doesn=E2=80=99t work well with the tiling window manager I=E2=80= =99m using. Also, it=E2=80=99s really a mode that you enter and have to leave afterward= s. So I tend to prefer diff for simple diffs, and I resort to ediff in more tricky situations (like when I have to compare two .drv files for debugging, uh! ;-)). Thanks, Ludo=E2=80=99.