D1222: merge: add a config option to disable path conflict checking

This revision was automatically updated to reflect the committed changes. Closed by commit rHG37450a122128: merge: add a config option to disable path conflict checking (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1223: merge: disable path conflict checking by default (issue5716)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2a774cae3a03: merge: disable path conflict checking by default (issue5716) (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D1223: merge: disable path conflict checking by default (issue5716)

sid0 updated this revision to Diff 3082. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1223?vs=3076=3082 REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES mercurial/configitems.py tests/test-audit-path.t

D1222: merge: add a config option to disable path conflict checking

sid0 added a comment. > The debug section doesn't seem to exists, could we use 'experimental' instead while we fix the performance regression? Good idea! Done, thanks! REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1222 To: sid0, #hg-reviewers Cc:

D1222: merge: add a config option to disable path conflict checking

sid0 updated this revision to Diff 3081. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1222?vs=3073=3081 REVISION DETAIL https://phab.mercurial-scm.org/D1222 AFFECTED FILES mercurial/configitems.py mercurial/merge.py CHANGE DETAILS diff --git

D1224: merge: cache unknown dir checks (issue5716)

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

D1223: merge: disable path conflict checking by default (issue5716)

sid0 updated this revision to Diff 3076. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1223?vs=3075=3076 REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES mercurial/configitems.py tests/test-audit-path.t

D1223: merge: disable path conflict checking by default (issue5716)

sid0 updated this revision to Diff 3075. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1223?vs=3074=3075 REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES mercurial/configitems.py tests/test-audit-path.t

D1222: merge: add a config option to disable path conflict checking

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We've found a severe perf regression in `hg update` caused by the path conflict checking code. The next patch will disable this by default. REPOSITORY rHG

D1223: merge: disable path conflict checking by default (issue5716)

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We shouldn't ship a severe perf regression in hg update for 4.4. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1223 AFFECTED FILES

D899: annotate: track whether a particular annotation was the result of a skip

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f5a135b2b04: annotate: track whether a particular annotation was the result of a skip (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D897: context: rename local 'attr' to 'attr_'

This revision was automatically updated to reflect the committed changes. Closed by commit rHG52e9310626a8: context: rename local attr to attr_ (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D897?vs=2318=2339 REVISION

D896: annotate: move annotatepair unit tests to a separate file

This revision was automatically updated to reflect the committed changes. Closed by commit rHG80215865d154: annotate: move annotatepair unit tests to a separate file (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D895: check-code: allow an exception for camelcase where required

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb332c01247d8: check-code: allow an exception for camelcase where required (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D899: annotate: track whether a particular annotation was the result of a skip

sid0 added a comment. Turns out it actually was buggy. Thanks for catching it! I switched to using `attrs.evolve` (and in the earlier diff setting `frozen=True` to make the attr immutable) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 To: sid0,

D899: annotate: track whether a particular annotation was the result of a skip

sid0 updated this revision to Diff 2331. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D899?vs=2329=2331 REVISION DETAIL https://phab.mercurial-scm.org/D899 AFFECTED FILES mercurial/context.py tests/test-annotate.py CHANGE DETAILS diff --git

D898: annotate: introduce attr for storing per-line annotate data

sid0 updated this revision to Diff 2328. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D898?vs=2319=2328 REVISION DETAIL https://phab.mercurial-scm.org/D898 AFFECTED FILES mercurial/commands.py mercurial/context.py mercurial/hgweb/webcommands.py

D900: annotate: mark lines affected by skip-annotate with *

sid0 updated this revision to Diff 2330. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D900?vs=2321=2330 REVISION DETAIL https://phab.mercurial-scm.org/D900 AFFECTED FILES mercurial/commands.py tests/test-annotate.t CHANGE DETAILS diff --git

D899: annotate: track whether a particular annotation was the result of a skip

sid0 updated this revision to Diff 2329. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D899?vs=2320=2329 REVISION DETAIL https://phab.mercurial-scm.org/D899 AFFECTED FILES mercurial/context.py tests/test-annotate.py CHANGE DETAILS diff --git

D899: annotate: track whether a particular annotation was the result of a skip

sid0 added inline comments. INLINE COMMENTS > sid0 wrote in context.py:1164-1165 > Good question! Not in this case, because a particular annotation can never go > from skip=True to skip=False. If we decide to overwrite the annotation > afterwards, the whole object is replaced, not just fctx

D899: annotate: track whether a particular annotation was the result of a skip

sid0 added a comment. I'll add a comment explaining that. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 To: sid0, #hg-reviewers Cc: indygreg, mercurial-devel ___ Mercurial-devel mailing list

D899: annotate: track whether a particular annotation was the result of a skip

sid0 added inline comments. INLINE COMMENTS > indygreg wrote in context.py:1164-1165 > I see that we're copying a ref to the object instead of making an object > copy. When we had tuples, that was fine because tuples are immutable. But > with attr, instances can be modified. > > Will this

D900: annotate: mark lines affected by skip-annotate with *

sid0 added a comment. Yeah, I plan to do all of those before marking the option un-experimental. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D900 To: sid0, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel ___

D898: annotate: introduce attr for storing per-line annotate data

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We're going to extend this a bit -- at first by simply adding whether this was a skipped child. We're well on our way to outgrowing tuples, though -- adding more

D900: annotate: mark lines affected by skip-annotate with *

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is to prevent weird surprises from happening with skips being attributed to the wrong changeset. REPOSITORY rHG Mercurial REVISION DETAIL

D896: annotate: move annotatepair unit tests to a separate file

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In upcoming patches the output is going to be significantly longer than it is today, and doctests don't allow wrapping the output. REPOSITORY rHG Mercurial

D899: annotate: track whether a particular annotation was the result of a skip

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We're going to expose this information in the UI in an upcoming patch. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D899 AFFECTED

D895: check-code: allow an exception for camelcase where required

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY unittest has a `maxDiff` parameter which has to be set to `None` in order for large enough failure diffs to be displayed. Add a comment to disable the camelcase

D897: context: rename local 'attr' to 'attr_'

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In the next diff we're going to import mercurial.thirdparty.attr, and pyflakes complains about this if this rename isn't done. REPOSITORY rHG Mercurial REVISION

D867: thirdparty: vendor attrs

This revision was automatically updated to reflect the committed changes. Closed by commit rHG765eb17a7eb8: thirdparty: vendor attrs (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D867?vs=2244=2253 REVISION DETAIL

D871: python3: don't byte mangle third-party packages

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9fb9f8440b71: python3: dont byte mangle third-party packages (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D871?vs=2246=2251

D868: changelog: use attrs instead of namedtuple

This revision was automatically updated to reflect the committed changes. Closed by commit rHGe51c8ffa1ffa: changelog: use attrs instead of namedtuple (authored by sid0, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D868?vs=2232=2252#toc REPOSITORY rHG Mercurial

D866: tests: disable lints on mercurial/thirdparty

This revision was automatically updated to reflect the committed changes. Closed by commit rHG41401f502c83: tests: disable lints on mercurial/thirdparty (authored by sid0, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D866?vs=2230=2250

D871: python3: don't byte mangle third-party packages

sid0 updated this revision to Diff 2246. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D871?vs=2243=2246 REVISION DETAIL https://phab.mercurial-scm.org/D871 AFFECTED FILES mercurial/__init__.py CHANGE DETAILS diff --git a/mercurial/__init__.py

D867: thirdparty: vendor attrs

sid0 updated this revision to Diff 2244. sid0 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D867?vs=2231=2244 REVISION DETAIL https://phab.mercurial-scm.org/D867 AFFECTED FILES mercurial/thirdparty/__init__.py

D871: python3: don't byte mangle third-party packages

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Third-party packages are already expected to be dual-version clean. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D871 AFFECTED FILES

D868: changelog: use attrs instead of namedtuple

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY See http://www.attrs.org/en/stable/why.html#namedtuples for why attrs are better than namedtuples. REPOSITORY rHG Mercurial REVISION DETAIL

D866: tests: disable lints on mercurial/thirdparty

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY In the next patch, this directory will be used to vendor in some third-party code. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D866

D867: thirdparty: vendor attrs

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The attrs package allows defining namedtuple-like classes with no weird behavior and no runtime performance cost. This patch vendors in attrs 17.2.0. 1.

D351: demandimport: disable by default if chg is being used

sid0 added a comment. > I tried that approach. If we only set HGDEMANDIMPORT for the forked process to execute hg server, it will be an infinite loop - environment config hash will mismatch. Setting HGDEMANDIMPORT for both the forked and non-forked chg client processes seems less cleaner.

Re: D153: test-dirstate-race: hide irrelevant hg status output

This revision was automatically updated to reflect the committed changes. Closed by commit rHG34a8ef358c93: test-dirstate-race: hide irrelevant hg status output (authored by sid0). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D153?vs=351=354 REVISION

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

sid0 updated this revision to Diff 351. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D153?vs=337=351 REVISION DETAIL https://phab.mercurial-scm.org/D153 AFFECTED FILES tests/test-dirstate-race.t CHANGE DETAILS diff --git

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

sid0 added inline comments. INLINE COMMENTS > martinvonz wrote in test-dirstate-race.t:223-231 > Oh, the "hg status" is just to cause it to write the dirstate? Would "hg > debugrebuilddirstate" work? That doesn't produce any output and it's clearer > that that will result in the dirstate

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

sid0 added inline comments. INLINE COMMENTS > test-dirstate-race.t:244 > >$ hg status ^^ this one should be empty. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D153 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To:

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

sid0 added inline comments. INLINE COMMENTS > martinvonz wrote in test-dirstate-race.t:223-231 > The commit that introduced this test case > (https://phab.mercurial-scm.org/rHG15e85dded93323d286dc0a758edde1b9dbea5cdd) > referred to bug https://bz.mercurial-scm.org/show_bug.cgi?id=5581. The >

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

sid0 added a comment. (I think this should go into stable as a "test fix") REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D153 EMAIL PREFERENCES https://phab.mercurial-scm.org/settings/panel/emailpreferences/ To: sid0, #hg-reviewers Cc: mercurial-devel

Re: D153: test-dirstate-race: replace BROKEN line with explanation of changed output

sid0 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY See the explanation for more. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D153 AFFECTED FILES tests/test-dirstate-race.t CHANGE