Which parts of Evolve can be upstreamed?

Martin von Zweigbergk martinvonz at google.com
Thu Feb 11 22:54:50 UTC 2021


On Mon, Feb 8, 2021 at 11:28 PM Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
> The short answer is:
>
> They are comment in multiple source files about their status and the
> part that can be uptreamed.
>
>
> For a longer answer I need to double check my notes.
> On a general basis :
> - The user facing command is the most "mutable" part that we will likely
> keep experimenting for a while.

Sure, they may always change a bit, but I think obslog and prune have
been quite stable for a while. I know that the obslog output was
changed quite a bit recently, but that change could have been done in
core instead if it had been there.

Maybe I'll start upstreaming the changes to rewriteutil.py that have
been added in since the last attempt. Then I'll see if I can upstream
the prune command.

> - The latest upstreaming effort was around the stack concept that proved
> itself central for providing a consistent UX around `hg evolve` in
> distributed context. I would be happy to see it get to conclusion.
> - The change to heads computation and checking is a good candidate for
> upstreaming is all the logic live in core and they "wrapping" in the
> extension are neither very clean nor performant

I looked into that a bit. It seems it's used for some
experimental.single-head-per-branch that I had never heard of. If
that's correct, it doesn't seem that useful to me at least. If others
care about that option, they can upstream that part. Correct me if I
misunderstood what the "heads computation and checking" is about, of
course.

>
> On 2/8/21 11:59 PM, Martin von Zweigbergk wrote:
> > Hi,
> >
> > We have talked about upstreaming the Evolve extension for years and some
> > of it has been upstreamed, but most of it remains. I think most of us
> > agree that it would be good to have it upstreamed at some point. Are
> > there some uncontroversial parts that I can start moving upstream? The
> > obslog and prune commands seem like good candidates to me. What do you
> > think?
> >
>
> --
> Pierre-Yves David



More information about the Mercurial-devel mailing list