mercurial-setup should enable the rebase extension

RESOLVED FIXED in mozilla29

Status

RESOLVED FIXED
5 years ago
6 months ago

People

(Reporter: Gijs, Assigned: Gijs)

Tracking

unspecified
mozilla29
x86
Mac OS X

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

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

5 years ago
You want to submit a patch? /tools/mercurial in the tree.
Created attachment 8358051 [details] [diff] [review]
offer the rebase extension through hg-setup,

Something like this? That extensions string seemes unused, so I removed it...
Attachment #8358051 - Flags: review?(gps)
(Assignee)

Updated

5 years ago
Assignee: nobody → gijskruitbosch+bugs
Status: NEW → ASSIGNED

Comment 3

5 years ago
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)
Attachment #8358051 - Flags: review?(gps) → review+
(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
Whiteboard: [fixed-in-fx-team]
https://hg.mozilla.org/mozilla-central/rev/fad63a2cefbe
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Whiteboard: [fixed-in-fx-team]
Target Milestone: --- → mozilla29

Updated

6 months ago
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.