[PATCH 2 of 5] merge: show list of bids for each file in bid-merge in ui.note()

[Pulkit Goyal]

On Sat, Sep 12, 2020 at 8:31 AM Yuya Nishihara <yuya at tcha.org> wrote:
>
> On Fri, 11 Sep 2020 12:35:30 +0530, Pulkit Goyal wrote:
> > # HG changeset patch
> > # User Pulkit Goyal <7895pulkit at gmail.com>
> > # Date 1598442653 -19800
> > #      Wed Aug 26 17:20:53 2020 +0530
> > # Node ID 76753724e6b5453d9540c73b1a1a6f11de818e46
> > # Parent  c196dc7f6cf18e32a8646ae7cd0b08014f8ffbdf
> > # EXP-Topic merge-newnode
> > merge: show list of bids for each file in bid-merge in ui.note()
> >
> > Earlier, we were showing the list of bids only when we were ambiguously picking.
> > However, the cases where we unambiguously picked a side may not always be
> > correct and need to be fixed.
> >
> > Having list of bids for all files will be helpful in debugging.
>
> Will experienced users can/have to understand the output? If it's just for
> debugging, I prefer not seeing it unless necessary.

It's for debugging purposes only. Right now, a lot of times the merge
code does not add an action for an ancestor. This leads to bid merge
doing the wrong thing.
This and showing number of ancestors in this debug output is meant to
track down such cases where `manifestmerge()` is missing adding action
for a file for some ancestors.
>
> >    auction for merging merge bids
> > -   f1: picking 'get' action
> > -   f2: picking 'keep' action
> > +   f1:
> > +     list of bids:
> > +       remote is newer -> g
> > +       versions differ -> m
> > +     picking 'get' action
>
> Nit: if it's not a debug output, maybe it can be more readable by saying
> the action first.
>
>   f1: picking 'get' action
>     list of bids:
>       ...