1082937 - Make firefoxtree compatible with Mercurial 3.2

Status: RESOLVED FIXED

(Developer Services :: Mercurial: firefoxtree, defect)

Description

[Gregory Szorc [:gps]]

The removal of localrepository.push and localrepository.pull in Mercurial 3.2 (currently @) broke firefoxtree in multiple ways. We need some small patches to fix things.

Comment 1

[Gregory Szorc [:gps]]

Attachment: firefoxtree: support Mercurial 3.2 version of exchange.push ()

Mercurial 3.2 (currently in @) introduces a "bookmarks" named argument
to exchange.push(). We add a **kwargs to handle it.

Comment 2

[Gregory Szorc [:gps]]

Attachment: firefoxtree: support Mercurial 3.2 version of pull() ()

Mercurial 3.2 (currently in @) removed localrepository.pull in favor of
using exchange.pull directly. We refactor our code to favor
exchange.pull as well.

As part of this refactoring, we had to update references to the repo
from "self" to an argument. We also had to add the blocking checking for
"is firefox tree" into pull() since we now wrap a global function, not
a per-repo one.

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 8505126 [details] [diff] [review]
firefoxtree: support Mercurial 3.2 version of exchange.push ()

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

::: hgext/firefoxtree/__init__.py
@@ +149,5 @@
>      return '\n'.join(lines)
>  
> +# **kwargs is here to support the "bookmarks" named argument, introduced in
> +# Mercurial 3.2. We can convert back to a named argument once we drop <3.2
> +# support.

For general future proofing, I think we should keep **kwargs on such hooks. IOW, I don't think we need this comment.

Comment 4

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/2bf88266a19a
https://hg.mozilla.org/hgcustom/version-control-tools/rev/688d7ab047b3