Show history for file incomplete

[Paul Eichhorn]

Hello,

I have been using MercurialEclipse to merge two large-ish diverging branches that also share a lot of bugfixes. During this I frequently need to check the individual file history to do a correct merge. Unfortunately, the history for a file or path only includes "true" history, i.e. past revisions on the branch that I am working in. The revisions altering this file from the merge target are missing. 

Is there an option to see the global history of a file including all branches?

Kind regards

Paul

[Amenel Voglozin]

Hi,

The options regarding file history are in:

• the menu of the History view;
• the preferences (Window > Preferences > Team > Mercurial > History).

File history only displays what Mercurial returns, but Mercurial in turn only does what it is asked to do. You can view the command that MercurialEclipse sends to Mercurial by showing the console (Window > Preferences > Team > Mercurial > Console).

You can confirm the file history entries by entering that command on the command line or in the terminal.

You can see all options to the log command at https://www.selenic.com/mercurial/hg.1.html#log

In order to always have some flags sent to Mercurial, be it by MercurialEclipse or when you type commands on the command line/in the terminal, you can create/edit your .hgrc file and specify those flags in the [defaults] section. As an example, my .hgrc file contains:

[defaults]

log = -f

That's because I want Mercurial to always follow file renames.

Read the options at the URL I gave earlier and experiment with them in order to find out which ones match your need. Then, for as long as you have that need, specify the options in your .hgrc file.

HTH.

--
You received this message because you are subscribed to the Google Groups "MercurialEclipse" group.
To unsubscribe from this group and stop receiving emails from it, send an email to mercurialeclip...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Paul Reuter]

Hello Amenel,

thank you for your reply, I did some digging on your advice.

The mercurial console uses the command "log --debug --limit 50 --follow —style <path-to-style> <path-to-file>"

Dropping the —style, I can verify that this command does indeed drop revisions on other branches. The problem seems to be the —follow option. It does not only track file renames, but also restricts output to ancestors/descendants of the starting revision, which defaults to the current revision.

To track renames while also showing the file history across different branches, one needs to explicitly specify a revision range that can reach other branches ( i.e. —rev ':' ).

This works, but is a HUGE slowdown. In the hg command line, hg log <path-to-file> is near instant, while hg log -f <path-to-file> -r : takes upwards of 10 seconds.

I am now sure how I can use the defaults setting to override the behaviour, since —follow is explicitly part of the command. Could we get a preference option to enable/disable —follow?

Kind regards,
Paul

> You received this message because you are subscribed to a topic in the Google Groups "MercurialEclipse" group.
> To unsubscribe from this topic, visit https://groups.google.com/d/topic/mercurialeclipse/wb0FoDlb3r4/unsubscribe.
> To unsubscribe from this group and all its topics, send an email to mercurialeclip...@googlegroups.com.

[Amenel Voglozin]

Hi,

Could you please create an issue about the possibility to disable the inclusion of --follow? This is the issue tracker: https://bitbucket.org/mercurialeclipse/main/issues

I'll be defining soon which issues will potentially make it into the next release.

Thank you.