958302 - mercurial-setup should enable the rebase extension

Status: RESOLVED FIXED

(Firefox Build System :: Mach Core, enhancement)

Description

[:Gijs (he/him)]

As per summary. I was surprised to see `hg pull --rebase` fail on my newly setup ubuntu vm... hg-setup can just deal with that problem for us, I think. :-)

Comment 1

[Gregory Szorc [:gps]]

You want to submit a patch? /tools/mercurial in the tree.

Comment 2

[:Gijs (he/him)]

Attachment: offer the rebase extension through hg-setup,

Something like this? That extensions string seemes unused, so I removed it...

Comment 3

[Gregory Szorc [:gps]]

Comment on attachment 8358051 [details] [diff] [review]
offer the rebase extension through hg-setup,

Review of attachment 8358051 [details] [diff] [review]:
-----------------------------------------------------------------

FWIW, rebase isn't enabled by default because the Mercurial people consider it an advanced command. Once we add more "advanced" commands like this, we should consider adding some kind of message about what extensions are advanced so new users don't fall into traps. Let's worry about that later.

::: tools/mercurial/hgsetup/wizard.py
@@ +149,5 @@
>                  print('')
>  
> +        if 'rebase' not in active:
> +            if self._prompt_yn('Would you like to enable the rebase extension '
> +                'to help maintain a linear history'):

I'm going to nit this to:

Would you like to enable the rebase extension to allow you to move changesets around (which can help maintain a linear history)

Comment 4

[:Gijs (he/him)]

(In reply to Gregory Szorc [:gps] from comment #3)
> ::: tools/mercurial/hgsetup/wizard.py
> @@ +149,5 @@
> >                  print('')
> >  
> > +        if 'rebase' not in active:
> > +            if self._prompt_yn('Would you like to enable the rebase extension '
> > +                'to help maintain a linear history'):
> 
> I'm going to nit this to:
> 
> Would you like to enable the rebase extension to allow you to move
> changesets around (which can help maintain a linear history)

With that, remote:   https://hg.mozilla.org/integration/fx-team/rev/fad63a2cefbe

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/fad63a2cefbe