D6475: merge: fix race that could cause wrong size in dirstate

[durin42 (Augie Fackler)]

durin42 added a comment.


  I'm broadly happy with this, but had one point where I need clarification and I'd appreciate splitting the worker.py bit into its own change.

INLINE COMMENTS

> merge.py:1805
> +            if k == ACTION_GET and wantfiledata:
> +                getfiledata.extend([None] * len(acts))
>              # Remove these files from actions[ACTION_MERGE] as well. This is

I'm a little confused by this - it looks like we unconditionally set None for some filedatas? why?

> worker.py:86
>  
> -def worker(ui, costperarg, func, staticargs, args, threadsafe=True):
> +def worker(ui, costperarg, func, staticargs, args, hasretval=False,
> +           threadsafe=True):

Could we make the worker.py change discrete? I think it merits its own commit even if it's in service of this change.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6475/new/

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

To: valentin.gatienbaron, durin42, martinvonz, #hg-reviewers
Cc: mercurial-devel