[MERGE][BUG] 51980: bzr log <file>returns inappropriate revisions

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Kent Gibson wrote:
> In my mind at least, ``bzr log <file>`` should only show the revisions
> that change the file, and exclude merge commits.  Is it the general
> consensus that it should include merge commits?  I'm just talking the
> long form here - I agree with you on the short forms.

Personally, I'd like to see the merge commits in the long form, but
others may have different ideas.

> I'm also curious as to how ``bzr log <directory>`` is expected to behave.
> Currently it only shows changes to the directory itself, not the files
> contained in the directory tree.

That's expected.  I think we want to support showing changes to
directory children in the future, but we may wait for a new inventory
format that would actually mark directories as changed every time one
their files or directories changed.  (Directory changes would bubble up
to the root.)

>>> I *think* the best way to make it fast is to use
>>> fileids_altered_by_revision_ids.

> I tried something like that originally.
> It was better than the deltas approach, but no where near as fast
> Robey's approach - fileids_altered_by_revision_ids is sufficiently
> slow that it has a progress bar.

There may be a way of combining approaches, so that we get almost the
same speed as this approach, but with greater accuracy.  But if you ever
wondered why we hadn't fixed this bug before, this is why.  Doing it
right is a bit messy.

> And the output was the same, at least for the examples I checked at
> the time.
> No merge commits in either.
> 
> Worryingly, I just compared the output of the two approaches on NEWS
> and the fileids_altered_by_revision_ids approach returned a few
> revisions LESS.

Individual file knits are required to have revisions for all the
revisions referred to in the inventory knit, but they are permitted to
have more.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF/BWg0F+nu1YWqI0RAtC5AJkBGbnrypt46Nc1CzhJzqx1RTf65gCfZ2dQ
j2/GWeJEfTaBqgzqUdFr5Ts=
=qkiO
-----END PGP SIGNATURE-----