Bug#871945: mercurial: suboptimal diff compared to previous versions

[Vincent Lefevre]

On 2019-08-14 14:37:45 +0200, Julien Cristau wrote:
> On Sun, Aug 13, 2017 at 12:01:49AM +0200, Vincent Lefevre wrote:
> > Control: forwarded -1 https://bz.mercurial-scm.org/show_bug.cgi?id=5656
> > 
> > I've reported this bug upstream.
> > 
> Thanks for doing that.  As the upstream issue was resolved as wontfix,
> I'm doing the same here.

OK, the Mutt repository has migrated to git anyway.

If someone else is affected by this issue, I think that a workaround
is to use the extdiff extension, as the GNU diff output was fine on
the example I had provided.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Bug#871945: mercurial: suboptimal diff compared to previous versions

[Vincent Lefevre]

Control: forwarded -1 https://bz.mercurial-scm.org/show_bug.cgi?id=5656

I've reported this bug upstream.

-- 
Vincent Lefèvre  - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

Bug#871945: mercurial: suboptimal diff compared to previous versions

[Vincent Lefevre]

Package: mercurial
Version: 4.3.1-2
Severity: minor

I've noticed that the diff has changed compared to previous versions,
and it can be suboptimal. For instance, on the Mutt repository
https://dev.mutt.org/hg/mutt/ with

  hg diff -r 3244 -r 3245

I previously got:

[...]
-#: curs_main.c:1295 pattern.c:1312
+#: curs_main.c:1299 pattern.c:1312
 msgid "Search wrapped to bottom."
 msgstr "La recherche est repartie de la fin."
 
-#: curs_main.c:1339
+#: curs_main.c:1340
 msgid "No new messages"
 msgstr "Pas de nouveaux messages"
 
-#: curs_main.c:1339
+#: curs_main.c:1340
 msgid "No unread messages"
 msgstr "Pas de messages non lus"
 
-#: curs_main.c:1340
+#: curs_main.c:1341
 msgid " in this limited view"
 msgstr " dans cette vue limitée"
 
-#: curs_main.c:1361 pager.c:2332
+#: curs_main.c:1362 pager.c:2332
[...]

I now get:

[...]
-#: curs_main.c:1295 pattern.c:1312
+#: curs_main.c:1299 pattern.c:1312
 msgid "Search wrapped to bottom."
 msgstr "La recherche est repartie de la fin."
 
-#: curs_main.c:1339
+#: curs_main.c:1340
 msgid "No new messages"
 msgstr "Pas de nouveaux messages"
 
-#: curs_main.c:1339
-msgid "No unread messages"
-msgstr "Pas de messages non lus"
-
 #: curs_main.c:1340
+msgid "No unread messages"
+msgstr "Pas de messages non lus"
+
+#: curs_main.c:1341
 msgid " in this limited view"
 msgstr " dans cette vue limitée"
 
-#: curs_main.c:1361 pager.c:2332
+#: curs_main.c:1362 pager.c:2332
[...]

-- System Information:
Debian Release: buster/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), 
(500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.11.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=POSIX, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=POSIX 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages mercurial depends on:
ii  libc6 2.24-14
ii  mercurial-common  4.3.1-2
ii  python2.7.13-2
ii  ucf   3.0036

Versions of packages mercurial recommends:
ii  openssh-client  1:7.5p1-5

Versions of packages mercurial suggests:
pn  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff  
pn  qct   

-- no debconf information