history of renamed files is lost (mercurial) (Bugzilla #9468)

[vladak]

status CLOSED severity major in component analyzer for 0.8
Reported in version unspecified on platform ANY/Generic
Assigned to: Lubos Kosco

On 2009-06-15 09:35:55 +0000, vita wrote:

By default, if a file was renamed, "hg log -v" stops at point, when the file was renamed. Changesets before renaming are not shown. As result OpenGrok incorrectly displays history of renamed files.

To show changesets prior renaming, -f option has to be explicitly used:

hg log [OPTION]... [FILE]

aliases: history

show revision history of entire repository or files

Print the revision history of the specified files or the entire
project.

File history is shown without following rename or copy history of
files.  Use -f/--follow with a file name to follow history across
renames and copies. --follow without a file name will only show
ancestors or descendants of the starting revision. --follow-first
only follows the first parent of merge revisions.

Suggested fix:

diff -r 85c934b53b1e src/org/opensolaris/opengrok/history/MercurialRepository.java
--- a/src/org/opensolaris/opengrok/history/MercurialRepository.java Tue Nov 11 15:32:05 2008 +0100
+++ b/src/org/opensolaris/opengrok/history/MercurialRepository.java Mon Jun 15 18:12:50 2009 +0200
@@ -84,6 +84,7 @@
List cmd = new ArrayList();
cmd.add(getCommand());
cmd.add("log");

•    cmd.add("-f");
   cmd.add("--template");
   cmd.add(file.isDirectory() ? DIR_TEMPLATE : TEMPLATE);
   cmd.add(filename);
  

Looks to me like adding -f has performance impact on files which were not renamed. But of course it has performance impact on renamed files as it needs to display all past changesets.

Example (without -f, the output shows only one changeset which renamed the file):

--- 8< ---
$ hg log usr/src/uts/intel/io/dnet/dnet.c
changeset: 9860:20e31304c39b
user: Garrett D'Amore gdamore@opensolaris.org
date: Fri Jun 12 14:33:37 2009 -0700
description:
PSARC 2009/319 MII & GMII Common Layer
6730277 Generic 802.3 MII/GMII Support for GLDv3
6845677 dmfe driver not suspend/resume safe
6845682 dmfe driver should support Brussels
6845684 dmfe driver should use new style netlb ioctls
6547496 RFE: convert DMFE_DEBUGs to dtrace SDTs
6848129 afe should support flow control and netlbtest
6848136 don't deliver dnet header
--- 8< ---

Example (with -f):
--- 8< ---
hg log -f usr/src/uts/intel/io/dnet/dnet.c
changeset: 9860:20e31304c39b
user: Garrett D'Amore gdamore@opensolaris.org
date: Fri Jun 12 14:33:37 2009 -0700
description:
PSARC 2009/319 MII & GMII Common Layer
6730277 Generic 802.3 MII/GMII Support for GLDv3
6845677 dmfe driver not suspend/resume safe
6845682 dmfe driver should support Brussels
6845684 dmfe driver should use new style netlb ioctls
6547496 RFE: convert DMFE_DEBUGs to dtrace SDTs
6848129 afe should support flow control and netlbtest
6848136 don't deliver dnet header

changeset: 9316:241870bff81e
user: vitezslav batrla - Sun Microsystems - Prague Czech Republic <Vitezs
lav.Batrla@Sun.COM>
date: Thu Apr 09 09:27:33 2009 +0200
description:
6768204 dnet interface takes a long time to resume after plumb/unplumb in Hyper-V virtual machine

changeset: 7656:2621e50fdf4a
user: Sherry Moore Sherry.Moore@Sun.COM
date: Mon Sep 22 16:30:26 2008 -0700
description:
PSARC 2008/382 Fast Reboot
6714038 Fast Reboot support for x86 platforms

changeset: 5835:0c32aa58ebac
user: gd78059
date: Mon Jan 14 15:35:51 2008 -0800
description:
Contributed by Masa Murayama.
6574580 dnet doesn't work for 21143 based nic card in 100Mbps

changeset: 5607:ece69f7cb91a
user: gd78059
date: Wed Dec 05 19:58:32 2007 -0800
description:
6540812 amd64 dnet driver missing
6622301 dnet should support suspend/resume
6632441 dnet driver does not report link state for MII link

changeset: 5445:7cb529554cc9
user: vb160487
date: Fri Nov 09 13:00:18 2007 -0800
description:
6592519 dnet driver stops responding when running under Virtual Server

[... and more changesets are displayed ]
--- 8< ---

On 2009-08-28 09:39:27 +0000, Lubos Kosco wrote:

fixed in
changeset 821 9270f0f0cfcc

On 2009-09-02 09:17:35 +0000, Lubos Kosco wrote:

with changeset 822 12919bf735cc I limited this bug only to files, not directories (because of hg behaviour when doing log and -f from other directory and our broken junit tests because of that ;) )