This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb85962350bb3: merge: cache unknown dir checks (issue5716)
(authored by mbthomas, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1224?vs=3473&id=40
mbthomas updated this revision to Diff 3473.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1224?vs=3083&id=3473
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/
durin42 requested changes to this revision.
durin42 added a comment.
This revision now requires changes to proceed.
needs rebased, otherwise looks fine
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To: mbthomas, #hg-reviewers, durin42
Cc: durin42, sid0, kr
mbthomas added a comment.
Yes, fine to punt to after 4.4. With https://phab.mercurial-scm.org/D1223
the checks are disabled, so we're back to the old behaviour for path conflicts,
but the perf is ok.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To: mbt
durin42 added a comment.
Is it okay to punt on this until after 4.4?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To: mbthomas, #hg-reviewers
Cc: durin42, sid0, krbullock, mercurial-devel
___
Mercurial-devel mai
mbthomas added a comment.
Updated as requested.
The whole of `_checkunknownfiles` is probably a reasonable candidate for
native code if we want to speed up `update`. It's the second most expensive
part, after actually updating the files. The function is also pretty isolated
- it acces
mbthomas updated this revision to Diff 3083.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1224?vs=3078&id=3083
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/
sid0 added a comment.
Could you make this a class with unknowndircache and missingdircache being
private members?
How much do you think writing some of this code in native code (e.g. Rust)
would help?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To
mbthomas added a comment.
There is still some cost to doing the check, so it's not a complete reversal
of issue5716, but it helps a lot.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To: mbthomas, #hg-reviewers
Cc: krbullock, mercurial-devel
_
krbullock added a comment.
Code LGTM, but I haven't done any performance testing on this.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To: mbthomas, #hg-reviewers
Cc: krbullock, mercurial-devel
___
Mercurial-dev
krbullock added a comment.
If this mitigates or fixes issue5716, please mention it in the summary line.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1224
To: mbthomas, #hg-reviewers
Cc: krbullock, mercurial-devel
___
mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
As mentioned in https://phab.mercurial-scm.org/D1222, the recent
pathconflicts change regresses update
performance in large repositories when many files are bein
12 matches
Mail list logo
