[PATCH 6 of 6] merge: invoke cmdutil.fileprefetchhooks() prior to applying updates

Yuya Nishihara yuya at tcha.org
Sun Feb 11 19:23:56 EST 2018


On Sun, 11 Feb 2018 15:30:19 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1518373556 18000
> #      Sun Feb 11 13:25:56 2018 -0500
> # Node ID d3d1e171fbfcb45de0e29516db2a72b616dd7fcd
> # Parent  f479bfd4a1d8c4eb0ae67f6f5cda8afe9c5da7dc
> merge: invoke cmdutil.fileprefetchhooks() prior to applying updates

The series generally looks good, but

> --- a/mercurial/merge.py
> +++ b/mercurial/merge.py
> @@ -23,6 +23,7 @@
>      nullrev,
>  )
>  from . import (
> +    cmdutil,

This re-introduces import cycle cmdutil->merge->cmdutil.


More information about the Mercurial-devel mailing list