D750: rebase: move bookmarks with --keep (issue5682)

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> quark wrote in rebase.py:1539
> In the future we might want to get the `'rebase'` name from current transaction (and enforce an active transaction in `cleanupnodes`). In that case the `name` parameter becomes less necessary and `moves` could be the 3rd argument.
> 
> I'll update the code if I'm expected to do that.

> I'll update the code if I'm expected to do that.

Yes, I was planning to let you take the contents of this patch and put it in yours.

> scmutil.py:588-589
> +    
> +    By default, bookmark moves are calculated automatically from 'replacements',
> +    but 'moves' can be used to override that.
>  

As I said on IRC, please also update this to be more accurate, because it 'moves' it not only about overrides, it can also have items that are not in 'replacements'

> scmutil.py:594-595
>      """
> +    if not replacements and not moves:
> +        return
> +

I'd just drop this actually. Nothing expensive happens if they're both empty anyway

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D750

To: martinvonz, #hg-reviewers, quark
Cc: quark, mercurial-devel