{"state":{"revisions":[{"id":"6661","callsign":"HG","title":"lookup: don't use \"00changelog.i@None\" when lookup of prefix fails","author":"martinvonz","summary":"We were shadowing the \"node\" variable, so we always passed None to the\nLookupError instead of the node we meant to pass.\n\n(This showed up in py3 tests since py3 doesn't like to format None\nusing \"%s\".)","testPlan":"","lineCount":"4","dependsOn":[],"reviewers":["indygreg"],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"15977","author":"martinvonz","id":"97477","dateCreated":"1563557812","dateModified":"1563557812"}],"dateCreated":"1563557812","dateModified":"1563557813","status":"Needs Review"},{"id":"6660","callsign":"HG","title":"commands: removed part of description from abort and continue","author":"taapas1128","summary":"The description for registration of new `continuefunc` or `abortfunc`\nis removed as it is not required from user perspective.","testPlan":"","lineCount":"4","dependsOn":["6659"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"15974","author":"taapas1128","id":"97455","dateCreated":"1563481218","dateModified":"1563481218"}],"dateCreated":"1563481218","dateModified":"1563481218","status":"Needs Review"},{"id":"6659","callsign":"HG","title":"graft: split graft code to avoid duplication","author":"taapas1128","summary":"To avoid duplication of code due to `cmdutil.continuegraft()`; `graft()`\nis split into `cmdutil.finishgraft()` which deals with the execution of graft\nonce `revs` are generated and `cmdutil.continuegraftstate()` which updates opts\nfrom `graftstate` file when graft is continued from an interrupted state.\n\nFurther tests for issue1175 are updated to show the behaviour of `hg continue`.","testPlan":"","lineCount":"252","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"15973","author":"taapas1128","id":"97449","dateCreated":"1563481207","dateModified":"1563481207"}],"dateCreated":"1563481207","dateModified":"1563481218","status":"Needs Review"},{"id":"6658","callsign":"HG","title":"py3: fix test-setdiscovery.t on Python 3 by conditionalizing two lines","author":"durin42","summary":"I'm not clear why this behaves very slightly differently on Python 3,\nbut I'm also not concerned about it.","testPlan":"","lineCount":"6","dependsOn":[],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"15972","author":"durin42","id":"97440","dateCreated":"1563474259","dateModified":"1563474259"}],"dateCreated":"1563474259","dateModified":"1563474259","status":"Needs Review"},{"id":"6440","callsign":"HG","title":"fix: let fixer tools inherit hg's cwd so they can look at the working copy","author":"hooper","summary":"This lets fixer tools do things like find configuration files, with the caveat\nthat they'll only see the version of that file in the working copy, regardless\nof what revisions are being fixed.","testPlan":"","lineCount":"50","dependsOn":[],"reviewers":[],"ccs":["martinvonz","durin42","mercurial-devel"],"actions":[{"type":"comment","comment":"I still think we should fix the cwd for fixers, but it seems Martin and I agree that repo-root is more consistent. Would you be willing to reroll with repo-root instead of cwd?","author":"durin42","id":"97422","dateCreated":"1563473564","dateModified":"1563473564"},{"type":"inline","comment":"FWIW, I agree that running using cwd-relative path feels wrong.","replyTo":"93645","isNewFile":"1","line":"106","lineLength":"0","path":"hgext\/fix.py","diffId":"15244","author":"martinvonz","id":"93907","dateCreated":"1559322086","dateModified":"1559322086"},{"type":"inline","comment":"Hm. Is {root} in the templater for the command? Maybe have a sample in the test demonstrating that?\n\nI'm still dubious that cwd is the right thing, simply because it's unpredictable. I could see $(dirname filepath) or repo root as consistent, but cwd feels off to me somehow. I don't feel strongly though, so as long as {root} exists I can get what I need for hg's fixer definitions...","replyTo":"93599","isNewFile":"1","line":"106","lineLength":"0","path":"hgext\/fix.py","diffId":"15244","author":"durin42","id":"93645","dateCreated":"1558703705","dateModified":"1558703705"},{"type":"inline","comment":"It depends on whether we want to make it easier for tools that want to examine the tree upward from the cwd or tools that want to examine the tree downward from the root. I suspect that \"upward\" will be more important because of the way some tools use config files that apply to subtrees. For some tools it's weird because reading code to format from stdin is often an afterthought. Either way, for completeness, the root and cwd would both need to be available in either subprocess cwd or the command template. There may also be some room to prefer configs like \"cd {root} && mycommand\".","replyTo":"93575","isNewFile":"1","line":"106","lineLength":"0","path":"hgext\/fix.py","diffId":"15244","author":"hooper","id":"93599","dateCreated":"1558659760","dateModified":"1558659760"},{"type":"inline","comment":"I wonder if it'd be more generally useful to run the fixer in the repo root than the same `pwd` as the command invocation. WDYT?","replyTo":null,"isNewFile":"1","line":"106","lineLength":"0","path":"hgext\/fix.py","diffId":"15244","author":"durin42","id":"93575","dateCreated":"1558618336","dateModified":"1558618336"},{"type":"update","diffId":"15244","author":"hooper","id":"93557","dateCreated":"1558569635","dateModified":"1558569635"}],"dateCreated":"1558569635","dateModified":"1563473564","status":"Needs Review"},{"id":"6430","callsign":"HG","title":"rust-discovery: using from Python code","author":"gracinet","summary":"As previously done in other topics, the Rust version is used if it's been\nbuilt.\n\nThe version fully in Rust of the partialdiscovery class has the performance\nadvantage over the Python version (actually using the Rust MissingAncestor) if\nthe undecided set is big enough. Otherwise no sampling occurs, and the\ndiscovery is reasonably fast anyway.\n\nNote: it's hard to predict the size of the initial undecided set, it can\ndepend on the kind of topological changes between the local and remote graphs.\nThe point of the Rust version is to make the bad cases acceptable.\n\nMore specifically, the performance advantages are:\n\n- faster sampling, especially takefullsample()\n- much faster addmissings() in almost all cases (see commit message in\n  grandparent of the present changeset)\n- no conversion cost of the undecided set at the interface between Rust and\n  Python\n\n== Measurements with big undecided sets\n\nFor an extreme example, discovery between mozilla-try and mozilla-unified\n(over one million undecided revisions, same case as in dbd0fcca6dfc), we\nget roughly a x2.5\/x3 better performance:\n\nGrowing sample size (5% starting with 200): time goes down from\n210 to 72 seconds.\nConstant sample size of 200: time down from 1853 to 659 seconds.\n\nWith a sample size computed from number of roots and heads of the\nundecided set (`respectsize` is `False`), here are perfdiscovery results:\n\nBefore ! wall 9.358729 comb 9.360000 user 9.310000 sys 0.050000 (median of 50)\nAfter  ! wall 3.793819 comb 3.790000 user 3.750000 sys 0.040000 (median of 50)\n\nIn that later case, the sample sizes are routinely in the hundreds of\nthousands of revisions. While still faster, the Rust iteration in\naddmissings has less of an advantage than with smaller sample sizes, but\none sees addcommons becoming faster, probably a consequence of not having\nto copy big sets back and forth.\n\nThis example is not a goal in itself, but it showcases several different\nareas in which the process can become slow, due to different factors, and\nhow this full Rust version can help.\n\n== Measurements with small undecided sets\n\nIn cases the undecided set is small enough than no sampling occurs,\nthe Rust version has a disadvantage at init if `targetheads` is really big\n(some time is lost in the translation to Rust data structures),\nand that is compensated by the faster `addmissings()`.\n\nOn a private repository with over one million commits, we still get a minor\nimprovement, of 6.8%:\n\n  Before ! wall 0.593585 comb 0.590000 user 0.550000 sys 0.040000 (median of 50)\n  After  ! wall 0.553035 comb 0.550000 user 0.520000 sys 0.030000 (median of 50)\n\nWhat's interesting in that case is the first addinfo() at 180ms for Rust and\n233ms for Python+C, mostly due to add_missings and the children cache\ncomputation being done in less than 0.2ms on the Rust side vs over 40ms on the\nPython side.\n\nThe worst case we have on hand is with mozilla-try, prepared with\ndiscovery-helper.sh for 10 heads and depth 10, time goes up 2.2% on the median.\nIn this case `targetheads` is really huge with 165842 server heads.\n\n  Before ! wall 0.823884 comb 0.810000 user 0.790000 sys 0.020000 (median of 50)\n  After  ! wall 0.842607 comb 0.840000 user 0.800000 sys 0.040000 (median of 50)\n\nIf that would be considered a problem, more adjustments can be made, which are\nprematurate at this stage: cooking special variants of methods of the inner\nMissingAncestors object, retrieving local heads directly from Rust to avoid\nthe cost of conversion. Effort would probably be better spent at this point\nimproving the surroundings if needed.\n\nHere's another data point with a smaller repository, pypy, where performance\nis almost identical\n\n Before ! wall 0.015121 comb 0.030000 user 0.020000 sys 0.010000 (median of 186)\n After  ! wall 0.015009 comb 0.010000 user 0.010000 sys 0.000000 (median of 184)","testPlan":"","lineCount":"5","dependsOn":["6429"],"reviewers":[],"ccs":["pulkit","marmoute","martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":"I tested this series on our repository and found the following speedup in a case when there are 6k heads and 15k csets missing:\n\nBefore:\n\n```\n! wall 3.281062 comb 3.280000 user 3.200000 sys 0.080000 (best of 25)\n! wall 4.941540 comb 4.940000 user 4.860000 sys 0.080000 (max of 25)\n! wall 4.181741 comb 4.180800 user 4.103600 sys 0.077200 (avg of 25)\n! wall 4.281518 comb 4.290000 user 4.180000 sys 0.110000 (median of 25)\n```\n\nAfter:\n\n```\n! wall 2.589386 comb 2.590000 user 2.490000 sys 0.100000 (best of 25)\n! wall 4.658467 comb 4.660000 user 4.510000 sys 0.150000 (max of 25)\n! wall 3.624166 comb 3.625200 user 3.544400 sys 0.080800 (avg of 25)\n! wall 3.633663 comb 3.640000 user 3.540000 sys 0.100000 (median of 25)\n```","author":"pulkit","id":"97267","dateCreated":"1563359619","dateModified":"1563359619"},{"type":"comment","comment":"In the couple of last version, we already saved minutes in real life use case simply by improving pure CPU processing time client side. Can you elaborate on what other types of evidences you need to convince you there exist CPU bound case for discovery?","author":"marmoute","id":"96361","dateCreated":"1562252782","dateModified":"1562252782"},{"type":"comment","comment":">>! In D6430#96225, @marmoute wrote:\n> The \u00d72.5 speedup is the kind of things that motivate this series. Even if the mozilla-unified\/mozilla-try is just and example it triggers the kind of pathological case we encounter in real life: large undecided set. We keep finding such pathological case from time to time, and will keep finding them. In addition there are case with legitimate large undedicated set (the mozilla example for one).\n> Having this faster code significantly reduce the impact of these pathological cases.\n\nI still don't see how those cases are CPU-bound.\n\nI won't object if someone else who believes in this queues the series, though. I'll even add accept stamps. But I want to see that some other reviewer believes in it first.\n","author":"martinvonz","id":"96300","dateCreated":"1562088119","dateModified":"1562088119"},{"type":"comment","comment":"The \u00d72.5 speedup is the kind of things that motivate this series. Even if the mozilla-unified\/mozilla-try is just and example it triggers the kind of pathological case we encounter in real life: large undecided set. We keep finding such pathological case from time to time, and will keep finding them. In addition there are case with legitimate large undedicated set (the mozilla example for one).\nHaving this faster code significantly reduce the impact of these pathological cases.\n\nIn addition as Georges pointed out, having this logic in Rust is a good step toward having a fast path detecting no-op pull. Something else we are interrested in.","author":"marmoute","id":"96225","dateCreated":"1562060281","dateModified":"1562060281"},{"type":"comment","comment":"\n\nNobody has reacted yet to @martinvonz call for other opinions, can someone look at it?\n\nLet me restate that the series makes a good difference when the sampling part of the discovery process actually kicks in, and it does that roughly three times faster. In other cases, none of the new Rust code is actually executed, the main difference lies in data interchange at the Rust - Python interface. (recall that all performance comparisons are against a Rust-enhanced Mercurial, in particular with the Rust `MissingAncestors` object)\n\nThe size of the undecided set can behave in a chaotic manner, especially in discoveries that involve continuous integration repositories with lots of merging and branching. The mozilla-unified \/ mozilla-try is but an example of that. Yes, we've seen discoveries go havoc at our customer's, with the size of the undecided set exploding. What the series does performance-wise is help keep these cases to an acceptable time.\n\n@martinvonz: I understand your concern about double maintenance. Let me reassure you that we are willing to maintain that, and it will cost us less than tracking down the perfect real-life example. About the 6.8%, that's  a case where the undecided set is small, it's there to demonstrate that despite the focus on the sampling is still a bit faster on other code paths.\n\nThis series has also potential for :\n\n- further performance improvements if that's needed in the future; the obvious candidate would be a more aggressive integration with the `MissingAncestors` object, especially in `addcommons()`\n- pure Rust push\/pull machinery, such as fastpaths doing the discovery entirely in Rust and bailing out if there's nothing to actually send or receive, smart status able to give discovery information in near realtime etc.\n\n\n","author":"gracinet","id":"96155","dateCreated":"1561895125","dateModified":"1561895125"},{"type":"comment","comment":"> This example is not a goal in itself,\n\nHmm, I would actually consider that the strongest selling point of this series. The other case (the 6.8% improvement) doesn't seem enough to justify all this code.\n\n> but it showcases several different\n> areas in which the process can become slow, due to different factors, and\n> how this full Rust version can help.\n\nI don't see this as much of an argument for discovery in Rust. I only care about practically measurable differences. The only real improvement was that \"pull into mozilla-try repo from mozilla-unified\" case.\n\nI'm fine with taking this series if we think that that use case is important enough to justify the extra maintenance of having a second implementation of the discovery code. I wouldn't think that use case is very common, but I'm guessing that the fact that you spent time on this series means that you have customers with repos with similar characteristics.\n\nWhat do others think?\n","author":"martinvonz","id":"95159","dateCreated":"1560747856","dateModified":"1560747856"},{"type":"comment","comment":"Instability fixed, and I took the opportunity to rebase again to leverage `policy.importrust`, that's been queued yesterday (rHGf7385ed775a8)\n\nI added new performance measurements for the big pathological case (mozilla-try \/ mozilla-unified) `with respectsize=False`. Speedup, compared to parent commit is still about x2.5 for me, not exactly for the same reasons, that's interesting.","author":"gracinet","id":"94975","dateCreated":"1560433054","dateModified":"1560433054"},{"type":"update","diffId":"15487","author":"gracinet","id":"94971","dateCreated":"1560432790","dateModified":"1560432790"},{"type":"comment","comment":"Update of the whole series done but, ended up in an inconsistent state, and I have to go. Please don't act on it until I give the signal it's ready (sorry for inconvenience)","author":"gracinet","id":"94889","dateCreated":"1560364846","dateModified":"1560364846"},{"type":"update","diffId":"15473","author":"gracinet","id":"94882","dateCreated":"1560363446","dateModified":"1560363446"},{"type":"comment","comment":"I think this series needs to be updated for D2647. I'm curious to see the timing numbers after that patch (I can get those myself once the series is updated if you're tired of running the perf commands).","author":"martinvonz","id":"94013","dateCreated":"1559598683","dateModified":"1559598683"},{"type":"update","diffId":"15230","author":"gracinet","id":"93433","dateCreated":"1558544446","dateModified":"1558544446"}],"dateCreated":"1558544446","dateModified":"1563381056","status":"Needs Review"},{"id":"6429","callsign":"HG","title":"rust-discovery: optimization of add commons\/missings for empty arguments","author":"gracinet","summary":"These two cases have to be catched early for different reasons.\nIn the case of add_missing_revisions, we don't want to trigger\nthe computation of the undecided set (and the children cache)\ntoo early: the later the better.\n\nIn the case of add_common_revisions, the inner `MissingAncestors`\nobject wouldn't know that all ancestors of its bases have already\nbeen removed from the undecided.\nIn principle, that would in itself be a lead for further\nimprovement: this remove_ancestors_from could be more incremental,\nbut the current performance seems to be good enough.","testPlan":"","lineCount":"9","dependsOn":["6428"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"comment","comment":"Thanks, looks good.","author":"kevincox","id":"94979","dateCreated":"1560434443","dateModified":"1560434443"},{"type":"accept","author":"kevincox","id":"94978","dateCreated":"1560434443","dateModified":"1560434443"},{"type":"comment","comment":"@kevincox, thanks for the review of this and its predecessors. I think I've addressed all your remarks and improvement suggestions.","author":"gracinet","id":"94977","dateCreated":"1560433270","dateModified":"1560433270"},{"type":"comment","comment":">>! In D6429#94512, @kevincox wrote:\n> Wouldn't it be better to make `add_missing_revisions` work properly on empty inputs? It seems like it is too error prone to try and catch every caller. If possible I would like to push this check down as far as possible.\n> \n> It seems easy enough to do in https:\/\/www.mercurial-scm.org\/repo\/hg\/file\/tip\/rust\/hg-core\/src\/discovery.rs#l56 by checking if `common` grew.  This has the added benefit that attempting to re-add bases will also skill the work.\n\nDone in the update version.\n\n","author":"gracinet","id":"94973","dateCreated":"1560432820","dateModified":"1560432820"},{"type":"update","diffId":"15486","author":"gracinet","id":"94970","dateCreated":"1560432785","dateModified":"1560432785"},{"type":"update","diffId":"15472","author":"gracinet","id":"94878","dateCreated":"1560363441","dateModified":"1560363441"},{"type":"comment","comment":"Wouldn't it be better to make `add_missing_revisions` work properly on empty inputs? It seems like it is too error prone to try and catch every caller. If possible I would like to push this check down as far as possible.\n\nIt seems easy enough to do in https:\/\/www.mercurial-scm.org\/repo\/hg\/file\/tip\/rust\/hg-core\/src\/discovery.rs#l56 by checking if `common` grew.  This has the added benefit that attempting to re-add bases will also skill the work.","author":"kevincox","id":"94512","dateCreated":"1560171233","dateModified":"1560171233"},{"type":"reject","author":"kevincox","id":"94511","dateCreated":"1560171233","dateModified":"1560171233"},{"type":"update","diffId":"15229","author":"gracinet","id":"93423","dateCreated":"1558544438","dateModified":"1558544438"}],"dateCreated":"1558544438","dateModified":"1563381052","status":"Needs Review"},{"id":"6428","callsign":"HG","title":"rust-discovery: using the children cache in add_missing","author":"gracinet","summary":"The DAG range computation often needs to get back to very old\nrevisions, and turns out to be disproportionately long, given\nthat the end goal is to remove the descendents of the given\nmissing revisons from the undecided set.\n\nThe fast iteration capabilities available in the Rust case make\nit possible to avoid the DAG range entirely, at the cost of\nprecomputing the children cache, and to simply iterate on\nchildren of the given missing revisions.\n\nThis is a case where staying on the same side of the interface\nbetween the two languages has clear benefits.\n\nOn discoveries with initial undecided sets\nsmall enough to bypass sampling entirely, the total cost of\ncomputing the children cache and the subsequent iteration\nbecomes better than the Python + C counterpart, which relies on\nreachableroots2.\n\nFor example, on a repo with more than one million revisions with\nan initial undecided set of 11 elements, we get these figures:\n\nRust version with simple iteration\n  addcommons: 57.287us\n  first undecided computation: 184.278334ms\n  first children cache computation: 131.056us\n  addmissings iteration: 42.766us\n  first addinfo total: 185.24 ms\n\nPython + C version\n  first addcommons: 0.29 ms\n  addcommons 0.21 ms\n  first undecided computation 191.35 ms\n  addmissings 45.75 ms\n  first addinfo total: 237.77 ms\n\nOn discoveries with large undecided sets, the initial price paid\nmakes the first addinfo slower than the Python + C version,\nbut that's more than compensated by the gain in sampling and\nsubsequent iterations.\nHere's an extreme example with an undecided set of a million revisions:\n\nRust version:\n  first undecided computation: 293.842629ms\n  first children cache computation: 407.911297ms\n  addmissings iteration: 34.312869ms\n  first addinfo total: 776.02 ms\n  taking initial sample\n  query 2: sampling time: 1318.38 ms\n  query 2; still undecided: 1005013, sample size is: 200\n  addmissings: 143.062us\n\nPython + C version:\n  first undecided computation 298.13 ms\n  addmissings 80.13 ms\n  first addinfo total: 399.62 ms\n  taking initial sample\n  query 2: sampling time: 3957.23 ms\n  query 2; still undecided: 1005013, sample size is: 200\n  addmissings 52.88 ms","testPlan":"","lineCount":"61","dependsOn":["6427"],"reviewers":["kevincox"],"ccs":["mjpieters","durin42","kevincox","mercurial-devel"],"actions":[{"type":"inline","comment":"Yes, you're right, I replaced it with a \"Performance note\" section for the callers.\nAs for the rationale for the change, I think that the commit message is more than enough.","replyTo":"94515","isNewFile":"1","line":"233","lineLength":"0","path":"rust\/hg-core\/src\/discovery.rs","diffId":"15228","author":"gracinet","id":"94976","dateCreated":"1560433104","dateModified":"1560433104"},{"type":"update","diffId":"15485","author":"gracinet","id":"94967","dateCreated":"1560432780","dateModified":"1560432780"},{"type":"update","diffId":"15471","author":"gracinet","id":"94877","dateCreated":"1560363436","dateModified":"1560363436"},{"type":"inline","comment":"These added comments seem more relevant to the implementation of the method than they are to the caller. Would it make sense to move them inside of the function body so that they don't busy the doc-comment?","replyTo":null,"isNewFile":"1","line":"233","lineLength":"0","path":"rust\/hg-core\/src\/discovery.rs","diffId":"15228","author":"kevincox","id":"94515","dateCreated":"1560171579","dateModified":"1560171579"},{"type":"accept","author":"kevincox","id":"94514","dateCreated":"1560171579","dateModified":"1560171579"},{"type":"comment","comment":"This revision is new. At the time I submitted the previous series, it was almost always the case that the advantage of the C `reachableroots2()` over the Rust ``dagop::range()` was more than compensated by sampling been done in Rust instead of Python.\nI originally planned to finish that one and submit it as a follow-up optimization, but now it's necessary to prevent being slower in the fastest cases where there's no sampling.","author":"gracinet","id":"93455","dateCreated":"1558545439","dateModified":"1558545439"},{"type":"update","diffId":"15228","author":"gracinet","id":"93413","dateCreated":"1558544430","dateModified":"1558544430"}],"dateCreated":"1558544430","dateModified":"1563381047","status":"Needs Review"},{"id":"6427","callsign":"HG","title":"discovery: new devel.discovery.randomize option","author":"gracinet","summary":"By default, this is True, but setting it to False is a uniform\nway to kill all randomness in integration tests such as test-setdiscovery.t\n\nBy \"uniform\" we mean that it can be passed to implementations in other\nlanguages, for which the monkey-patching of random.sample would be\nirrelevant.\n\nIn the above mentioned test file, we use it right away,\nreplacing the adhoc extension that had the same purpose, and to derandomize a\ncase with many round-trips, that we'll need to behave uniformly in the Rust\nversion.","testPlan":"","lineCount":"29","dependsOn":["6426"],"reviewers":["kevincox"],"ccs":["kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15937","author":"Alphare","id":"97297","dateCreated":"1563381041","dateModified":"1563381041"},{"type":"update","diffId":"15470","author":"gracinet","id":"94876","dateCreated":"1560363430","dateModified":"1560363430"},{"type":"accept","author":"kevincox","id":"94510","dateCreated":"1560170381","dateModified":"1560170381"},{"type":"comment","comment":"@kevincox this used to be D6346\nI had to fix conflict and adapt the test due to growing sample size having landed since then","author":"gracinet","id":"93410","dateCreated":"1558544177","dateModified":"1558544177"},{"type":"update","diffId":"15226","author":"gracinet","id":"93387","dateCreated":"1558543823","dateModified":"1558543823"}],"dateCreated":"1558543823","dateModified":"1563381041","status":"Needs Review"},{"id":"6426","callsign":"HG","title":"rust-discovery: optionally don't randomize at all, for tests","author":"gracinet","summary":"As seen from Python, this is a new `randomize` kwarg in init of the\ndiscovery object. It replaces random picking by some arbitrary yet\ndeterministic strategy.\n\nThis is the same as what test-setdiscovery.t does, with the added\nbenefit to be usable both in Python and Rust implementations.","testPlan":"","lineCount":"87","dependsOn":["6425"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15936","author":"Alphare","id":"97296","dateCreated":"1563381035","dateModified":"1563381035"},{"type":"update","diffId":"15484","author":"gracinet","id":"94966","dateCreated":"1560432771","dateModified":"1560432771"},{"type":"accept","author":"kevincox","id":"93580","dateCreated":"1558624508","dateModified":"1558624508"},{"type":"comment","comment":"@kevincox this used to be D6345","author":"gracinet","id":"93406","dateCreated":"1558544113","dateModified":"1558544113"},{"type":"update","diffId":"15225","author":"gracinet","id":"93377","dateCreated":"1558543814","dateModified":"1558543814"}],"dateCreated":"1558543814","dateModified":"1563381035","status":"Needs Review"},{"id":"6425","callsign":"HG","title":"rust-discovery: exposing sampling to python","author":"gracinet","summary":" ","testPlan":"","lineCount":"28","dependsOn":["6424"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15935","author":"Alphare","id":"97295","dateCreated":"1563381029","dateModified":"1563381029"},{"type":"update","diffId":"15483","author":"gracinet","id":"94965","dateCreated":"1560432766","dateModified":"1560432766"},{"type":"accept","author":"kevincox","id":"93579","dateCreated":"1558623306","dateModified":"1558623306"},{"type":"comment","comment":"@kevincox this used to be D6261","author":"gracinet","id":"93403","dateCreated":"1558544059","dateModified":"1558544059"},{"type":"update","diffId":"15224","author":"gracinet","id":"93368","dateCreated":"1558543806","dateModified":"1558543806"}],"dateCreated":"1558543806","dateModified":"1563381029","status":"Needs Review"},{"id":"6424","callsign":"HG","title":"rust-discovery: takefullsample() core implementation","author":"gracinet","summary":"take_full_sample() browses the undecided set in both directions: from\nits roots as well as from its heads.\n\nFollowing what's done on the Python side, we alter update_sample()\nsignature to take a closure returning an iterator: either ParentsIterator\nor an iterator over the children found in `children_cache`. These constructs\nshould probably be split off in a separate module.\n\nThis is a first concrete example where a more abstract graph notion (probably\n a trait) would be useful, as this is nothing but an operation on the reversed\nDAG.\n\nA similar motivation in the context of the discovery\nprocess would be to replace the call to dagops::range in\n`add_missing_revisions()` with a simple iteration over descendents, again an\noperation on the reversed graph.","testPlan":"","lineCount":"247","dependsOn":["6423"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15934","author":"Alphare","id":"97294","dateCreated":"1563381024","dateModified":"1563381024"},{"type":"update","diffId":"15482","author":"gracinet","id":"94964","dateCreated":"1560432761","dateModified":"1560432761"},{"type":"inline","comment":"I think it would be nice to remove the magic number.\n\n```\nif self.cur >= self.parents.len()\n```","replyTo":null,"isNewFile":"1","line":"124","lineLength":"0","path":"rust\/hg-core\/src\/discovery.rs","diffId":"15223","author":"kevincox","id":"93578","dateCreated":"1558623225","dateModified":"1558623225"},{"type":"accept","author":"kevincox","id":"93577","dateCreated":"1558623225","dateModified":"1558623225"},{"type":"comment","comment":"@kevincox this used to be D6260  (I don't think I changed anything besides rebasing)","author":"gracinet","id":"93400","dateCreated":"1558543998","dateModified":"1558543998"},{"type":"update","diffId":"15223","author":"gracinet","id":"93358","dateCreated":"1558543798","dateModified":"1558543798"}],"dateCreated":"1558543798","dateModified":"1563381024","status":"Needs Review"},{"id":"6423","callsign":"HG","title":"rust-discovery: core implementation for take_quick_sample()","author":"gracinet","summary":"This makes in particular `rand` no longer a testing dependency.\n\nWe keep a seedable random generator on the `PartialDiscovery` object\nitself, to avoid lengthy initialization.\n\nIn take_quick_sample() itself, we had to avoid keeping the reference\nto `self.undecided` to cope with the mutable reference introduced\nby the the call to `limit_sample`, but it's still manageable without\nresorting to inner mutability.\n\nSampling being prone to be improved in the mid-term future, testing\nis minimal, amounting to checking which code path got executed.","testPlan":"","lineCount":"196","dependsOn":["6517"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15933","author":"Alphare","id":"97293","dateCreated":"1563381018","dateModified":"1563381018"},{"type":"accept","author":"kevincox","id":"93576","dateCreated":"1558622845","dateModified":"1558622845"},{"type":"comment","comment":"@kevincox this used to be D6257 (I don't think I changed anything besides rebasing)","author":"gracinet","id":"93397","dateCreated":"1558543848","dateModified":"1558543848"},{"type":"update","diffId":"15222","author":"gracinet","id":"93352","dateCreated":"1558543791","dateModified":"1558543791"}],"dateCreated":"1558543791","dateModified":"1563381018","status":"Needs Review"},{"id":"6517","callsign":"HG","title":"rust-discovery: read the index from a repo passed at init","author":"gracinet","summary":"This makes the API of the Rust PartialDiscovery object now\nthe same (or rather a subset) of the Python object, hence\neasier to control through module policy down the road.","testPlan":"","lineCount":"23","dependsOn":["6516"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15932","author":"Alphare","id":"97292","dateCreated":"1563381013","dateModified":"1563381013"},{"type":"accept","author":"kevincox","id":"94955","dateCreated":"1560420335","dateModified":"1560420335"},{"type":"update","diffId":"15465","author":"gracinet","id":"94830","dateCreated":"1560363227","dateModified":"1560363227"}],"dateCreated":"1560363227","dateModified":"1563381013","status":"Needs Review"},{"id":"6516","callsign":"HG","title":"rust-discovery: accept the new 'respectsize' init arg","author":"gracinet","summary":"At this stage, we don't do anything about it: it will be meaningful\nin sampling methods that aren't implemented yet.","testPlan":"","lineCount":"11","dependsOn":[],"reviewers":[],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15931","author":"Alphare","id":"97291","dateCreated":"1563381008","dateModified":"1563381008"},{"type":"update","diffId":"15464","author":"gracinet","id":"94824","dateCreated":"1560363222","dateModified":"1560363222"}],"dateCreated":"1560363222","dateModified":"1563381008","status":"Needs Review"},{"id":"6267","callsign":"HG","title":"incoming: detect if server send partial replies","author":"joerg.sonnenberger","summary":"incoming is not using the normal exchange logic and therefore doesn't\nknow how to tell with pullbundles. Fixing that is involved and it is\ncurrently not sure if the current incoming code will survive, so apply a\nband aid for now.","testPlan":"","lineCount":"14","dependsOn":[],"reviewers":["indygreg"],"ccs":["indygreg","mercurial-devel"],"actions":[{"type":"inline","comment":"We know that this whole code fragment for \"incoming\" is seriously limited and should go away. Do we really want to change the whole API for that one special use case?","replyTo":"91468","isNewFile":"1","line":"642","lineLength":"0","path":"mercurial\/bundlerepo.py","diffId":"14835","author":"joerg.sonnenberger","id":"97272","dateCreated":"1563372152","dateModified":"1563372152"},{"type":"inline","comment":"Something I didn't notice before is that this function doesn't do any UI presentation. So it feels like a bug to print a message in this function assuming that fetched changesets will be displayed.\n\nI suppose that means we'll need to include the \"was partial reply\" state in the return value and format it to a warning elsewhere.\n\nSorry for not catching this on first review. I intend to queue this patch for stable so it gets in the 5.0 release, as I think the improved UI is good to have.","replyTo":null,"isNewFile":"1","line":"642","lineLength":"0","path":"mercurial\/bundlerepo.py","diffId":"14835","author":"indygreg","id":"91468","dateCreated":"1555686455","dateModified":"1555686455"},{"type":"reject","author":"indygreg","id":"91467","dateCreated":"1555686455","dateModified":"1555686455"},{"type":"update","diffId":"14835","author":"joerg.sonnenberger","id":"91256","dateCreated":"1555543888","dateModified":"1555543888"},{"type":"inline","comment":"Same comment as above regarding the `x in localrepo` issues.","replyTo":null,"isNewFile":"1","line":"641","lineLength":"0","path":"mercurial\/bundlerepo.py","diffId":"14808","author":"indygreg","id":"91191","dateCreated":"1555538183","dateModified":"1555538183"},{"type":"inline","comment":"+1 for this feature. But the warning message is a bit ambiguous to me. How about something like `warning: server sent partial data; not all remote changesets are available`. This still isn't great. But I'm struggling to find a way to better state the issue here.","replyTo":null,"isNewFile":"1","line":"640","lineLength":"0","path":"mercurial\/bundlerepo.py","diffId":"14808","author":"indygreg","id":"91190","dateCreated":"1555538183","dateModified":"1555538183"},{"type":"inline","comment":"`localrepo.__contains__` can be slow in tight loops because it has to resolve `self.changelog`. Also, `localrepo.__getitem__` (which `__contains__` calls) accepts a myriad of different values (integers, hex and binary hashes, etc). We want to user a lower-level API to perform lookups. I think `localrepo.changelog.hasnode()` is what we want. Please alias that to a local to avoid the `localrepo.changelog` property resolution in a loop.","replyTo":null,"isNewFile":"1","line":"639","lineLength":"0","path":"mercurial\/bundlerepo.py","diffId":"14808","author":"indygreg","id":"91189","dateCreated":"1555538183","dateModified":"1555538183"},{"type":"comment","comment":"+1 for feature. Needs some minor work to get review.","author":"indygreg","id":"91188","dateCreated":"1555538183","dateModified":"1555538183"},{"type":"reject","author":"indygreg","id":"91187","dateCreated":"1555538183","dateModified":"1555538183"},{"type":"update","diffId":"14808","author":"joerg.sonnenberger","id":"91181","dateCreated":"1555537007","dateModified":"1555537007"}],"dateCreated":"1555537007","dateModified":"1563372152","status":"Needs Revision"},{"id":"6629","callsign":"HG","title":"rust-dirstate: use EntryState enum instead of literals","author":"Alphare","summary":"This improves code readability quite a bit, while also adding a layer of\nsafety because we're checking the state byte against the enum.","testPlan":"","lineCount":"225","dependsOn":["6628"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"inline","comment":"Sorry yes. I've been writing too much python at work.","replyTo":"97263","isNewFile":"1","line":"85","lineLength":"0","path":"rust\/hg-core\/src\/lib.rs","diffId":"15898","author":"kevincox","id":"97268","dateCreated":"1563363332","dateModified":"1563363332"},{"type":"inline","comment":"The one-liner does not compile, so I improved the comment to explain why (which it really should have in the first place).","replyTo":"97168","isNewFile":"1","line":"42","lineLength":"0","path":"rust\/hg-cpython\/src\/parsers.rs","diffId":"15898","author":"Alphare","id":"97264","dateCreated":"1563359389","dateModified":"1563359389"},{"type":"inline","comment":"Did you mean `{:?}`. I can't find anything related to your syntax.","replyTo":"97167","isNewFile":"1","line":"85","lineLength":"0","path":"rust\/hg-core\/src\/lib.rs","diffId":"15898","author":"Alphare","id":"97263","dateCreated":"1563359389","dateModified":"1563359389"},{"type":"inline","comment":"If you are going to a comment I would say why. However in this case it probably isn't worth having a comment.\n\nYou can also do this on one line `entry.state.into::<u8>() as c_char` which I think is simple enough.","replyTo":null,"isNewFile":"1","line":"42","lineLength":"0","path":"rust\/hg-cpython\/src\/parsers.rs","diffId":"15898","author":"kevincox","id":"97168","dateCreated":"1563206883","dateModified":"1563206883"},{"type":"inline","comment":"I like using `{!r}` so that the substituted entry is quoted and unambiguous. ","replyTo":null,"isNewFile":"1","line":"85","lineLength":"0","path":"rust\/hg-core\/src\/lib.rs","diffId":"15898","author":"kevincox","id":"97167","dateCreated":"1563206883","dateModified":"1563206883"},{"type":"accept","author":"kevincox","id":"97166","dateCreated":"1563206883","dateModified":"1563206883"},{"type":"update","diffId":"15898","author":"Alphare","id":"97089","dateCreated":"1562923378","dateModified":"1562923378"},{"type":"update","diffId":"15842","author":"Alphare","id":"96794","dateCreated":"1562759204","dateModified":"1562759204"}],"dateCreated":"1562759204","dateModified":"1563363332","status":"Needs Review"},{"id":"6628","callsign":"HG","title":"rust-parsers: switch to parse\/pack_dirstate to mutate-on-loop","author":"Alphare","summary":"Both `parse_dirstate` and `pack_dirstate` can operate directly on the data\nthey're passed, which prevents the creation of intermediate data structures,\nsimplifies the function signatures and reduces boilerplate. They are exposed\ndirectly to the Python for now, but a later patch will make use of them inside\n`hg-core`.","testPlan":"","lineCount":"457","dependsOn":["6627"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mjpieters","mercurial-devel"],"actions":[{"type":"inline","comment":"The \"proper\" solution is [SystemTime](https:\/\/doc.rust-lang.org\/std\/time\/struct.SystemTime.html) however I will admit that it is a bit more awkward to use. However if you are going to use Duration please document that it is the Duration since the Unix Epoch.","replyTo":null,"isNewFile":"1","line":"81","lineLength":"0","path":"rust\/hg-core\/src\/dirstate\/parsers.rs","diffId":"15897","author":"kevincox","id":"97176","dateCreated":"1563207887","dateModified":"1563207887"},{"type":"inline","comment":"Would it be best to panic on overflow? `now.as_secs().try_into::<i32>().expect(\"time overflow\")`.","replyTo":null,"isNewFile":"1","line":"87","lineLength":"0","path":"rust\/hg-core\/src\/dirstate\/parsers.rs","diffId":"15897","author":"kevincox","id":"97175","dateCreated":"1563207887","dateModified":"1563207887"},{"type":"inline","comment":"If these are always 20 bytes long you are best to use `[u8; 20]`. That way there will be no indirection. And since `Vec` is 3 words it will have a bigger immediate size on 64bit platforms.","replyTo":null,"isNewFile":"1","line":"16","lineLength":"0","path":"rust\/hg-core\/src\/dirstate\/mod.rs","diffId":"15897","author":"kevincox","id":"97174","dateCreated":"1563207887","dateModified":"1563207887"},{"type":"accept","author":"kevincox","id":"97173","dateCreated":"1563207887","dateModified":"1563207887"},{"type":"update","diffId":"15897","author":"Alphare","id":"97088","dateCreated":"1562923371","dateModified":"1562923371"},{"type":"update","diffId":"15841","author":"Alphare","id":"96784","dateCreated":"1562759197","dateModified":"1562759197"}],"dateCreated":"1562759197","dateModified":"1563359428","status":"Needs Review"},{"id":"6631","callsign":"HG","title":"rust-cpython: add macro for sharing references","author":"Alphare","summary":"Following an experiment done by Georges Racinet, we now have a working way of\nsharing references between Python and Rust. This is needed in many points of\nthe codebase, for example every time we need to expose an iterator to a\nRust-backed Python class.\n\nIn a few words, references are (unsafely) marked as `'static` and coupled\nwith manual reference counting; we are doing manual borrow-checking.\n\nThis changes introduces two declarative macro to help reduce boilerplate.\nWhile it is better than not using macros, they are not perfect. They need to:\n\n\t- Integrate with the garbage collector for container types (not needed\n\t  as of yet), as stated in the docstring\n\t- Allow for leaking multiple attributes at the same time\n\t- Inject the `leaked_count` data attribute in `py_class`-generated\n\t  structs\n\t- Automatically namespace the functions and attributes they generate\n\nFor at least the last two points, we will need to write a procedural macro\ninstead of a declarative one.\nWhile this reference-sharing mechanism is being ironed out I thought it best\nnot to implement it yet.\n\nLastly, and implementation detail renders our Rust-backed Python iterators too\nstrict to be proper drop-in replacements, as will be illustrated in a future\npatch: if the data structure referenced by a non-depleted iterator is mutated,\nan `AlreadyBorrowed` exception is raised, whereas Python would allow it, only\nto raise a `RuntimeError` if `next` is called on said iterator. This will have\nto be addressed at some point.","testPlan":"","lineCount":"330","dependsOn":["6630"],"reviewers":[],"ccs":["gracinet","durin42","kevincox","mercurial-devel"],"actions":[{"type":"inline","comment":"The terminology is weird here. You don't appear to be tracking leaks, just borrows. ","replyTo":null,"isNewFile":"1","line":"55","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"kevincox","id":"97226","dateCreated":"1563282804","dateModified":"1563282804"},{"type":"inline","comment":"This catches a mutable borrow after other borrows, however I believe it fails to catch a mutable borrow followed by immutable borrows.","replyTo":null,"isNewFile":"1","line":"85","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"kevincox","id":"97225","dateCreated":"1563282804","dateModified":"1563282804"},{"type":"inline","comment":"Thanks. I missed that.","replyTo":"97221","isNewFile":"1","line":"61","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"kevincox","id":"97224","dateCreated":"1563282804","dateModified":"1563282804"},{"type":"comment","comment":">>! In D6631#97216, @kevincox wrote:\n> Is there any reason this can't be done using `Rc<RefCell<DirsMultiset>>`?  I have an example here: https:\/\/rust.godbolt.org\/z\/MNNR_F\n\nI see now that since python is managing the reference it does make some sense to do it this way.","author":"kevincox","id":"97223","dateCreated":"1563282804","dateModified":"1563282804"},{"type":"inline","comment":"Hi Kevin,\n\nall that CPython's `del` does is decrement the reference count, and if it drops to 0, then the memory will be freed immediately. On the other hand, the `clone_ref()` at line 106 does increment it. \n\nSo, in your example, after `del c` the refcount of `c` is 1 and the memory shouldn't be freed.\n","replyTo":"97219","isNewFile":"1","line":"61","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"gracinet","id":"97221","dateCreated":"1563281513","dateModified":"1563281513"},{"type":"inline","comment":"I'm failing to see what actually prevents the \"container\" from being dropped while the \"iterator\" is alive. Is this somehow tied to the Python GC?\n\nFor example:\n\n```\nc = RustObject()\ni = iter(i)\ndel c\n# What is keeping the backing rust memory alive at this point.\n```","replyTo":null,"isNewFile":"1","line":"61","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"kevincox","id":"97219","dateCreated":"1563275543","dateModified":"1563275543"},{"type":"inline","comment":"Instead of adding methods to the interface type I would just create a templated struct which has these methods as well as the data and count. It doesn't seem like these actually need to be in the parent type.","replyTo":null,"isNewFile":"1","line":"57","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"kevincox","id":"97218","dateCreated":"1563275543","dateModified":"1563275543"},{"type":"inline","comment":"You aren't really using the `RefCell` type here. It might be better to just use `Cell` for the count and `UnsafeCell` for the data.","replyTo":null,"isNewFile":"1","line":"45","lineLength":"0","path":"rust\/hg-cpython\/src\/macros.rs","diffId":"15844","author":"kevincox","id":"97217","dateCreated":"1563275543","dateModified":"1563275543"},{"type":"comment","comment":"Is there any reason this can't be done using `Rc<RefCell<DirsMultiset>>`?  I have an example here: https:\/\/rust.godbolt.org\/z\/MNNR_F\n\nIt uses `Rc` and `RefCell` however it does need to do some unsafe work to keep the RefCell borrowed for longer than would otherwise be easy to do. The advantages here are\n\n1. Lifetime is automatically managed by the Rc. This ensures that our parent data doesn't get deleted while the iterator is still alive.\n2. The linked implementation uses a mutable borrow. However it would be easy to make an immutable version which would allow multiple iterators over the same \"container\".\n3. Mutable access is managed by the RefCell so we don't need to do our own.","author":"kevincox","id":"97216","dateCreated":"1563275543","dateModified":"1563275543"},{"type":"update","diffId":"15844","author":"Alphare","id":"96813","dateCreated":"1562759218","dateModified":"1562759218"}],"dateCreated":"1562759218","dateModified":"1563282804","status":"Needs Review"},{"id":"6630","callsign":"HG","title":"rust-docstrings: add missing module docstrings","author":"Alphare","summary":" ","testPlan":"","lineCount":"29","dependsOn":["6629"],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"accept","author":"kevincox","id":"97165","dateCreated":"1563205921","dateModified":"1563205921"},{"type":"update","diffId":"15893","author":"Alphare","id":"97078","dateCreated":"1562921406","dateModified":"1562921406"},{"type":"update","diffId":"15843","author":"Alphare","id":"96804","dateCreated":"1562759211","dateModified":"1562759211"}],"dateCreated":"1562759211","dateModified":"1563205922","status":"Needs Review"},{"id":"6626","callsign":"HG","title":"rust-dirstate: create dirstate submodule in hg-cpython","author":"Alphare","summary":"This module will soon hold multiple files, this change is to make the\nreview process easier.","testPlan":"","lineCount":"688","dependsOn":[],"reviewers":["kevincox"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"inline","comment":"I think I would find it more readable as `for (filename, dirstate) in ...`. If you want to unpack it I would do that in the first line of the loop body. However it might also be best just to use `dirstate.state`. I guess the downside there is you don't get a compile error if a new field is added.","replyTo":null,"isNewFile":"1","line":"178","lineLength":"0","path":"rust\/hg-cpython\/src\/dirstate\/mod.rs","diffId":"15839","author":"kevincox","id":"97095","dateCreated":"1562946743","dateModified":"1562946743"},{"type":"inline","comment":"Should there be a check that this element exists?","replyTo":null,"isNewFile":"1","line":"119","lineLength":"0","path":"rust\/hg-cpython\/src\/dirstate\/mod.rs","diffId":"15839","author":"kevincox","id":"97094","dateCreated":"1562946743","dateModified":"1562946743"},{"type":"inline","comment":"```\n.map(py.None())\n```","replyTo":null,"isNewFile":"1","line":"68","lineLength":"0","path":"rust\/hg-cpython\/src\/dirstate\/dirs_multiset.rs","diffId":"15839","author":"kevincox","id":"97093","dateCreated":"1562946743","dateModified":"1562946743"},{"type":"inline","comment":"```\nlet dirs_map = if ...\n```","replyTo":null,"isNewFile":"1","line":"35","lineLength":"0","path":"rust\/hg-cpython\/src\/dirstate\/dirs_multiset.rs","diffId":"15839","author":"kevincox","id":"97092","dateCreated":"1562946743","dateModified":"1562946743"},{"type":"inline","comment":"```\nlet skip_state = skip.map(|skip| skip.extract::<PyBytes>(py)?.data(py)[0] as i8);\n```","replyTo":null,"isNewFile":"1","line":"34","lineLength":"0","path":"rust\/hg-cpython\/src\/dirstate\/dirs_multiset.rs","diffId":"15839","author":"kevincox","id":"97091","dateCreated":"1562946743","dateModified":"1562946743"},{"type":"accept","author":"kevincox","id":"97090","dateCreated":"1562946743","dateModified":"1562946743"},{"type":"update","diffId":"15839","author":"Alphare","id":"96764","dateCreated":"1562759184","dateModified":"1562759184"}],"dateCreated":"1562759184","dateModified":"1562946743","status":"Needs Review"},{"id":"6634","callsign":"HG","title":"rust-dirstate: call rust dirstatemap from Python","author":"Alphare","summary":"Since Rust-backed Python classes cannot be used as baseclasses (for\nrust-cpython anyway), we use composition rather than inheritance.\n\nThis also allows us to keep the IO operations in the Python side, removing\n(for now) the need to rewrite VFS in Rust, which would be a heavy undertaking.","testPlan":"","lineCount":"201","dependsOn":["6633"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"15894","author":"Alphare","id":"97079","dateCreated":"1562921425","dateModified":"1562921425"},{"type":"update","diffId":"15852","author":"Alphare","id":"96869","dateCreated":"1562769277","dateModified":"1562769277"}],"dateCreated":"1562769277","dateModified":"1562923403","status":"Needs Review"},{"id":"6633","callsign":"HG","title":"rust-dirstate: rust-cpython bridge for dirstatemap","author":"Alphare","summary":"This change also showcases the limitations of the `py_shared_ref!` macro.\n\nSee the previous commit 'rust-dirstate: rust implementation of dirstatemap`\nfor an explanation for the TODOs in the code.","testPlan":"","lineCount":"630","dependsOn":["6632"],"reviewers":[],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15851","author":"Alphare","id":"96859","dateCreated":"1562769269","dateModified":"1562769269"}],"dateCreated":"1562769269","dateModified":"1562923398","status":"Needs Review"},{"id":"6632","callsign":"HG","title":"rust-dirstate: rust implementation of dirstatemap","author":"Alphare","summary":"The `dirstatemap` is one of the last building blocks needed to get to a\n`dirstate.walk` Rust implementation.\n\nDisclaimer: This change is part of a big (10) series of patches, all of which\nstarted as one big changeset that took a long time to write.\nThis `dirstatemap` implementation is a compromise in terms of complexity both\nfor me and for the reviewers. I chose to submit this patch right now because\nwhile it is not perfect, it works and is simple enough (IMHO) to be reviewed.\n\nThe Python implementation uses a lot of lazy propertycaches, breaks\nencapsulation and is used as an iterator in a lot of places, all of which\ndictated the somewhat unidiomatic patterns in this change.\nLike written in the comments, rewriting this struct to use the typestate\npattern might be a good idea, but this is a good first step.","testPlan":"","lineCount":"433","dependsOn":["6631"],"reviewers":[],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15850","author":"Alphare","id":"96853","dateCreated":"1562769264","dateModified":"1562769264"}],"dateCreated":"1562769264","dateModified":"1562923393","status":"Needs Review"},{"id":"6627","callsign":"HG","title":"rust-parsers: move parser bindings to their own file and Python module","author":"Alphare","summary":"This tidies up the Rust side while simplifying the Python side.","testPlan":"","lineCount":"366","dependsOn":["6626"],"reviewers":[],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"update","diffId":"15840","author":"Alphare","id":"96774","dateCreated":"1562759190","dateModified":"1562759190"}],"dateCreated":"1562759190","dateModified":"1562923364","status":"Needs Review"},{"id":"6479","callsign":"HG","title":"shelve: first prototype of storing\/restoring unresolved changes","author":"navaneeth.suresh","summary":"This is an RFC patch. This does three things:\n\n1. Adds an `--unresolved` flag to `hg shelve`.\n2. Adds an `--unresolved` flag to `hg unshelve`.\n3. Adds an experimental config option `store-in-extra` to handle storage method.\n\nWhen `experimental.store-in-extra == True`:\nThe mergestate records are stored in changeset extras. I have used the storage\nformat supported for hg versions 3.7 or later. For the time being, I have omitted\nthe storage of the content of the local version of unresolved files.\n\nOtherwise:\nThe usual mergestate information in `$HGRCPATH\/merge\/` is moved to\n`$HGRCPATH\/merge-unresolved\/<basename>\/`.\n\nAfter shelving, and the working directory is updated to `p1()`.\n\nUnresolved shelve changesets are stored with the extra mapping\n`{'unresolved-merge': True}`. Also, `hg shelve --patch` and\n`hg shelve --list` will show unresolved files separately as:\n\n```\n$ hg shelve --list\ndefault (unresolved)         (1s ago)    changes to: C\n```\n\n`hg shelve` will abort when:\n\n1. No merge is active on calling with `--unresolved`.\n2. No unresolved files found in active merge on calling with `--unresolved`.\n3. Merge is active on calling without `--unresolved`.\n\n`hg unshelve --unresolved` will get the user back to the old unresolved merge by\nthe following steps:\n\nStep 1: If the user has committed new changesets after shelving the changes,\nthey must update the working directory to one of the merge parents.\n\nStep 2: Change parents of dirstate to p1 and p2.\n\nStep 3: In order to restore our partially resolved state, we will move the\ncontents of `$HGRCPATH\/merge-unresolved\/<basename>\/`\nto `$HGRCPATH\/merge\/` if `experimental.store-in-extra` not\nset `True`. Otherwise, we'll write from data stored in changeset extras.\n\nStep 4: We now have a state in which files marked as resolved might have\nconflicts. But, we will apply the changes in shelve on the top of this so that we\ncan get our old unresolved merge again by the usual unshelve mechanism.\n\nThe usual rebase step is avoided on unresolved shelve changesets. Also, we\nuse the functions present in `merge.py` to read\/write mergestate records\nfrom\/to changeset extras.\n\n`$ hg unshelve --unresolved` will abort when:\n\n1. The working directory is dirty.\n2. If there is an ongoing merge.\n3. If the working directory is not at either p1 or p2.\n(p1, p2 are the parents of the unresolved shelve changeset)","testPlan":"","lineCount":"612","dependsOn":[],"reviewers":[],"ccs":["pulkit","mercurial-devel"],"actions":[{"type":"update","diffId":"15765","author":"navaneeth.suresh","id":"96393","dateCreated":"1562268299","dateModified":"1562268299"},{"type":"update","diffId":"15764","author":"navaneeth.suresh","id":"96392","dateCreated":"1562268141","dateModified":"1562268141"},{"type":"comment","comment":">>! In D6479#96318, @pulkit wrote:\n> Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core?\n\nDoing that right away!","author":"navaneeth.suresh","id":"96360","dateCreated":"1562252646","dateModified":"1562252646"},{"type":"comment","comment":"Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core?","author":"pulkit","id":"96318","dateCreated":"1562104734","dateModified":"1562104734"},{"type":"update","diffId":"15693","author":"navaneeth.suresh","id":"96015","dateCreated":"1561724171","dateModified":"1561724171"},{"type":"inline","comment":"fixed. i added `(extrastorage !)` manually to the corresponding test case. this will prevent it from changing on executing with `usualstorage` test case. thanks!","replyTo":"95141","isNewFile":"1","line":"169","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"navaneeth.suresh","id":"95146","dateCreated":"1560698124","dateModified":"1560698124"},{"type":"update","diffId":"15534","author":"navaneeth.suresh","id":"95143","dateCreated":"1560697995","dateModified":"1560697995"},{"type":"inline","comment":"this if and endif can be removed.","replyTo":null,"isNewFile":"1","line":"138","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95142","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"We can get rid of this #if and #endif too. the usualstorage one will have `(unresolved)` in the test output. We have functionality to have test output case wise which can be used.\n\nFor example, here we have two different outputs in py3 and non-py3 cases. https:\/\/www.mercurial-scm.org\/repo\/hg-committed\/file\/tip\/tests\/test-debugcommands.t#l213","replyTo":null,"isNewFile":"1","line":"169","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95141","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"we don't need this #if and #endif, it can be removed.","replyTo":null,"isNewFile":"1","line":"253","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95140","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"we don't need this #if and #endif, it can be removed.","replyTo":null,"isNewFile":"1","line":"279","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95139","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"we don't need this #if and #endif, it can be removed.","replyTo":null,"isNewFile":"1","line":"528","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95138","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"we don't need this #if and #endif, it can be removed.","replyTo":null,"isNewFile":"1","line":"442","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95137","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"we don't need this #if and #endif, it can be removed.","replyTo":null,"isNewFile":"1","line":"371","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95136","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"inline","comment":"we don't need this #if and #endif, it can be removed.","replyTo":null,"isNewFile":"1","line":"344","lineLength":"0","path":"tests\/test-shelve-unresolved.t","diffId":"15517","author":"pulkit","id":"95135","dateCreated":"1560694987","dateModified":"1560694987"},{"type":"comment","comment":"Now, we have mergestate information storage in changeset level too with the help of extra mapping.","author":"navaneeth.suresh","id":"95070","dateCreated":"1560543564","dateModified":"1560543564"},{"type":"update","diffId":"15517","author":"navaneeth.suresh","id":"95064","dateCreated":"1560542219","dateModified":"1560542219"},{"type":"comment","comment":">>! In D6479#94711, @pulkit wrote:\n> Can you fold both the commits, it will be better to see code for both storing and restoring mergestates in one patch.\n\n@pulkit I've folded the changesets and updated the revision. Abandoned D6478. This looks like a huge change though. No worries as this work more or less like an RFC patch.","author":"navaneeth.suresh","id":"94740","dateCreated":"1560282571","dateModified":"1560282571"},{"type":"update","diffId":"15451","author":"navaneeth.suresh","id":"94733","dateCreated":"1560282303","dateModified":"1560282303"},{"type":"update","diffId":"15449","author":"navaneeth.suresh","id":"94729","dateCreated":"1560280880","dateModified":"1560280880"},{"type":"inline","comment":"Let's move this parent changing of dirstate out of this function. This functions should only have logic related to storing and restoring unresolved states.","replyTo":null,"isNewFile":"1","line":"726","lineLength":"0","path":"hgext\/shelve.py","diffId":"15435","author":"pulkit","id":"94713","dateCreated":"1560276402","dateModified":"1560276402"},{"type":"inline","comment":"let's have `shelvectx` an optional argument to `_isunresolvedshelve()`. If `shelvectx` is passed we use that, otherwise we fallback to checking the directory in merge-unresolved\/.\n\nAnd then use that function here.","replyTo":null,"isNewFile":"1","line":"1061","lineLength":"0","path":"hgext\/shelve.py","diffId":"15435","author":"pulkit","id":"94712","dateCreated":"1560276402","dateModified":"1560276402"},{"type":"comment","comment":"Can you fold both the commits, it will be better to see code for both storing and restoring mergestates in one patch.","author":"pulkit","id":"94711","dateCreated":"1560276402","dateModified":"1560276402"},{"type":"update","diffId":"15435","author":"navaneeth.suresh","id":"94636","dateCreated":"1560252615","dateModified":"1560252615"},{"type":"inline","comment":"this comment can be a part of function documentation.","replyTo":null,"isNewFile":"1","line":"722","lineLength":"0","path":"hgext\/shelve.py","diffId":"15431","author":"pulkit","id":"94615","dateCreated":"1560206877","dateModified":"1560206877"},{"type":"inline","comment":"the functions needs documentation.","replyTo":null,"isNewFile":"1","line":"717","lineLength":"0","path":"hgext\/shelve.py","diffId":"15431","author":"pulkit","id":"94614","dateCreated":"1560206877","dateModified":"1560206877"},{"type":"update","diffId":"15431","author":"navaneeth.suresh","id":"94594","dateCreated":"1560192117","dateModified":"1560192117"},{"type":"inline","comment":"`vfs.rename`  should be used here.","replyTo":null,"isNewFile":"1","line":"724","lineLength":"0","path":"hgext\/shelve.py","diffId":"15423","author":"pulkit","id":"94578","dateCreated":"1560188340","dateModified":"1560188340"},{"type":"update","diffId":"15423","author":"navaneeth.suresh","id":"94570","dateCreated":"1560186708","dateModified":"1560186708"},{"type":"update","diffId":"15422","author":"navaneeth.suresh","id":"94569","dateCreated":"1560185478","dateModified":"1560185478"},{"type":"inline","comment":"we can do this check by looking into shelvectx extras below.","replyTo":null,"isNewFile":"1","line":"1039","lineLength":"0","path":"hgext\/shelve.py","diffId":"15420","author":"pulkit","id":"94562","dateCreated":"1560184550","dateModified":"1560184550"},{"type":"inline","comment":"if merge-unresolved\/ does not exists, it means there are no unresolved shelves, right? we should not be creating it then.","replyTo":null,"isNewFile":"1","line":"724","lineLength":"0","path":"hgext\/shelve.py","diffId":"15420","author":"pulkit","id":"94561","dateCreated":"1560184550","dateModified":"1560184550"},{"type":"inline","comment":"why do we need to do this?","replyTo":null,"isNewFile":"1","line":"722","lineLength":"0","path":"hgext\/shelve.py","diffId":"15420","author":"pulkit","id":"94560","dateCreated":"1560184550","dateModified":"1560184550"},{"type":"update","diffId":"15420","author":"navaneeth.suresh","id":"94558","dateCreated":"1560184198","dateModified":"1560184198"},{"type":"comment","comment":">>! In D6479#94556, @pulkit wrote:\n>>>! In D6479#94555, @navaneeth.suresh wrote:\n>>> Can we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate from previously stored one, what purpose does this merging serves?\n>> \n>> \n>> The usual unshelve mechanism restores the content of the files in the mergestate. However, we'll be still in a state with only one parent. This merge will help to recreate the exact same state with two parents.\n> \n> There are other ways to set the second parent, like dirstate.setparents() I think. It is worth investigating to find a way to do it without merging again.\n\nInteresting. Then, I shall investigate it and update the diff.\n","author":"navaneeth.suresh","id":"94557","dateCreated":"1560182423","dateModified":"1560182423"},{"type":"comment","comment":">>! In D6479#94555, @navaneeth.suresh wrote:\n>> Can we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate from previously stored one, what purpose does this merging serves?\n> \n> \n> The usual unshelve mechanism restores the content of the files in the mergestate. However, we'll be still in a state with only one parent. This merge will help to recreate the exact same state with two parents.\n\nThere are other ways to set the second parent, like dirstate.setparents() I think. It is worth investigating to find a way to do it without merging again.","author":"pulkit","id":"94556","dateCreated":"1560182162","dateModified":"1560182162"},{"type":"comment","comment":"> Can we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate from previously stored one, what purpose does this merging serves?\n\n\nThe usual unshelve mechanism restores the content of the files in the mergestate. However, we'll be still in a state with only one parent. This merge will help to recreate the exact same state with two parents.","author":"navaneeth.suresh","id":"94555","dateCreated":"1560181695","dateModified":"1560181695"},{"type":"comment","comment":"> step 2: Internally, merge p1 with p2 with the merge tool :fail.\n> This will not update the contents of the files with conflicting changes.\n> Instead, it will mark them as unresolved.\n\nCan we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate from previously stored one, what purpose does this merging serves?\n> \n> step 3: This internal merge will also mark the files which are already\n> resolved by the user in the unresolved shelve changeset as unresolved. But,\n> we will move the contents of $HGRCPATH\/merge-unresolved\/<basename>\/\n> to $HGRCPATH\/merge\/ so that we can restore the partially resolved states.\n> \n> step 4: We now have a state in which files marked as resolved might have\n> conflicts. But, we will apply the changes in shelve on the top of this so that we\n> can get our old unresolved merge again by the usual unshelve mechanism.\n> The usual rebase step is avoided on unresolved shelve changesets.\n\n\n\n","author":"pulkit","id":"94537","dateCreated":"1560177628","dateModified":"1560177628"},{"type":"update","diffId":"15346","author":"navaneeth.suresh","id":"94075","dateCreated":"1559759989","dateModified":"1559759989"}],"dateCreated":"1559759989","dateModified":"1562268299","status":"Needs Review"},{"id":"6550","callsign":"HG","title":"tracing: add a couple of trace points on obsolete and repoview","author":"durin42","summary":"I was seeing weird stalls in some fast commands, and these trace\nevents help explain them.","testPlan":"","lineCount":"16","dependsOn":["6527"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"15609","author":"durin42","id":"95547","dateCreated":"1560983009","dateModified":"1560983009"}],"dateCreated":"1560983009","dateModified":"1560983009","status":"Needs Review"},{"id":"6527","callsign":"HG","title":"dirstate: add counter events for work queue depth","author":"durin42","summary":"","testPlan":"","lineCount":"3","dependsOn":["6522"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"15563","author":"durin42","id":"95281","dateCreated":"1560811381","dateModified":"1560811381"},{"type":"update","diffId":"15479","author":"durin42","id":"94947","dateCreated":"1560392230","dateModified":"1560392230"}],"dateCreated":"1560392230","dateModified":"1560983009","status":"Needs Review"},{"id":"6522","callsign":"HG","title":"tracing: add many more timedcm() calls throughout the codebase","author":"durin42","summary":"I've been trying to understand where time goes in `hg status` and this helped\nme get a sense of things. I'm happy to try and split this up if it's too\nconfusing, but I felt like it was fine as-is since all the changes are the\nsame.","testPlan":"","lineCount":"176","dependsOn":[],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"15601","author":"durin42","id":"95514","dateCreated":"1560975937","dateModified":"1560975937"},{"type":"update","diffId":"15562","author":"durin42","id":"95280","dateCreated":"1560811377","dateModified":"1560811377"},{"type":"update","diffId":"15474","author":"durin42","id":"94913","dateCreated":"1560373618","dateModified":"1560373618"}],"dateCreated":"1560373618","dateModified":"1560983002","status":"Needs Review"},{"id":"6056","callsign":"HG","title":"patch: stop aborting when add\/rename\/copy files on --interactive (issue5727)","author":"navaneeth.suresh","summary":"issue5727 was reported specifically for mq on using qrefresh. On investigating further,\nI realized that it was a check in `patch.py` that resulting in the abort. I may be wrong.\nOn interactive mode, `gp.mode` was not `None`. I added a check in `_applydiff()` not to\nabort when `gp.mode` is `None` or `ui.interactive` is `True`.","testPlan":"","lineCount":"21","dependsOn":[],"reviewers":[],"ccs":["durin42","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"This patch breaks `test-split.t` - could you take a look?","author":"durin42","id":"94760","dateCreated":"1560357642","dateModified":"1560357642"},{"type":"comment","comment":"Gentle ping for review.","author":"navaneeth.suresh","id":"89905","dateCreated":"1553450928","dateModified":"1553450928"},{"type":"inline","comment":"IIUC, the current scenario is running into `abort: cannot create foo.h: destination already exists` if an empty file has been added. This means that the test case in my previous comment works fine without running into an error. I tested with hg (version 4.9+3-b70b7c585ee9) by adding a file with contents by running one command after another in my command line and got the same output. The interactive UI prompted me with only two queries. For an empty file, it should be only one as there are no changes to record. This might be the case for `qrefresh`. I'm not sure about this though.","replyTo":"89525","isNewFile":"1","line":"570","lineLength":"0","path":"tests\/test-mq-qrefresh.t","diffId":"14492","author":"navaneeth.suresh","id":"89558","dateCreated":"1552798795","dateModified":"1552798795"},{"type":"inline","comment":"I don't see the output which asks for `record this change to foo.h`  here in the test.","replyTo":"89500","isNewFile":"1","line":"570","lineLength":"0","path":"tests\/test-mq-qrefresh.t","diffId":"14492","author":"pulkit","id":"89525","dateCreated":"1552777310","dateModified":"1552777310"},{"type":"inline","comment":"i think that's usual here as the file `foo.h` is empty. i have the following case running successfully with this patch:\n```\n  $ echo foo > foo.h\n  $ hg add foo.h\n  $ hg qrefresh -i --config ui.interactive=true <<EOF\n  > y\n  > y\n  > n\n  > EOF\n  diff --git a\/foo.h b\/foo.h\n  new file mode 100644\n  examine changes to 'foo.h'? [Ynesfdaq?] y\n  \n  @@ -0,0 +1,1 @@\n  +foo\n  record this change to 'foo.h'? [Ynesfdaq?] y\n```","replyTo":"89407","isNewFile":"1","line":"570","lineLength":"0","path":"tests\/test-mq-qrefresh.t","diffId":"14492","author":"navaneeth.suresh","id":"89500","dateCreated":"1552726626","dateModified":"1552726626"},{"type":"inline","comment":"does this prompt ended here? it didn't show changes in 'foo.h'?","replyTo":null,"isNewFile":"1","line":"570","lineLength":"0","path":"tests\/test-mq-qrefresh.t","diffId":"14492","author":"pulkit","id":"89407","dateCreated":"1552657178","dateModified":"1552657178"},{"type":"update","diffId":"14492","author":"navaneeth.suresh","id":"89302","dateCreated":"1552544470","dateModified":"1552544470"},{"type":"update","diffId":"14319","author":"navaneeth.suresh","id":"88269","dateCreated":"1551641057","dateModified":"1551641057"}],"dateCreated":"1551641057","dateModified":"1560357642","status":"Needs Review"},{"id":"6355","callsign":"HG","title":"shelve: add `update --shelve` if shelve extension is loaded","author":"pulkit","summary":"A lot of times, I need to update to some other cset with dirty working\ndirectory. Good number of times, I run `hg shelve` and `hg update` in order.\n\nLet's add --shelve flag to `hg update` which will shelve wdir changes before\nrunning the update.\n\n.. feature::\n\n    `--shelve` flag to `hg update` if shelve extension is enabled. The flag will\n    shelve working directory changes before performing update.","testPlan":"","lineCount":"36","dependsOn":[],"reviewers":["durin42"],"ccs":["durin42","mharbison72","martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":"I like where this is going, but agree we should add a dirty-subrepos check so this doesn't burn subrepo users.","author":"durin42","id":"94753","dateCreated":"1560356242","dateModified":"1560356242"},{"type":"reject","author":"durin42","id":"94752","dateCreated":"1560356242","dateModified":"1560356242"},{"type":"comment","comment":">>! In D6355#92614, @mharbison72 wrote:\n> Should this abort if subrepos are present, since you can't shelve a subrepo?  No -S is available on `update`, but maybe looking for .hgsub with any contents is good enough?\n\nOn second thought, maybe just check for dirty subrepos so that this isn\u2019t completely incompatible with subrepos.\n","author":"mharbison72","id":"92616","dateCreated":"1557770825","dateModified":"1557770825"},{"type":"comment","comment":"Should this abort if subrepos are present, since you can't shelve a subrepo?  No -S is available on `update`, but maybe looking for .hgsub with any contents is good enough?\n\nI don't have time to play with it right now, but I know updating a dirty repo with dirty subrepos is massively confusing already.","author":"mharbison72","id":"92615","dateCreated":"1557754608","dateModified":"1557754608"},{"type":"inline","comment":"It's not clear that this is related to `--shelve`. Can we instead first check if the working is dirty? Or make this message more explicit. The former seems better if you think users (including you) will want to set `defaults.update=--shelve`.","replyTo":null,"isNewFile":"1","line":"1177","lineLength":"0","path":"tests\/test-shelve.t","diffId":"15045","author":"martinvonz","id":"92439","dateCreated":"1557506428","dateModified":"1557506428"},{"type":"update","diffId":"15045","author":"pulkit","id":"92409","dateCreated":"1557402072","dateModified":"1557402072"}],"dateCreated":"1557402072","dateModified":"1560356243","status":"Needs Revision"},{"id":"6082","callsign":"HG","title":"phabricator: add a `--branch` flag to `hg phabsend`","author":"pulkit","summary":"One of the existing problems with using phabricator for us is that there is no\nway to specify that the revision\/patch\/differential is intended for stable\nbranch.\n\nThis patch adds a new flag `--branch` to `hg phabsend` command. If the\n`--branch` is passed, `hg phabsend` will add a comment to the related\ndifferential saying that `The review is intended for a <branch-name> branch`.\n\nI looked into other API's which we can use or other properties which can be used\nto put the branch info and didn't found anything quite useful.\n\nFuture improvement can be checking the branch of the patch and commenting that\nbranch name.\n\nI am not sure how to add tests for this. I tested this patch while sending this\npatch.","testPlan":"","lineCount":"20","dependsOn":[],"reviewers":[],"ccs":["durin42","indygreg","Kwan","mharbison72","mercurial-devel"],"actions":[{"type":"comment","comment":"FYI: I've updated our phabricator recently, so maybe it's worth revisiting the branch-name-in-phab functionality from this patch?","author":"durin42","id":"94750","dateCreated":"1560355915","dateModified":"1560355915"},{"type":"comment","comment":">>! In D6082#89656, @pulkit wrote:\n>>>! In D6082#88981, @Kwan wrote:\n>>>>! In D6082#88852, @mharbison72 wrote:\n>>>>>! In D6082#88851, @pulkit wrote:\n>>>> @mharbison72 thanks for tips on adding test. Will add tests in next iteration.\n>>>> \n>>>> I found that Differentials do have a branch field, maybe we can use that? https:\/\/secure.phabricator.com\/source\/phabricator\/browse\/master\/src\/applications\/differential\/customfield\/DifferentialBranchField.php\n>>> \n>>> Seems worth a shot.  I don\u2019t know anything about it, but presumably this would be rendered specially in the web UI, like the test plan, etc.  That sounds better than as a follow up comment.  It also seems natural enough that maybe it can be done unconditionally, instead of needing the argument.\n>> \n>> Yeah, it shows in the Diff Detail pane, [like here](https:\/\/phabricator-dev.allizom.org\/D1092?id=1765).  Unfortunately I think it can be only set when using the creatediff endpoint, which is what I had to change my fork to do (though I could be wrong, the conduit docs are too sparse to be sure).\n> \n> Last night I tried different endpoints and looks like creatediff is the only one which can be used to set the branch. I have asked on their discourse https:\/\/discourse.phabricator-community.org\/t\/conduit-api-to-set-branch-of-a-differential\/2521.\n> \n> Talking about creatediff, can it be used instead of createrawdiff? It it's possible can you paste the changes you did your fork, maybe we need the exact same changes.\n\nOh man, yeah sure, let me just commit the WIP and push.  It's a lot of extra code to wrangle the data into creatediff form.  Bear in mind this wasn't exactly ready to have other eyes on it, and it's possible not all the changes are actually necessary (particularly the urlencoding ones, _so_ much fun having [multiple different ways](https:\/\/secure.phabricator.com\/T12447#216803) to submit the same data to Conduit :\/). I also have not downstreamed all my py3 compat changes yet.\nFrankly I thought this amount of extra code probably wouldn't fly for submitting to the official version (and my coding style is probably questionable).\n\nOn the plus side this did let me [successfully submit](https:\/\/phabricator.services.mozilla.com\/D23114?id=76558) binary file changes to mozilla-central.\n\n[In all its \"glory\"](https:\/\/bitbucket.org\/KwanEsq\/phabsend-moz\/commits\/branch\/beta)\n\nI've also started to write up what I've learnt about the API for the wiki there, to document things the official docs are silent on, like what the \"changes\" parameter to the creatediff endpoint is actually supposed to be.  Hopefully that'd help anyone else who wanted to use such APIs in future (or who even wanted to make changes to mine).\n","author":"Kwan","id":"89707","dateCreated":"1552998145","dateModified":"1552998191"},{"type":"comment","comment":">>! In D6082#88981, @Kwan wrote:\n>>>! In D6082#88852, @mharbison72 wrote:\n>>>>! In D6082#88851, @pulkit wrote:\n>>> @mharbison72 thanks for tips on adding test. Will add tests in next iteration.\n>>> \n>>> I found that Differentials do have a branch field, maybe we can use that? https:\/\/secure.phabricator.com\/source\/phabricator\/browse\/master\/src\/applications\/differential\/customfield\/DifferentialBranchField.php\n>> \n>> Seems worth a shot.  I don\u2019t know anything about it, but presumably this would be rendered specially in the web UI, like the test plan, etc.  That sounds better than as a follow up comment.  It also seems natural enough that maybe it can be done unconditionally, instead of needing the argument.\n> \n> Yeah, it shows in the Diff Detail pane, [like here](https:\/\/phabricator-dev.allizom.org\/D1092?id=1765).  Unfortunately I think it can be only set when using the creatediff endpoint, which is what I had to change my fork to do (though I could be wrong, the conduit docs are too sparse to be sure).\n\nLast night I tried different endpoints and looks like creatediff is the only one which can be used to set the branch. I have asked on their discourse https:\/\/discourse.phabricator-community.org\/t\/conduit-api-to-set-branch-of-a-differential\/2521.\n\nTalking about creatediff, can it be used instead of createrawdiff? It it's possible can you paste the changes you did your fork, maybe we need the exact same changes.\n\n>>! In D6082#89250, @indygreg wrote:\n> While there may be a need for an explicit `--branch` argument, should we start by having `hg phabsend` automatically pick up the branch from the changeset? i.e. wouldn't we want branch selection to be automatic?\n\nYes I agree. The next version of this patch will make `hg phabsend` automatically pick up the branch from changeset.","author":"pulkit","id":"89656","dateCreated":"1552994691","dateModified":"1552994691"},{"type":"update","diffId":"14548","author":"pulkit","id":"89639","dateCreated":"1552943259","dateModified":"1552943259"},{"type":"comment","comment":"While there may be a need for an explicit `--branch` argument, should we start by having `hg phabsend` automatically pick up the branch from the changeset? i.e. wouldn't we want branch selection to be automatic?","author":"indygreg","id":"89251","dateCreated":"1552502219","dateModified":"1552502219"},{"type":"comment","comment":">>! In D6082#88981, @Kwan wrote:\n>>>! In D6082#88852, @mharbison72 wrote:\n>>>>! In D6082#88851, @pulkit wrote:\n>>> @mharbison72 thanks for tips on adding test. Will add tests in next iteration.\n>>> \n>>> I found that Differentials do have a branch field, maybe we can use that? https:\/\/secure.phabricator.com\/source\/phabricator\/browse\/master\/src\/applications\/differential\/customfield\/DifferentialBranchField.php\n>> \n>> Seems worth a shot.  I don\u2019t know anything about it, but presumably this would be rendered specially in the web UI, like the test plan, etc.  That sounds better than as a follow up comment.  It also seems natural enough that maybe it can be done unconditionally, instead of needing the argument.\n> \n> Yeah, it shows in the Diff Detail pane, [like here](https:\/\/phabricator-dev.allizom.org\/D1092?id=1765).  Unfortunately I think it can be only set when using the creatediff endpoint, which is what I had to change my fork to do (though I could be wrong, the conduit docs are too sparse to be sure).\n\nYeah, that's kinda how I read the documentation too :\/\n\nI wonder if we can use `parents.set` in `differential.revision.edit` on the first commit in the series.  Or add the branch name to the existing metadata wiith `differential.setdiffproperty`?  I've aliased `phabimport` to `!\"%HG%\" phabread $1 --stack | \"%HG%\" import --bypass -`, but maybe a first class phabimport that knows how to use the data would make the tooling easier?","author":"mharbison72","id":"88983","dateCreated":"1552156019","dateModified":"1552156019"},{"type":"comment","comment":">>! In D6082#88852, @mharbison72 wrote:\n>>>! In D6082#88851, @pulkit wrote:\n>> @mharbison72 thanks for tips on adding test. Will add tests in next iteration.\n>> \n>> I found that Differentials do have a branch field, maybe we can use that? https:\/\/secure.phabricator.com\/source\/phabricator\/browse\/master\/src\/applications\/differential\/customfield\/DifferentialBranchField.php\n> \n> Seems worth a shot.  I don\u2019t know anything about it, but presumably this would be rendered specially in the web UI, like the test plan, etc.  That sounds better than as a follow up comment.  It also seems natural enough that maybe it can be done unconditionally, instead of needing the argument.\n\nYeah, it shows in the Diff Detail pane, [like here](https:\/\/phabricator-dev.allizom.org\/D1092?id=1765).  Unfortunately I think it can be only set when using the creatediff endpoint, which is what I had to change my fork to do (though I could be wrong, the conduit docs are too sparse to be sure).","author":"Kwan","id":"88982","dateCreated":"1552150082","dateModified":"1552150082"},{"type":"comment","comment":">>! In D6082#88851, @pulkit wrote:\n> @mharbison72 thanks for tips on adding test. Will add tests in next iteration.\n> \n> I found that Differentials do have a branch field, maybe we can use that? https:\/\/secure.phabricator.com\/source\/phabricator\/browse\/master\/src\/applications\/differential\/customfield\/DifferentialBranchField.php\n\nSeems worth a shot.  I don\u2019t know anything about it, but presumably this would be rendered specially in the web UI, like the test plan, etc.  That sounds better than as a follow up comment.  It also seems natural enough that maybe it can be done unconditionally, instead of needing the argument.","author":"mharbison72","id":"88852","dateCreated":"1552086746","dateModified":"1552086746"},{"type":"comment","comment":"@mharbison72 thanks for tips on adding test. Will add tests in next iteration.\n\nI found that Differentials do have a branch field, maybe we can use that? https:\/\/secure.phabricator.com\/source\/phabricator\/browse\/master\/src\/applications\/differential\/customfield\/DifferentialBranchField.php","author":"pulkit","id":"88851","dateCreated":"1552084239","dateModified":"1552084239"},{"type":"comment","comment":"To create a test, you need to `pip install pytest-vcr`, edit `auth.hgphab.phabtoken` at the top of the test, and use `--test-vcr` with your `hg phabsend` command.  See a641fd1a1196 for some background, and remember to purge your phabtoken from the changes before posting.  FWIW, I used a VirtualBox VM running Phabricator from Bitnami to figure things out before generating the test on phab.m-s.o to avoid extra noise.","author":"mharbison72","id":"88621","dateCreated":"1551980125","dateModified":"1551980125"},{"type":"comment","comment":"This review is intended for `default` branch.","author":"pulkit","id":"88617","dateCreated":"1551967198","dateModified":"1551967198"},{"type":"update","diffId":"14384","author":"pulkit","id":"88612","dateCreated":"1551967197","dateModified":"1551967197"}],"dateCreated":"1551967197","dateModified":"1560355916","status":"Needs Review"},{"id":"6122","callsign":"HG","title":"tests: add a file listing all the flaky tests","author":"lothiraldan","summary":"This file can be used by CI instances to skip tests known to be flaky and\nfocus on tests with no false negatives.","testPlan":"","lineCount":"1","dependsOn":[],"reviewers":[],"ccs":["durin42","av6","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D6122#89861, @lothiraldan wrote:\n>>>! In D6122#89819, @av6 wrote:\n>>>>! In D6122#89818, @lothiraldan wrote:\n>>> @av6 is a `--no-flaky-tests` flag what you had in mind?\n>> \n>> Something like that, yes. I suggested that flag seeing how this change introduces a quite specific file with just one line. And I thought \"if it's important, let's integrate it deeper into the test runner\".\n>> \n>> But a flag for run-tests.py is not the only alternative. Now that I think about `#require`, can \u200btest-remotefilelog-bgprefetch.t be marked with `#require not-an-exotic-fs-inside-docker` (or whatever the actual thing that causes flakiness if it's known)? hghave.py already checks various filesystem features, why not make it check for the cause of issue6083?\n> \n> For this specific test, we are not sure that it's the exact issue, it's our best lead. I'm afraid that identifying the underlying cause will be 90% of the work fixing it.\n> \n> My goal is to allow people running tests outside our buildbot and gcc build farm to being able to quickly identify which test error are expected or not. And for CI setups, we want the flaky test to not impact the return code as it would makes the build fails in most of CI setups.\n> \n> Identifying the root cause of the issue is a problem that takes time and expertise, the docker exotic fs lead is actually from @durin42, I would have not guessed it. I would like to find a way for people to report that a test is flaky on their setup without requiring them to dig too deep in the issue.\n> \n> I would be ok with the `--no-flaky-tests` flag, even if I found the `#require flaky` a bit confusing.\n\n@av6 What is your final thoughts on this patch?","author":"lothiraldan","id":"94743","dateCreated":"1560332334","dateModified":"1560332334"},{"type":"comment","comment":">>! In D6122#89819, @av6 wrote:\n>>>! In D6122#89818, @lothiraldan wrote:\n>> @av6 is a `--no-flaky-tests` flag what you had in mind?\n> \n> Something like that, yes. I suggested that flag seeing how this change introduces a quite specific file with just one line. And I thought \"if it's important, let's integrate it deeper into the test runner\".\n> \n> But a flag for run-tests.py is not the only alternative. Now that I think about `#require`, can \u200btest-remotefilelog-bgprefetch.t be marked with `#require not-an-exotic-fs-inside-docker` (or whatever the actual thing that causes flakiness if it's known)? hghave.py already checks various filesystem features, why not make it check for the cause of issue6083?\n\nFor this specific test, we are not sure that it's the exact issue, it's our best lead. I'm afraid that identifying the underlying cause will be 90% of the work fixing it.\n\nMy goal is to allow people running tests outside our buildbot and gcc build farm to being able to quickly identify which test error are expected or not. And for CI setups, we want the flaky test to not impact the return code as it would makes the build fails in most of CI setups.\n\nIdentifying the root cause of the issue is a problem that takes time and expertise, the docker exotic fs lead is actually from @durin42, I would have not guessed it. I would like to find a way for people to report that a test is flaky on their setup without requiring them to dig too deep in the issue.\n\nI would be ok with the `--no-flaky-tests` flag, even if I found the `#require flaky` a bit confusing.","author":"lothiraldan","id":"89862","dateCreated":"1553246537","dateModified":"1553246537"},{"type":"comment","comment":">>! In D6122#89818, @lothiraldan wrote:\n> @av6 is a `--no-flaky-tests` flag what you had in mind?\n\nSomething like that, yes. I suggested that flag seeing how this change introduces a quite specific file with just one line. And I thought \"if it's important, let's integrate it deeper into the test runner\".\n\nBut a flag for run-tests.py is not the only alternative. Now that I think about `#require`, can \u200btest-remotefilelog-bgprefetch.t be marked with `#require not-an-exotic-fs-inside-docker` (or whatever the actual thing that causes flakiness if it's known)? hghave.py already checks various filesystem features, why not make it check for the cause of issue6083?","author":"av6","id":"89819","dateCreated":"1553171476","dateModified":"1553171476"},{"type":"comment","comment":"The big difference between `#require slow` and `#require flaky` is that we don't want to run the slow tests by default but we want to run the flaky test by default if not specified otherwise. I don't know enough about the test runner to evaluate the amount of work need to support a `--no-flaky-tests` flag, \n\n@av6 is a `--no-flaky-tests` flag what you had in mind?","author":"lothiraldan","id":"89818","dateCreated":"1553169140","dateModified":"1553169140"},{"type":"comment","comment":">>! In D6122#89169, @av6 wrote:\n> Another way to do this could be to introduce another special keyword, similar to \"slow\", so that tests that are known flaky can `#require flaky` or even mark a specific block with `#if flaky`. Obviously fixing \u200btest-remotefilelog-bgprefetch.t is a better idea altogether, but I'm not going to claim that it's easy.\n\nFor this specific test case, it's not flaky on our Buildbot instance (https:\/\/buildbot.mercurial-scm.org\/builders\/hg%20tests). It only happens on exotic filesystems (like inside a Docker container) and when running the tests in parallel.\n\nFlaky tests on our buildbot instances are usually fixed quite quickly, this contrib file is more for tests that are flaky outside our buildbot setup.","author":"lothiraldan","id":"89181","dateCreated":"1552414270","dateModified":"1552414270"},{"type":"comment","comment":"Another way to do this could be to introduce another special keyword, similar to \"slow\", so that tests that are known flaky can `#require flaky` or even mark a specific block with `#if flaky`. Obviously fixing \u200btest-remotefilelog-bgprefetch.t is a better idea altogether, but I'm not going to claim that it's easy.","author":"av6","id":"89170","dateCreated":"1552392288","dateModified":"1552392288"},{"type":"update","diffId":"14475","author":"lothiraldan","id":"89164","dateCreated":"1552384685","dateModified":"1552384685"}],"dateCreated":"1552384685","dateModified":"1560332334","status":"Needs Review"},{"id":"6356","callsign":"HG","title":"mdiff: prepare mdiff to be used for run-tests to replace unidiff","author":"sangeet259","summary":"Patch 1\/2\n\nThis patch adds some functions to mdiff.py that will be called from run-tests.py\nwhich will be added in the second part of this patch series.\n\nThe future changes to run-tests.py will enable one to use mdiif\nto diff rather than unidiff whenever the mercurial is installed in the system.\n\nhg diff uses mdiff which which gives simpler and more readable diffs than unidiff\n\nWhy do I need to split the patches into two ?\nThe reason to split what would have been a single patch into two is because\nfor the next patch to be able to use the mdiff during tests,\nthis revision has to be there in the system's mercurial installation.","testPlan":"","lineCount":"36","dependsOn":[],"reviewers":[],"ccs":["durin42","pulkit","martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D6356#94599, @sangeet259 wrote:\n> @pulkit \n>> My understanding is that the 1st patch should be present in the mercurial installed in the system, which is what you said right? If that's correct, we can go ahead and have this whole as one patch as I don't think people usually do install system hg on patch to patch basis.\n> \n> Yes, that is what I was trying to say.\n> But apart from that, I see the two changes as doing two logically separable things, to deserve to be broken into two commits.\n> \n> Is that justified?\n\nTo be honest, the motivation behind this patch is the next patch. It will be nice to have them as one patch, so that when in future someone does annotate, they can see the whole functionality in one patch. But I fine with accepting as separate patches too.\n\nAlso, this patch still has some un-addressed comments incase you missed them.","author":"pulkit","id":"94610","dateCreated":"1560206469","dateModified":"1560206469"},{"type":"comment","comment":"@pulkit \n> My understanding is that the 1st patch should be present in the mercurial installed in the system, which is what you said right? If that's correct, we can go ahead and have this whole as one patch as I don't think people usually do install system hg on patch to patch basis.\n\nYes, that is what I was trying to say.\nBut apart from that, I see the two changes as doing two logically separable things, to deserve to be broken into two commits.\n\nIs that justified?","author":"sangeet259","id":"94599","dateCreated":"1560199497","dateModified":"1560199497"},{"type":"comment","comment":">>! In D6356#92695, @sangeet259 wrote:\n>>>! In D6356#92644, @pulkit wrote:\n>>> Why do I need to split the patches into two ?\n>>> The reason to split what would have been a single patch into two is because\n>>> for the next patch to be able to use the mdiff during tests,\n>>> this revision has to be there in the system's mercurial installation.\n>> \n>> I didn't get the last line. Can you explain more?\n>> \n>> I think both can be folded in one and should be good.\n> \n> @pulkit \n> Well the next patch imports mercurial and then calls `mdff.new_diff` . If I combine those two patches then you can not see the change as while testing D6359 , if there `mdiff` doesn't already have new_diff \n> it will always fall back to unified_diff as happened with @durin42  , while he was trying to see the alternate path as he trying to test D5514 .\n> \n> What I am trying to do here is, once D6356 is has added `new_diff` to `mdiff`, you can then have this revision installed in your system or wherever one tests this, and then check D6359 to see the alternate path it follows.\n\nI was trying to test it and unable to get this to work both with a single patch and two splitted patches.\n\nMy understanding is that the 1st patch should be present in the mercurial installed in the system, which is what you said right? If that's correct, we can go ahead and have this whole as one patch as I don't think people usually do install system hg on patch to patch basis.\n","author":"pulkit","id":"92737","dateCreated":"1557937290","dateModified":"1557937290"},{"type":"inline","comment":"nit: `return itertools.chain.from_iterable(hunklines)`","replyTo":null,"isNewFile":"1","line":"552","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"15049","author":"pulkit","id":"92734","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"inline","comment":"may be worth to rename it to `prepare_mdiff_input`.","replyTo":null,"isNewFile":"1","line":"531","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"15049","author":"pulkit","id":"92733","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"inline","comment":"We can do\n```\ndate = datetime.datetime.now().strftime(\"%a %b %d %y %H:%M:%S %Y %z\")\nreturn \"\".join(expected), date, \"\".join(output), date, diffopts(noprefix=True)\n```","replyTo":null,"isNewFile":"1","line":"540","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"15049","author":"pulkit","id":"92732","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"inline","comment":"I was unable to find any `getdiff` in this file.","replyTo":null,"isNewFile":"1","line":"544","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"15049","author":"pulkit","id":"92731","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"inline","comment":"nit: `return process_mdiff(uheaders, hunks)`","replyTo":null,"isNewFile":"1","line":"562","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"15049","author":"pulkit","id":"92730","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"inline","comment":"backwards compatibility with what?","replyTo":null,"isNewFile":"1","line":"557","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"15049","author":"pulkit","id":"92729","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"comment","comment":"> Patch 1\/2\n\nwe don't add that to commit messages.","author":"pulkit","id":"92728","dateCreated":"1557936004","dateModified":"1557936004"},{"type":"comment","comment":">>! In D6356#92644, @pulkit wrote:\n>> Why do I need to split the patches into two ?\n>> The reason to split what would have been a single patch into two is because\n>> for the next patch to be able to use the mdiff during tests,\n>> this revision has to be there in the system's mercurial installation.\n> \n> I didn't get the last line. Can you explain more?\n> \n> I think both can be folded in one and should be good.\n\n@pulkit \nWell the next patch imports mercurial and then calls `mdff.new_diff` . If I combine those two patches then you can not see the change as while testing D6359 , if there `mdiff` doesn't already have new_diff \nit will always fall back to unified_diff as happened with @durin42  , while he was trying to see the alternate path as he trying to test D5514 .\n\nWhat I am trying to do here is, once D6356 is has added `new_diff` to `mdiff`, you can then have this revision installed in your system or wherever one tests this, and then check D6359 to see the alternate path it follows.","author":"sangeet259","id":"92697","dateCreated":"1557907221","dateModified":"1557907221"},{"type":"comment","comment":"> Why do I need to split the patches into two ?\n> The reason to split what would have been a single patch into two is because\n> for the next patch to be able to use the mdiff during tests,\n> this revision has to be there in the system's mercurial installation.\n\nI didn't get the last line. Can you explain more?\n\nI think both can be folded in one and should be good.","author":"pulkit","id":"92645","dateCreated":"1557853675","dateModified":"1557853675"},{"type":"comment","comment":"> Oh, nice! I sometimes use run-tests.py -i and just accept an unreadable diff because I know that hg diff might make it easier to read. I had not understood why :) \nGlad to know you will be helped :)\n\nAdded some description to the commit message!","author":"sangeet259","id":"92456","dateCreated":"1557512190","dateModified":"1557512190"},{"type":"comment","comment":">>! In D6356#92453, @sangeet259 wrote:\n>>>! In D6356#92451, @martinvonz wrote:\n>>> The future changes to run-tests.py will enable one to use mdiif\n>>> to diff rather than unidiff whenever the mercurial is installed in the system.\n>> \n>> Perhaps a naive question, but why is that desirable? How will I (as someone running tests) notice?\n> \n> @martinvonz \n> This patch is a breakdown of the earlier patch https:\/\/phab.mercurial-scm.org\/D5514\n\nOh, nice! I sometimes use `run-tests.py -i` and just accept an unreadable diff because I know that `hg diff` might make it easier to read. I had not understood why :)\n\n> \n> \n> [[ https:\/\/phab.mercurial-scm.org\/D5514 | There ]] I have detailed why is this required.\n> In short, the diff output of tests is a bit ugly compared to what hg diff does, which is much nicer.\n> \n> \n> \n> I am thinking of putting that descriptive commit message in the patch 2\/2.\n\nPerhaps also adding a \"which gives simpler diffs\" or something like that to this patch?","author":"martinvonz","id":"92454","dateCreated":"1557510262","dateModified":"1557510262"},{"type":"comment","comment":">>! In D6356#92451, @martinvonz wrote:\n>> The future changes to run-tests.py will enable one to use mdiif\n>> to diff rather than unidiff whenever the mercurial is installed in the system.\n> \n> Perhaps a naive question, but why is that desirable? How will I (as someone running tests) notice?\n\n@martinvonz \nThis patch is a breakdown of the earlier patch https:\/\/phab.mercurial-scm.org\/D5514\n\n\n[[ https:\/\/phab.mercurial-scm.org\/D5514 | There ]] I have detailed why is this required.\nIn short, the diff output of tests is a bit ugly compared to what hg diff does, which is much nicer.\n\n\n\nI am thinking of putting that descriptive commit message in the patch 2\/2.\n\n\n","author":"sangeet259","id":"92453","dateCreated":"1557510056","dateModified":"1557510056"},{"type":"comment","comment":"> The future changes to run-tests.py will enable one to use mdiif\n> to diff rather than unidiff whenever the mercurial is installed in the system.\n\nPerhaps a naive question, but why is that desirable? How will I (as someone running tests) notice?","author":"martinvonz","id":"92452","dateCreated":"1557509673","dateModified":"1557509673"},{"type":"update","diffId":"15049","author":"sangeet259","id":"92446","dateCreated":"1557509283","dateModified":"1557509283"}],"dateCreated":"1557509283","dateModified":"1560206469","status":"Needs Review"},{"id":"6359","callsign":"HG","title":"test: change test's diff generation to use mdiff for nicer output","author":"sangeet259","summary":"This is patch (2\/2), hence must be there in the repo after 1\/2, which is at https:\/\/phab.mercurial-scm.org\/D6356\n\nThe current diff being used by tests upon failing is not very good. Sometimes there is a lot of redundancy.\n\nTo see for yourself, follow these steps:\n\n1. Download this bundle : http:\/\/bit.ly\/2IDgJFU\n\n```\n$ hg clone https:\/\/www.mercurial-scm.org\/hg\n$ cd hg\/\n$ hg unbundle af8efb83e1d6.hg\n$ hg up a1e70c1dbec0^\n$ g revert --all --rev a1e70c1dbec0\n$ hg revert -i tests\/test-bookmarks-pushpull.t # revert only the last three hunks (press 'n' for the first 8, and 'y' for the last three)\n$ cd tests\n$ hg diff --rev a1e70c1dbec0 # nice output from Mercurial\n$ .\/run-test.py test-bookmarks-pushpull.t # poor output from the test runner\n```\n\nIf you couldn't follow those steps, you can simply check the diffs here:\n\n* test's diff:\n\n```\n\n> --- \/media\/sangeet\/Stuff\/hgrepo\/Octobus\/MD4\/tests\/test-bookmarks-pushpull.t\n> +++ \/media\/sangeet\/Stuff\/hgrepo\/Octobus\/MD4\/tests\/test-bookmarks-pushpull.t.b2-binary.err\n> @@ -1086,8 +1086,7 @@\n>    pushing to $TESTTMP\/issue4455-dest (glob)\n>    searching for changes\n>    no changes found\n> -  pushkey-abort: prepushkey hook exited with status 1\n> -  abort: exporting bookmark @ failed!\n> +  abort: prepushkey hook exited with status 1\n>    [255]\n\n>  #endif\n> @@ -1126,27 +1125,27 @@\n>    pushing to ssh:\/\/user@dummy\/issue4455-dest\n>    searching for changes\n>    no changes found\n> +  remote: prepushkey hook exited with status 1\n> +  abort: push failed on remote\n> +  [255]\n> +\n> +#endif\n> +\n> +  $ hg -R ..\/issue4455-dest\/ bookmarks\n> +  no bookmarks set\n> +\n> +Using http\n> +----------\n> +\n> +#if b2-pushkey\n> +  $ hg push -B @ http # bundle2+\n> +  pushing to http:\/\/localhost:$HGPORT\/\n> +  searching for changes\n> +  no changes found\n>    remote: pushkey-abort: prepushkey hook exited with status 1\n>    abort: exporting bookmark @ failed!\n>    [255]\n>\n> -#endif\n> -\n> -  $ hg -R ..\/issue4455-dest\/ bookmarks\n> -  no bookmarks set\n> -\n> -Using http\n> -----------\n> -\n> -#if b2-pushkey\n> -  $ hg push -B @ http # bundle2+\n> -  pushing to http:\/\/localhost:$HGPORT\/\n> -  searching for changes\n> -  no changes found\n> -  remote: pushkey-abort: prepushkey hook exited with status 1\n> -  abort: exporting bookmark @ failed!\n> -  [255]\n> -\n>    $ hg -R ..\/issue4455-dest\/ bookmarks\n>    no bookmarks set\n>\n> @@ -1166,8 +1165,8 @@\n>    pushing to ssh:\/\/user@dummy\/issue4455-dest\n>    searching for changes\n>    no changes found\n> -  remote: pushkey-abort: prepushkey hook exited with status 1\n> -  abort: exporting bookmark @ failed!\n> +  remote: prepushkey hook exited with status 1\n> +  abort: push failed on remote\n>    [255]\n>\n>  #endif\n>\n> ERROR: test-bookmarks-pushpull.t (case b2-binary) output changed\n> !.\n> Failed test-bookmarks-pushpull.t (case b2-binary): output changed\n> # Ran 2 tests, 0 skipped, 1 failed.\n> python hash seed: 133193196\n> ```\n---\n\n* diff used by hg diff:\n\n```\n> diff -r a1e70c1dbec0 tests\/test-bookmarks-pushpull.t\n> --- a\/tests\/test-bookmarks-pushpull.t\tThu Nov 01 22:20:00 2018 +0530\n> +++ b\/tests\/test-bookmarks-pushpull.t\tTue Oct 17 12:38:13 2017 +0200\n> @@ -1086,8 +1086,7 @@\n>    pushing to $TESTTMP\/issue4455-dest (glob)\n>    searching for changes\n>    no changes found\n> -  pushkey-abort: prepushkey hook exited with status 1\n> -  abort: exporting bookmark @ failed!\n> +  abort: prepushkey hook exited with status 1\n>    [255]\n>\n>  #endif\n> @@ -1126,8 +1125,8 @@\n>    pushing to ssh:\/\/user@dummy\/issue4455-dest\n>    searching for changes\n>    no changes found\n> -  remote: pushkey-abort: prepushkey hook exited with status 1\n> -  abort: exporting bookmark @ failed!\n> +  remote: prepushkey hook exited with status 1\n> +  abort: push failed on remote\n>    [255]\n>\n>  #endif\n> @@ -1166,8 +1165,8 @@\n>    pushing to ssh:\/\/user@dummy\/issue4455-dest\n>    searching for changes\n>    no changes found\n> -  remote: pushkey-abort: prepushkey hook exited with status 1\n> -  abort: exporting bookmark @ failed!\n> +  remote: prepushkey hook exited with status 1\n> +  abort: push failed on remote\n>    [255]\n>\n>  #endif\n```\n\nTests uses _unified_diff based on difflib.py . The output isn't great!\n\nMercurial's diff uses mdiff which gives better diffs.\nThis patch uses mdiff's unidiff function to generate the diff for the failed tests.","testPlan":"","lineCount":"527","dependsOn":["6356"],"reviewers":[],"ccs":["pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"@pulkit \n\n> The commit message has diff which confuses `hg import`.  You need to indent those diffs.\n\u2705 \n> Also, remove the pastebin links as they are not required since we have diffs.\n\u2705 \n>> Download this bundle : http:\/\/bit.ly\/2DuJjsS\n> \n> This link asks me to login. So definitely not a good link to put in commit message.\n\u2705  \n","author":"sangeet259","id":"94602","dateCreated":"1560200514","dateModified":"1560200514"},{"type":"update","diffId":"15433","author":"sangeet259","id":"94600","dateCreated":"1560200157","dateModified":"1560200157"},{"type":"comment","comment":"The commit message has diff which confuses `hg import`.  You need to indent those diffs.\n\nAlso, remove the pastebin links as they are not required since we have diffs.\n\n> Download this bundle : http:\/\/bit.ly\/2DuJjsS\n\nThis link asks me to login. So definitely not a good link to put in commit message.","author":"pulkit","id":"92736","dateCreated":"1557936451","dateModified":"1557936451"},{"type":"update","diffId":"15052","author":"sangeet259","id":"92475","dateCreated":"1557523020","dateModified":"1557523020"}],"dateCreated":"1557523020","dateModified":"1560200514","status":"Needs Review"},{"id":"6462","callsign":"HG","title":"commitextras: try to remove localrepo hacking to add extras to commit","author":"pulkit","summary":"","testPlan":"","lineCount":"59","dependsOn":[],"reviewers":[],"ccs":["martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":"Can you elaborate a bit about what the current hack does and why it's bad?","author":"martinvonz","id":"94006","dateCreated":"1559597555","dateModified":"1559597555"},{"type":"comment","comment":"I am not sure this is good way to do this. But I will definitely like to remove the hacking around localrepo to add extras to a commit.","author":"pulkit","id":"93869","dateCreated":"1559240493","dateModified":"1559240510"},{"type":"update","diffId":"15302","author":"pulkit","id":"93865","dateCreated":"1559240451","dateModified":"1559240451"}],"dateCreated":"1559240451","dateModified":"1559597555","status":"Needs Review"},{"id":"5299","callsign":"HG","title":"phabricator: fallback reading arcanist config files","author":"philpep","summary":"This allow the phabricator extension to read arc config files to auto-configure\nurl, token and callsign.\n\nWe use it as a fallback when phabricator.url or phabricator.callsign aren't\ndefined.\n\nThis allow to configure conduit_uri and repository.callsign in a tracked\n.arcconfig json file in the root of the repository, so users having lot of\nsmall repositories in phabricator doesn't need to configure .hg\/hgrc after a\nfresh clone.","testPlan":"","lineCount":"51","dependsOn":[],"reviewers":["durin42"],"ccs":["durin42","Kwan","mharbison72","mercurial-devel"],"actions":[{"type":"comment","comment":"Thanks for reviewing @Kwan !\n\nActually I think parsing\/merging arcconfig files will be quite hard to maintain because they are not fully documented and subject to changes.\n\nFor my needs, just having hg being able to get phabricator.url and phabricator.callsign from .arcconfig in the repo root is enough. Then I just need to match this with hg auth config.\nI'll try to have a smaller patch not trying to read other files than .arcconfig and not reading the token.","author":"philpep","id":"92911","dateCreated":"1558002229","dateModified":"1558002229"},{"type":"comment","comment":"I see at least one outstanding comment that points out a typo. I'm generally in favor of this though, so please let us know when it's time to take another look.","author":"durin42","id":"92791","dateCreated":"1557943704","dateModified":"1557943704"},{"type":"reject","author":"durin42","id":"92790","dateCreated":"1557943704","dateModified":"1557943704"},{"type":"inline","comment":"Although, this wouldn't work with changing phab instances in hgrc, and using .arcrc for the token, since `readarcconfig` would return the  token for the original URL.  An alternative would be having `readarcconfig` return a dict mapping hosts to tokens (with '\/api\/' stripped from the hosts), and then `readurltoken` does `token = hgrctoken or arctokens.get(url)`.","replyTo":"92590","isNewFile":"1","line":"217","lineLength":"5","path":"hgext\/phabricator.py","diffId":"14253","author":"Kwan","id":"92605","dateCreated":"1557659058","dateModified":"1557659058"},{"type":"inline","comment":"Looks like annotating it with `@util.cachefunc` is enough?","replyTo":"78872","isNewFile":"1","line":"175","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"Kwan","id":"92604","dateCreated":"1557659058","dateModified":"1557659058"},{"type":"inline","comment":"Oh, and the `config.get('hosts', {}).get(uri)` would have to use a uri with `.path = b'api\/'`","replyTo":"91403","isNewFile":"1","line":"201","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"Kwan","id":"92592","dateCreated":"1557597352","dateModified":"1557597352"},{"type":"inline","comment":"Typo: should be `arcconfig` (two 'c's).\nAlso no dot for the \"\/etc\/\" one according to the docs","replyTo":null,"isNewFile":"1","line":"193","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14253","author":"Kwan","id":"92591","dateCreated":"1557597352","dateModified":"1557597352"},{"type":"inline","comment":"Something I realised with some testing is that this requires both .arcconfig and .arcrc, one can't rely on the repo's .arcconfig for the repo settings while using .hg\/hgrc for the auth settings (or use hgrc for phab url with .arcrc for auth).  Maybe it could instead do the following:\n```\n    hgrcurl = repo.ui.config(b'phabricator', b'url')\n    arcurl, arctoken, __ = readarcconfig(repo)\n    url = hgrcurl or arcurl\n    if not url:\n        [etc...]\n\n    res = [etc...]\n    hgrctoken = None\n\n    if res:\n        [etc...]\n        hgrctoken = auth.get(b'token')\n    token = hgrctoken or arctoken\n    if not token:\n        [etc...]\n```\n\nThat way any mix of settings in hgrc or .arcconfig\/.arcrc would work, with hgrc having precedence.","replyTo":null,"isNewFile":"1","line":"217","lineLength":"5","path":"hgext\/phabricator.py","diffId":"14253","author":"Kwan","id":"92590","dateCreated":"1557597352","dateModified":"1557597352"},{"type":"inline","comment":"I think you could do\n```\nurl = util.url(conduit_uri)\nurl.path = None\nurl = b'%s' % url\n```\n\nAlso I think you need to check for `phabricator.uri` first, then fall back to `conduit_uri`, see [change to phabricator's .arcconfig](https:\/\/github.com\/phacility\/phabricator\/commit\/f0e6dc122109bcc2c3cade0af04b3f06af2fe50b) and [mozilla-central's current one](https:\/\/hg.mozilla.org\/mozilla-central\/file\/f7a15eb24f3d\/.arcconfig) (and perhaps rename conduit_uri variable appropriately)","replyTo":"78871","isNewFile":"1","line":"201","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"Kwan","id":"91403","dateCreated":"1555661299","dateModified":"1555661299"},{"type":"inline","comment":"Woops... Thanks for catching this!","replyTo":"87626","isNewFile":"1","line":"187","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14175","author":"philpep","id":"87948","dateCreated":"1551264587","dateModified":"1551264587"},{"type":"inline","comment":"Yes, done.","replyTo":"87627","isNewFile":"1","line":"200","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14175","author":"philpep","id":"87947","dateCreated":"1551264587","dateModified":"1551264587"},{"type":"inline","comment":"Indeed, I fixed this.","replyTo":"87628","isNewFile":"1","line":"290","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14175","author":"philpep","id":"87946","dateCreated":"1551264587","dateModified":"1551264587"},{"type":"update","diffId":"14253","author":"philpep","id":"87944","dateCreated":"1551264509","dateModified":"1551264509"},{"type":"inline","comment":"It might be clearer to return None, since the function is to fetch the repoid.","replyTo":null,"isNewFile":"1","line":"290","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14175","author":"mharbison72","id":"87628","dateCreated":"1550858358","dateModified":"1550858358"},{"type":"inline","comment":"Should this be using vfs to open, instead of raw open?  Using the vfs layer allows the class that provides posix-like functionality on Windows to be used.","replyTo":null,"isNewFile":"1","line":"200","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14175","author":"mharbison72","id":"87627","dateCreated":"1550858358","dateModified":"1550858358"},{"type":"inline","comment":"s\/.encoding\/.environ\/ ?","replyTo":null,"isNewFile":"1","line":"187","lineLength":"0","path":"hgext\/phabricator.py","diffId":"14175","author":"mharbison72","id":"87626","dateCreated":"1550858358","dateModified":"1550858358"},{"type":"comment","comment":"Thanks for the review and sorry for taking so long time to update the patch... I made changes to use encoding.environ and vfs like you suggested.\nPlease let me known what I can do to introduce this (or at least part of) this feature, thanks!","author":"philpep","id":"87542","dateCreated":"1550773155","dateModified":"1550773155"},{"type":"update","diffId":"14175","author":"philpep","id":"87540","dateCreated":"1550772964","dateModified":"1550772964"},{"type":"update","diffId":"14174","author":"philpep","id":"87539","dateCreated":"1550772537","dateModified":"1550772537"},{"type":"inline","comment":"I think there\u2019s something for environment variables in encoding (or maybe procutil- I don\u2019t have the code in front of me).\n\nAlso, is there a way to use vfs here?  I think we\u2019re trying to avoid direct os.path usage.\n\nhttps:\/\/www.mercurial-scm.org\/wiki\/WindowsUTF8Plan","replyTo":null,"isNewFile":"1","line":"181","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"mharbison72","id":"78889","dateCreated":"1543080661","dateModified":"1543080661"},{"type":"inline","comment":"pycompat.iswindows","replyTo":null,"isNewFile":"1","line":"179","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"mharbison72","id":"78888","dateCreated":"1543080661","dateModified":"1543080661"},{"type":"inline","comment":"I'd be nice to cache the result of `readarcconfig` but I don't known how to implement this, any suggestion ?","replyTo":null,"isNewFile":"1","line":"175","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"philpep","id":"78872","dateCreated":"1542993410","dateModified":"1542993410"},{"type":"inline","comment":"HINT: This doesn't work for current mercurial config because \"arc install-certificates\" add a trailing \"\/\" to conduit_uri and our .arcconfig doesn't have this trailing slash.\nAny idea how to handle this properly ?","replyTo":null,"isNewFile":"1","line":"201","lineLength":"0","path":"hgext\/phabricator.py","diffId":"12590","author":"philpep","id":"78871","dateCreated":"1542993322","dateModified":"1542993322"},{"type":"update","diffId":"12590","author":"philpep","id":"78866","dateCreated":"1542993179","dateModified":"1542993179"}],"dateCreated":"1542993179","dateModified":"1558002229","status":"Needs Revision"},{"id":"5514","callsign":"HG","title":"test: change test's diff generation to use mdiff for nicer output","author":"sangeet259","summary":"The current diff being used by tests upon failing is not very good. Sometimes there is a lot of redundancy.\n\nTo see for yourself, follow these steps:\n\n1. Download this bundle : http:\/\/bit.ly\/2DuJjsS\n\n```\n$ hg clone https:\/\/www.mercurial-scm.org\/hg\n$ cd hg\/\n$ hg unbundle af8efb83e1d6.hg\n$ hg up a1e70c1dbec0^\n$ g revert --all --rev a1e70c1dbec0\n$ hg revert -i tests\/test-bookmarks-pushpull.t # revert only the last three hunks (press 'n' for the first 8, and 'y' for the last three)\n$ cd tests\n$ hg diff --rev a1e70c1dbec0 # nice output from Mercurial\n$ .\/run-test.py test-bookmarks-pushpull.t # poor output from the test runner\n```\n\nIf you couldn't follow those steps, you can simply check the diffs here:\n\n* test's diff: https:\/\/pastebin.com\/Z4LRg4vx\n\n```\n\n--- \/media\/sangeet\/Stuff\/hgrepo\/Octobus\/MD4\/tests\/test-bookmarks-pushpull.t\n+++ \/media\/sangeet\/Stuff\/hgrepo\/Octobus\/MD4\/tests\/test-bookmarks-pushpull.t.b2-binary.err\n@@ -1086,8 +1086,7 @@\n   pushing to $TESTTMP\/issue4455-dest (glob)\n   searching for changes\n   no changes found\n-  pushkey-abort: prepushkey hook exited with status 1\n-  abort: exporting bookmark @ failed!\n+  abort: prepushkey hook exited with status 1\n   [255]\n\n #endif\n@@ -1126,27 +1125,27 @@\n   pushing to ssh:\/\/user@dummy\/issue4455-dest\n   searching for changes\n   no changes found\n+  remote: prepushkey hook exited with status 1\n+  abort: push failed on remote\n+  [255]\n+\n+#endif\n+\n+  $ hg -R ..\/issue4455-dest\/ bookmarks\n+  no bookmarks set\n+\n+Using http\n+----------\n+\n+#if b2-pushkey\n+  $ hg push -B @ http # bundle2+\n+  pushing to http:\/\/localhost:$HGPORT\/\n+  searching for changes\n+  no changes found\n   remote: pushkey-abort: prepushkey hook exited with status 1\n   abort: exporting bookmark @ failed!\n   [255]\n\n-#endif\n-\n-  $ hg -R ..\/issue4455-dest\/ bookmarks\n-  no bookmarks set\n-\n-Using http\n-----------\n-\n-#if b2-pushkey\n-  $ hg push -B @ http # bundle2+\n-  pushing to http:\/\/localhost:$HGPORT\/\n-  searching for changes\n-  no changes found\n-  remote: pushkey-abort: prepushkey hook exited with status 1\n-  abort: exporting bookmark @ failed!\n-  [255]\n-\n   $ hg -R ..\/issue4455-dest\/ bookmarks\n   no bookmarks set\n\n@@ -1166,8 +1165,8 @@\n   pushing to ssh:\/\/user@dummy\/issue4455-dest\n   searching for changes\n   no changes found\n-  remote: pushkey-abort: prepushkey hook exited with status 1\n-  abort: exporting bookmark @ failed!\n+  remote: prepushkey hook exited with status 1\n+  abort: push failed on remote\n   [255]\n\n #endif\n\nERROR: test-bookmarks-pushpull.t (case b2-binary) output changed\n!.\nFailed test-bookmarks-pushpull.t (case b2-binary): output changed\n# Ran 2 tests, 0 skipped, 1 failed.\npython hash seed: 133193196\n```\n---\n\n* diff used by hg diff: https:\/\/pastebin.com\/qanQEsiA\n\n```\ndiff -r a1e70c1dbec0 tests\/test-bookmarks-pushpull.t\n--- a\/tests\/test-bookmarks-pushpull.t\tThu Nov 01 22:20:00 2018 +0530\n+++ b\/tests\/test-bookmarks-pushpull.t\tTue Oct 17 12:38:13 2017 +0200\n@@ -1086,8 +1086,7 @@\n   pushing to $TESTTMP\/issue4455-dest (glob)\n   searching for changes\n   no changes found\n-  pushkey-abort: prepushkey hook exited with status 1\n-  abort: exporting bookmark @ failed!\n+  abort: prepushkey hook exited with status 1\n   [255]\n\n #endif\n@@ -1126,8 +1125,8 @@\n   pushing to ssh:\/\/user@dummy\/issue4455-dest\n   searching for changes\n   no changes found\n-  remote: pushkey-abort: prepushkey hook exited with status 1\n-  abort: exporting bookmark @ failed!\n+  remote: prepushkey hook exited with status 1\n+  abort: push failed on remote\n   [255]\n\n #endif\n@@ -1166,8 +1165,8 @@\n   pushing to ssh:\/\/user@dummy\/issue4455-dest\n   searching for changes\n   no changes found\n-  remote: pushkey-abort: prepushkey hook exited with status 1\n-  abort: exporting bookmark @ failed!\n+  remote: prepushkey hook exited with status 1\n+  abort: push failed on remote\n   [255]\n\n #endif\n```\n\nTests uses _unified_diff based on difflib.py . The output isn't great!\n\nMercurial's diff uses mdiff which gives better diffs.\nThis patch uses mdiff's unidiff function to generate the diff for the failed tests.","testPlan":"","lineCount":"56","dependsOn":[],"reviewers":["durin42"],"ccs":["pulkit","durin42","mercurial-devel"],"actions":[{"type":"comment","comment":"(moving this off the dashboard until it gets updated)","author":"durin42","id":"87386","dateCreated":"1550694075","dateModified":"1550694075"},{"type":"reject","author":"durin42","id":"87385","dateCreated":"1550694075","dateModified":"1550694075"},{"type":"comment","comment":"Apologies, I didn't run the tests after the latest addition. \ud83d\ude14","author":"sangeet259","id":"87361","dateCreated":"1550590876","dateModified":"1550590876"},{"type":"inline","comment":"In the future please *run tests* before requesting another round of review: this is a trivial syntax error and proves you didn't try running tests.","replyTo":null,"isNewFile":"1","line":"80","lineLength":"0","path":"tests\/run-tests.py","diffId":"13998","author":"durin42","id":"87356","dateCreated":"1550588918","dateModified":"1550588918"},{"type":"comment","comment":"Even with my in-flight fixes, I can't get this to use the non-unified_diff codepath. Can you test again?\n\nhttps:\/\/bitbucket.org\/snippets\/durin42\/nejj94 has my in-flight fixes, but you may find it challenging to apply (the test output in the commit message confuses the patch parser). Hopefully that helps...","author":"durin42","id":"87355","dateCreated":"1550588918","dateModified":"1550588918"},{"type":"comment","comment":"I've done some cleanups (dropped an unused import, copyedited the commit message a bit) and should push this soon. Thanks!","author":"durin42","id":"87354","dateCreated":"1550588435","dateModified":"1550588435"},{"type":"comment","comment":"Hey @durin42 , take a look at the changes when you get time.","author":"sangeet259","id":"87352","dateCreated":"1550567970","dateModified":"1550567970"},{"type":"comment","author":"sangeet259","id":"87008","dateCreated":"1550117862","dateModified":"1550567945"},{"type":"update","diffId":"13998","author":"sangeet259","id":"86564","dateCreated":"1549774133","dateModified":"1549774133"},{"type":"inline","comment":"At least add a docstring taht explains this is designed to be a similar API to `difflib.unified_diff`?","replyTo":null,"isNewFile":"1","line":"554","lineLength":"0","path":"mercurial\/mdiff.py","diffId":"13123","author":"durin42","id":"82040","dateCreated":"1547133473","dateModified":"1547133473"},{"type":"inline","comment":"unused?","replyTo":null,"isNewFile":"1","line":"54","lineLength":"0","path":"tests\/run-tests.py","diffId":"13123","author":"durin42","id":"82039","dateCreated":"1547133473","dateModified":"1547133473"},{"type":"inline","comment":"unused?","replyTo":null,"isNewFile":"1","line":"50","lineLength":"0","path":"tests\/run-tests.py","diffId":"13123","author":"durin42","id":"82038","dateCreated":"1547133473","dateModified":"1547133473"},{"type":"inline","comment":"Nit: `except (ImportError, AttributeError):` instead of just catching `Exception`.","replyTo":null,"isNewFile":"1","line":"81","lineLength":"0","path":"tests\/run-tests.py","diffId":"13123","author":"durin42","id":"82037","dateCreated":"1547133473","dateModified":"1547133473"},{"type":"update","diffId":"13123","author":"sangeet259","id":"81958","dateCreated":"1547110532","dateModified":"1547110532"},{"type":"comment","comment":">>! In D5514#81800, @sangeet259 wrote:\n> @durin42 So the `try\/except` will fall back to `unified diff`?\n\nCorrect.\n\n> Is there a way we can enforce this on system's that don't have mercurial installed globally and not have to fall back on the earlier practice.\n\nI think we don't have any choice: if hg isn't installed, we have to fall back to the old codepath, since we won't know if mdiff is present.\n\n> \n> Also, I didn't get your comment on checking the API of `mdiff` :\/ \n\nWell, what if we iterate on the API of mdiff.new_diff? then again, if the point of it is to have the same API as difflib.unified_diff, probably don't need to worry (and so we only have to fall back to difflib if mdiff isn't available or is too old).","author":"durin42","id":"81890","dateCreated":"1547066844","dateModified":"1547066844"},{"type":"comment","comment":"@durin42 So the `try\/except` will fall back to `unified diff`?\nIs there a way we can enforce this on system's that don't have mercurial installed globally and not have to fall back on the earlier practice.\n\nAlso, I didn't get your comment on checking the API of `mdiff` :\/ ","author":"sangeet259","id":"81800","dateCreated":"1547021099","dateModified":"1547021099"},{"type":"comment","comment":">If you couldn't follow those steps, you can simply check the diffs here:\n>\n> test's diff: https:\/\/pastebin.com\/Z4LRg4vx\n> diff used by hg diff: https:\/\/pastebin.com\/qanQEsiA\n\nCan you make the diffs a part of commit message since pastebin's pastes can be removed in future?","author":"pulkit","id":"81704","dateCreated":"1546968449","dateModified":"1546968449"},{"type":"inline","comment":"This will fail if Mercurial isn't already globally installed on the machine, as would be the case in at least some packaging circumstances when building from a source tarball.\n\nProbably need a try\/except, and _maybe_ a sanity check that mdiff's API matches what we expect?","replyTo":null,"isNewFile":"1","line":"72","lineLength":"0","path":"tests\/run-tests.py","diffId":"13051","author":"durin42","id":"81701","dateCreated":"1546966076","dateModified":"1546966076"},{"type":"reject","author":"durin42","id":"81700","dateCreated":"1546966076","dateModified":"1546966076"},{"type":"comment","comment":"Note: To see this in action, one needs to add the changes from this `mdiff.py` to the mdiff.py of their installed mercurial.\nThis is because unless you do that, you cannot import `mdiff.new_patch` as that function won't be there in your installed version, and hence it will keep falling back to the `unified_diff`.\n\n\nElse, can it be implemented in any other way.","author":"sangeet259","id":"81572","dateCreated":"1546873561","dateModified":"1546873561"},{"type":"update","diffId":"13051","author":"sangeet259","id":"81571","dateCreated":"1546873153","dateModified":"1546873153"},{"type":"update","diffId":"13050","author":"sangeet259","id":"81566","dateCreated":"1546872835","dateModified":"1546872835"}],"dateCreated":"1546872835","dateModified":"1557907222","status":"Needs Revision"},{"id":"6342","callsign":"HG","title":"style: run a patched black on a subset of mercurial","author":"durin42","summary":"This applied black to the 20 smallest files in mercurial\/:\n\n    ls -S1 mercurial\/*.py | tail -n20 | xargs black --skip-string-normalization\n\nNote that a few files failed to format, presumably due to a bug in my\npatch. The intent is to be able to compare results to D5064 with\nhttps:\/\/github.com\/python\/black\/pull\/826 applied to black.\n\nI skipped string normalization on this patch for clarity - in reality\nI think we'd want one pass without string normalization, followed by\nanother to normalize strings (which is basically replacing ' with \"\nglobally.)","testPlan":"","lineCount":"350","dependsOn":[],"reviewers":[],"ccs":["martinvonz","mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"15040","author":"durin42","id":"92387","dateCreated":"1557344046","dateModified":"1557344046"},{"type":"update","diffId":"15039","author":"durin42","id":"92386","dateCreated":"1557343865","dateModified":"1557343865"},{"type":"comment","comment":"Yes, the intent is to show what the result of the patch to black is,\nand once that lands to try and get consensus that we've addressed the\nmajor issue with black and can move on. I've tried adding b prefixes\neverywhere without black, or by using a different formatter, and the\nother formatters just aren't good enough at wrapping lines, so not\nusing black will probably imply some kind of pain. :(","author":"durin42","id":"92327","dateCreated":"1557168257","dateModified":"1557168257"},{"type":"inline","comment":"As I said on the pull request for black, I don't like that these lines get split up.","replyTo":null,"isNewFile":"1","line":"27","lineLength":"3","path":"mercurial\/policy.py","diffId":"15009","author":"martinvonz","id":"92309","dateCreated":"1557158077","dateModified":"1557158077"},{"type":"comment","comment":"I would be happy to have our code auto-formatted. I assume this patch is just to show what the result will be and it's not meant to be queued until that patch for black has been accepted.","author":"martinvonz","id":"92308","dateCreated":"1557158077","dateModified":"1557158077"},{"type":"update","diffId":"15009","author":"durin42","id":"92231","dateCreated":"1557026352","dateModified":"1557026352"}],"dateCreated":"1557026352","dateModified":"1557344046","status":"Needs Review"},{"id":"5064","callsign":"HG","title":"style: run black on a subset of mercurial","author":"mjpieters","summary":"This applied black to the 20 smallest files in mercurial\/:\n\n    ls -S1 mercurial\/*.py | tail -n20 | xargs black","testPlan":"","lineCount":"597","dependsOn":[],"reviewers":["indygreg","durin42"],"ccs":["mharbison72","av6","mercurial-devel"],"actions":[{"type":"comment","comment":"Per mailing list thread, I've sent out https:\/\/phab.mercurial-scm.org\/D5539 to show what yapf would want to do.","author":"durin42","id":"81884","dateCreated":"1547065835","dateModified":"1547065835"},{"type":"comment","comment":">>! In D5064#78994, @mharbison72 wrote:\n>>>! In D5064#78990, @durin42 wrote:\n>> \n>> Does anyone strongly object, or do we want to embrace black and the formatting changes it implies?\n> \n> Is there a fix extension configuration (and I guess precommit hook- I've never used it) for this?  If so, maybe it should go on the ContributingChanges page.\n\nMy plan was to put an `hg fix` configuration in contrib and mention it in ContributingChanges. I'd advise against a hook for this, but if someone else wanted to write one I'd at least drop it in contrib as an example...","author":"durin42","id":"79401","dateCreated":"1543527970","dateModified":"1543527970"},{"type":"comment","comment":">>! In D5064#78990, @durin42 wrote:\n> \n> Does anyone strongly object, or do we want to embrace black and the formatting changes it implies?\n\nIs there a fix extension configuration (and I guess precommit hook- I've never used it) for this?  If so, maybe it should go on the ContributingChanges page.","author":"mharbison72","id":"78995","dateCreated":"1543343465","dateModified":"1543343465"},{"type":"comment","comment":">>! In D5064#78780, @mjpieters wrote:\n>>>! In D5064#78545, @av6 wrote:\n>> I look at the changes and see nitpicks at best. On the one hand, black proved better than any linter that we can already write consistent code. On the other, if black were a linter... I'd switch to flake8, which at least is [[ https:\/\/www.mercurial-scm.org\/repo\/evolve\/file\/tip\/setup.cfg#l1 | configurable ]].\n> \n> The whole **point** of black is that it is not configurable. Configurable means you still have to argue about style and decide on a configuration.\n\nYep. I find I care less about style decisions when the computer is able to make them for me: eg I prefer ' to \", but since black can fix that and I don't have to type the \" myself, I don't really care.\n\nDoes anyone strongly object, or do we want to embrace black and the formatting changes it implies?","author":"durin42","id":"78990","dateCreated":"1543333753","dateModified":"1543333753"},{"type":"comment","comment":">>! In D5064#78545, @av6 wrote:\n> I look at the changes and see nitpicks at best. On the one hand, black proved better than any linter that we can already write consistent code. On the other, if black were a linter... I'd switch to flake8, which at least is [[ https:\/\/www.mercurial-scm.org\/repo\/evolve\/file\/tip\/setup.cfg#l1 | configurable ]].\n\nThe whole **point** of black is that it is not configurable. Configurable means you still have to argue about style and decide on a configuration.","author":"mjpieters","id":"78780","dateCreated":"1542721643","dateModified":"1542721643"},{"type":"comment","comment":"I look at the changes and see nitpicks at best. On the one hand, black proved better than any linter that we can already write consistent code. On the other, if black were a linter... I'd switch to flake8, which at least is [[ https:\/\/www.mercurial-scm.org\/repo\/evolve\/file\/tip\/setup.cfg#l1 | configurable ]].","author":"av6","id":"78546","dateCreated":"1542177684","dateModified":"1542177684"},{"type":"inline","comment":"I'm surprised by this result. I'd like to think the reformatting tool would be smarter than this.","replyTo":null,"isNewFile":"1","line":"18","lineLength":"0","path":"mercurial\/mergeutil.py","diffId":"12135","author":"indygreg","id":"78536","dateCreated":"1542158446","dateModified":"1542158446"},{"type":"comment","comment":"Where do we stand on the intent to mass reformat the code base?\n\nI'm not super thrilled at some of black's decisions (like using double quotes for all strings and merging imports into the same line which leads to excessive code churn later). But the exact style doesn't matter as much as having it be consistent. So I'm willing to go with black if we feel it's the best tool for the job. I'm not sure what the alternatives are these days.","author":"indygreg","id":"78535","dateCreated":"1542158446","dateModified":"1542158446"},{"type":"update","diffId":"12135","author":"mjpieters","id":"76341","dateCreated":"1539524510","dateModified":"1539524510"},{"type":"inline","comment":"I think we'll want to send this chunk as a separate commit, as it is a policy change. I'd be happy to accept that patch today.","replyTo":null,"isNewFile":"0","line":"43","lineLength":"0","path":"contrib\/check-commit","diffId":"12059","author":"indygreg","id":"76072","dateCreated":"1539436980","dateModified":"1539436980"},{"type":"update","diffId":"12059","author":"mjpieters","id":"75974","dateCreated":"1539434351","dateModified":"1539434351"},{"type":"update","diffId":"12047","author":"mjpieters","id":"75925","dateCreated":"1539431766","dateModified":"1539431766"},{"type":"comment","comment":"The `import` parentheses collapsing is described here: https:\/\/github.com\/ambv\/black#parentheses. The behavior is not configurable.\n\n","author":"mjpieters","id":"75836","dateCreated":"1539425573","dateModified":"1539425573"},{"type":"update","diffId":"12030","author":"mjpieters","id":"75830","dateCreated":"1539425250","dateModified":"1539425250"}],"dateCreated":"1539425250","dateModified":"1557026352","status":"Needs Review"},{"id":"6312","callsign":"HG","title":"branchcache: update the filteredhash if we update the tiprev","author":"pulkit","summary":"We update the tiprev and in next if statement we check whether the branchcache\nis valid or not. If the update of tiprev happens, then definitely\nself.validfor() will return False because filteredhash is old now.\n\nLet's update the filteredhash if we update the tiprev also. This prevents us\nfrom entering the loop where we iter all the heads, and find the tiprev.","testPlan":"","lineCount":"1","dependsOn":[],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">          if ntiprev > self.tiprev:\n>              self.tiprev = ntiprev\n>              self.tipnode = cl.node(ntiprev)\n> +            self.filteredhash = scmutil.filteredhash(repo, self.tiprev)\n>  \n>          if not self.validfor(repo):\n>              # cache key are not valid anymore\n\nand update `self.filteredhash` later again, which smells. Instead, shouldn't\nwe check the validity first, and take the fast path only if it was valid?\n\n```\nif self.validfor(repo):  # was valid, can take fast path\n    self.tiprev = ntiprev\n    self.tipnode = cl.node(ntiprev)\nelse:  # bad luck, recompute tiprev\/tipnode\n    ...\nself.filteredhash = scmutil.filteredhash(repo, self.tiprev)\n```","author":"yuja","id":"91967","dateCreated":"1556440717","dateModified":"1556440717"},{"type":"update","diffId":"14927","author":"pulkit","id":"91837","dateCreated":"1556320974","dateModified":"1556320974"}],"dateCreated":"1556320974","dateModified":"1556440717","status":"Needs Review"},{"id":"6259","callsign":"HG","title":"[POC] revset: on-disk cache for children queries","author":"joerg.sonnenberger","summary":"This is a proof of concept for further discussion.","testPlan":"","lineCount":"137","dependsOn":[],"reviewers":[],"ccs":["martinvonz","indygreg","mercurial-devel"],"actions":[{"type":"comment","comment":"Perhaps we'd want this to not be specifically for revsets? We could also write to it when we write to the changelog to keep it up to date.","author":"martinvonz","id":"91118","dateCreated":"1555507748","dateModified":"1555507748"},{"type":"comment","comment":"For the NetBSD repository, a trivial test with the new cache:\n\n```\ntime hg log -r '1000~-400' -T {node} > \/dev\/null\nreal\t0m1.898s\ntime hg log -r '1000~-400' -T {node} > \/dev\/null\nreal\t0m0.170s\ntime hg log -r '1000~-1' -T {node} > \/dev\/null\nreal\t0m0.166s\ntime hg log -r '440000~-1' -T {node} > \/dev\/null\nreal\t0m0.170s\n```\n\nFirst one includes the time to initially warmup the cache.\n\nWithout the cache:\n```\ntime hg log -r '1000~0' -T {node} > \/dev\/null\nreal\t0m0.196s\ntime hg log -r '1000~-1' -T {node} > \/dev\/null\nreal\t0m0.825s\ntime hg log -r '1000~-2' -T {node} > \/dev\/null\nreal\t0m1.288s\ntime hg log -r '1000~-400' -T {node} > \/dev\/null\nreal\t3m23.201s\ntime hg log -r '440000~-1' -T {node} > \/dev\/null\nreal\t0m0.182s\n```\n\nIn other words, building the cache is amortised by one or two queries for children early up in the tree. The cache still provides a good benefit nearer to tip.","author":"joerg.sonnenberger","id":"91110","dateCreated":"1555505679","dateModified":"1555505679"},{"type":"comment","comment":"Do you have performance numbers to share? Substantial wins would definitely pique my interest :)","author":"indygreg","id":"91066","dateCreated":"1555498467","dateModified":"1555498467"},{"type":"update","diffId":"14789","author":"joerg.sonnenberger","id":"91040","dateCreated":"1555454599","dateModified":"1555454599"}],"dateCreated":"1555454599","dateModified":"1555507748","status":"Needs Review"},{"id":"6027","callsign":"HG","title":"mq: make unshelve to apply on modified mq patch (issue4318)","author":"navaneeth.suresh","summary":"unshelve wasn't working on a modified mq patch. I added checks for\nnot aborting on a modified mq patch in both rebase and mq.\n\nChecking `repo.vfs.exists('unshelverebasestate')` works in rebase,\nnot in mq. I used `cmdutil.unfinishedstates` to find `shelvedstate`\nin mq.","testPlan":"","lineCount":"29","dependsOn":[],"reviewers":["martinvonz"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"> It doesn't make sense to check the existence of 'shelvedstate' in a static\n> table.\n> \n> Can't we somehow get around the mq in a similar way to shelve.getcommitfunc()?\n> I don't think it's good idea to rely on state files saved on disk.\n\nI felt that the only workaround to stop aborting unshelve on a modified mq patch should be adding a check on `mq.abortifwdirpatched()`. Will try to investigate in `shelve.getcommitfunc()` for sure. Thanks.","author":"navaneeth.suresh","id":"89928","dateCreated":"1553624502","dateModified":"1553624502"},{"type":"comment","comment":"> --- a\/hgext\/mq.py\n> +++ b\/hgext\/mq.py\n> @@ -3518,7 +3518,10 @@\n>                  delattr(self.unfiltered(), r'mq')\n>  \n>          def abortifwdirpatched(self, errmsg, force=False):\n> -            if self.mq.applied and self.mq.checkapplied and not force:\n> +            shelveinprogress = any('shelvedstate' in state\n> +                                    for state in cmdutil.unfinishedstates)\n> +            if (self.mq.applied and self.mq.checkapplied and not force and\n> +                not shelveinprogress):\n\nIt doesn't make sense to check the existence of 'shelvedstate' in a static\ntable.\n\nCan't we somehow get around the mq in a similar way to shelve.getcommitfunc()?\nI don't think it's good idea to rely on state files saved on disk.","author":"yuja","id":"89919","dateCreated":"1553552983","dateModified":"1553552983"},{"type":"comment","comment":"Gentle ping for review.","author":"navaneeth.suresh","id":"89906","dateCreated":"1553450952","dateModified":"1553450952"},{"type":"update","diffId":"14400","author":"navaneeth.suresh","id":"88740","dateCreated":"1552069564","dateModified":"1552069564"},{"type":"comment","comment":"Ping for review.","author":"navaneeth.suresh","id":"88530","dateCreated":"1551851154","dateModified":"1551851154"},{"type":"update","diffId":"14245","author":"navaneeth.suresh","id":"87900","dateCreated":"1551183856","dateModified":"1551183856"}],"dateCreated":"1551183856","dateModified":"1553624502","status":"Needs Review"},{"id":"2010","callsign":"HG","title":"check-commit: allow foo_bar naming in functions","author":"indygreg","summary":"nameswithallthewordssmashedtogetherarehardtoread.\nespeciallyifenglishisnotyourprimarylanguage.\n\nLet's align with the rest of the programming universe and\nallow_the_use_of_underscores_in_names.","testPlan":"","lineCount":"10","dependsOn":[],"reviewers":["pulkit","durin42"],"ccs":["martinvonz","av6","yuja","durin42","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D2010#89433, @martinvonz wrote:\n>>>! In D2010#89337, @indygreg wrote:\n>> Should we queue this patch or abandon it?\n> \n> I'm for it, even though it leads to inconsistency. However, we may want to discuss ahead of time what our long-term plan for existing symbols is. Do we eventually want to remove that inconsistency? I took a quick look for examples where it seemed obviously not worth it to rename and it was harder to find good examples than I had expected. Perhaps `bail_if_changed` and `extensions.wrap_function` are some of the more frequently used. But most very commonly used functions seem to have short names already. So maybe even if we wanted to eventually make it consistent, it won't be as bad as people have feared? I still don't feel very strongly, but I wanted to highlight what it would mean in practice.\n\nextensions.wrap_function is one of the most used function by extensions and I will be happy if we don't rename it. Renaming it will break a lot of extensions, let's prevent it.","author":"pulkit","id":"89523","dateCreated":"1552775308","dateModified":"1552775308"},{"type":"comment","comment":">>! In D2010#89436, @indygreg wrote:\n> If we loosen the naming requirement, I think a good convention would be to have new files use the *modern* convention and for existing code\/files to generally stick to the old convention.\n> \n> That being said, if someone were to introduce a new function into an existing file and wanted to use the modern names, I wouldn't mind.\n> \n> I would not like to see global, API breaking rewrites for the sake of rewrites. If we wanted to do a global search and replace on variables inside functions, I'd be OK with that (that won't break API compat). But I'm in no rush to do it.\n> \n> I would also not like to see patches introducing mixed naming conventions within functions. I think we should try to keep things consistent at definitely the function level and possibly the file level.\n\nSounds good to me. As I said before, we don't seem to have that many functions that have many words in their name, so I don't think the inconsistency would be very noticeable anyway.","author":"martinvonz","id":"89439","dateCreated":"1552667824","dateModified":"1552667824"},{"type":"comment","comment":"If we loosen the naming requirement, I think a good convention would be to have new files use the *modern* convention and for existing code\/files to generally stick to the old convention.\n\nThat being said, if someone were to introduce a new function into an existing file and wanted to use the modern names, I wouldn't mind.\n\nI would not like to see global, API breaking rewrites for the sake of rewrites. If we wanted to do a global search and replace on variables inside functions, I'd be OK with that (that won't break API compat). But I'm in no rush to do it.\n\nI would also not like to see patches introducing mixed naming conventions within functions. I think we should try to keep things consistent at definitely the function level and possibly the file level.","author":"indygreg","id":"89436","dateCreated":"1552667480","dateModified":"1552667480"},{"type":"comment","comment":">>! In D2010#89337, @indygreg wrote:\n> Should we queue this patch or abandon it?\n\nI'm for it, even though it leads to inconsistency. However, we may want to discuss ahead of time what our long-term plan for existing symbols is. Do we eventually want to remove that inconsistency? I took a quick look for examples where it seemed obviously not worth it to rename and it was harder to find good examples than I had expected. Perhaps `bail_if_changed` and `extensions.wrap_function` are some of the more frequently used. But most very commonly used functions seem to have short names already. So maybe even if we wanted to eventually make it consistent, it won't be as bad as people have feared? I still don't feel very strongly, but I wanted to highlight what it would mean in practice.","author":"martinvonz","id":"89434","dateCreated":"1552663454","dateModified":"1552663454"},{"type":"comment","comment":">>! In D2010#89337, @indygreg wrote:\n> Should we queue this patch or abandon it?\n\nI wanted to have underscores in names but reading @yuja and @av6 comments about inconsistency, I feel maybe it's not a good idea.","author":"pulkit","id":"89408","dateCreated":"1552657304","dateModified":"1552657304"},{"type":"comment","comment":"Should we queue this patch or abandon it?","author":"indygreg","id":"89337","dateCreated":"1552613849","dateModified":"1552613849"},{"type":"comment","comment":"As opposed to 11 words smashed together, function names in Mercurial usually are 2 or 3 words (if not just one), which is not at all bad. I think breaking consistency with the existing code base would be worse than making people get used to no-spaces style (the one that python's stdlib usually follows, in fact). So, FWIW, -1 from me.","author":"av6","id":"33903","dateCreated":"1517723192","dateModified":"1517723215"},{"type":"comment","comment":"I'm kinda -1 on this because of inconsistency with the 10-year codebase.","author":"yuja","id":"33887","dateCreated":"1517646932","dateModified":"1517646932"},{"type":"comment","comment":"I'm also +1 on this.","author":"durin42","id":"33697","dateCreated":"1517595429","dateModified":"1517595429"},{"type":"accept","author":"durin42","id":"33696","dateCreated":"1517595429","dateModified":"1517595429"},{"type":"comment","comment":"I am +1 on this.","author":"pulkit","id":"33694","dateCreated":"1517595331","dateModified":"1517595331"},{"type":"accept","author":"pulkit","id":"33693","dateCreated":"1517595331","dateModified":"1517595331"},{"type":"update","diffId":"5162","author":"indygreg","id":"33687","dateCreated":"1517595246","dateModified":"1517595246"}],"dateCreated":"1517595246","dateModified":"1553109112","status":"Needs Review"},{"id":"6005","callsign":"HG","title":"uncommit: added interactive mode -i(issue6062)","author":"taapas1128","summary":"This adds interactive option to uncommit . Part of this code has been\nimported from evolve from commit hash `da2fdaa3d97c`. The basic\nfunctionality of the code lies in `_interactiveuncommit()`. It first uncommits\neverything then performs action similar to interactive amend .\n\nThe current implementation is not perfect and might result in `Hunk Failed`.\nat some point.","testPlan":"","lineCount":"1094","dependsOn":[],"reviewers":[],"ccs":["ryanmce","spectral","pulkit","martinvonz","mercurial-devel"],"actions":[{"type":"update","diffId":"14558","author":"taapas1128","id":"89708","dateCreated":"1553000469","dateModified":"1553000469"},{"type":"inline","comment":"uncommitting instead of recording","replyTo":null,"isNewFile":"1","line":"1053","lineLength":"0","path":"mercurial\/patch.py","diffId":"14547","author":"pulkit","id":"89706","dateCreated":"1552995408","dateModified":"1552995408"},{"type":"inline","comment":"here also, uncommit instead of record.","replyTo":null,"isNewFile":"1","line":"1052","lineLength":"0","path":"mercurial\/patch.py","diffId":"14547","author":"pulkit","id":"89705","dateCreated":"1552995408","dateModified":"1552995408"},{"type":"inline","comment":"`uncommit` instead of `record` here too.","replyTo":null,"isNewFile":"1","line":"1050","lineLength":"0","path":"mercurial\/patch.py","diffId":"14547","author":"pulkit","id":"89704","dateCreated":"1552995408","dateModified":"1552995408"},{"type":"inline","comment":"this should be `uncommit this change` right?","replyTo":null,"isNewFile":"1","line":"1046","lineLength":"0","path":"mercurial\/patch.py","diffId":"14547","author":"pulkit","id":"89703","dateCreated":"1552995408","dateModified":"1552995408"},{"type":"update","diffId":"14547","author":"taapas1128","id":"89637","dateCreated":"1552934250","dateModified":"1552934250"},{"type":"update","diffId":"14546","author":"taapas1128","id":"89634","dateCreated":"1552932468","dateModified":"1552932468"},{"type":"inline","comment":"This operation thing can be used to show `select hunks to uncommit` message.","replyTo":null,"isNewFile":"1","line":"258","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14521","author":"pulkit","id":"89633","dateCreated":"1552929443","dateModified":"1552929443"},{"type":"inline","comment":"okay sure.","replyTo":"89514","isNewFile":"1","line":"253","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14464","author":"taapas1128","id":"89521","dateCreated":"1552751527","dateModified":"1552751527"},{"type":"inline","comment":"yes I applied your patch and I m trying to figure out what is going wrong . I will send a fix soon.","replyTo":"89515","isNewFile":"1","line":"241","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"taapas1128","id":"89520","dateCreated":"1552751527","dateModified":"1552751527"},{"type":"inline","comment":"Yes, please try to fix it. Did you try?","replyTo":"89507","isNewFile":"1","line":"241","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"martinvonz","id":"89515","dateCreated":"1552745888","dateModified":"1552745888"},{"type":"inline","comment":"I suggested addressing the todo now instead of waiting.","replyTo":"89508","isNewFile":"1","line":"253","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89514","dateCreated":"1552745888","dateModified":"1552745888"},{"type":"inline","comment":"I am a little puzzled about what is to be done here . the TODO states that operations are currently not wrapped . how do you want me to continue ?","replyTo":"89463","isNewFile":"1","line":"253","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14464","author":"taapas1128","id":"89508","dateCreated":"1552731138","dateModified":"1552731138"},{"type":"inline","comment":"do you want me to remove the temporary commit part in this patch or a follow up of this because that will require fixing it up for added files.","replyTo":"89468","isNewFile":"1","line":"241","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"taapas1128","id":"89507","dateCreated":"1552731138","dateModified":"1552731138"},{"type":"update","diffId":"14521","author":"taapas1128","id":"89504","dateCreated":"1552728980","dateModified":"1552728980"},{"type":"update","diffId":"14520","author":"taapas1128","id":"89501","dateCreated":"1552728260","dateModified":"1552728260"},{"type":"inline","comment":"Do we need to create the temporary commit? I found it hard to reason about (the temporary commit contains the changes that should be removed, which confused me) and we should ideally not leave that commit in the repo. I tried to rewrite it to not write the temporary commit. You can see my patch at http:\/\/paste.debian.net\/1073278\/. As you can see in the changed test case there, it doesn't work with added files. I don't know if that's because of the crecord bug that you mention on line 254 of this version or something else. Hopefully the patch is still a good start and maybe you can fix that bug. It would be great if you can even fix it in crecord (if that's where it is), so all users of crecord can benefit.","replyTo":null,"isNewFile":"1","line":"241","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"martinvonz","id":"89468","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"`amend_source` includes the full hash. I think it's better to do the same here.","replyTo":null,"isNewFile":"1","line":"265","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"martinvonz","id":"89467","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"`extras` is a confusing name for a node (it sounds too much like it's a changeset extras dict). I suggest renaming it to `oldnode`.","replyTo":null,"isNewFile":"1","line":"270","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"martinvonz","id":"89466","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"I think it's still unclear if we even want to make that change (I think I would prefer it, but I'd like to hear from others), so let's leave it as is for now.","replyTo":"89315","isNewFile":"1","line":"110","lineLength":"0","path":"tests\/test-uncommit-interactive.t","diffId":"14464","author":"martinvonz","id":"89465","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"nit: remove the leading space here and in other docstrings for consistency (we seem to have about 60 instances with a leading space and 2900 without)","replyTo":null,"isNewFile":"1","line":"216","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14493","author":"martinvonz","id":"89464","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"It doesn't look done to me...","replyTo":"89232","isNewFile":"1","line":"253","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89463","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"I didn't mean \"use `cleanupnodes()` too\", I meant \"here too\" :) I.e., use `cleanupnodes()` here just like we do elsewhere in this file, not in addition to using `createmarkers()`. So just delete the `createmarkers()` call.","replyTo":"89227","isNewFile":"1","line":"235","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89462","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"It looks like this is only useful in the non-interactive case. It's generally preferred to avoid unnecessary work, both because it's wasting computer resources (not really an issue here) and because it makes it clearer how the code works. In this case, it will make it clear that the `--keep` option does not matter with `--interactive`. However, it seems reasonable for `--keep` (and the corresponding config option) to be respected with `--interactive`. Maybe you should pass `keep` it into `_interactiveuncommit()` and use it there? I'd be fine with just leaving a TODO about that (and leave the `keepcommit` code here).","replyTo":null,"isNewFile":"1","line":"185","lineLength":"5","path":"hgext\/uncommit.py","diffId":"14493","author":"martinvonz","id":"89461","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"comment","comment":"Can you wrap the commit message to 80 columns? I didn't find anything on https:\/\/www.mercurial-scm.org\/wiki\/ContributingChanges about it, but that's how almost everyone else does it.","author":"martinvonz","id":"89460","dateCreated":"1552678817","dateModified":"1552678817"},{"type":"inline","comment":"Can I work on this as a part as a follow up ? or should i make amends in this patch . ","replyTo":"89228","isNewFile":"1","line":"110","lineLength":"0","path":"tests\/test-uncommit-interactive.t","diffId":"14464","author":"taapas1128","id":"89315","dateCreated":"1552579696","dateModified":"1552579696"},{"type":"comment","comment":"@martinvonz I have made the necessary modifications and updated the description.","author":"taapas1128","id":"89314","dateCreated":"1552579696","dateModified":"1552579696"},{"type":"update","diffId":"14493","author":"taapas1128","id":"89304","dateCreated":"1552574286","dateModified":"1552574286"},{"type":"inline","comment":"nit: indent by 4 spaces","replyTo":null,"isNewFile":"1","line":"230","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89234","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"nit: indent by 4 spaces","replyTo":null,"isNewFile":"1","line":"261","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89233","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"I think it's fine to do it directly there, without wrapping. We're shipping this extension with core, so it shouldn't be a problem. It will have no effect unless you've enabled the extension, as far as I can tell.","replyTo":null,"isNewFile":"1","line":"253","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89232","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"nit: No need to say that it's a function, and the \"for interactively uncommiting a commit\" seems pretty obvious from the name. Just start with \"Makes a temporary commit...\" instead.","replyTo":null,"isNewFile":"1","line":"214","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89231","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"Same nit here: No need to say that it's a function, just start with \"Applies the patch...\"","replyTo":null,"isNewFile":"1","line":"270","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89230","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"Add \" (EXPERIMENTAL)\" to the end of this description since the feature doesn't work with curses. That way it won't be visible when the user runs `hg help uncommit`.","replyTo":null,"isNewFile":"1","line":"148","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89229","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"I think at least @spectral and @ryanmce had previously suggested that `hg revert -i` should ask you what pieces to keep, not what to discard. Your patch reminded me of that discussion, so I sent D6125. I'm curious to hear what others think about `hg uncommit -i`. Should it ask you what to discard or what to keep? I can see arguments both ways.\n\nPerhaps the strongest argument in favor if showing what to keep is that it makes uncommitting part of a line *much* easier. Let's say you changed a line from \"a\" to \"c\" in the commit and you meant to change it to \"b\" in the commit and leave the change to \"c\" in the working copy. You'd be presented with this:\n```\n-a\n+c\n```\n\nIf what you select is what to keep in the commit, then it seems pretty obvious that you should change that to:\n```\n-a\n+b\n```\n\nIt's much less obvious what to do if you select what to discard.\n\nI think it would also make it easier to implement this feature if the user selected what to keep (we would create a commit based on that and then move the dirstate there).","replyTo":null,"isNewFile":"1","line":"110","lineLength":"0","path":"tests\/test-uncommit-interactive.t","diffId":"14464","author":"martinvonz","id":"89228","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"Should probably use `scmutil.cleanupnodes()` here too?","replyTo":null,"isNewFile":"1","line":"235","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89227","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"inline","comment":"I think you're relying on this empty commit to not be saved, but I think it will be if the user has set `experiemtal.uncommit.keep` (or if they passed `--keep`). It seems better to not even attempt to create it if we don't want it.","replyTo":null,"isNewFile":"1","line":"191","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14464","author":"martinvonz","id":"89226","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"comment","comment":">>! In D6005#89211, @pulkit wrote:\n>>>! In D6005#89182, @martinvonz wrote:\n>> Can you update the commit message to explain how this works? I think I saw somewhere else that it first uncommits everything and then does an interactive amend. Is that correct?\n> \n> Yes, this is correct.\n>> \n>> Also, I just tried to use this feature and it failed (depending on how many lines were added). I added two lines to a file, committed, then ran `hg uncommit -i` and selected the first line. Then I got this:\n>> \n>> ```\n>> starting interactive selection\n>> patching file z\n>> Hunk #1 succeeded at 2 with fuzz 2 (offset -1 lines).\n>> ```\n> \n> Yes this is also expected with the current implementation. Sometimes uncommit can fail and it will report `Hunk Failed` like this. There is definitely lot to improve in this implementation and I am fine with having this in core first.\n\nThat definitely should be in the commit message.","author":"martinvonz","id":"89225","dateCreated":"1552497194","dateModified":"1552497194"},{"type":"comment","comment":">>! In D6005#89182, @martinvonz wrote:\n> Can you update the commit message to explain how this works? I think I saw somewhere else that it first uncommits everything and then does an interactive amend. Is that correct?\n\nYes, this is correct.\n> \n> Also, I just tried to use this feature and it failed (depending on how many lines were added). I added two lines to a file, committed, then ran `hg uncommit -i` and selected the first line. Then I got this:\n> \n> ```\n> starting interactive selection\n> patching file z\n> Hunk #1 succeeded at 2 with fuzz 2 (offset -1 lines).\n> ```\n\nYes this is also expected with the current implementation. Sometimes uncommit can fail and it will report `Hunk Failed` like this. There is definitely lot to improve in this implementation and I am fine with having this in core first.\n\n","author":"pulkit","id":"89211","dateCreated":"1552465939","dateModified":"1552465939"},{"type":"comment","comment":"I suppose no .. because in the very initial patch I combined `hg uncommit` with `hg commit -i`(as was stated in the bug description(https:\/\/bz.mercurial-scm.org\/show_bug.cgi?id=6062)) . But later on I was asked to import it from `evolve` . The basic functionality lies in `_interactiveuncommit()` and the other two functions are imported as dependencies to that. ","author":"taapas1128","id":"89183","dateCreated":"1552416483","dateModified":"1552416483"},{"type":"comment","comment":"Can you update the commit message to explain how this works? I think I saw somewhere else that it first uncommits everything and then does an interactive amend. Is that correct?\n\nAlso, I just tried to use this feature and it failed (depending on how many lines were added). I added two lines to a file, committed, then ran `hg uncommit -i` and selected the first line. Then I got this:\n\n```\nstarting interactive selection\npatching file z\nHunk #1 succeeded at 2 with fuzz 2 (offset -1 lines).\n```\n","author":"martinvonz","id":"89182","dateCreated":"1552414856","dateModified":"1552414856"},{"type":"update","diffId":"14464","author":"taapas1128","id":"89100","dateCreated":"1552324675","dateModified":"1552324675"},{"type":"update","diffId":"14461","author":"taapas1128","id":"89072","dateCreated":"1552319396","dateModified":"1552319396"},{"type":"inline","comment":"okay sending a separate patch right away","replyTo":"88738","isNewFile":"1","line":"399","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"taapas1128","id":"89065","dateCreated":"1552318795","dateModified":"1552318795"},{"type":"inline","comment":"Yes, please do. Then we can consider while reviewing that patch if we even need to pass the matcher. It's better to have that discussion separate from this patch.","replyTo":"88737","isNewFile":"1","line":"399","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"martinvonz","id":"88738","dateCreated":"1552066880","dateModified":"1552066880"},{"type":"inline","comment":"@martinvonz this part of the patch too (`323,329,366`) has no relation with interactive uncommit but it makes `match` optional for `unamend`. Should I remove is and send it as a seperate patch too ?","replyTo":"87640","isNewFile":"1","line":"399","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"taapas1128","id":"88737","dateCreated":"1552066781","dateModified":"1552066781"},{"type":"update","diffId":"14399","author":"taapas1128","id":"88735","dateCreated":"1552058869","dateModified":"1552058869"},{"type":"inline","comment":"Okay . Then I am reverting this back to what it was.","replyTo":"88733","isNewFile":"1","line":"109","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14386","author":"taapas1128","id":"88734","dateCreated":"1552058644","dateModified":"1552058644"},{"type":"inline","comment":"So you're fixing something that was missed in an old commit? Please put that fix in a separate patch.","replyTo":"88732","isNewFile":"1","line":"109","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14386","author":"martinvonz","id":"88733","dateCreated":"1552057393","dateModified":"1552057393"},{"type":"inline","comment":"In line number `115` a matcher is used . This is between oldctx and netctx now . In D971 a the matcher was removed so the comment was altered . But whenever the matcher was reused the comment wasn't changed .","replyTo":"88643","isNewFile":"1","line":"109","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14386","author":"taapas1128","id":"88732","dateCreated":"1552028753","dateModified":"1552028753"},{"type":"inline","comment":"> It is the part of _uncommitdirstate() that has been left behind. okay I am not changing that\n\nAre you referring to D971? I see that your change kind of backs out that change. But why?","replyTo":"88641","isNewFile":"1","line":"109","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14386","author":"martinvonz","id":"88643","dateCreated":"1551992859","dateModified":"1551992859"},{"type":"inline","comment":"It is the  part of _uncommitdirstate() that has been left behind. okay I am not changing that","replyTo":"88636","isNewFile":"1","line":"109","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14386","author":"taapas1128","id":"88641","dateCreated":"1551992528","dateModified":"1551992528"},{"type":"update","diffId":"14389","author":"taapas1128","id":"88638","dateCreated":"1551992416","dateModified":"1551992416"},{"type":"inline","comment":"Similar existing flags and their descriptions:\n\ncommit: \"use interactive mode\"\namend: \"use interactive mode\"\nforget: \"use interactive mode\"\nrevert: \"interactively select the changes\"\nabsorb: \"interactively select which chunks to apply\"\nshelve: \"interactive mode, only works while creating a shelve\"\n\nI'd prefer to be consistent with one of those. I personally think revert's and absorb's versions are clearest.","replyTo":null,"isNewFile":"1","line":"148","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14388","author":"martinvonz","id":"88637","dateCreated":"1551989808","dateModified":"1551989808"},{"type":"inline","comment":"I don't follow the \"not containing changed files matched by match\" part. It *only* fixes the parts matched by the matches, right? Also, I think the matcher is just an optimization -- it would be incorrect, I think, to pass a matcher that doesn't match all the changes between oldctx and newctx. I'd just leave the comment untouched for now. We may even want to remove the matcher argument, but we can do that in a separate patch, if at all.","replyTo":null,"isNewFile":"1","line":"109","lineLength":"1","path":"hgext\/uncommit.py","diffId":"14386","author":"martinvonz","id":"88636","dateCreated":"1551989808","dateModified":"1551989808"},{"type":"inline","comment":"I preferred the old wording where it said \"newctx\" instead of \"a copy of oldctx\".","replyTo":null,"isNewFile":"1","line":"109","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14386","author":"martinvonz","id":"88635","dateCreated":"1551989808","dateModified":"1551989808"},{"type":"inline","comment":"No need to pass the `interactive` flag here, right?","replyTo":null,"isNewFile":"1","line":"107","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14386","author":"martinvonz","id":"88634","dateCreated":"1551989808","dateModified":"1551989808"},{"type":"comment","comment":"Here are some little comments to start with. I haven't even started reviewing the three new functions, but I need to take a break and work on other things a bit now.","author":"martinvonz","id":"88633","dateCreated":"1551989808","dateModified":"1551989808"},{"type":"update","diffId":"14388","author":"taapas1128","id":"88631","dateCreated":"1551989040","dateModified":"1551989040"},{"type":"comment","comment":"@martinvonz cleaned it up . ","author":"taapas1128","id":"88629","dateCreated":"1551988873","dateModified":"1551988873"},{"type":"update","diffId":"14387","author":"taapas1128","id":"88628","dateCreated":"1551988760","dateModified":"1551988760"},{"type":"update","diffId":"14386","author":"taapas1128","id":"88627","dateCreated":"1551988403","dateModified":"1551988403"},{"type":"comment","comment":"As I said a while ago on IRC, it feels like `_fixdirstate()` should not need an `interactive` flag, and it should not even need to be specifically for uncommit. It feels like it should work the same for any case where we move to a different commit without changing the working copy, such as uncommit, unamend, amend, fix (though we may want optimized code paths for some of them). So I took this patch and tried the most naive attempt at unifying the interactive version with the non-interactive version, namely to just drop the code for the interactive path (see patch below). Surprisingly, all tests pass :) So maybe you can just apply the below patch and clean it up (drop the `if True`), or maybe you need to add tests.\n\n```\ndiff --git a\/hgext\/uncommit.py b\/hgext\/uncommit.py\n--- a\/hgext\/uncommit.py\n+++ b\/hgext\/uncommit.py\n@@ -109,59 +109,10 @@ def _fixdirstate(repo, oldctx, newctx, m\n     oldctx to a copy of oldctx not containing changed files matched by\n     match.\n     \"\"\"\n-    ctx = repo['.']\n     ds = repo.dirstate\n     ds.setparents(newctx.node(), node.nullid)\n     copies = dict(ds.copies())\n-    if interactive:\n-        # In interactive cases, we will find the status between oldctx and ctx\n-        # and considering only the files which are changed between oldctx and\n-        # ctx, and the status of what changed between oldctx and ctx will help\n-        # us in defining the exact behavior\n-        s = oldctx.status(ctx, match=match)\n-        for f in s.modified:\n-            # These are files which are modified between oldctx and ctx which\n-            # contains two cases: 1) Were modified in oldctx and some\n-            # modifications are uncommitted\n-            # 2) Were added in oldctx but some part is uncommitted (this cannot\n-            # contain the case when added files are uncommitted completely as\n-            # that will result in status as removed not modified.)\n-            # Also any modifications to a removed file will result the status as\n-            # added, so we have only two cases. So in either of the cases, the\n-            # resulting status can be modified or clean.\n-            if ds[f] == 'r':\n-                # But the file is removed in the working directory, leaving that\n-                # as removed\n-                continue\n-            ds.normallookup(f)\n-\n-        for f in s.added:\n-            # These are the files which are added between oldctx and ctx(new\n-            # one), which means the files which were removed in oldctx\n-            # but uncommitted completely while making the ctx\n-            # This file should be marked as removed if the working directory\n-            # does not adds it back. If it's adds it back, we do a normallookup.\n-            # The file can't be removed in working directory, because it was\n-            # removed in oldctx\n-            if ds[f] == 'a':\n-                ds.normallookup(f)\n-                continue\n-            ds.remove(f)\n-\n-        for f in s.removed:\n-            # These are files which are removed between oldctx and ctx, which\n-            # means the files which were added in oldctx and were completely\n-            # uncommitted in ctx. If a added file is partially uncommitted, that\n-            # would have resulted in modified status, not removed.\n-            # So a file added in a commit, and uncommitting that addition must\n-            # result in file being stated as unknown.\n-            if ds[f] == 'r':\n-                # The working directory say it's removed, so lets make the file\n-                # unknown\n-                ds.drop(f)\n-                continue\n-            ds.add(f)\n-    else:\n+    if True:\n         s = newctx.status(oldctx, match=match)\n         for f in s.modified:\n             if ds[f] == 'r':\n```\n","author":"martinvonz","id":"88625","dateCreated":"1551985450","dateModified":"1551985450"},{"type":"update","diffId":"14385","author":"taapas1128","id":"88624","dateCreated":"1551983082","dateModified":"1551983082"},{"type":"comment","comment":"@pulkit Thanks for pointing that out . That was extremely silly of me . I have corrected that . Is there anything else to be changed ?","author":"taapas1128","id":"88055","dateCreated":"1551390417","dateModified":"1551390417"},{"type":"update","diffId":"14278","author":"taapas1128","id":"88053","dateCreated":"1551390277","dateModified":"1551390277"},{"type":"inline","comment":"I just skimmed through changes and looks like this is missing in the changed version.","replyTo":null,"isNewFile":"0","line":"101","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14193","author":"pulkit","id":"88049","dateCreated":"1551389274","dateModified":"1551389274"},{"type":"comment","comment":"@pulkit I am unable to figure out why the output for `test-unamend.t` is changing . Any hint on that ?","author":"taapas1128","id":"88046","dateCreated":"1551381557","dateModified":"1551381557"},{"type":"comment","comment":"@martinvonz I made the changes you asked . However I am not sure why `test-unamend.t` is changing because when `interactive` is false so it should behave exactly like the previous `_fixdirstate()` functioned . Can you provide some help with this ? I will work further based on your review.","author":"taapas1128","id":"87647","dateCreated":"1550865111","dateModified":"1550865111"},{"type":"update","diffId":"14193","author":"taapas1128","id":"87644","dateCreated":"1550864664","dateModified":"1550864664"},{"type":"update","diffId":"14192","author":"taapas1128","id":"87642","dateCreated":"1550860371","dateModified":"1550860371"},{"type":"inline","comment":"I've been trying to avoid accessing status fields by index because it's not very readable. Can you use the same pattern as below instead (i.e. `s.modifed` etc)?","replyTo":null,"isNewFile":"1","line":"114","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"martinvonz","id":"87641","dateCreated":"1550860142","dateModified":"1550860142"},{"type":"inline","comment":"Instead of defining a value here, specify the argument by name when you call the function: `_uncommitdirstate(..., interactive=False)`. But it's probably better to just make `interactive` default to `False` and not pass it here.","replyTo":null,"isNewFile":"1","line":"399","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"martinvonz","id":"87640","dateCreated":"1550860142","dateModified":"1550860142"},{"type":"inline","comment":"Keep the match optional instead?","replyTo":null,"isNewFile":"1","line":"400","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"martinvonz","id":"87639","dateCreated":"1550860142","dateModified":"1550860142"},{"type":"inline","comment":"I don't think we need to rename it from `_fixdirstate()`, especially since it's used for both uncommit and unamend. (Fix commit message too, of course, if you switch back to the old name.)","replyTo":null,"isNewFile":"1","line":"101","lineLength":"0","path":"hgext\/uncommit.py","diffId":"14191","author":"martinvonz","id":"87638","dateCreated":"1550860142","dateModified":"1550860142"},{"type":"comment","comment":"I haven't reviewed much of it, but here are some initial comments","author":"martinvonz","id":"87637","dateCreated":"1550860142","dateModified":"1550860142"},{"type":"update","diffId":"14191","author":"taapas1128","id":"87630","dateCreated":"1550859507","dateModified":"1550859507"}],"dateCreated":"1550859507","dateModified":"1553000756","status":"Needs Review"},{"id":"6123","callsign":"HG","title":"similar: add condition to avoid Zerodivisonerror in function _score() (issue6099)","author":"akshjain.jain74","summary":"","testPlan":"","lineCount":"4","dependsOn":[],"reviewers":["durin42"],"ccs":["av6","pulkit","mercurial-devel"],"actions":[{"type":"inline","comment":"yes actually \ud83d\ude05  i did'nt noticed that ","replyTo":"89412","isNewFile":"1","line":"68","lineLength":"0","path":"mercurial\/similar.py","diffId":"14487","author":"akshjain.jain74","id":"89432","dateCreated":"1552659675","dateModified":"1552659675"},{"type":"update","diffId":"14508","author":"akshjain.jain74","id":"89430","dateCreated":"1552659596","dateModified":"1552659596"},{"type":"comment","comment":"thanks for the review\n","author":"akshjain.jain74","id":"89422","dateCreated":"1552658279","dateModified":"1552658279"},{"type":"comment","comment":">>! In D6123#89410, @pulkit wrote:\n> Can you try to add a test for this?\n\nyes i can definitely try to add test for this ","author":"akshjain.jain74","id":"89421","dateCreated":"1552658267","dateModified":"1552658267"},{"type":"inline","comment":"no need for this else. you can `return 0` without else.","replyTo":null,"isNewFile":"1","line":"68","lineLength":"0","path":"mercurial\/similar.py","diffId":"14487","author":"pulkit","id":"89412","dateCreated":"1552657477","dateModified":"1552657477"},{"type":"inline","comment":"we can do `if lengths:` here.","replyTo":null,"isNewFile":"1","line":"66","lineLength":"0","path":"mercurial\/similar.py","diffId":"14487","author":"pulkit","id":"89411","dateCreated":"1552657477","dateModified":"1552657477"},{"type":"comment","comment":"Can you try to add a test for this?","author":"pulkit","id":"89410","dateCreated":"1552657477","dateModified":"1552657477"},{"type":"update","diffId":"14487","author":"akshjain.jain74","id":"89272","dateCreated":"1552508232","dateModified":"1552508232"},{"type":"comment","comment":"actually  i am not getting what can be the proper topic for this :(","author":"akshjain.jain74","id":"89249","dateCreated":"1552501010","dateModified":"1552501010"},{"type":"comment","comment":"sorry for that , but can you tell me in what condition this function will return none value?","author":"akshjain.jain74","id":"89248","dateCreated":"1552500860","dateModified":"1552500860"},{"type":"inline","comment":"`None > 1` is still an issue, see my comment above.","replyTo":null,"isNewFile":"1","line":"66","lineLength":"1","path":"mercurial\/similar.py","diffId":"14482","author":"av6","id":"89240","dateCreated":"1552500162","dateModified":"1552500162"},{"type":"comment","comment":"Okay, let's go over #1 in https:\/\/www.mercurial-scm.org\/wiki\/ContributingChanges#Submission_checklist once more. If you want to know what a good \"topic\" is, look at what other people do. How patches that get accepted generally look. How bug-fixing commits are worded.\n\nSecondly, about that capitalization. I'm sorry if this is some sort of silly autocorrect that's doing it for you, I really hope you're not writing commit messages on a phone.","author":"av6","id":"89239","dateCreated":"1552500162","dateModified":"1552500162"},{"type":"update","diffId":"14482","author":"akshjain.jain74","id":"89237","dateCreated":"1552498479","dateModified":"1552498479"},{"type":"comment","comment":"Sorry for the various mistake\n I will correct everything in an hour thanks","author":"akshjain.jain74","id":"89222","dateCreated":"1552470438","dateModified":"1552470438"},{"type":"inline","comment":"This returns None in some cases, and code that uses `_score()` and `score()` tries to compare it to an integer. In Python3 `None > 1` raises TypeError.","replyTo":null,"isNewFile":"1","line":"67","lineLength":"0","path":"mercurial\/similar.py","diffId":"14477","author":"av6","id":"89221","dateCreated":"1552469028","dateModified":"1552469028"},{"type":"inline","comment":"This is some... interesting syntax. Is this valid Python?","replyTo":null,"isNewFile":"1","line":"66","lineLength":"1","path":"mercurial\/similar.py","diffId":"14477","author":"av6","id":"89220","dateCreated":"1552468824","dateModified":"1552468824"},{"type":"comment","comment":"I find it troubling that we now have contributors that don't follow #1 in https:\/\/www.mercurial-scm.org\/wiki\/ContributingChanges#Submission_checklist. Potentially #4 too (as Pulkit commented).\n\nSeriously, the title is terrible at describing what this patch fixes and where. The commit message could briefly mention why\/when this condition is even required.","author":"av6","id":"89219","dateCreated":"1552468824","dateModified":"1552468824"},{"type":"comment","comment":"Oh sorry ,my bad  I think that is by mistake I will correct it now\nIthink while committing I added that file by mistake","author":"akshjain.jain74","id":"89217","dateCreated":"1552468624","dateModified":"1552468624"},{"type":"inline","comment":"Is this change required for this patch?","replyTo":null,"isNewFile":"1","line":"1127","lineLength":"0","path":"hgext\/histedit.py","diffId":"14477","author":"pulkit","id":"89214","dateCreated":"1552467285","dateModified":"1552467285"},{"type":"update","diffId":"14477","author":"akshjain.jain74","id":"89176","dateCreated":"1552414170","dateModified":"1552414170"}],"dateCreated":"1552414170","dateModified":"1552659675","status":"Needs Review"},{"id":"6026","callsign":"HG","title":"lock: Improve the waiting for lock message which will help newcomers\n(issue6081)","author":"akshjain.jain74","summary":"","testPlan":"","lineCount":"71","dependsOn":[],"reviewers":[],"ccs":["pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D6026#88552, @pulkit wrote:\n> I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now.\n> \n> Something like:\n> \n> `waiting for lock on working directory of b held by process '*' running <cmd-name> on host '*'`\n\nSo for which commands we can show this message, like i got message when i run hg commit --amend sometimes ","author":"akshjain.jain74","id":"88558","dateCreated":"1551900706","dateModified":"1551900706"},{"type":"inline","comment":"I accept these changes while running test,  if i am not changing this then it will cause test failing","replyTo":"88554","isNewFile":"0","line":"18","lineLength":"0","path":"tests\/test-lock-badness.t","diffId":"14277","author":"akshjain.jain74","id":"88557","dateCreated":"1551893473","dateModified":"1551893473"},{"type":"comment","comment":"okay @pulkit let me work upon your suggestion and ","author":"akshjain.jain74","id":"88556","dateCreated":"1551893473","dateModified":"1551893473"},{"type":"inline","comment":"The output is not correctly aligned. ","replyTo":null,"isNewFile":"1","line":"62","lineLength":"0","path":"tests\/test-lock-badness.t","diffId":"14291","author":"pulkit","id":"88555","dateCreated":"1551879636","dateModified":"1551879636"},{"type":"inline","comment":"still here are unrealted changes.","replyTo":"88052","isNewFile":"0","line":"18","lineLength":"0","path":"tests\/test-lock-badness.t","diffId":"14277","author":"pulkit","id":"88554","dateCreated":"1551879636","dateModified":"1551879636"},{"type":"inline","comment":"unrelated changes.","replyTo":null,"isNewFile":"1","line":"155","lineLength":"0","path":"tests\/test-extdiff.t","diffId":"14291","author":"pulkit","id":"88553","dateCreated":"1551879636","dateModified":"1551879636"},{"type":"comment","comment":"I am not sure the new message is much helpful. As JordiGH and others pointed out on IRC, it will definitely be helpful if we can show which operation has the lock right now.\n\nSomething like:\n\n`waiting for lock on working directory of b held by process '*' running <cmd-name> on host '*'`","author":"pulkit","id":"88552","dateCreated":"1551879636","dateModified":"1551879636"},{"type":"update","diffId":"14291","author":"akshjain.jain74","id":"88119","dateCreated":"1551530162","dateModified":"1551530162"},{"type":"comment","comment":"@pulkit done changes as per your suggestion in lock file too but what did you meant by storelock?","author":"akshjain.jain74","id":"88059","dateCreated":"1551392049","dateModified":"1551392049"},{"type":"update","diffId":"14279","author":"akshjain.jain74","id":"88056","dateCreated":"1551391885","dateModified":"1551391885"},{"type":"inline","comment":"unrelated changes in the test file here and below.","replyTo":null,"isNewFile":"0","line":"18","lineLength":"0","path":"tests\/test-lock-badness.t","diffId":"14277","author":"pulkit","id":"88052","dateCreated":"1551389487","dateModified":"1551389487"},{"type":"inline","comment":"remove which file manually to continue?\n\nI think we should delete the `If it still fails, ..... remove the file manually to continue` part.","replyTo":null,"isNewFile":"1","line":"316","lineLength":"0","path":"hgext\/journal.py","diffId":"14277","author":"pulkit","id":"88051","dateCreated":"1551389487","dateModified":"1551389487"},{"type":"inline","comment":"This is only for locking namejournal.lock and not for working directory lock and store lock. We need to improve message there too.","replyTo":null,"isNewFile":"1","line":"310","lineLength":"0","path":"hgext\/journal.py","diffId":"14277","author":"pulkit","id":"88050","dateCreated":"1551389487","dateModified":"1551389487"},{"type":"update","diffId":"14277","author":"akshjain.jain74","id":"88048","dateCreated":"1551388596","dateModified":"1551388596"},{"type":"update","diffId":"14274","author":"akshjain.jain74","id":"88039","dateCreated":"1551376882","dateModified":"1551376882"},{"type":"update","diffId":"14273","author":"akshjain.jain74","id":"88038","dateCreated":"1551373745","dateModified":"1551373745"},{"type":"update","diffId":"14272","author":"akshjain.jain74","id":"88037","dateCreated":"1551373367","dateModified":"1551373367"},{"type":"update","diffId":"14271","author":"akshjain.jain74","id":"88036","dateCreated":"1551373151","dateModified":"1551373151"},{"type":"comment","comment":"Ya I am sending that  just trying to find out the file","author":"akshjain.jain74","id":"87909","dateCreated":"1551191027","dateModified":"1551191027"},{"type":"comment","comment":"This patch does not changes any code. It only changes some test output. You need to change the error message in the code.","author":"pulkit","id":"87908","dateCreated":"1551190913","dateModified":"1551190913"},{"type":"update","diffId":"14244","author":"akshjain.jain74","id":"87894","dateCreated":"1551173448","dateModified":"1551173448"}],"dateCreated":"1551173448","dateModified":"1551900706","status":"Needs Review"},{"id":"6043","callsign":"HG","title":"UnicodeEncoding:change the default encoding of the whole script to be 'UTF-8'\n(issue6040)","author":"akshjain.jain74","summary":"","testPlan":"","lineCount":"23","dependsOn":[],"reviewers":["indygreg"],"ccs":["indygreg","mercurial-devel"],"actions":[{"type":"comment","comment":"If we wanted to call `sys.setdefaultencoding()`, we should call it once during `hg` or at the top of `mercurial\/__init__.py`.\n\nBut we don't want to call `sys.setdefaultencoding()`. This topic has been discussed heavily over the years. The various answers at https:\/\/stackoverflow.com\/questions\/3828723\/why-should-we-not-use-sys-setdefaultencodingutf-8-in-a-py-script have a lot of context and I won't rehash the reasons here.\n\nMay I ask what compelled you to want to do this? Any bug you encountered that was fixed by this change represents a place where Mercurial isn't handling encoding properly. We should fix the actual places where that is occurring. Because even if we switch to UTF-8 as the default string encoding, UTF-8 isn't used everywhere and the underlying encoding problem may still exist!\n\nAny patch to introduce `sys.setdefaultencoding()` into the code base will likely never be accepted (unless it is doing something special like what `HGUNICODEPEDANTRY` is doing). So you may want to mark this code review as abandoned.","author":"indygreg","id":"88140","dateCreated":"1551559275","dateModified":"1551559310"},{"type":"reject","author":"indygreg","id":"88139","dateCreated":"1551559275","dateModified":"1551559275"},{"type":"update","diffId":"14292","author":"akshjain.jain74","id":"88121","dateCreated":"1551536157","dateModified":"1551536157"}],"dateCreated":"1551536157","dateModified":"1551559275","status":"Needs Revision"},{"id":"6029","callsign":"HG","title":"Bug 1477205 - Remove the exception when a node is created after closing the AudioContext. r?padenot","author":"vmillet","summary":"","testPlan":"","lineCount":"77","dependsOn":[],"reviewers":[],"ccs":["marmoute","mercurial-devel"],"actions":[{"type":"comment","comment":"Hi Valentin,\n\nIt looks like you are not using the right Phabricator instance. This one is dedicated to the Mercurial projet, not Firefox.","author":"marmoute","id":"87950","dateCreated":"1551270268","dateModified":"1551270268"},{"type":"update","diffId":"14252","author":"vmillet","id":"87940","dateCreated":"1551264426","dateModified":"1551264426"}],"dateCreated":"1551264426","dateModified":"1551270268","status":"Needs Review"},{"id":"4664","callsign":"HG","title":"mergecommit: add a new extension to merge in-memory and create a commit","author":"pulkit","summary":"This patch adds a new mergecommit command which is very useful for workflows\nwhere there is automated merging involved. This patch uses existing in-memory\nmerge API to merge in-memory and create a commit.\n\nI was thinking about --commit flag to merge command, but then we need other\ncommitopts too, so created a new command.\n\nThis patches filemerge.py to not raise IMMConflictsError on first conflict\nbecause we need a list of conflicts in the end.","testPlan":"","lineCount":"345","dependsOn":[],"reviewers":[],"ccs":["marcink","mercurial-devel"],"actions":[{"type":"comment","comment":"I don't aim for this to get reviewed and pushed. This is here right now for sharing. We are using this extension internally for months now and has shown good results.","author":"pulkit","id":"87922","dateCreated":"1551193372","dateModified":"1551193372"},{"type":"update","diffId":"14248","author":"pulkit","id":"87921","dateCreated":"1551192772","dateModified":"1551192772"},{"type":"comment","comment":"Thinking about this more, I think I have not done a good job writing commit message. The extension is very useful when you have automation around merges or you do merges because of the following reasons:\n\n  * The merge is done in-memory and is very fast if you disable the path conflicts auditing\n  * You can specify a merge destination using --dest flag, which means you don't need to update to merge. You can merge two changesets from anywhere\n  * You can parallelize multiple merges\n  * This can be used as --dry-run for hg merge as it can tell whether a merge will result in conflicts or not without applying anything\n\nThat said, I am not sure if this looks like a good candidate for in-core extension. However, we want to share the work we have done on speeding up merge internally so that it can help other companies which uses merges. So, feel free to pick this up from here if you need this. :)","author":"pulkit","id":"72700","dateCreated":"1538342063","dateModified":"1538342063"},{"type":"update","diffId":"11198","author":"pulkit","id":"70929","dateCreated":"1537361525","dateModified":"1537361525"}],"dateCreated":"1537361525","dateModified":"1551193372","status":"Needs Review"},{"id":"5410","callsign":"HG","title":"merge: allow to merge non-conflicting changes outside narrowspec","author":"pulkit","summary":"This patch allows merging of non-conflicting changes outside narrowspec.","testPlan":"","lineCount":"15","dependsOn":[],"reviewers":["durin42","martinvonz"],"ccs":["martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D5410#87526, @pulkit wrote:\n>>>! In D5410#85244, @martinvonz wrote:\n>>>>! In D5410#85232, @pulkit wrote:\n>>>>>! In D5410#80207, @martinvonz wrote:\n>>>> I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside\/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of `hg merge` to the time of `hg commit`. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.\n>>> \n>>> IIUC, dirstate does not contains files outside narrowspec. Maybe we need to do this in merge state?\n>> \n>> I think neither of them currently contains files outside narrows, so we'd need to extend whichever we decide. It's probably easier to extend the merge state. I'm not sure which I think is cleaner to extend. There's precedent for populating the commit based on the dirstate (index) in git.\n> \n> Or not touch any of them and introduce a new file?\n\nSure, that's another option. It might be the easiest one since it won't involve making the format compatible (although I think that's pretty easy for the merge state).","author":"martinvonz","id":"87557","dateCreated":"1550799377","dateModified":"1550799377"},{"type":"comment","comment":">>! In D5410#85244, @martinvonz wrote:\n>>>! In D5410#85232, @pulkit wrote:\n>>>>! In D5410#80207, @martinvonz wrote:\n>>> I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside\/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of `hg merge` to the time of `hg commit`. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.\n>> \n>> IIUC, dirstate does not contains files outside narrowspec. Maybe we need to do this in merge state?\n> \n> I think neither of them currently contains files outside narrows, so we'd need to extend whichever we decide. It's probably easier to extend the merge state. I'm not sure which I think is cleaner to extend. There's precedent for populating the commit based on the dirstate (index) in git.\n\nOr not touch any of them and introduce a new file?","author":"pulkit","id":"87526","dateCreated":"1550768316","dateModified":"1550768316"},{"type":"comment","comment":">>! In D5410#85232, @pulkit wrote:\n>>>! In D5410#80207, @martinvonz wrote:\n>> I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside\/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of `hg merge` to the time of `hg commit`. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.\n> \n> IIUC, dirstate does not contains files outside narrowspec. Maybe we need to do this in merge state?\n\nI think neither of them currently contains files outside narrows, so we'd need to extend whichever we decide. It's probably easier to extend the merge state. I'm not sure which I think is cleaner to extend. There's precedent for populating the commit based on the dirstate (index) in git.","author":"martinvonz","id":"85244","dateCreated":"1549297459","dateModified":"1549297459"},{"type":"comment","comment":">>! In D5410#80207, @martinvonz wrote:\n> I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside\/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of `hg merge` to the time of `hg commit`. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.\n\nIIUC, dirstate does not contains files outside narrowspec. Maybe we need to do this in merge state?","author":"pulkit","id":"85232","dateCreated":"1549288085","dateModified":"1549288085"},{"type":"comment","comment":"I'm pretty sure this doesn't actually perform the merge, it just drops the changes outside the narrowspec. On commit, we need to record that outside\/ has the new nodeid that we got from the side we merged in. To do that, we need to remember what that nodeid is, from the time of `hg merge` to the time of `hg commit`. That probably means storing the nodeid in the dirstate (like git does), or maybe in the merge state.","author":"martinvonz","id":"80208","dateCreated":"1544539647","dateModified":"1544539647"},{"type":"reject","author":"martinvonz","id":"80207","dateCreated":"1544539647","dateModified":"1544539647"},{"type":"comment","comment":"I am dubiuos that my fix is correct. I went through the history and didn't find any explanation why we don't allow merging non-conflicting changes outside narrowspec except TODO's. @martinvonz do you know why we don't allow merging of non-conflicting changes here?","author":"pulkit","id":"80202","dateCreated":"1544527498","dateModified":"1544527498"},{"type":"update","diffId":"12822","author":"pulkit","id":"80195","dateCreated":"1544527312","dateModified":"1544527312"}],"dateCreated":"1544527312","dateModified":"1550799376","status":"Needs Revision"},{"id":"5941","callsign":"HG","title":"tweakdefault: Add better documentation for ui.tweakdefault\n(issue6000)","author":"akshjain.jain74","summary":"","testPlan":"","lineCount":"8","dependsOn":[],"reviewers":["pulkit"],"ccs":["pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"okay","author":"akshjain.jain74","id":"87031","dateCreated":"1550152045","dateModified":"1550152045"},{"type":"comment","comment":">>! In D5941#87025, @akshjain.jain74 wrote:\n> @pulkit like what else we required to improve the documentation for the issue , in general what tweakdefault do for mercurial is already mention in the issue \ud83e\udd14 \n\nAs commented on the issue, I don't think we need anything more.\n\n(Marking this as Request Changes to move it out of review list)","author":"pulkit","id":"87029","dateCreated":"1550151740","dateModified":"1550151740"},{"type":"reject","author":"pulkit","id":"87028","dateCreated":"1550151740","dateModified":"1550151740"},{"type":"comment","comment":"@pulkit like what else we required to improve the documentation for the issue , in general what tweakdefault do for mercurial is already mention in the issue \ud83e\udd14 ","author":"akshjain.jain74","id":"87025","dateCreated":"1550151448","dateModified":"1550151448"},{"type":"comment","comment":"Hi, thanks for the patch. This is adding just un required churn to help text.","author":"pulkit","id":"87024","dateCreated":"1550150934","dateModified":"1550150934"},{"type":"update","diffId":"14079","author":"akshjain.jain74","id":"86979","dateCreated":"1550088514","dateModified":"1550088514"},{"type":"update","diffId":"14050","author":"akshjain.jain74","id":"86861","dateCreated":"1550002957","dateModified":"1550002957"},{"type":"update","diffId":"14038","author":"akshjain.jain74","id":"86788","dateCreated":"1549912783","dateModified":"1549912783"},{"type":"update","diffId":"14037","author":"akshjain.jain74","id":"86784","dateCreated":"1549912214","dateModified":"1549912214"}],"dateCreated":"1549912214","dateModified":"1550152045","status":"Needs Revision"},{"id":"1937","callsign":"FBHGX","title":"p4fastimport: import purged files as empty files","author":"hollisb","summary":"P4 may preserve only the most recent copy of a file's data, automatically\n\"purging\" the file data from older changelists when a new one is submitted.\nThat data is gone, and can't be accessed even from P4.\n\nWhen importing such a file, we create an empty file so we can record that it\nexisted (e.g. which changelist introduced it).\n\nTherefore, we include it in the list of filelogs we import, and we record that\nchangelists modified the file too. The file just has empty contents in the\nolder changesets.","testPlan":"","lineCount":"56","dependsOn":[],"reviewers":["dsp","durin42","quark","durham"],"ccs":[],"actions":[{"type":"comment","comment":"This is on Facebook's extensions repository, which I don't own. At this point, it probably makes sense to move p4fastimport to its own repository and maintain it there.","author":"durin42","id":"86775","dateCreated":"1549908053","dateModified":"1549908053"},{"type":"resign","author":"durin42","id":"86774","dateCreated":"1549908053","dateModified":"1549908053"},{"type":"comment","comment":"Hi, I still need this. Since my P4 repo has \"purged\" changesets, I can't import without this patch.","author":"hollisb","id":"86773","dateCreated":"1549907549","dateModified":"1549907549"},{"type":"update","diffId":"5001","author":"hollisb","id":"32644","dateCreated":"1516757506","dateModified":"1516757506"}],"dateCreated":"1516757506","dateModified":"1549908576","status":"Needs Review"},{"id":"5786","callsign":"HG","title":"blackbox: support blackbox.notrack regex patterns to exclude tracking events","author":"spectral","summary":" ","testPlan":"","lineCount":"80","dependsOn":["5785"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"plan-changes","author":"spectral","id":"85906","dateCreated":"1549495123","dateModified":"1549495123"},{"type":"update","diffId":"13659","author":"spectral","id":"84882","dateCreated":"1548973422","dateModified":"1548973422"},{"type":"update","diffId":"13656","author":"spectral","id":"84872","dateCreated":"1548972435","dateModified":"1548972435"}],"dateCreated":"1548972435","dateModified":"1549495123","status":"Changes Planned"},{"id":"5785","callsign":"HG","title":"blackbox: take regex patterns for blackbox.track","author":"spectral","summary":" ","testPlan":"","lineCount":"44","dependsOn":[],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D5785#84935, @yuja wrote:\n> Can't we process the pattern as a glob? It's compatible with `*` and much\n> easier to write. Or do you need the power of the regexp?\n\nI generally prefer regex, but I might be an outlier. We do not need the power of regexp, especially if we get a negative filter (next commit), so I'll do that (eventually).  Marking as \"plan changes\" for now...","author":"spectral","id":"85439","dateCreated":"1549312931","dateModified":"1549312931"},{"type":"plan-changes","author":"spectral","id":"85438","dateCreated":"1549312931","dateModified":"1549312931"},{"type":"comment","comment":"> +        track = ui.configlist('blackbox', 'track')\n> +        if not track:\n> +            self._active = False\n> +        elif b'*' in track:\n> +            self._trackedevents = re.compile(b'.*')\n> +        else:\n> +            try:\n> +                self._trackedevents = re.compile(b'|'.join(track))\n> +            except re.error as e:\n> +                ui.warn('invalid blackbox.track setting: %s\\n' % e)\n> +                self._active = False\n\nCan't we process the pattern as a glob? It's compatible with `*` and much\neasier to write. Or do you need the power of the regexp?","author":"yuja","id":"84936","dateCreated":"1549027197","dateModified":"1549027197"},{"type":"update","diffId":"13658","author":"spectral","id":"84881","dateCreated":"1548973421","dateModified":"1548973421"},{"type":"update","diffId":"13655","author":"spectral","id":"84863","dateCreated":"1548972433","dateModified":"1548972433"}],"dateCreated":"1548972433","dateModified":"1549312931","status":"Changes Planned"},{"id":"5812","callsign":"HG","title":"py3: pass str into ValueError to prevent b'' prefix in output","author":"pulkit","summary":"# skip-blame because mostly just r'' prefixes","testPlan":"","lineCount":"24","dependsOn":[],"reviewers":["durin42","martinvonz"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">   I am not whether this is correct. This should have fix failure of `test-lfs-serve.t#lfsremote-on` failure on py3 but it does not.\n\nAs you guess, this isn't correct. For example, `_(unicode_sring)` will crash\nif gettext is enabled.\n\nI don't know why ValueError is used extensively in exchange.py and where it's\nsupposed to be caught, but the easiest workaround is to make a ValueError\nsubclass that implements __bytes__.\n\n```\nclass ExchangeValueError(ValueError):\n    __bytes__ = _tobytes\n```","author":"yuja","id":"85203","dateCreated":"1549198102","dateModified":"1549198102"},{"type":"comment","comment":"I am not whether this is correct. This should have fix failure of `test-lfs-serve.t#lfsremote-on` failure on py3 but it does not.","author":"pulkit","id":"85190","dateCreated":"1549196395","dateModified":"1549196395"},{"type":"update","diffId":"13716","author":"pulkit","id":"85179","dateCreated":"1549196017","dateModified":"1549196017"}],"dateCreated":"1549196017","dateModified":"1549198102","status":"Needs Review"},{"id":"5737","callsign":"HG","title":"py3: convert info.name to bytes in subrepo.py","author":"pulkit","summary":"","testPlan":"","lineCount":"5","dependsOn":[],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">          for info in tar:\n> +            infoname = pycompat.bytestr(info.name)\n\nSo `info.name` would come from environment. It's probably better to use\n`encoding.strtolocal()`.","author":"yuja","id":"84402","dateCreated":"1548850912","dateModified":"1548850912"},{"type":"update","diffId":"13559","author":"pulkit","id":"84338","dateCreated":"1548800838","dateModified":"1548800838"}],"dateCreated":"1548800838","dateModified":"1548850912","status":"Needs Review"},{"id":"5632","callsign":"HG","title":"setdiscovery: pass srvheads into partialdiscovery constructor","author":"martinvonz","summary":"I found it hard to follow how disco._undecided was initialized (the\ncall to disco.addbases(srvheads) caused the disco.undecided property\nto be access, which initialized disco._undecided). I think this patch\nmakes it easier.","testPlan":"","lineCount":"18","dependsOn":[],"reviewers":["lothiraldan"],"ccs":["mercurial-devel"],"actions":[{"type":"comment","comment":"This needs updating since it conflicts with changes made on the stable branch.","author":"martinvonz","id":"83763","dateCreated":"1548442886","dateModified":"1548442886"},{"type":"plan-changes","author":"martinvonz","id":"83762","dateCreated":"1548442886","dateModified":"1548442886"},{"type":"update","diffId":"13324","author":"martinvonz","id":"83090","dateCreated":"1547835635","dateModified":"1547835635"}],"dateCreated":"1547835635","dateModified":"1548442886","status":"Changes Planned"},{"id":"5496","callsign":"HG","title":"revset: add \"samebranch\" keyword argument to the merge revset","author":"angel.ezquerra","summary":"By default all merges are shown but if \"samebranch\" is set to False then merges\nwith the same branch (i.e. where both parents belong to the same branch) will\nbe filtered out.\n\nConversely, if \"samebranch\" is set to True then only merges with the same branch\nwill be shown.\n\nThis is useful to visualize at a high level the relationships between different\nbranches and how they are merged with each other.\n\nWith the addition of the merge(withbranch) idiom on a previous revision this\ncould already be done in a quite complicated way, by doing something like:\n\nmerge() and branch(somebranch) and not merge(somebranch)\n\nThis is not very practical ano only works for a single branch. Thus this new\noption is added.","testPlan":"","lineCount":"59","dependsOn":["5495"],"reviewers":[],"ccs":["mharbison72","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">   Maybe `anonymous`, defaulting to True?\n\nTo all: the default can't be True. It would break the current `merge()`\nrevset behavior. Only viable choice is to set the default to \"don't care\".\n\nAnd I think tri-state bool is confusing in this context. So, IMHO, it's\nbetter to add an argument taking a keyword string specifying constraint\nsuch as `merge(between=\"a-keyword-to-select-merges-of-named-branches\")`.\n\n> That's in the glossary under `Branch, anonymous`, so not technically\n> a merge, but I think it still conveys the point.\n\nI disagree. Merges of the same branch are pretty common if your team preferred\nmerge-based strategy. I wouldn't explicitly call new head pulled from public\nrepo as an anonymous head.\n\nIt can also be wrong if you're using bookmarks.","author":"yuja","id":"83416","dateCreated":"1548247882","dateModified":"1548247882"},{"type":"comment","comment":">>! In D5496#82908, @angel.ezquerra wrote:\n>>>! In D5496#82671, @yuja wrote:\n> \n> Do you mean that the flag should only indicate whether you want to hide the same branch merges? I guess that is OK too, since the main use case for this flag is to hide the merge from the same branch. However I think we should change the flag name then. Perhaps \"hidesame\"? Or \"includesame\" or \"includeself\", defaulting to True? Any ideas?\n\nMaybe `anonymous`, defaulting to True?  That's in the glossary under `Branch, anonymous`, so not technically a merge, but I think it still conveys the point.\n\nI think I have a similar reaction as Yuya, but in the opposite direction- `merge(anonymous=True)` makes me think that's all that's of interest.  So maybe `withanonymous`?\n\nI do like the compactness of:\n\n    merge() => all merges\n    merge(anonymous=True) => only merges with matching (p1, p2) branch names\n    merge(anonymous=False) => only merges with different (p1, p2) branch names\n\nOtherwise finding only anonymous merges is something like `merge() - merge(anonymous=False)`, and it took some thinking to get there with the double negative.\n\nBut I have no idea how well that applies to other things if we set that precedent here, and don't feel that strongly about it.","author":"mharbison72","id":"83200","dateCreated":"1548181703","dateModified":"1548181703"},{"type":"comment","comment":">   > Okay, I didn't notice that. And it's tricky to map `samebranch=False` to\n>   >  \"different branch\" constraint. I would read it as \"I don't care whether\n>   >  the branches are the same or not.\"\n>   >\n>   > We can instead express it as `merge() - merge(samebranch=True)`.\n>   \n>   Do you mean that the flag should only indicate whether you want to hide the same branch merges?\n\nI just mean tri-state bool is confusing. `<whatever>=False` sounds like we\ndon't care about the `<whatever>` condition.\n\n> I guess that is OK too, since the main use case for this flag is to hide the merge from the same branch. However I think we should change the flag name then. Perhaps \"hidesame\"? Or \"includesame\" or \"includeself\", defaulting to True? Any ideas?\n\nIt could be an argument taking a string like `'same'`, but I can't think\nof nice names. What's the best term describing a merge between two named\nbranches?","author":"yuja","id":"83052","dateCreated":"1547734900","dateModified":"1547734900"},{"type":"comment","comment":">>! In D5496#82671, @yuja wrote:\n>>   > `[, samebranch]` or [, samebranch=False]`.\n>>   \n>>   I guess that means:\n>>   \n>>   @predicate('merge([withbranch [, samebranch=None]])', safe=True)\n>>   \n>>   Right? (I realized that it is incorrect to say that samebranch's default value is False).\n> \n> Okay, I didn't notice that. And it's tricky to map `samebranch=False` to\n> \"different branch\" constraint. I would read it as \"I don't care whether\n> the branches are the same or not.\"\n\n>>! In D5496#82671, @yuja wrote:\n>>   > `[, samebranch]` or [, samebranch=False]`.\n>>   \n>>   I guess that means:\n>>   \n>>   @predicate('merge([withbranch [, samebranch=None]])', safe=True)\n>>   \n>>   Right? (I realized that it is incorrect to say that samebranch's default value is False).\n> \n> Okay, I didn't notice that. And it's tricky to map `samebranch=False` to\n> \"different branch\" constraint. I would read it as \"I don't care whether\n> the branches are the same or not.\"\n> \n> We can instead express it as `merge() - merge(samebranch=True)`.\n\nDo you mean that the flag should only indicate whether you want to hide the same branch merges? I guess that is OK too, since the main use case for this flag is to hide the merge from the same branch. However I think we should change the flag name then. Perhaps \"hidesame\"? Or \"includesame\" or \"includeself\", defaulting to True? Any ideas?\n","author":"angel.ezquerra","id":"82908","dateCreated":"1547662268","dateModified":"1547662268"},{"type":"comment","comment":">   > `[, samebranch]` or [, samebranch=False]`.\n>   \n>   I guess that means:\n>   \n>   @predicate('merge([withbranch [, samebranch=None]])', safe=True)\n>   \n>   Right? (I realized that it is incorrect to say that samebranch's default value is False).\n\nOkay, I didn't notice that. And it's tricky to map `samebranch=False` to\n\"different branch\" constraint. I would read it as \"I don't care whether\nthe branches are the same or not.\"\n\nWe can instead express it as `merge() - merge(samebranch=True)`.\n\n>   >   if len(matchfns) == 1:\n>   >       # fast path for common case\n>   >       return subset.filter(matchfn[0], ...)\n>   >   else:\n>   >       return subset.filter(lambda r: all(p(r) for p in matchfn), ...)\n>   \n>   Do you think this makes the code simpler?\n\nYes. The original version was hard to find all possible call paths.\nSeparate function per constraint is easier to follow.\n\n> In any case, if you think this approach is best I can do it, but perhaps it would be a little better to keep a single subset.filter call as follows:\n>   \n>     if len(matchfns) == 1:\n>         finalmatchfn = matchfns[0]\n>     else:\n>         finalmatchfn = lambda r: all(p(r) for p in matchfns)\n>     return subset.filter(finalmatchfn, condrepr='<merge>')\n\nI don't care about these differences.","author":"yuja","id":"82671","dateCreated":"1547644201","dateModified":"1547644201"},{"type":"comment","comment":">>! In D5496#82394, @yuja wrote:\n>> -@predicate('merge(withbranch)', safe=True)\n>> +@predicate('merge(withbranch, samebranch=True)', safe=True)\n> \n> `[, samebranch]` or [, samebranch=False]`.\n\nI guess that means:\n\n@predicate('merge([withbranch [, samebranch=None]])', safe=True)\n\nRight? (I realized that it is incorrect to say that samebranch's default value is False).\n\n>>      withbranch = ''\n>>      if 'withbranch' in args:\n>>          withbranch = getstring(args['withbranch'],\n>>                                 _('withbranch argument must be a string'))\n>>          kind, branchname, branchmatcher = stringutil.stringmatcher(withbranch)\n>> +    samebranch = None\n>> +    if 'samebranch' in args:\n>> +        # i18n: \"samebranch\" is a keyword\n>> +        samebranch = getboolean(args['samebranch'],\n>> +            _('samebranch argument must be a True or False'))\n>>      cl = repo.changelog\n>>      # create the function that will be used to filter the subset\n>>      if withbranch:\n>>          # matchfn is a function that returns true when a revision\n>>          # is a merge and the second parent belongs to a branch that\n>>          # matches the withbranch pattern (which can be a literal or a regex)\n>>          if kind == 'literal':\n>> -            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n>> -                                 and repo[r].p2().branch() == withbranch)\n>> +            basematchfn = lambda r: (cl.parentrevs(r)[1] != -1\n>> +                                     and repo[r].p2().branch() == withbranch)\n>>          else:\n>> -            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n>> -                                 and branchmatcher(repo[r].p2().branch()))\n>> -    else:\n>> -        # matchfn is a function that returns true when a revision is a merge\n>> -        matchfn = lambda r: cl.parentrevs(r)[1] != -1\n>> +            basematchfn = lambda r: (cl.parentrevs(r)[1] != -1\n>> +                                     and branchmatcher(repo[r].p2().branch()))\n>> +    else:\n>> +        basematchfn = lambda r: cl.parentrevs(r)[1] != -1\n>> +    if samebranch is None:\n>> +        matchfn = basematchfn\n>> +    else:\n>> +        # if samebranch was specified, build a new match function\n>> +        # that on top of basematch checks if the parents belong (or not)\n>> +        # to the same branch (depending on the value of samebranch)\n>> +        def matchfn(r):\n>> +            c = repo[r]\n>> +            if not basematchfn(r):\n>> +                return False\n>> +            issamebranchmerge = c.p1().branch() == c.p2().branch()\n>> +            return issamebranchmerge if samebranch else not issamebranchmerge\n> \n> These conditions can be formed as followed:\n> \n> ```\n> matchfns = [lambda r: cl.parentrevs(r)[1] != -1]\n> if withbranch:\n>     matchfns.append(lambda r: branchmatcher(repo[r].p2().branch()))\n> if samebranch:\n>     matchfns.append(samebranchmatchfn)\n> \n> if len(matchfns) == 1:\n>     # fast path for common case\n>     return subset.filter(matchfn[0], ...)\n> else:\n>     return subset.filter(lambda r: all(p(r) for p in matchfn), ...)\n> ```\n\nDo you think this makes the code simpler? In any case, if you think this approach is best I can do it, but perhaps it would be a little better to keep a single subset.filter call as follows:\n\n```\nif len(matchfns) == 1:\n    finalmatchfn = matchfns[0]\nelse:\n    finalmatchfn = lambda r: all(p(r) for p in matchfns)\nreturn subset.filter(finalmatchfn, condrepr='<merge>')\n```\n\nWhat do you think?\n","author":"angel.ezquerra","id":"82562","dateCreated":"1547596927","dateModified":"1547596927"},{"type":"update","diffId":"13211","author":"angel.ezquerra","id":"82415","dateCreated":"1547508409","dateModified":"1547508409"},{"type":"comment","comment":"> -@predicate('merge(withbranch)', safe=True)\n> +@predicate('merge(withbranch, samebranch=True)', safe=True)\n\n`[, samebranch]` or [, samebranch=False]`.\n\n>      withbranch = ''\n>      if 'withbranch' in args:\n>          withbranch = getstring(args['withbranch'],\n>                                 _('withbranch argument must be a string'))\n>          kind, branchname, branchmatcher = stringutil.stringmatcher(withbranch)\n> +    samebranch = None\n> +    if 'samebranch' in args:\n> +        # i18n: \"samebranch\" is a keyword\n> +        samebranch = getboolean(args['samebranch'],\n> +            _('samebranch argument must be a True or False'))\n>      cl = repo.changelog\n>      # create the function that will be used to filter the subset\n>      if withbranch:\n>          # matchfn is a function that returns true when a revision\n>          # is a merge and the second parent belongs to a branch that\n>          # matches the withbranch pattern (which can be a literal or a regex)\n>          if kind == 'literal':\n> -            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n> -                                 and repo[r].p2().branch() == withbranch)\n> +            basematchfn = lambda r: (cl.parentrevs(r)[1] != -1\n> +                                     and repo[r].p2().branch() == withbranch)\n>          else:\n> -            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n> -                                 and branchmatcher(repo[r].p2().branch()))\n> -    else:\n> -        # matchfn is a function that returns true when a revision is a merge\n> -        matchfn = lambda r: cl.parentrevs(r)[1] != -1\n> +            basematchfn = lambda r: (cl.parentrevs(r)[1] != -1\n> +                                     and branchmatcher(repo[r].p2().branch()))\n> +    else:\n> +        basematchfn = lambda r: cl.parentrevs(r)[1] != -1\n> +    if samebranch is None:\n> +        matchfn = basematchfn\n> +    else:\n> +        # if samebranch was specified, build a new match function\n> +        # that on top of basematch checks if the parents belong (or not)\n> +        # to the same branch (depending on the value of samebranch)\n> +        def matchfn(r):\n> +            c = repo[r]\n> +            if not basematchfn(r):\n> +                return False\n> +            issamebranchmerge = c.p1().branch() == c.p2().branch()\n> +            return issamebranchmerge if samebranch else not issamebranchmerge\n\nThese conditions can be formed as followed:\n\n```\nmatchfns = [lambda r: cl.parentrevs(r)[1] != -1]\nif withbranch:\n    matchfns.append(lambda r: branchmatcher(repo[r].p2().branch()))\nif samebranch:\n    matchfns.append(samebranchmatchfn)\n\nif len(matchfns) == 1:\n    # fast path for common case\n    return subset.filter(matchfn[0], ...)\nelse:\n    return subset.filter(lambda r: all(p(r) for p in matchfn), ...)\n```","author":"yuja","id":"82395","dateCreated":"1547435478","dateModified":"1547435478"},{"type":"update","diffId":"13205","author":"angel.ezquerra","id":"82389","dateCreated":"1547419525","dateModified":"1547419525"},{"type":"update","diffId":"13018","author":"angel.ezquerra","id":"81361","dateCreated":"1546801412","dateModified":"1546801412"}],"dateCreated":"1546801412","dateModified":"1548247882","status":"Needs Review"},{"id":"5495","callsign":"HG","title":"revset: add \"branch\" positional arguments to the merge revset","author":"angel.ezquerra","summary":"Make it possible to only include those merge revisions that are merges with one\nor more specific branches (passed as a positional argument that can receive\neither a single branch name or a regular expression). All merge revisions are\nshown by default (i.e. if no \"merge with\" branch or expression is specified).","testPlan":"","lineCount":"124","dependsOn":[],"reviewers":[],"ccs":["mharbison72","mjpieters","lothiraldan","pulkit","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"Thank you Matt. I just did that.\n\nCheers,\n\nAngel","author":"angel.ezquerra","id":"82634","dateCreated":"1547625859","dateModified":"1547625859"},{"type":"comment","comment":">>! In D5495#82416, @angel.ezquerra wrote:\n> I've sent an updated set of patches, following your recommendations. There are 2 patches now, since each includes its own tests. This means that the 3rd patch on the original patch set is no longer needed. However I don't know what is the best way to tell that to phabricator...\n\nI think you should be able to go to that 3rd patch, and set it to abandoned in the actions at the bottom.\n\n\n","author":"mharbison72","id":"82590","dateCreated":"1547618397","dateModified":"1547618397"},{"type":"comment","comment":">>! In D5495#82397, @yuja wrote:\n> Generally looks good.\n> \n> Can you fix a couple of nits? And if possible, fold the tests from D5577\n> into this and the next patch. We prefer including relevant test in each\n> commit.\n> \n>> -@predicate('merge()', safe=True)\n>> +@predicate('merge(withbranch)', safe=True)\n> \n> `merge([withbranch])` as it is an optional parameter.\n> \n>>  def merge(repo, subset, x):\n>> -    \"\"\"Changeset is a merge changeset.\n>> +    \"\"\"Changeset is a merge changeset\n>> +\n>> +    All merge revisions are returned by default. If a \"withbranch\"\n>> +    pattern is provided only merges with (i.e. whose second parent\n>> +    belongs to) those branches that match the pattern will be returned.\n>> +    The simplest pattern is the name of a single branch. It is also\n>> +    possible to specify a regular expression by starting the pattern\n>> +    with \"re:\". This can be used to match more than one branch\n>> +    (e.g. \"re:branch1|branch2\").\n>>      \"\"\"\n>>      # i18n: \"merge\" is a keyword\n>> -    getargs(x, 0, 0, _(\"merge takes no arguments\"))\n>> +    args = getargsdict(x, 'merge', 'withbranch')\n>> +    withbranch = ''\n>> +    if 'withbranch' in args:\n>> +        withbranch = getstring(args['withbranch'],\n>> +                               _('withbranch argument must be a string'))\n>> +        kind, branchname, branchmatcher = stringutil.stringmatcher(withbranch)\n> \n> Can you merge this with the next `if withbranch:` block to reduce the number\n> of conditionally defined variables referenced later?\n> \n>>      cl = repo.changelog\n>> -    return subset.filter(lambda r: cl.parentrevs(r)[1] != -1,\n>> -                         condrepr='<merge>')\n>> +    # create the function that will be used to filter the subset\n>> +    if withbranch:\n> \n>> +        # matchfn is a function that returns true when a revision\n>> +        # is a merge and the second parent belongs to a branch that\n>> +        # matches the withbranch pattern (which can be a literal or a regex)\n> \n> Nit: these comments seem a bit verbose. It's documented in stringmatcher().\n> \n>> +        if kind == 'literal':\n>> +            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n>> +                                 and repo[r].p2().branch() == withbranch)\n>> +        else:\n>> +            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n>> +                                 and branchmatcher(repo[r].p2().branch()))\n> \n> If we don't have anything special about the `literal` kind, we can always use\n> the `branchmatcher()`. `if kind == 'literal'` isn't needed.\n\n\n\n>>! In D5495#82407, @yuja wrote:\n>>   What about making the argument a revset instead of a branch name. You can get the same result `merge(branch(\"foo\")` but have a more expressive result `merge(only(4.8, 4.7))` ?\n> \n> That's basically a simpler form of my `filter()` proposal.\n> \n> The problem of `merge(branch(\"foo\"))` is that it's ambiguous which revision\n> the expression will be tested against. It could be expressed as\n> `merge(p2=branch(\"foo\"))` to disambiguate, but this syntax isn't generic\n> enough to express the `samebranch=True` constraint. So if we want a truly\n> expressive syntax, we'll need something like a lambda function.\n> \n> ```\n> filtereach(merge(), p2(_) & branch(\"foo\"))\n> filtereach(merge(), samebranch(parents(_))\n> ```\n> \n> I agreed with Angel in that `merge(withbranch=name)` would be useful enough\n> to have a dedicated syntax, but I'm open to other ideas like\n> `merge(p1=expr, p2=expr)`.\n\n@lothiraldan , your proposal is interesting but as @yuja said it is less generic that introducing a full blown filter function. Also, to be really flexible it would require some way to refer to the p2 revision (i.e. you'd need to introduce an implicit or explicit reference to each of the p1 or p2 revisions). I think this would make the syntax for the most common use cases that I want to cover too complex. That being said, the proposed syntax leaves open the door for introducing such revset based filtering in the future if needed (although I think that a generic filter function would be more useful).\n\n@yuja  , I've sent an updated set of patches, following your recommendations. There are 2 patches now, since each includes its own tests. This means that the 3rd patch on the original patch set is no longer needed. However I don't know what is the best way to tell that to phabricator...","author":"angel.ezquerra","id":"82416","dateCreated":"1547509014","dateModified":"1547509014"},{"type":"update","diffId":"13210","author":"angel.ezquerra","id":"82413","dateCreated":"1547508400","dateModified":"1547508400"},{"type":"comment","comment":">   What about making the argument a revset instead of a branch name. You can get the same result `merge(branch(\"foo\")` but have a more expressive result `merge(only(4.8, 4.7))` ?\n\nThat's basically a simpler form of my `filter()` proposal.\n\nThe problem of `merge(branch(\"foo\"))` is that it's ambiguous which revision\nthe expression will be tested against. It could be expressed as\n`merge(p2=branch(\"foo\"))` to disambiguate, but this syntax isn't generic\nenough to express the `samebranch=True` constraint. So if we want a truly\nexpressive syntax, we'll need something like a lambda function.\n\n```\nfiltereach(merge(), p2(_) & branch(\"foo\"))\nfiltereach(merge(), samebranch(parents(_))\n```\n\nI agreed with Angel in that `merge(withbranch=name)` would be useful enough\nto have a dedicated syntax, but I'm open to other ideas like\n`merge(p1=expr, p2=expr)`.","author":"yuja","id":"82407","dateCreated":"1547472644","dateModified":"1547472644"},{"type":"comment","comment":"What about making the argument a revset instead of a branch name. You can get the same result `merge(branch(\"foo\")` but have a more expressive result `merge(only(4.8, 4.7))` ?\n\n(Sorry to be a bit late to the party) ","author":"lothiraldan","id":"82404","dateCreated":"1547468468","dateModified":"1547468468"},{"type":"comment","comment":"Generally looks good.\n\nCan you fix a couple of nits? And if possible, fold the tests from D5577\ninto this and the next patch. We prefer including relevant test in each\ncommit.\n\n> -@predicate('merge()', safe=True)\n> +@predicate('merge(withbranch)', safe=True)\n\n`merge([withbranch])` as it is an optional parameter.\n\n>  def merge(repo, subset, x):\n> -    \"\"\"Changeset is a merge changeset.\n> +    \"\"\"Changeset is a merge changeset\n> +\n> +    All merge revisions are returned by default. If a \"withbranch\"\n> +    pattern is provided only merges with (i.e. whose second parent\n> +    belongs to) those branches that match the pattern will be returned.\n> +    The simplest pattern is the name of a single branch. It is also\n> +    possible to specify a regular expression by starting the pattern\n> +    with \"re:\". This can be used to match more than one branch\n> +    (e.g. \"re:branch1|branch2\").\n>      \"\"\"\n>      # i18n: \"merge\" is a keyword\n> -    getargs(x, 0, 0, _(\"merge takes no arguments\"))\n> +    args = getargsdict(x, 'merge', 'withbranch')\n> +    withbranch = ''\n> +    if 'withbranch' in args:\n> +        withbranch = getstring(args['withbranch'],\n> +                               _('withbranch argument must be a string'))\n> +        kind, branchname, branchmatcher = stringutil.stringmatcher(withbranch)\n\nCan you merge this with the next `if withbranch:` block to reduce the number\nof conditionally defined variables referenced later?\n\n>      cl = repo.changelog\n> -    return subset.filter(lambda r: cl.parentrevs(r)[1] != -1,\n> -                         condrepr='<merge>')\n> +    # create the function that will be used to filter the subset\n> +    if withbranch:\n\n> +        # matchfn is a function that returns true when a revision\n> +        # is a merge and the second parent belongs to a branch that\n> +        # matches the withbranch pattern (which can be a literal or a regex)\n\nNit: these comments seem a bit verbose. It's documented in stringmatcher().\n\n> +        if kind == 'literal':\n> +            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n> +                                 and repo[r].p2().branch() == withbranch)\n> +        else:\n> +            matchfn = lambda r: (cl.parentrevs(r)[1] != -1\n> +                                 and branchmatcher(repo[r].p2().branch()))\n\nIf we don't have anything special about the `literal` kind, we can always use\nthe `branchmatcher()`. `if kind == 'literal'` isn't needed.","author":"yuja","id":"82397","dateCreated":"1547435479","dateModified":"1547435479"},{"type":"update","diffId":"13204","author":"angel.ezquerra","id":"82387","dateCreated":"1547419518","dateModified":"1547419518"},{"type":"comment","comment":">   This would not make it possible to select multiple \"merged with\" branches by doing: hg log -r \"merge(feature1, feature2)\"\n>   Instead I guess you are proposing that for that use case we force the user to do: hg log -r \"merge('re:(feature1|feature2)')\n>   \n>   Did I understand you correctly?\n\nYes. And we can introduce other prefixes of string matcher if `re:` seemed\nunnecessarily complex.\n\nEDIT: or introduce `merge(withbranch=(foo, bar))` syntax. This works, but is really new\nsyntax so I don't want to go this way at this point.","author":"yuja","id":"82310","dateCreated":"1547259824","dateModified":"1547260148"},{"type":"comment","comment":">>! In D5495#82036, @yuja wrote:\n>>   I think it would be a good idea to make the \"branch\" arguments more flexible. One option could be to use a stringmatcher to add support for regular expressions as you suggest. I can look into that. However there may be some other options worth exploring. The one you suggest is very interesting although I find the syntax a bit complicated for the common use cases that I want to enable which are:\n>>   \n>>   1. Ignore merges from the same branch, which in a named-branch based branching strategy are usually irrelevant\n>>   2. Look into merges with a specific branch (e.g. which branches have been merged with the default branch)?\n>>   \n>>   In my experience those two are the ones that are the most common and I think we should try to make the easy to use. That is, I think that even if mercurial had a filter function like the one you propose I would still want to be able to express those 2 common merge properties in a simple way.\n> \n> Yep, I agree with that.\n> \n>>   That being said, I really like your idea since I often find myself being unable to express what I want with a revset (as powerful as those are) because of the lack of a filtering mechanism. Adding a generic filter function would be very useful indeed. I'm not sure if the syntax you propose would work as is though. It seems that it would need a new \"&\" operator? In any case I believe that it is out of the scope of this particular set of patches. Do you agree?\n> \n> Yes. Actually I have a PoC-level implementation of generic filtering predicate,\n> which can be reviewed separately.\n> \n>> If so I can focus on improving this patch by adding the stringmatcher as you suggest (as it seems I'm not the only one who thinks this would be useful). Is that ok?\n> \n> Sounds good to me. To be clear, I want `'withbranch'` instead of\n> `'*withbranch'`, because the withbranch option doesn't look like a first-class\n> parameter of the `merge()` predicate.\n\nThis would not make it possible to select multiple \"merged with\" branches by doing: hg log -r \"merge(feature1, feature2)\"\nInstead I guess you are proposing that for that use case we force the user to do: hg log -r \"merge('re:(feature1|feature2)')\n\nDid I understand you correctly?","author":"angel.ezquerra","id":"82291","dateCreated":"1547248200","dateModified":"1547248200"},{"type":"comment","comment":">   I think it would be a good idea to make the \"branch\" arguments more flexible. One option could be to use a stringmatcher to add support for regular expressions as you suggest. I can look into that. However there may be some other options worth exploring. The one you suggest is very interesting although I find the syntax a bit complicated for the common use cases that I want to enable which are:\n>   \n>   1. Ignore merges from the same branch, which in a named-branch based branching strategy are usually irrelevant\n>   2. Look into merges with a specific branch (e.g. which branches have been merged with the default branch)?\n>   \n>   In my experience those two are the ones that are the most common and I think we should try to make the easy to use. That is, I think that even if mercurial had a filter function like the one you propose I would still want to be able to express those 2 common merge properties in a simple way.\n\nYep, I agree with that.\n\n>   That being said, I really like your idea since I often find myself being unable to express what I want with a revset (as powerful as those are) because of the lack of a filtering mechanism. Adding a generic filter function would be very useful indeed. I'm not sure if the syntax you propose would work as is though. It seems that it would need a new \"&\" operator? In any case I believe that it is out of the scope of this particular set of patches. Do you agree?\n\nYes. Actually I have a PoC-level implementation of generic filtering predicate,\nwhich can be reviewed separately.\n\n> If so I can focus on improving this patch by adding the stringmatcher as you suggest (as it seems I'm not the only one who thinks this would be useful). Is that ok?\n\nSounds good to me. To be clear, I want `'withbranch'` instead of\n`'*withbranch'`, because the withbranch option doesn't look like a first-class\nparameter of the `merge()` predicate.","author":"yuja","id":"82036","dateCreated":"1547126177","dateModified":"1547126177"},{"type":"comment","comment":">>! In D5495#81562, @yuja wrote:\n>> +@predicate('merge(*withbranch)', safe=True)\n>>  def merge(repo, subset, x):\n>> -    \"\"\"Changeset is a merge changeset.\n>> +    \"\"\"Changeset is a merge changeset\n>> +\n>> +    All merge revisions are returned by default. If one or more \"withbranch\"\n>> +    names are provided only merges with those branches (i.e. whose\n>> +    second parent belongs to one of those branches) will be returned.\n> \n> I understand this will be useful in a certain branch strategy, but the\n> proposed syntax is hardly extensible. Maybe it can be a non-wildcard argument\n> of `stringmatcher` type so we can at least add another option later.\n>\n> Any thoughts? Do anyone love this feature?\n> \n> If we had a syntax to filter revisions by sub expression, this and the\n> samebranch option could be expressed as follows:\n> \n> ```\n> merge() & filter($a, p2($a) & branch(\"...\"))\n> merge() & filter($a, samebranch(parents($a)))\n> \n> where filter(argname, boolean-expr)\n> ```\n> \n> This is much more expressive (or verbose) and can support other types of\n> branches, but is hard to implement.\n\nThank you for the review, @yuja \n\nI think it would be a good idea to make the \"branch\" arguments more flexible. One option could be to use a stringmatcher to add support for regular expressions as you suggest. I can look into that. However there may be some other options worth exploring. The one you suggest is very interesting although I find the syntax a bit complicated for the common use cases that I want to enable which are:\n\n1. Ignore merges from the same branch, which in a named-branch based branching strategy are usually irrelevant\n2. Look into merges with a specific branch (e.g. which branches have been merged with the default branch)?\n\nIn my experience those two are the ones that are the most common and I think we should try to make the easy to use. That is, I think that even if mercurial had a filter function like the one you propose I would still want to be able to express those 2 common merge properties in a simple way.\n\nThat being said, I really like your idea since I often find myself being unable to express what I want with a revset (as powerful as those are) because of the lack of a filtering mechanism. Adding a generic filter function would be very useful indeed. I'm not sure if the syntax you propose would work as is though. It seems that it would need a new \"&\" operator? In any case I believe that it is out of the scope of this particular set of patches. Do you agree? If so I can focus on improving this patch by adding the stringmatcher as you suggest (as it seems I'm not the only one who thinks this would be useful). Is that ok?\n","author":"angel.ezquerra","id":"81915","dateCreated":"1547076060","dateModified":"1547076060"},{"type":"comment","comment":">>! In D5495#81562, @yuja wrote:\n>> +@predicate('merge(*withbranch)', safe=True)\n>>  def merge(repo, subset, x):\n>> -    \"\"\"Changeset is a merge changeset.\n>> +    \"\"\"Changeset is a merge changeset\n>> +\n>> +    All merge revisions are returned by default. If one or more \"withbranch\"\n>> +    names are provided only merges with those branches (i.e. whose\n>> +    second parent belongs to one of those branches) will be returned.\n> \n> I understand this will be useful in a certain branch strategy, but the\n> proposed syntax is hardly extensible. Maybe it can be a non-wildcard argument\n> of `stringmatcher` type so we can at least add another option later.\n> \n> Any thoughts? Do anyone love this feature?\n\nI like this feature as it will be quite useful for us. Also I like your filter() suggestion more than the syntax this series introduces.","author":"pulkit","id":"81688","dateCreated":"1546949106","dateModified":"1546949106"},{"type":"comment","comment":"> +@predicate('merge(*withbranch)', safe=True)\n>  def merge(repo, subset, x):\n> -    \"\"\"Changeset is a merge changeset.\n> +    \"\"\"Changeset is a merge changeset\n> +\n> +    All merge revisions are returned by default. If one or more \"withbranch\"\n> +    names are provided only merges with those branches (i.e. whose\n> +    second parent belongs to one of those branches) will be returned.\n\nI understand this will be useful in a certain branch strategy, but the\nproposed syntax is hardly extensible. Maybe it can be a non-wildcard argument\nof `stringmatcher` type so we can at least add another option later.\n\nAny thoughts? Do anyone love this feature?\n\nIf we had a syntax to filter revisions by sub expression, this and the\nsamebranch option could be expressed as follows:\n\n```\nmerge() & filter($a, p2($a) & branch(\"...\"))\nmerge() & filter($a, samebranch(parents($a)))\n\nwhere filter(argname, boolean-expr)\n```\n\nThis is much more expressive (or verbose) and can support other types of\nbranches, but is hard to implement.","author":"yuja","id":"81563","dateCreated":"1546870648","dateModified":"1546870648"},{"type":"update","diffId":"13017","author":"angel.ezquerra","id":"81355","dateCreated":"1546801405","dateModified":"1546801405"}],"dateCreated":"1546801405","dateModified":"1547625859","status":"Needs Review"},{"id":"5565","callsign":"HG","title":"revlog: add version 2 format flag to control sparse","author":"indygreg","summary":"Revlog behavior should live as close to the revlog as possible.\nIn version 1 revlogs, we engaged sparse semantics by using a\nrepository requirement. This constituted action at a distance\nand wasn't optimal.\n\nThis commit introduces a feature flag on version 2 revlogs that\nexplicitly denotes whether sparse reading semantics are enabled.\n\nThe flag is enabled by default for version 2 revlogs.\n\nIn order to get the flag enabled by default, we had to tweak\nlocalrepo's logic for populating opener options to only set\n\"sparse-revlog\" if the requirement was present. This lets the\nrevlog initializer use sane defaults depending on the revlog\nversion. (The interaction between opener options and the revlog\nclass is kinda wonky and could use a re-think. But my little\nbrain isn't prepared to handle that at this time.)\n\nI'm also a bit unsure why we have 2 attributes controlling\nsparse behavior (revlog._sparserevlog and revlog._withsparseread).\nI *think* they can be consolidated. But I'm not sure. The new\nrevlog feature flag implies both, which seems reasonable.","testPlan":"","lineCount":"44","dependsOn":[],"reviewers":[],"ccs":["lothiraldan","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D5565#82224, @lothiraldan wrote:\n> Why have a flag for revlog v2 at all? Since v2 have not been \"released\"\n> yet, why not use sparse-revlog logic in all case when using revlog v2?\n\nThat's a good point and I'm glad you weighed in on this. I meant to ask that question in the commit message!\n\nIf we don't have a good reason to disable sparse revlogs, I'd be OK removing the feature flag and implying the feature by default. I'll update this commit accordingly unless others object to making is always on.\n\n> The revlog._sparserevlog flag enables sparse writing (and reading),\n> writing sparse revlog requires readers to use sparse-reading and is\n> gated behind a new requirement (introduced in hg 4.7).\n> \n> Sparse-reading can be used for non-sparse repositories, it is just a\n> reader thing.\n\nThank you for clarifying this! It might be useful to have this better documented in the code...","author":"indygreg","id":"82293","dateCreated":"1547248288","dateModified":"1547248288"},{"type":"plan-changes","author":"indygreg","id":"82292","dateCreated":"1547248288","dateModified":"1547248288"},{"type":"comment","comment":"> Revlog behavior should live as close to the revlog as possible.\n> In version 1 revlogs, we engaged sparse semantics by using a\n> repository requirement. This constituted action at a distance\n> and wasn't optimal.\n> \n> This commit introduces a feature flag on version 2 revlogs that\n> explicitly denotes whether sparse reading semantics are enabled.\n\nWhy have a flag for revlog v2 at all? Since v2 have not been \"released\"\nyet, why not use sparse-revlog logic in all case when using revlog v2? \n\n> \n> The flag is enabled by default for version 2 revlogs.\n> \n> In order to get the flag enabled by default, we had to tweak\n> localrepo's logic for populating opener options to only set\n> \"sparse-revlog\" if the requirement was present. This lets the\n> revlog initializer use sane defaults depending on the revlog\n> version. (The interaction between opener options and the revlog\n> class is kinda wonky and could use a re-think. But my little\n> brain isn't prepared to handle that at this time.)\n> \n> I'm also a bit unsure why we have 2 attributes controlling\n> sparse behavior (revlog._sparserevlog and revlog._withsparseread).\n> I *think* they can be consolidated. But I'm not sure. The new\n> revlog feature flag implies both, which seems reasonable.\n\nThe revlog._sparserevlog flag enables sparse writing (and reading),\nwriting sparse revlog requires readers to use sparse-reading and is\ngated behind a new requirement (introduced in hg 4.7).\n\nSparse-reading can be used for non-sparse repositories, it is just a\nreader thing.\n","author":"lothiraldan","id":"82225","dateCreated":"1547201188","dateModified":"1547201188"},{"type":"update","diffId":"13161","author":"indygreg","id":"82180","dateCreated":"1547166755","dateModified":"1547166755"}],"dateCreated":"1547166755","dateModified":"1547248288","status":"Changes Planned"},{"id":"5567","callsign":"HG","title":"revlog: assign revlog._io in version lookup conditional","author":"indygreg","summary":"A single version lookup is desirable.","testPlan":"","lineCount":"9","dependsOn":["5566"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"13163","author":"indygreg","id":"82200","dateCreated":"1547166761","dateModified":"1547166761"}],"dateCreated":"1547166761","dateModified":"1547166762","status":"Needs Review"},{"id":"5566","callsign":"HG","title":"revlog: rename revlog I\/O classes to reflect version (API)","author":"indygreg","summary":"I never liked these names. They imply the existence of exactly\n2 revlog versions. We're hacking on version 2. So let's\nintroduce better names.","testPlan":"","lineCount":"14","dependsOn":["5565"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"13162","author":"indygreg","id":"82190","dateCreated":"1547166758","dateModified":"1547166758"}],"dateCreated":"1547166758","dateModified":"1547166761","status":"Needs Review"},{"id":"5539","callsign":"HG","title":"style: run yapf on a subset of mercurial","author":"durin42","summary":"I've tried to pick knobs that more or less conform to our current\nstyle. I ran the formatter on the same set of files as the black\nproposal (see D5064), but it resulted in many fewer edits.","testPlan":"","lineCount":"171","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"inline","comment":"We could force this to one-per-line by adding a trailing comma.","replyTo":null,"isNewFile":"1","line":"53","lineLength":"0","path":"mercurial\/scmwindows.py","diffId":"13110","author":"durin42","id":"81887","dateCreated":"1547066206","dateModified":"1547066206"},{"type":"inline","comment":"yapf bug here, filed as https:\/\/github.com\/google\/yapf\/issues\/662","replyTo":null,"isNewFile":"1","line":"57","lineLength":"1","path":"mercurial\/minifileset.py","diffId":"13110","author":"durin42","id":"81886","dateCreated":"1547066206","dateModified":"1547066206"},{"type":"comment","comment":"I see a few minor issues here, but it's at least plausible?","author":"durin42","id":"81885","dateCreated":"1547066206","dateModified":"1547066206"},{"type":"update","diffId":"13110","author":"durin42","id":"81877","dateCreated":"1547065732","dateModified":"1547065732"}],"dateCreated":"1547065732","dateModified":"1547066206","status":"Needs Review"},{"id":"5503","callsign":"HG","title":"vfs: add support for repo names with `$` when using with env vars (issue5739)","author":"navaneeth.suresh","summary":"`$ foo=bar hg root` fails to recognise the repo `$foo`. I stopped expanding env\nvars from vfs when there exists a repo with the same name as the env var.","testPlan":"","lineCount":"12","dependsOn":[],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">   > This is logically incorrect. The problem is that we're doing variable\n>   >  expansion at too lower layer. `vfs(expand(user_specified_path))` makes\n>   >  some sense, but `vfs(expand(getcwd()))` is clearly wrong. And the vfs class\n>   >  can't know where the `base` comes from.\n>   \n>   If I add a condition for expanding env var if present in `hgrc`, can this work as a fix?\n\nMaybe no. Where do you intend to add such code? vfs doesn't know where the path\ncomes from. Neither does localrepo.\n\n>   If the only solution for this is shifting path expansion from `vfs` class, where do you\n>   think it can be?\n\nSomewhere specifying repository path read from hgrc or user input.","author":"yuja","id":"81826","dateCreated":"1547043138","dateModified":"1547043138"},{"type":"comment","comment":"> This is logically incorrect. The problem is that we're doing variable\n> expansion at too lower layer. `vfs(expand(user_specified_path))` makes\n> some sense, but `vfs(expand(getcwd()))` is clearly wrong. And the vfs class\n> can't know where the `base` comes from.\n\nIf I add a condition for expanding env var if present in `hgrc`, can this work as a fix?\nIf the only solution for this is shifting path expansion from `vfs` class, where do you\nthink it can be?","author":"navaneeth.suresh","id":"81684","dateCreated":"1546920534","dateModified":"1546920534"},{"type":"comment","comment":">      def __init__(self, base, audit=True, cacheaudited=False, expandpath=False,\n>                   realpath=False):\n> +        if '$' in base and os.path.isdir(base):\n> +            # when there exists a repo '$foo' and an env var foo=bar, stop\n> +            # expanding path. refer issue5739.\n> +            expandpath = False\n\nThis is logically incorrect. The problem is that we're doing variable\nexpansion at too lower layer. `vfs(expand(user_specified_path))` makes\nsome sense, but `vfs(expand(getcwd()))` is clearly wrong. And the vfs class\ncan't know where the `base` comes from.","author":"yuja","id":"81561","dateCreated":"1546867921","dateModified":"1546867921"},{"type":"update","diffId":"13046","author":"navaneeth.suresh","id":"81547","dateCreated":"1546862928","dateModified":"1546862928"},{"type":"update","diffId":"13025","author":"navaneeth.suresh","id":"81425","dateCreated":"1546850305","dateModified":"1546850305"}],"dateCreated":"1546850305","dateModified":"1547043138","status":"Needs Review"},{"id":"5444","callsign":"HG","title":"help: use \"yes\" and \"no\" for boolean defaults instead of \"on\" and \"off\"","author":"av6","summary":"","testPlan":"","lineCount":"45","dependsOn":[],"reviewers":["durin42"],"ccs":["yuja","martinvonz","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"I feel `--no-<thing>` and `--<thing>=off|false` are more natural, and\n`(default: %s)` is the latter form.","author":"yuja","id":"80613","dateCreated":"1544924937","dateModified":"1544924937"},{"type":"comment","comment":"Arguments against yes\/no:\n\n1. \"default: yes\/no\" can easily be read as \"is this a default\", which is not quite the same, although it would have the same effect.\n\n2. On\/off fits well in sentences like \"is --hidden on by default\".\n\nI see your arguments too (mostly the last one of them), but I still slightly prefer on\/off.","author":"martinvonz","id":"80611","dateCreated":"1544903230","dateModified":"1544903230"},{"type":"comment","comment":"The point of D5430 was to make hg help output more human friendly by replacing `True` and `False` with something less Python-related. In other words, more human-friendly. \"Yes\" and \"no\" are way more human-friendly:\n\n* they are one of the most used words, so people naturally expect to see them, and can tell them apart from just \"y\" or \"n\" (they are also less ambiguous themselves \u2014 just look up how many meanings \"on\" or \"off\" has and how many parts of speech can they be),\n* they also work perfectly fine as answers to the flag descriptions (Consider hidden changesets? Yes, please. No, thanks.),\n* and \"no\" (more precisely, \"no-\") is the very same thing that users should add to the flags to negate them (not \"--off-hidden\").\n","author":"av6","id":"80608","dateCreated":"1544897014","dateModified":"1544897014"},{"type":"comment","comment":"TBH, I think 'on' and 'off' are more appropriate than 'yes' and 'no'.","author":"pulkit","id":"80606","dateCreated":"1544888113","dateModified":"1544888113"},{"type":"update","diffId":"12881","author":"av6","id":"80580","dateCreated":"1544874595","dateModified":"1544874595"}],"dateCreated":"1544874595","dateModified":"1544924937","status":"Needs Review"},{"id":"2880","callsign":"HG","title":"bundle: add the possibility to bundle bookmarks (issue5792)","author":"lothiraldan","summary":"Also take the wlock when unbundling. It shouldn't have a big impact on\nperformance.","testPlan":"","lineCount":"143","dependsOn":[],"reviewers":["indygreg"],"ccs":["martinvonz","indygreg","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"Just a reminder that this has not been queued yet.","author":"martinvonz","id":"79389","dateCreated":"1543515570","dateModified":"1543515570"},{"type":"inline","comment":"I tried adding such scenarios but failed to produce a divergence scenario, no idea why.\n\nI don't think I will have time to debug the issue before the freeze, so let's skip this changeset for 4.6","replyTo":"53793","isNewFile":"1","line":"37","lineLength":"26","path":"tests\/test-bundle-bookmarks.t","diffId":"7077","author":"lothiraldan","id":"54248","dateCreated":"1523950897","dateModified":"1523950897"},{"type":"inline","comment":"I think it should be the same thing as pulling from another repo. Try putting the same changes in another repo and pulling from it without giving the path a name (nothing in [paths] config). I haven't checked what suffix will be used on the divergent bookmark, but it probably makes sense to use the same here (perhaps it's just going to be \"D1@1\" as I guessed before).","replyTo":"53729","isNewFile":"1","line":"37","lineLength":"26","path":"tests\/test-bundle-bookmarks.t","diffId":"7077","author":"martinvonz","id":"53793","dateCreated":"1523724103","dateModified":"1523724103"},{"type":"inline","comment":"I have added such test and indeed this case is not handled right now. I'm not aware of how Mercurial handle this case when exchanging bookmarks, I will need to take a look at the code to find out.\n\nWhat is the correct behavior here? Change the existing bookmark or the bookmark from the bundle?","replyTo":"46275","isNewFile":"1","line":"37","lineLength":"26","path":"tests\/test-bundle-bookmarks.t","diffId":"7077","author":"lothiraldan","id":"53729","dateCreated":"1523698843","dateModified":"1523698843"},{"type":"update","diffId":"8263","author":"lothiraldan","id":"53727","dateCreated":"1523698706","dateModified":"1523698706"},{"type":"comment","comment":">>! In D2880#52559, @indygreg wrote:\n> What's the status of this patch? Is it still reviewable? If so, let's get a rebased version submitted, just in case things have changed.\n\nI need to update the patch according to @martinvoz comment.\n\nI was also waiting on your comment on https:\/\/phab.mercurial-scm.org\/D2880#46263, do you think we will keep the option once the bundlespec system is revamped? If yes, we can make the config option a non-experimental one. But if it will be dropped soon, I think keeping it experimental until it's dropped is preferable. What do you think?","author":"lothiraldan","id":"52583","dateCreated":"1523555228","dateModified":"1523555228"},{"type":"comment","comment":"What's the status of this patch? Is it still reviewable? If so, let's get a rebased version submitted, just in case things have changed.","author":"indygreg","id":"52560","dateCreated":"1523549760","dateModified":"1523549760"},{"type":"reject","author":"indygreg","id":"52559","dateCreated":"1523549760","dateModified":"1523549760"},{"type":"inline","comment":"Can we have a similar test case where we create divergence? Create a fork in the graph in the debugdrawdag call above. Let's say you have commit F that branches off of B, then do something like this:\n\n```\n$ hg bundle --all bundle\n$ hg strip --no-backup C\n$ hg bookmarks -f -r F D1\n$ hg unbundle -q bundle\n$ hg log -G -T '{desc} {bookmarks}\\n'\n  o  E\n  |\n  o  D D1 D2\n  |\n  o  C\n  |\n  |  o F D1@1\n  |\/\n  o  B\n  |\n  o  A A1\n```\n\nI don't know if \"@1\" is the appropriate divergence marker, but I can't think of a better one. I haven't even looked at your code to try to guess what it would be in practice (if it would work at all).","replyTo":null,"isNewFile":"1","line":"37","lineLength":"26","path":"tests\/test-bundle-bookmarks.t","diffId":"7077","author":"martinvonz","id":"46275","dateCreated":"1521218729","dateModified":"1521218729"},{"type":"inline","comment":"I was afraid we might have to delete this option once we have the discussion about bundle spec format with @indygreg. If that would be the case, I would feel more comfortable deleting an experimental option.\n\nIf we agreed on moving bundle-phases out of experimental, I guess we can do the same for bundle-bookmarks.\n\n@indygreg Do you think we would still have this option around once we have new-style bundle spec?","replyTo":"46262","isNewFile":"1","line":"422","lineLength":"0","path":"mercurial\/configitems.py","diffId":"7077","author":"lothiraldan","id":"46264","dateCreated":"1521208181","dateModified":"1521208181"},{"type":"inline","comment":"Any reason why we have all these config option as experimental? We talked at sprint about moving things out of experimental and we agreed on `experimental.bundle-phases`. This one sounds similar.","replyTo":null,"isNewFile":"1","line":"422","lineLength":"0","path":"mercurial\/configitems.py","diffId":"7077","author":"pulkit","id":"46262","dateCreated":"1521206865","dateModified":"1521206865"},{"type":"update","diffId":"7077","author":"lothiraldan","id":"46256","dateCreated":"1521206506","dateModified":"1521206506"}],"dateCreated":"1521206506","dateModified":"1543515570","status":"Needs Review"},{"id":"5308","callsign":"HG","title":"store: don't pass 'atomictemp=True' while appending to fncache","author":"pulkit","summary":"Appending to an atomictemp file means that the entire file is copied first.\nThanks to Yuya for suggesting.","testPlan":"","lineCount":"2","dependsOn":[],"reviewers":[],"ccs":["yuja","mjpieters","mercurial-devel"],"actions":[{"type":"comment","comment":">   > As I said, we'll also need to somehow hide partial data from another\n>   >  reader processes. There's no read lock.\n>   \n>   \n>   Read locks! was there a previous attempt on implementing them? I will try to take a shot at implementing them. I am unable to find any good detail except mentions in wiki or mailing list archive.\n\nAnother option is to ignore trailing data after `\\n`. That's how the revlog\nparser gets around partially-written entry.\n\nIn either way, writing fncache non-atomically wouldn't be strictly compatible\nwith older hg clients. I think that's okayish, but I should note that.","author":"yuja","id":"79385","dateCreated":"1543492790","dateModified":"1543492790"},{"type":"comment","comment":">>! Pasting Yuja's reply to that from mailing list:\n>>>! In D5308#78989, @pulkit wrote:\n>>>>! In D5308#78985, @yuja wrote:\n>>>> --- a\/mercurial\/store.py\n>>>> +++ b\/mercurial\/store.py\n>>>> @@ -486,7 +486,7 @@\n>>>>          if self.addls:\n>>>>             # if we have just new entries, let's append them to the fncache\n>>>>              tr.addbackup('fncache')\n>>>> -            fp = self.vfs('fncache', mode='ab', atomictemp=True)\n>>>> +            fp = self.vfs('fncache', mode='ab')\n>>> \n>>> Ah, no. addbackup() creates hardlink, which means fncache can't be updated in\n>>> place. Also, the reader wouldn't handle partially-written fncache well.\n>> \n>> do we need to call `addbackup()` if we are just appending?\n>\n> We need a mechanism to restore the original content on rollback. IIUC,\n> it's `tr.add()` for append-only files.\n>\n> As I said, we'll also need to somehow hide partial data from another\n> reader processes. There's no read lock.\n\nRead locks! was there a previous attempt on implementing them? I will try to take a shot at implementing them. I am unable to find any good detail except mentions in wiki or mailing list archive.","author":"pulkit","id":"79002","dateCreated":"1543424805","dateModified":"1543424805"},{"type":"comment","comment":">>! In D5308#78985, @yuja wrote:\n>> --- a\/mercurial\/store.py\n>> +++ b\/mercurial\/store.py\n>> @@ -486,7 +486,7 @@\n>>          if self.addls:\n>>              # if we have just new entries, let's append them to the fncache\n>>              tr.addbackup('fncache')\n>> -            fp = self.vfs('fncache', mode='ab', atomictemp=True)\n>> +            fp = self.vfs('fncache', mode='ab')\n> \n> Ah, no. addbackup() creates hardlink, which means fncache can't be updated in\n> place. Also, the reader wouldn't handle partially-written fncache well.\n\ndo we need to call `addbackup()` if we are just appending?","author":"pulkit","id":"78989","dateCreated":"1543326786","dateModified":"1543326786"},{"type":"comment","comment":"> --- a\/mercurial\/store.py\n> +++ b\/mercurial\/store.py\n> @@ -486,7 +486,7 @@\n>          if self.addls:\n>              # if we have just new entries, let's append them to the fncache\n>              tr.addbackup('fncache')\n> -            fp = self.vfs('fncache', mode='ab', atomictemp=True)\n> +            fp = self.vfs('fncache', mode='ab')\n\nAh, no. addbackup() creates hardlink, which means fncache can't be updated in\nplace. Also, the reader wouldn't handle partially-written fncache well.","author":"yuja","id":"78986","dateCreated":"1543325866","dateModified":"1543325866"},{"type":"update","diffId":"12610","author":"pulkit","id":"78976","dateCreated":"1543324956","dateModified":"1543324956"}],"dateCreated":"1543324956","dateModified":"1543492790","status":"Needs Review"},{"id":"5295","callsign":"HG","title":"branchmap: define a hasbranch() to find whether a branch exists or not","author":"pulkit","summary":"This patch introduces a branchmap.hasbranch() function to find whether a branch\nexists or not. I was going through profile of one of most used command\ninternally on server side and found that we are spending ~50% of time finding\nwhether a branch exists or not. We are reading the branchmap cache, building the\nrelated object and then finding whether a branch exists or not which is quite\nslow on repositories which have more than 10k named branches.\n\nIn the new function, we just iterate over the whole branchmap cache and find\nthat whether a branch name is present or not. This is essentially\nbranchmap.read() but without any hash validation, creation of the branchcache()\nobject.\n\nFollowing were the improvements observed:\n\nBefore:\n\n`hg log -b . -l 1`: 0.53 sec\n`hg log -b <last_branch_in_the_cache> -l 1`: 1.12 sec\n\nAfter:\n\n`hg log -b . -l 1`: 0.32 sec\n`hg log -b <last_branch_in_the_cache> -l 1`: 0.95 sec\n\n\nThere we no improvements observed in `hg log -r <branch_name>`, if the log limit\nis greater than 1, and while using revsets.\n\nI have added a TODO here that we can use binary search instead of plain\niteration for finding whether a branch name exists or not. I got to know that\nMartijn Pieters is working on some related stuff to load branchmap in memory as\nraw data and decided to implement binary search on top of that.","testPlan":"","lineCount":"29","dependsOn":[],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"I don't think it's good idea to re-scan the cache file per hasbranch() call.\nInstead, we'll probably need a lazy parser backed by a in-memory cache data.\nThe current cache file format is text-based, which wouldn't be easily bisected\nwithout loading (or memmap) the whole content.\n\n> +def hasbranch(repo, branchname):\n> +    \"\"\"check whether a branchname exists in the repo or not by reading the\n> +    branchmap cache\"\"\"\n> +\n> +    if not repo.cachevfs.exists(_filename(repo)):\n> +        # branchmap file is not present, let's go repo.branchmap() route which\n> +        # will create that file\n> +        return branchname in repo.branchmap()\n> +\n> +    # TODO: implement binary-search here for faster search\n> +    with repo.cachevfs(_filename(repo)) as f:\n> +        f = repo.cachevfs(_filename(repo))\n> +        lineiter = iter(f)\n> +        next(lineiter).rstrip('\\n').split(\" \", 2)\n\nNeed to check if the cache file is valid.\n\n> +        for l in lineiter:\n> +            l = l.rstrip('\\n')\n> +            if not l:\n> +                continue\n> +            label = l.split(\" \", 2)[2]\n> +            label = encoding.tolocal(label.strip())\n> +            if label == branchname:\n\nAnd maybe need to check if the node exists.\n\n> +                return True\n> +    return False","author":"yuja","id":"78895","dateCreated":"1543118662","dateModified":"1543118662"},{"type":"update","diffId":"12582","author":"pulkit","id":"78822","dateCreated":"1542887394","dateModified":"1542887394"}],"dateCreated":"1542887394","dateModified":"1543118662","status":"Needs Review"},{"id":"1701","callsign":"HG","title":"logtoprocess: add the possibility to not popup a console","author":"lothiraldan","summary":"Starting a subprocess on Windows with `DETACHED_PROCESS |\nCREATE_NEW_PROCESS_GROUP` as startup info means starting a console GUI window\nin almost all cases. If we add a logtoprocess for commandfinish and the prompt\ndo some hg calls, it will create a short-lived GUI window which is annoying\nfor end-users.\n\nCreating a subprocess with `CREATE_CONSOLE` instead seems to no start a\nconsole window but could have other side-effects so it kept under a config\nknob.","testPlan":"","lineCount":"13","dependsOn":["1700"],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"inline","comment":"Can we add `CREATE_NEW_PROCESS_GROUP` ?","replyTo":null,"isNewFile":"1","line":"66","lineLength":"0","path":"hgext\/logtoprocess.py","diffId":"4468","author":"yuja","id":"29101","dateCreated":"1513346507","dateModified":"1513346507"},{"type":"comment","comment":"> but could have other side-effects so it kept under a config knob.\n\nMy two cents, `experimental.*` might be better if the config knob exists as\na workaround for an unknown bug.","author":"yuja","id":"29100","dateCreated":"1513346507","dateModified":"1513346507"},{"type":"update","diffId":"4468","author":"lothiraldan","id":"29029","dateCreated":"1513332660","dateModified":"1513332660"}],"dateCreated":"1513332660","dateModified":"1541507268","status":"Needs Review"},{"id":"5102","callsign":"HG","title":"beautifygraph: add configs for customizing the characters","author":"hooper","summary":"I figure we should keep this out of graphmod.py and templatekw.py for now.\nMoving the extension functionality out of hgext is a separate issue.\n\nCalling ui.config() inside getgraphnode seems like it might slow things down,\nbut it needs to happen there because of the template keyword. We probably want\nto honor config overrides, so we can't cache glyphs at this level.","testPlan":"","lineCount":"208","dependsOn":[],"reviewers":[],"ccs":["spectral","mercurial-devel"],"actions":[{"type":"comment","comment":"I'll elaborate a bit. I think the idea of using unicode to make the graph good looking is flawed. There are no characters that properly serve common cases like this:\n\n```\no\n|\n \\\n  o\n```\n\nThat's part of why there was some disagreement in early discussion of this extension.\n\nI think it's a bad user experience, because if the graph looks 95% like a connected drawing, these broken areas are going to look like malfunctions (whereas we started with a stylized ascii drawing where the limitations are obvious to the user).\n\nAdditionally, the existing graphlog output is lossy. The two pipes in this example do not have the same meaning:\n\n```\no\n|\n|\n \\\n   o\n```\n\nEven if we had the unicode characters\/custom font needed to make this work, we would need at least 5 configurable variants of what is currently just a pipe. You would need hundreds of distinct characters to support all combinations of the 8 horizontal and diagonal edges in each character\/cell of the graph rendering. More than double that to support dashed lines. Maybe exclude some unused characters. It's hard to imagine making that easy to configure.\n\nYou can also imagine having the graphlog output optionally use only horizontal\/vertical edges so this can be done properly with box drawing characters. This is would complicate graphlog itself considerably, regardless of configuration.\n\nMeanwhile, this patch would be useful to some of our users, and it keeps the problems contained within the extension.","author":"hooper","id":"77628","dateCreated":"1540934965","dateModified":"1540934965"},{"type":"comment","comment":"hooper and I talked at the sprint, and they wrote up the following for why they feel we should keep this out of graphmod\/templatekw for now:\n\n> I don't think configurable graph log characters in core is a great idea right now, since it makes the empty promise that you can make logs look correct by using common fonts. E.g. the problem that pipe characters are used in several situations that just can't be handled well by one character.\n\nAs a specific example, there's no unicode line drawing characters that are fully-extended lines at 0 degrees (straight up) and 135 degrees (down to the right to the corner of the character box), so there will always be cases that can't really be represented \"perfectly\".\n\nI don't generally agree with this reasoning - limitations of unicode should not be a reason to require that we go through a separate extension like this.  The reasoning for the extension instead of just making the actual graph characters customizable was two-fold, if I remember correctly:\n\n1. there is currently some awkward code to handle extending one of the characters used to draw parent\/grandparent lines for a few lines and then switch to the other. (https:\/\/www.mercurial-scm.org\/repo\/hg\/file\/tip\/tests\/test-glog.t#l3041 shows this in action) - the code to implement this is not unicode safe (at least in python2)\n2. the current graphlog code does not currently have config knobs to control every character, I think. \n\n\nI think we should fix the code issue in #1 (I just sent D5112 for this), and then we can extended graphlog to have whatever character(s) we need, instead of attempting to do the replacements in an extension like we're currently doing?  The extension could just become a set of \"recommended\" values for these config knobs.\n","author":"spectral","id":"76474","dateCreated":"1539693777","dateModified":"1539693777"},{"type":"update","diffId":"12138","author":"hooper","id":"76357","dateCreated":"1539526671","dateModified":"1539526671"},{"type":"update","diffId":"12130","author":"hooper","id":"76302","dateCreated":"1539519730","dateModified":"1539519730"}],"dateCreated":"1539519730","dateModified":"1540934965","status":"Needs Review"},{"id":"4810","callsign":"HG","title":"repository: introduce an ellipses repo requirement","author":"pulkit","summary":"Right now there is no good way to check whether a repo is ellipses enabled or\nnot. This patch introduces a ellipses repo requirement which will be used in\nupcoming patches.\n\nI have purposefully not included narrow in the requirement name because now they\nare looking different concepts to me.","testPlan":"","lineCount":"5","dependsOn":[],"reviewers":[],"ccs":["indygreg","martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":"I think this patch (and later patches that start using it, of course) would be a good idea. I suppose it won't make it into 4.8, but we don't have a freeze, so please send an updated version whenever you have time","author":"martinvonz","id":"76964","dateCreated":"1539816026","dateModified":"1539816026"},{"type":"comment","comment":"New requirements should be documented in `help\/internals\/requirements.txt`.","author":"indygreg","id":"72817","dateCreated":"1538412974","dateModified":"1538412974"},{"type":"comment","comment":"Let's do this step by step and get the wireprotocol command reviewed first. Once that is done, I will resend this one.","author":"pulkit","id":"72789","dateCreated":"1538409775","dateModified":"1538409775"},{"type":"plan-changes","author":"pulkit","id":"72788","dateCreated":"1538409775","dateModified":"1538409775"},{"type":"inline","comment":"Yeah, the intent was to say the same thing as the comment about NARROW_REQUIREMENT says but re-reading myself, looks like I messed up. I will update this.","replyTo":"72704","isNewFile":"1","line":"22","lineLength":"2","path":"mercurial\/repository.py","diffId":"11501","author":"pulkit","id":"72706","dateCreated":"1538352558","dateModified":"1538352558"},{"type":"inline","comment":"I'm not sure I understand what this says.\n\nThe first sentence sounds too obvious to mention (kind of like \"when it's done, it should be working well\"), but I suspect you mean something else. Do you mean that that's the criteria for dropping the \"exp-\" prefix (much like the comment for narrow says above)?\n\nI don't know what the second sentence says either. Isn't it already generalized to shallow and ellipses?","replyTo":null,"isNewFile":"1","line":"22","lineLength":"2","path":"mercurial\/repository.py","diffId":"11501","author":"martinvonz","id":"72704","dateCreated":"1538352074","dateModified":"1538352074"},{"type":"update","diffId":"11501","author":"pulkit","id":"72668","dateCreated":"1538323845","dateModified":"1538323845"},{"type":"update","diffId":"11493","author":"pulkit","id":"72644","dateCreated":"1538265895","dateModified":"1538265895"}],"dateCreated":"1538265895","dateModified":"1539816026","status":"Changes Planned"},{"id":"4876","callsign":"HG","title":"amend: add config to skip amend if only date is changed (issue5828)","author":"Zharaskhan","summary":"When --date flag specified with `hg amend` and working copy is clean,\n`hg amend` amends, which is generally undesirable behavior.\nBut it is commonly used to change date on each amend.\nI added experimental.amend.dateonly config option to not amend\nif only thing that changed is date.\nI also added tests for this.","testPlan":"","lineCount":"56","dependsOn":[],"reviewers":["pulkit","durin42"],"ccs":["durin42","yuja","martinvonz","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"It sounds like @pulkit has some ideas on what needs to be done follow-up wise.","author":"durin42","id":"76409","dateCreated":"1539531108","dateModified":"1539531108"},{"type":"reject","author":"durin42","id":"76408","dateCreated":"1539531108","dateModified":"1539531108"},{"type":"comment","comment":">   I should be easy to introduce such an option and make amend respect it (similar amount of code as this patch), so I'd just like to hear if others think it's a good idea first. If others agree with it, then it seems better to introduce the generic option right away. I can't\/won't access IRC right now, but feel free to check there what others think and update this review when you have.\n\nSGTM.\n\nPerhaps, `ui.history-editing-backup` can be moved under the same config group.","author":"yuja","id":"74243","dateCreated":"1539087709","dateModified":"1539087709"},{"type":"comment","comment":">>! In D4876#74021, @pulkit wrote:\n> (Replying because I adviced Zharas to take up this issue and he is a new mercurial user and have less context on the problem)\n> \n>>>! In D4876#74017, @martinvonz wrote:\n>> I'm not sure how I feel about this. I think we talked within the team at Google about always passing a `-D now` and decided not to do it because of the issue you're fixing here (I may be confusing the discussion with one about using `hg metaedit`). Still, I feel like this patch is a workaround for the real problem. I assume that the real problem is that there the date is not normally updated when you amend a commit (i.e. you want to always pass `-D now`, not a specific other timestamp). If that's the problem we're trying address, should we instead introduce a config called something like `amend.updatetimestamp` that makes it update the timestamp to the current time? That would naturally not update the timestamp if the timestamp was the only thing that changed (just like this patch does it). The natural generalization of `amend.updatetimestamp` is something like `rewrite.updatetimestamp` that would be respected by amend, histedit, rebase, etc.\n>> \n>> What do you think? Is that the use case you're trying to address with this patch?\n> \n> I agree that the real problem is amend not updating the timestamp. People have aliased `amend` to `amend -D now` or just like you said, they always pass `-D now`. In such cases, even if the working directory is not changed, we end up creating a new commit with just date change. This patch tries to solve the problem of creating a new commit when only date has changed for people who do `amend -D now` always by preventing that if the config option is turned on.\n> \n> I like your idea of having a config option which is respected by all the commands.\n> \n> That said, will you like to see a v2 of this patch with inline comments addressed or we abandon this idea in favour of proposed config option to change the date.\n\nI should be easy to introduce such an option and make amend respect it (similar amount of code as this patch), so I'd just like to hear if others think it's a good idea first. If others agree with it, then it seems better to introduce the generic option right away. I can't\/won't access IRC right now, but feel free to check there what others think and update this review when you have.","author":"martinvonz","id":"74049","dateCreated":"1539015450","dateModified":"1539015450"},{"type":"inline","comment":"\"amend.skipdateonly\" sounds good.","replyTo":"74020","isNewFile":"1","line":"440","lineLength":"2","path":"mercurial\/configitems.py","diffId":"11660","author":"pulkit","id":"74022","dateCreated":"1539014629","dateModified":"1539014629"},{"type":"comment","comment":"(Replying because I adviced Zharas to take up this issue and he is a new mercurial user and have less context on the problem)\n\n>>! In D4876#74017, @martinvonz wrote:\n> I'm not sure how I feel about this. I think we talked within the team at Google about always passing a `-D now` and decided not to do it because of the issue you're fixing here (I may be confusing the discussion with one about using `hg metaedit`). Still, I feel like this patch is a workaround for the real problem. I assume that the real problem is that there the date is not normally updated when you amend a commit (i.e. you want to always pass `-D now`, not a specific other timestamp). If that's the problem we're trying address, should we instead introduce a config called something like `amend.updatetimestamp` that makes it update the timestamp to the current time? That would naturally not update the timestamp if the timestamp was the only thing that changed (just like this patch does it). The natural generalization of `amend.updatetimestamp` is something like `rewrite.updatetimestamp` that would be respected by amend, histedit, rebase, etc.\n> \n> What do you think? Is that the use case you're trying to address with this patch?\n\nI agree that the real problem is amend not updating the timestamp. People have aliased `amend` to `amend -D now` or just like you said, they always pass `-D now`. In such cases, even if the working directory is not changed, we end up creating a new commit with just date change. This patch tries to solve the problem of creating a new commit when only date has changed for people who do `amend -D now` always by preventing that if the config option is turned on.\n\nI like your idea of having a config option which is respected by all the commands.\n\nThat said, will you like to see a v2 of this patch with inline comments addressed or we abandon this idea in favour of proposed config option to change the date.","author":"pulkit","id":"74021","dateCreated":"1539014629","dateModified":"1539014629"},{"type":"inline","comment":"\"amend.dateonly\" sounds like it only updates the date. Maybe \"amend.skipdateonly\" or \"amend.nodateonly\"? It doesn't matter much because we'll need to update it anyway later if we drop the \"experimental\" label.","replyTo":null,"isNewFile":"1","line":"440","lineLength":"2","path":"mercurial\/configitems.py","diffId":"11660","author":"martinvonz","id":"74020","dateCreated":"1538975614","dateModified":"1538975614"},{"type":"inline","comment":"You only care about the date here, right? You can probably do something like `hg log -T '{date|isodate}\\n'` to make the test clearer.","replyTo":null,"isNewFile":"1","line":"372","lineLength":"14","path":"tests\/test-amend.t","diffId":"11660","author":"martinvonz","id":"74019","dateCreated":"1538975614","dateModified":"1538975614"},{"type":"comment","comment":"I'm not sure how I feel about this. I think we talked within the team at Google about always passing a `-D now` and decided not to do it because of the issue you're fixing here (I may be confusing the discussion with one about using `hg metaedit`). Still, I feel like this patch is a workaround for the real problem. I assume that the real problem is that there the date is not normally updated when you amend a commit (i.e. you want to always pass `-D now`, not a specific other timestamp). If that's the problem we're trying address, should we instead introduce a config called something like `amend.updatetimestamp` that makes it update the timestamp to the current time? That would naturally not update the timestamp if the timestamp was the only thing that changed (just like this patch does it). The natural generalization of `amend.updatetimestamp` is something like `rewrite.updatetimestamp` that would be respected by amend, histedit, rebase, etc.\n\nWhat do you think? Is that the use case you're trying to address with this patch?\n","author":"martinvonz","id":"74018","dateCreated":"1538975614","dateModified":"1538975614"},{"type":"comment","comment":"This looks good to me but since I helped Zharas in preparing the patch, I won't queue it.","author":"pulkit","id":"73696","dateCreated":"1538680221","dateModified":"1538680221"},{"type":"accept","author":"pulkit","id":"73695","dateCreated":"1538680221","dateModified":"1538680221"},{"type":"update","diffId":"11660","author":"Zharaskhan","id":"73590","dateCreated":"1538605984","dateModified":"1538605984"}],"dateCreated":"1538605984","dateModified":"1539531108","status":"Needs Revision"},{"id":"5052","callsign":"HG","title":"mercurial: strip function return type annotations (RFC)","author":"indygreg","summary":"THIS IS SUPER HACKY. DO NOT EVEN THINK ABOUT LANDING YET.\n\nNow that we have a custom module importer on Python 2 and that importer\nis using Python 3.7's tokenizer, it is possible for us to analyze the\nsource code token stream and transform it to valid Python 2.7 source\nbefore it is compiled into a code object.\n\nThis commit teaches the token stream transformer to recognize the tokens\nfor a function return type annotation and to strip those tokens from the\ntoken stream. As far as Python 2's code compiler is concerned, the original\nsource didn't contain a type annotation!\n\nTo prove it works, we define a type annotation in the dispatch module.\nPython 2 is able to import the module just fine.\n\nThis feature means we could start adding type annotations throughout the\ncode base while still remaining Python 2 compatible.\n\nBut why stop at type annotations? We could also rewrite the token stream\nso we can leverage other Python 3 only features. This includes \"yield from\"\nsuper() without arguments, class definitions without \"(object)\", etc. We\ncould also \"invert\" our source transformer strategy and make the code base\nnative Python 3 and source transform to remain compatible with Python 2.","testPlan":"","lineCount":"15","dependsOn":["5051"],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"12008","author":"indygreg","id":"75694","dateCreated":"1539415751","dateModified":"1539415751"}],"dateCreated":"1539415751","dateModified":"1539415751","status":"Needs Review"},{"id":"5051","callsign":"HG","title":"mercurial: implement custom module importer for Python 2.7 (RFC)","author":"indygreg","summary":"THIS IS SUPER HACKY. IT DOESN'T INVALIDATE .pyc FILES, WHICH MEANS SOURCE\nCHANGES AREN'T PICKED UP. DO NOT LAND.","testPlan":"","lineCount":"111","dependsOn":["5050"],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"12007","author":"indygreg","id":"75684","dateCreated":"1539415744","dateModified":"1539415744"}],"dateCreated":"1539415744","dateModified":"1539415751","status":"Needs Review"},{"id":"5050","callsign":"HG","title":"tests: add test verifying our Python 3 tokenizer works","author":"indygreg","summary":"Our vendored Python 3.7 tokenizer is now fully working on Python 2.7.\nLet's verify that by adding a test that ensures we can tokenize all .py\nfiles in the repo.","testPlan":"","lineCount":"65","dependsOn":["5049"],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"12006","author":"indygreg","id":"75674","dateCreated":"1539415737","dateModified":"1539415737"}],"dateCreated":"1539415737","dateModified":"1539415744","status":"Needs Review"},{"id":"5049","callsign":"HG","title":"hgdemandimport: don't use str.isidentifier()","author":"indygreg","summary":"This method doesn't exist in Python 2.7.\n\nThe new code is equivalent to what Python was doing up until\nisidentifier() was introduced to Lib\/tokenize.py in\n33856de84d1115a18b699e0ca93c3b921bc6a1af.\n\nStrictly speaking, a simple ascii check is not sufficient, as a proper\nidentifier is defined by PEP 3131 and allows non-ascii characters. But\nwe don't plan to use this tokenizer on arbitrary source code, so I think\nwe can get away with not conforming to PEP 3131.","testPlan":"","lineCount":"6","dependsOn":["5048"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"12005","author":"indygreg","id":"75664","dateCreated":"1539415731","dateModified":"1539415731"}],"dateCreated":"1539415731","dateModified":"1539415737","status":"Needs Review"},{"id":"5048","callsign":"HG","title":"hgdemandimport: port line consuming to Python 2","author":"indygreg","summary":"This commit rewrites the line consuming to use next() on a generator\nin order to appease Python 2.\n\nWith this commit, we are now able to emit some tokens on Python 2.7 using\nthe Python 3.7 tokenizer. But there are still bugs...","testPlan":"","lineCount":"24","dependsOn":["5047"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"12004","author":"indygreg","id":"75654","dateCreated":"1539415725","dateModified":"1539415725"}],"dateCreated":"1539415725","dateModified":"1539415731","status":"Needs Review"},{"id":"5047","callsign":"HG","title":"hgdemandimport: remove re.ASCII","author":"indygreg","summary":"This is a Python 3'ism. Our intent is to only use this code from Python\n2 and Python 2's behavior is essentially the same as re.ASCII AFAIK.","testPlan":"","lineCount":"5","dependsOn":["5046"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"12003","author":"indygreg","id":"75644","dateCreated":"1539415717","dateModified":"1539415717"}],"dateCreated":"1539415717","dateModified":"1539415725","status":"Needs Review"},{"id":"5046","callsign":"HG","title":"hgdemandimport: adjust imports to reflect vendored module","author":"indygreg","summary":"The \"token\" module is renamed in our local copy. Import it appropriately.\n\nThis angered test-check-module-imports due to attempting relative import of\nstdlib module and direct symbol imports. We suppress that check on this file\nsince it is mostly 3rd party code.","testPlan":"","lineCount":"18","dependsOn":["5045"],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"12002","author":"indygreg","id":"75634","dateCreated":"1539415710","dateModified":"1539415710"}],"dateCreated":"1539415710","dateModified":"1539415717","status":"Needs Review"},{"id":"5045","callsign":"HG","title":"hgdemandimport: remove unused functionality from vendored modules","author":"indygreg","summary":"We'll never use this. It is just bloating the files.\n\nThe PSF license section 3 stipulates that derived works...\n\"include in any such work a brief summary of the changes made to Python.\"\nWhile I think commit messages and version control count, I'm going one\nstep further and documenting things inline.\n\nThis change makes test-check-module-imports.t happy.","testPlan":"","lineCount":"193","dependsOn":["5044"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"12000","author":"indygreg","id":"75623","dateCreated":"1539415703","dateModified":"1539415703"}],"dateCreated":"1539415703","dateModified":"1539415710","status":"Needs Review"},{"id":"5044","callsign":"HG","title":"hgdemandimport: add PSF license and copyright notice to vendored files","author":"indygreg","summary":"This seems to be required per the PSFv2 license text.","testPlan":"","lineCount":"110","dependsOn":["5043"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"11999","author":"indygreg","id":"75613","dateCreated":"1539415696","dateModified":"1539415696"}],"dateCreated":"1539415696","dateModified":"1539415703","status":"Needs Review"},{"id":"5043","callsign":"HG","title":"hgdemandimport: vendor CPython 3.7 tokenizer modules","author":"indygreg","summary":"I have an evil plan to leverage the Python 3 tokenizer on Python 2.7.\n\nThe added files are Lib\/token.py and Lib\/tokenize.py from cpython's\nGit repository at commit d4ed8809ddfaa23fe5edf2987c03afc32f5576c0. This\ncommit corresponds to the current development tip of the 3.7 branch.\nThe only commit since the 3.7.0 tag is\nab75d9e4244ee24bc96ea9d52362899e3bf365a2, which appears to contain a minor\nfix to make the Python code more consistent with the C implementation.\n\nThe files are added without modifications. Future commits will tidy\nthings up a bit.\n\nBecause the files are third party, I've added them to static analysis\nexclusion lists.\n\ntest-check-py3-compat.t and test-check-module-imports.t currently fail.\nI'll deal with that in a subsequent commit.\n\n# no-check-commit style violations galore","testPlan":"","lineCount":"902","dependsOn":[],"reviewers":[],"ccs":["mjpieters","mercurial-devel"],"actions":[{"type":"update","diffId":"11998","author":"indygreg","id":"75607","dateCreated":"1539415690","dateModified":"1539415690"}],"dateCreated":"1539415690","dateModified":"1539415696","status":"Needs Review"},{"id":"5019","callsign":"HG","title":"pager: disable auto pager if we think it doesn't support F, R, X","author":"spectral","summary":"","testPlan":"","lineCount":"164","dependsOn":[],"reviewers":[],"ccs":["indygreg","mercurial-devel"],"actions":[{"type":"inline","comment":"Won't this iterate integers on Python 3?","replyTo":null,"isNewFile":"1","line":"1120","lineLength":"0","path":"mercurial\/ui.py","diffId":"11937","author":"indygreg","id":"75313","dateCreated":"1539368646","dateModified":"1539368646"},{"type":"comment","comment":"I need to review this on a fresher brain. But I'll be honest, I'm not sure how I feel about this.\n\nDo you know of other programs that jump through similar hoops to properly set up a pager?","author":"indygreg","id":"75312","dateCreated":"1539368646","dateModified":"1539368646"},{"type":"update","diffId":"11937","author":"spectral","id":"75284","dateCreated":"1539366293","dateModified":"1539366293"}],"dateCreated":"1539366293","dateModified":"1539368646","status":"Needs Review"},{"id":"2679","callsign":"HG","title":"[PoC] obsolete: config option to enable local only obsolescence mode","author":"indygreg","summary":"Our path to enable obsolescence\/evolve in core is to enable\ncreation of markers locally (no exchange) with user-facing behavior\nthat mimics existing behavior as closely as possible. Think of it\nas evolve light.\n\nWe introduce a config option to control this behavior.","testPlan":"","lineCount":"14","dependsOn":[],"reviewers":[],"ccs":["martinvonz","markand","durin42","lothiraldan","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D2679#73347, @martinvonz wrote:\n> Here's a case I just ran into where I would have liked to de-obsolete a commit:\n> \n> 1. Someone queues a patch and pushes to central repo. Repo looks like this:\n\nYou are using the words \"Someone queues a patch\", is your example taken from the current Mercurial project workflow? If so, keep in mind that this workflow is a bit unique. It is not what we refer as \"distributed evolution\" and diverges from it in various ways. In particular, we can highlight the following difference:\n\n\n  - Contributions are exchanged through email or Phabricator. Both ways fail to transfers the associated obsmarkers (and therefore break the evolution chains). \n    Instead people using distributed evolution exchanges changesets through mercurial repositories, fully taking advantage of the obsmarkers data. This makes it possible for them to collaborate on the same feature branch and other evolution benefits (eg: evolution data in code review tools).\n  -  The publication workflow is odds as hundreds of unrelated draft changeset can stack above each other before being published. This is not really the use-case that draft phase and evolution targets.\n> \n> ```\n> o  B\n> |\n> o  A\n> ```\n> \n> 2. I fix a typo and and amend, but I forget to push. \n> 3. I build my own commit on top. My repo:\n> \n> ```\n> o  X\n> |\n> o  B'\n> |\n> o  A\n> ```\nSmall side question: Why are you building X on top of (draft) B', are they related?\n> \n> 4. Someone pushes new patches to central repo. Central repo:\n> \n> ```\n> o  C\n> |\n> o  B\n> |\n> o  A\n> ```\nAdditional side question: Why is C on top of (draft) B. Are they related?\n> \n> 5. I pull from central repo. My repo:\n> \n> ```\n> o  C\n> |\n> x B\n> |\n> | o  X\n> | |\n> | o  B'\n> |\/\n> o  A\n> ```\n> \n> 6. I move my change onto the new upstream and prune my local B' that's now unwanted:\n> \n> ```\n> o X'\n> |\n> o  C\n> |\n> x B\n> |\n> | x B'\n> |\/\n> o  A\n> ```\n> \n> If upstream history was really just a single commit (`C` above), then the obvious thing to do is to just evolve that commit and push it. However, sometimes there is a long chain on top, and in my case there was a separate commit upstream that fixed the typo I fixed when I amended `B` and it would be a little confusing to explain why someone's fix was \"lost\". \n\nI can see two distinct arguments in that description:\n  #  Someone else made a similar fix in an independent changeset, and you want to give them the priority.\n  #  There are many drafts stacked above it and you don't want to rewrite B.\n\n\nRegarding the first argument, the case is easily handled by \"rewinding\" your amend's change and restoring the diff provided by 'B'. The `hg rewind` command deal with this case well: `hg rewind --to B`. The use of `hg prune` in your example is wrong. By using prune, you signal that the full line of change in B' (B' and it predecessors B) is something that is unwanted. So you are not just dropping the change introduced in your amend, but the other associated change.\n\nRegarding the second argument, the one I interpret as it would create too many orphans.\nIt seems to be the consequence of the current Mercurial Project workflow where many unrelated drafts get stacked.\nThe point of the draft phase is to signal that a changeset is safe to be rewritten. In other words that the consequences of such rewriting are acceptable. If you get to the point where rewriting draft no longer feel safe you seem to have a workflow issue.\n\nFor the sake of the current argument, let's assume that the workflow would be fixed in a direction where B would be public. After your pull. In that case, B' would be \"phase-divergent\". Solving that phase-divergence will create a \u0394B changeset with just the fix (you amend change). Rebasing that \u0394B on top of the other fix will make it disappears, giving priority as you intended.\n\n> So I'd prefer to mark B as no longer obsolete. I know I can do that with `hg strip B'`, but that also strips `X`, which is probably not a big loss, but it's a weird side-effect.\n\nYou cannot really strip the obsmarkers between B and B' without stripping B' itself. If B' end up being visible again it's Evolve that would be lost introducing confusion too.\n\n> Perhaps all I'm asking for is a way of dropping the obsmarker between `B` and `B'`. I don't know what the best UI for that would be, though. For now, I guess I'll use `hg strip`.\n\nStripping obsmarkers (and changesets) gets tricky quickly as their might continue to exist elsewhere. [issue5267](https:\/\/bz.mercurial-scm.org\/show_bug.cgi?id=5267) is a good example. There is already a couple of ways to do it (hg strip or hg debugobsolete) but it is currently confined into advanced commands. Before smoothing special case that could benefit stripping (or equivalent feature), it is important to deal with the UI for the main use-case. The use-case that solves both local and distributed evolution with the same command set. We want this commands set to comes first as we know it will be necessary. We can add more advanced commands and concept to deal with stripping afterward.\n\n\nLet me clarify that last part: imagine two commands (or command set, or concepts):\n\n # Command-A handles cases for both local and distributed evolution,\n # Command-B only handles local evolution, but deal with a corner case a bit later.\n\n\nIf we introduce Command-A early, we can foster a good user experience that will be the same for local and distributed case. This makes the \"step\" to distributed usage simple and painless. The overall user experience and other commands will make sure they work smoothly with Command-A. Later, we can introduce Command-B that will deal with specialized cases were Command-A is lacking. Since Command-A is already covering the main use-cases well, Command-B can focus on dealing with the specialized cases only. Each command has clear responsibilities.\n\nOn the other hand, introducing Command-B first will create a user experience that does not cover all of the main use-cases. The later arrival of Command-A will introduce an overlap in responsibilities confusing to users. In addition, it will create a problematic step to move from the local experience to the distributed one. Users will have to \"forget\" their previous usage to be able to get the better of Mercurial, this will create more confusion.","author":"lothiraldan","id":"74342","dateCreated":"1539204897","dateModified":"1539204897"},{"type":"comment","comment":"Here's a case I just ran into where I would have liked to de-obsolete a commit:\n\n1. Someone queues a patch and pushes to central repo. Repo looks like this:\n\n```\no  B\n|\no  A\n```\n\n2. I fix a typo and and amend, but I forget to push. \n3. I build my own commit on top. My repo:\n\n```\no  X\n|\no  B'\n|\no  A\n```\n\n4. Someone pushes new patches to central repo. Central repo:\n\n```\no  C\n|\no  B\n|\no  A\n```\n\n5. I pull from central repo. My repo:\n\n```\no  C\n|\nx B\n|\n| o  X\n| |\n| o  B'\n|\/\no  A\n```\n\n6. I move my change onto the new upstream and prune my local B' that's now unwanted:\n\n```\no X'\n|\no  C\n|\nx B\n|\n| x B'\n|\/\no  A\n```\n\nIf upstream history was really just a single commit (`C` above), then the obvious thing to do is to just evolve that commit and push it. However, sometimes there is a long chain on top, and in my case there was a separate commit upstream that fixed the typo I fixed when I amended `B` and it would be a little confusing to explain why someone's fix was \"lost\".  So I'd prefer to mark B as no longer obsolete. I know I can do that with `hg strip B'`, but that also strips `X`, which is probably not a big loss, but it's a weird side-effect. Perhaps all I'm asking for is a way of dropping the obsmarker between `B` and `B'`. I don't know what the best UI for that would be, though. For now, I guess I'll use `hg strip`.","author":"martinvonz","id":"73348","dateCreated":"1538584552","dateModified":"1538584552"},{"type":"inline","comment":"https:\/\/www.mercurial-scm.org\/wiki\/UIGuideline#naming_config_options","replyTo":null,"isNewFile":"1","line":"1041","lineLength":"0","path":"mercurial\/configitems.py","diffId":"6637","author":"markand","id":"73020","dateCreated":"1538468057","dateModified":"1538468057"},{"type":"comment","comment":">>! In D2679#70935, @durin42 wrote:\n>>>! In D2679#70934, @lothiraldan wrote:\n>>>>! In D2679#69388, @durin42 wrote:\n>>> I'm slowly becoming convinced that the long-unquestioned axiom that \"all markers are distributed globally\" isn't correct, and this is part of why: it's potentially of great value to be able to restore a change by re-pulling it, even though the obsmarkers would normally cause it to be deleted.\n>> Avoiding silent reappearance of the locally obsolete changeset that we see on a remote repository is a core feature of obsolescence. Actually, it is the one issue that prompted the creation of changeset evolution in the first place. \n> \n> There's a difference (in my view) between something accidentally coming back and intentionally coming back. The current state of affairs prevents both. I feel like we can do better.\n\nI feel like detecting if an obsolete changeset is re-added accidentally or intentionally is a near impossible problem. We have submitted code recently to detect when an obsolete changeset is re-added, but again we don't know if it is accidentally or intentionally. The safe path here is to inform the user about suspicious situations and give them the tool to explicitly restore changesets they want to be restored. That why we have been working on an explicit `hg rewind` command in evolve.\n\n> \n>> We and the other people using distributed evolution rely on this behavior on a daily basis. The includes people who picked up the evolve extension on their own and came up with their own workflow without ever speaking to us. We can see some user interfaces adjustment in the future, but the set of synchronized markers and the associated behavior is something we are happy about. It has been well tested in diverse teams and situation for multiple years now.\n> \n> I've brought this up repeatedly and been dismissed with this exact argument every time. I weary of it, because it's not a new argument, it's just blind devotion to the initial design without any attempt at reflection if we can do better.\n\n\nSince I joined Octobus, I've witnessed the exploration of all the remaining uncharted territories and solving of most of the resulting associated challenges. In particular, some important aspects of distributed evolution: instabilities resolutions and efficient obsmarkers exchanges have been solved and have working implementations used on a daily basis. We did alter the initial design when deemed so by new information from exploration or feedback of evolve users.\nDuring these developments, we did not find reasons to challenge the obsolescence core concepts. They, in fact, proved a useful help to build solutions to the distributed evolution challenges. To name a few of these progress and design changes: vocabulary renaming, the missing commands for history exploration and reviving, the new discovery protocol and more recently how to track fold in obsmarkers.\n\nIn a similar way, the numbers and types of distributed evolution users have grown and we had more and more opportunity to exchange with them. We base our plans on more than \"some people using it without complains\". They are a diverse and large corpus of people we have been talking to and studied their workflows. Here again, core concepts, in particular, the global state and instabilities are things that, practically helps teams to use distributed evolution workflows and newcomers to get a good grasp of it. Important behavior designed and tested in the past 5 years, like the exchange behavior, have been battle tested and real people rely on them in their day to day workflow.\n\nSo, it might seem like the same argument, but it is actually a stronger one. The data to back it kept growing in the past couple of years.\n\nIf you need more details, check our recent blog post about evolution: https:\/\/octobus.net\/blog\/2018-09-03-evolve-status-2018-08.html\n\n> I don't dispute that evolution as currently implemented is a good thing, but I feel like there's room for significant improvement while simultaneously simplifying the exchange algorithms. Care to try and convince me why I'm wrong, without anecdotal \"many people use this and haven't complained\" arguments?\n\n\nSure, the proposal in this PoC (\"unobsolete\" all re-added changesets) break basic distributed evolution workflow very quickly. Here are small examples among many. They display simple draft changesets roundtrips:\n\n- Example A:\n\n        - I am working on a repository with a changeset A that is present also on my default server\n        - I amend A into A'\n        - I pull from my default server, the server doesn't know yet that A has been rewritten into A'. A is sent by the server.\n        - A is hidden before the pull. Getting A to be visible again would be confusing for me as I would now have both A and A' \"alive\" at the same time.\n \n- Example B:\n\n        - I am working on a repository with a changeset A that is present also on my default server\n        - I amend A into A'\n        - One of my coworkers push a changeset B on top of A to the server\n        - I pull from my default server\n        - I receive both B and A, and I have all the needed information to stabilize B and continue my work. I don't want A to become \"unobsolete\" on pull.\n\nWe can provide other examples if needed.\n\nCould you give some details about the improvements that you suggest and that what kind of core changes they would require and their effects on distributed evolution?\n","author":"lothiraldan","id":"72403","dateCreated":"1538147960","dateModified":"1538147960"},{"type":"comment","comment":">>! In D2679#70934, @lothiraldan wrote:\n>>>! In D2679#69388, @durin42 wrote:\n>> I'm slowly becoming convinced that the long-unquestioned axiom that \"all markers are distributed globally\" isn't correct, and this is part of why: it's potentially of great value to be able to restore a change by re-pulling it, even though the obsmarkers would normally cause it to be deleted.\n> Avoiding silent reappearance of the locally obsolete changeset that we see on a remote repository is a core feature of obsolescence. Actually, it is the one issue that prompted the creation of changeset evolution in the first place. \n\nThere's a difference (in my view) between something accidentally coming back and intentionally coming back. The current state of affairs prevents both. I feel like we can do better.\n\n> We and the other people using distributed evolution rely on this behavior on a daily basis. The includes people who picked up the evolve extension on their own and came up with their own workflow without ever speaking to us. We can see some user interfaces adjustment in the future, but the set of synchronized markers and the associated behavior is something we are happy about. It has been well tested in diverse teams and situation for multiple years now.\n\nI've brought this up repeatedly and been dismissed with this exact argument every time. I weary of it, because it's not a new argument, it's just blind devotion to the initial design without any attempt at reflection if we can do better. I don't dispute that evolution as currently implemented is a good thing, but I feel like there's room for significant improvement while simultaneously simplifying the exchange algorithms. Care to try and convince me why I'm wrong, without anecdotal \"many people use this and haven't complained\" arguments?\n\n>> It's _super confusing_ when I `hg import` a patch and it seems to work but also immediately disappears, so I've got more sympathy for this PoC series than I do the theoretical purity of markers having any kind of globalness. Does that make sense?\n> This seems like an unrelated user interface issues. We usually warn the user when their working copy becomes obsolete, pointing out to the newest version\/evolution. We have to extend this messages logic to `hg import` to clarify the situation.\n\nI disagree, perhaps unsurprisingly.","author":"durin42","id":"70935","dateCreated":"1537377795","dateModified":"1537377795"},{"type":"comment","comment":">>! In D2679#69388, @durin42 wrote:\n>>>! In D2679#68489, @lothiraldan wrote:\n>> To take a step back, I'm wondering what's the end goal? I remember there was a discussion about having rebase enabled by default, is it related?\n> \n> Getting rebase (and maybe histedit?) enabled by default is my recollection of the rough goal.\n> \n>> \n>> The behavior target by this series (\"unobsolete\" re-pulled changeset) conflicts with the final behavior we want for Changeset Evolution. Intermediate steps are a good way to make progress. I feel like it is important to write down a clear plan when it comes to adding behavior that does not match our final goals. How are we planning to transition from the local-only step to full (ie, distributed) Evolution?\n> \n> I'm slowly becoming convinced that the long-unquestioned axiom that \"all markers are distributed globally\" isn't correct, and this is part of why: it's potentially of great value to be able to restore a change by re-pulling it, even though the obsmarkers would normally cause it to be deleted.\nAvoiding silent reappearance of the locally obsolete changeset that we see on a remote repository is a core feature of obsolescence. Actually, it is the one issue that prompted the creation of changeset evolution in the first place. We and the other people using distributed evolution rely on this behavior on a daily basis. The includes people who picked up the evolve extension on their own and came up with their own workflow without ever speaking to us. We can see some user interfaces adjustment in the future, but the set of synchronized markers and the associated behavior is something we are happy about. It has been well tested in diverse teams and situation for multiple years now.\n> It's _super confusing_ when I `hg import` a patch and it seems to work but also immediately disappears, so I've got more sympathy for this PoC series than I do the theoretical purity of markers having any kind of globalness. Does that make sense?\nThis seems like an unrelated user interface issues. We usually warn the user when their working copy becomes obsolete, pointing out to the newest version\/evolution. We have to extend this messages logic to `hg import` to clarify the situation.\n","author":"lothiraldan","id":"70934","dateCreated":"1537368619","dateModified":"1537368619"},{"type":"comment","comment":">>! In D2679#68489, @lothiraldan wrote:\n> To take a step back, I'm wondering what's the end goal? I remember there was a discussion about having rebase enabled by default, is it related?\n\nGetting rebase (and maybe histedit?) enabled by default is my recollection of the rough goal.\n\n> \n> The behavior target by this series (\"unobsolete\" re-pulled changeset) conflicts with the final behavior we want for Changeset Evolution. Intermediate steps are a good way to make progress. I feel like it is important to write down a clear plan when it comes to adding behavior that does not match our final goals. How are we planning to transition from the local-only step to full (ie, distributed) Evolution?\n\nI'm slowly becoming convinced that the long-unquestioned axiom that \"all markers are distributed globally\" isn't correct, and this is part of why: it's potentially of great value to be able to restore a change by re-pulling it, even though the obsmarkers would normally cause it to be deleted. It's _super confusing_ when I `hg import` a patch and it seems to work but also immediately disappears, so I've got more sympathy for this PoC series than I do the theoretical purity of markers having any kind of globalness. Does that make sense?","author":"durin42","id":"69389","dateCreated":"1536762660","dateModified":"1536762660"},{"type":"comment","comment":"Hi Pulkit,\n\nThanks for your patience. I had a couple of important things to get out of the way before I could turn my attention to this.\n\nI reached out to Ryan and he sent me the code he wrote at the 4.6 Sprint. I made it available here to support the discussion: https:\/\/phab.mercurial-scm.org\/D4479. The core differences in his approach are to filter out obsmarkers affecting the \"re-pulled\" nodes instead of \"stripping\" those markers. The main benefit is to avoid information loss. Stripping markers will break the evolution history, preventing user to benefit from it. Filtering markers out mean that the history will be fully restored if the affected changeset get obsolete again. It can be triggered by the same events.This is a pure implementation detail, having the same user-level effect than the behavior proposed in this Proof of Concept series.\n\nRegarding the implementation of this series, I feel like the current detection code needs to move at a higher level. Having changegroup aware of obsmarkers at such a low level seems wrong and can lead to consistency issues if the bundle contains  obsmarkers. An alternative approach would be to keep track of redundant incoming nodes during changegroup processing (on the transaction object as we are already doing for all new nodes), and process that list at the end of the transaction. We'll give a shot at such implementation, it is useful in other scenarios.\n\nTo take a step back, I'm wondering what's the end goal? I remember there was a discussion about having rebase enabled by default, is it related?\n\nThe behavior target by this series (\"unobsolete\" re-pulled changeset) conflicts with the final behavior we want for Changeset Evolution. Intermediate steps are a good way to make progress. I feel like it is important to write down a clear plan when it comes to adding behavior that does not match our final goals. How are we planning to transition from the local-only step to full (ie, distributed) Evolution?","author":"lothiraldan","id":"68489","dateCreated":"1536103480","dateModified":"1536103480"},{"type":"comment","comment":"Hey @lothiraldan, if not the patches itself, can you please explain the approach taken?\nIf I don't hear from you this week, I will push this series so that we can have enough time testing this in current cycle. Thanks!","author":"pulkit","id":"67297","dateCreated":"1535375938","dateModified":"1535375938"},{"type":"comment","comment":"@lothiraldan Gentle reminder for the series you were talking about.","author":"pulkit","id":"66824","dateCreated":"1534935417","dateModified":"1534935417"},{"type":"comment","comment":">>! In D2679#64079, @lothiraldan wrote:\n>>>! In D2679#62662, @pulkit wrote:\n>> These patches were result of a very extensive discussion about what ways we have to start supporting obsmarkers by default. I will like to push these changesets so that we can try these in this cycle. If I don't hear any concern in a week, I will push them.\n> \n> We made a series with Ryan during the sprint that had the advantage of not requiring to delete obs-markers. I will undust it, rebase it and send it here for making the discussion go forward.\n\nOh nice! That will be great! Looking forward to your series.","author":"pulkit","id":"64233","dateCreated":"1533639536","dateModified":"1533639536"},{"type":"comment","comment":">>! In D2679#62662, @pulkit wrote:\n> These patches were result of a very extensive discussion about what ways we have to start supporting obsmarkers by default. I will like to push these changesets so that we can try these in this cycle. If I don't hear any concern in a week, I will push them.\n\nWe made a series with Ryan during the sprint that had the advantage of not requiring to delete obs-markers. I will undust it, rebase it and send it here for making the discussion go forward.","author":"lothiraldan","id":"64080","dateCreated":"1533587987","dateModified":"1533587987"},{"type":"comment","comment":"These patches were result of a very extensive discussion about what ways we have to start supporting obsmarkers by default. I will like to push these changesets so that we can try these in this cycle. If I don't hear any concern in a week, I will push them.","author":"pulkit","id":"62663","dateCreated":"1533162260","dateModified":"1533162260"},{"type":"update","diffId":"6637","author":"indygreg","id":"43207","dateCreated":"1520210571","dateModified":"1520210571"}],"dateCreated":"1520210571","dateModified":"1539204897","status":"Needs Review"},{"id":"4716","callsign":"HG","title":"lfs: don't add extension to hgrc after clone or share (BC)","author":"indygreg","summary":"Now that repository loading in core supports automatically loading\nthe lfs extension when the \"lfs\" requirement is present, we no\nlonger need to update the .hg\/hgrc of newly-created repos to load\nthe lfs extension!\n\nI'm marking this as BC because it is a change in behavior. But users\nshould not notice unless they create an LFS repo with new Mercurial\nand then attempt to use it with an old versions that doesn't support\nautomatic extension loading.","testPlan":"","lineCount":"36","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"11324","author":"indygreg","id":"71559","dateCreated":"1537805608","dateModified":"1537805608"}],"dateCreated":"1537805608","dateModified":"1537805609","status":"Needs Review"},{"id":"4479","callsign":"HG","title":"[RFC] obsolete: add mechanism to filter obsstore","author":"lothiraldan","summary":"This patch is not ready to land and only sent for discussion.","testPlan":"","lineCount":"24","dependsOn":[],"reviewers":[],"ccs":["pulkit","martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":"I just had a quick look. obsmarker repr hash, are we kind of inventing a way to index obsmarkers? I am pretty sure you people have thought about that, can you explain why you went with obsmarker repr hash instead of including a real index?\n\nAlso, feel free to point me to old discussions if this was discussed earlier.","author":"pulkit","id":"68685","dateCreated":"1536183949","dateModified":"1536183949"},{"type":"comment","comment":"I'll reply to my own question: The context is in D2679.","author":"martinvonz","id":"68491","dateCreated":"1536103749","dateModified":"1536103749"},{"type":"comment","comment":"Why? (Sorry if I'm asking to early and you were just about to send an update.)","author":"martinvonz","id":"68488","dateCreated":"1536103366","dateModified":"1536103366"},{"type":"update","diffId":"10777","author":"lothiraldan","id":"68482","dateCreated":"1536103193","dateModified":"1536103193"}],"dateCreated":"1536103193","dateModified":"1536183949","status":"Needs Review"},{"id":"4409","callsign":"HG","title":"rebase: skip *all* obsolete revisions, just warn about divergence","author":"martinvonz","summary":"We already skip obsolete revisions in some case: if there is no\nsuccessor, or when the successor is in the rebase set or in the\ndestination, I think. However, we instead error out if the successor\nis elsewhere (e.g. a child or a sibling of the destination), because\nit would cause divergence. The previous commit fixed one specific case\nof this.\n\nConsider this history (based on a test case updated by this patch):\n\n  o  D\n  |\n  | o  B'\n  |\/\n  | o  C\n  | |\n  | x  B\n  |\/\n  o A\n\nIf the user now runs `hg rebase -s B -d D` we would error out and tell\nthem that it would cause divergence from B. This patch makes it so we\ninstead ignore B and C (and tell the user that we're doing that\nbecause it would cause divergence). I think this simpler model will be\neasier for users to understand (I had also thought that all obsolete\ncommits and their descendants were skipped until we got reports from\nusers that that wasn't the case).\n\nNote that we still skip just the obsolete (not its descendants) if\nit's a prune or if the successor is in the destination.\n\nThis should also let us simplify the source quite a bit. I'll do that\nin later commits after I've heard people's thoughts on this one.","testPlan":"","lineCount":"40","dependsOn":[],"reviewers":[],"ccs":["lothiraldan","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"Changing the behavior of `--src` to ignore obsolete and orphan unrelated to the destination seems like a good idea.\n\nHowever, this change seems to also affect `--rev`. The `--rev` allow for a precise selection of what the user wants to see rebased and it feels like we should stick to the user wishes here. Dropping explicitly selected revisions feels wrong and will make some use cases harder to perform.","author":"lothiraldan","id":"67654","dateCreated":"1535551219","dateModified":"1535551219"},{"type":"comment","comment":"> @@ -1289,18 +1286,16 @@\n>    o  0:b173517d0057 a\n>    \n>    $ hg rebase -d 0 -r 2\n> -  rebasing 2:a82ac2b38757 \"c\" (c)\n> +  note: not rebasing 2:a82ac2b38757 \"c\" (c) and its descendants as this would cause divergence\n\nLooks like the fix for issue5782 regressed.\n\nhttps:\/\/bz.mercurial-scm.org\/show_bug.cgi?id=5782","author":"yuja","id":"67642","dateCreated":"1535547342","dateModified":"1535547342"},{"type":"update","diffId":"10616","author":"martinvonz","id":"67528","dateCreated":"1535441604","dateModified":"1535441604"}],"dateCreated":"1535441604","dateModified":"1535551219","status":"Needs Review"},{"id":"4283","callsign":"HG","title":"webcommands: fix `@webcommand` decorator","author":"sheehan","summary":"This commit fixes the `@webcommand` decorator used to define\nwebcommands. Although webcommands are currently using this\ndecorator, it does not behave as intended. Using the decorator\nshould record the name of the decorator in a `commands` dict,\nand when a request arrives to hgweb the correct function to\ncall should be resolved from that dict.\n\nIn the current implementation the command is added to the\ncommands dict, but when hgweb attempts to resolve the function\nwhile processing a request, it instead looks for an attribute\nwith the same name attached to the `webcommands` module. To\nsummarize, a command 'commandname' should be resolved from\n\n    `mercurial.hgweb.webcommands.commands['commandname']`\n\nbut is instead being resolved from\n\n    `mercurial.hgweb.webcommands.commandname`\n\nThe decorator appears to be working on the core webcommands\n(such as log, rev, file) however this is because those\ncommands are defined with the same name in the underlying\nPython function.\n\nThis commit changes hgweb_mod.py to resolve the function used\nfrom webcommands to come from the `commands` dict in the\n`webcommands` module. Due to the change in how webcommands\nare resolved, a `wrapwebcommand` function is also added, which\nwraps a webcommand by applying the wrapper as a partial function\nand overwrites the existing function in the `commands` dict.\n\nWrapped webcommands in shipped extensions and hgweb tests\nare changed to use the fixed decorator and `wrapwebcommand`\nfunction.","testPlan":"","lineCount":"48","dependsOn":[],"reviewers":[],"ccs":["foozy","indygreg","mercurial-devel"],"actions":[{"type":"comment","comment":"Sorry, I overlooked delivery error of reply to phabricator.\n\nThis is re-sending of the reply at Sat, 18 Aug 2018 15:18:10 +0900,\nwhich was cc-ed to mercurial-devel@mercurial-scm.org.\n\nAt Wed, 15 Aug 2018 19:00:51 +0000,\nsheehan (Connor Sheehan) wrote:\n[snip]\n> diff --git a\/mercurial\/hgweb\/hgweb_mod.py b\/mercurial\/hgweb\/hgweb_mod.py\n> --- a\/mercurial\/hgweb\/hgweb_mod.py\n> +++ b\/mercurial\/hgweb\/hgweb_mod.py\n> @@ -354,7 +354,7 @@\n>                  cmd = cmd[style + 1:]\n>  \n>              # avoid accepting e.g. style parameter as command\n> -            if util.safehasattr(webcommands, cmd):\n> +            if cmd in webcommands.commands:\n>                  req.qsparams['cmd'] = cmd\n>  \n>              if cmd == 'static':\n> @@ -416,15 +416,15 @@\n>  \n>                  res.headers['ETag'] = tag\n>  \n> -            if cmd not in webcommands.__all__:\n> +            if cmd not in webcommands.commands:\n>                  msg = 'no such method: %s' % cmd\n>                  raise ErrorResponse(HTTP_BAD_REQUEST, msg)\n>              else:\n>                  # Set some globals appropriate for web handlers. Commands can\n>                  # override easily enough.\n>                  res.status = '200 Script output follows'\n>                  res.headers['Content-Type'] = ctype\n> -                return getattr(webcommands, cmd)(rctx)\n> +                return webcommands.commands[cmd](rctx)\n>  \n>          except (error.LookupError, error.RepoLookupError) as err:\n>              msg = pycompat.bytestr(err)\n\nIMHO, for backward compatibility, this kind of (API) change should\nhave deprecation period before stopping support, and should use\nui.deprecwan() while such period, like below (this implementation\nassumes introduction of new decorator registrar.webcommand).\n\n    def _getwebcommand(ui, name):\n        cmd = webcommands.commands.get(name, None)\n        if not cmd:\n            if (name in webcommands.__all__ and\n                util.safehasattr(webcommands, name)):\n                cmd = getattr(webcommands, name)\n                # store into webcommands.commands for subsequent access\n                webcommands.commands[name] = cmd\n\n                ui.deprecwarn('legacy registration for webcommand %s,'\n                              ' use registrar.webcommand decorator' % name,\n                              '5.0')\n        return cmd\n\n\n> diff --git a\/hgext\/largefiles\/uisetup.py b\/hgext\/largefiles\/uisetup.py\n> --- a\/hgext\/largefiles\/uisetup.py\n> +++ b\/hgext\/largefiles\/uisetup.py\n> @@ -151,7 +151,7 @@\n>      extensions.wrapfunction(archival, 'archive', overrides.overridearchive)\n>      extensions.wrapfunction(subrepo.hgsubrepo, 'archive',\n>                              overrides.hgsubrepoarchive)\n> -    extensions.wrapfunction(webcommands, 'archive', overrides.hgwebarchive)\n> +    webcommands.wrapwebcommand('archive', overrides.hgwebarchive)\n>      extensions.wrapfunction(cmdutil, 'bailifchanged',\n>                              overrides.overridebailifchanged)\n\nAfter changes above, direct invocation of original webcommand function\n'webcommands.archive()' from another code path avoids wrapping effect,\nbecause 'wrapwebcommand' wraps only the function stored in dispatch\ntable 'webcommands.command'.\n\nNot for webcommand wrapping example, but for normal command wrapping\nexample, largefiles extension wraps both 'rebase' command and 'rebase'\nfunction. In largefiles\/uisetup.py::\n\n        if name == 'rebase':\n            extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase',\n                overrides.overriderebase)\n            extensions.wrapfunction(module, 'rebase',\n                                    overrides.overriderebase)\n\nOf course, it will be rare that un-wrapped original function causes\nproblem in webcommand case. But \"wrap function in dispatch table\"\nshould be separated from \"stop wrapping original webcommand function\"\nat first, IMHO.\n\n\nI'm also working around webcommand registration, and will post patches\nsoon. But, of course, feel free to re-send your revised one, for\nfeedback between us :-)","author":"foozy","id":"66813","dateCreated":"1534900316","dateModified":"1534900316"},{"type":"comment","comment":">>! In D4283#65988, @indygreg wrote:\n> This seems like a strict improvement.\n> \n> But the proper way to register web commands from extensions would be to go through the `registrar` API and have the extension loader look for a well-named symbol in each extension module that is loaded and hgweb would consult the registrar for active commands. In theory, this will only activate web commands on repositories that have an extension loaded.\n> \n> Search for `templatefilter` in `mercurial\/extensions.py` for an example of how all this works.\n> \n> Would you be willing to try that approach? It doesn't have to be perfect. But we are moving to the registrar for extensions wishing to install well-defined things. And web commands fit that bill.\n\nSeems reasonable to me! I took a look through the code and I think I understand what is going on. I'll update this patch with something that uses the registrar API.","author":"sheehan","id":"66593","dateCreated":"1534772811","dateModified":"1534772811"},{"type":"plan-changes","author":"sheehan","id":"66592","dateCreated":"1534772811","dateModified":"1534772811"},{"type":"comment","comment":"This seems like a strict improvement.\n\nBut the proper way to register web commands from extensions would be to go through the `registrar` API and have the extension loader look for a well-named symbol in each extension module that is loaded and hgweb would consult the registrar for active commands. In theory, this will only activate web commands on repositories that have an extension loaded.\n\nSearch for `templatefilter` in `mercurial\/extensions.py` for an example of how all this works.\n\nWould you be willing to try that approach? It doesn't have to be perfect. But we are moving to the registrar for extensions wishing to install well-defined things. And web commands fit that bill.","author":"indygreg","id":"65989","dateCreated":"1534378968","dateModified":"1534378968"},{"type":"update","diffId":"10360","author":"sheehan","id":"65975","dateCreated":"1534359638","dateModified":"1534359638"}],"dateCreated":"1534359638","dateModified":"1534900316","status":"Changes Planned"},{"id":"4301","callsign":"HG","title":"tests: add a directory 'knownfailures' to check in known failures","author":"pulkit","summary":"There are some things which everyone of us stumble upon and found out that this\ndoes not work. Sometimes, we hg developers know that these things does not works\nbecause of experience. But this does not scale well when we have a new developer\nor maybe a user who wants to see what does not work and is interested in fixing\nthat.\n\nChecking in the tests about the things which don't work will help others to\nreproduce these and also helps in fixing because of functionalities\n.\/run-tests.py provides.\n\nIIRC we had this thought in one of the previous sprints also to checkin some of\nthe known failures.\n\nI am starting with checking in a basic test failure. But I plan to check in\nmore narrow related failures which we have found.\n\nUnable to find easily what exactly broken with merges and narrow made me to\nimplement this idea so that we won't have similar problem in future.","testPlan":"","lineCount":"4","dependsOn":[],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"comment","comment":"I also think that the 'knowfailures' can serve as a good place for new contributors.\nI don't want to check-in all the failures and leave them unfixed. It's like I don't know which one I will be able to fix and I have a reproduction which can help others.","author":"pulkit","id":"66188","dateCreated":"1534432054","dateModified":"1534432054"},{"type":"update","diffId":"10391","author":"pulkit","id":"66182","dateCreated":"1534431586","dateModified":"1534431586"}],"dateCreated":"1534431586","dateModified":"1534432054","status":"Needs Review"},{"id":"3896","callsign":"HG","title":"copies: handle case when both merge cset are not descendant of merge base","author":"pulkit","summary":"There can be cases when both the changesets which we are merging are not\ndescendants of the merge base. In those cases dirtyc1 and dirtyc2 both will be\ntrue. The existing code assumes that either of them will be true always but that\nis not a right assumption.\n\nI found this while working with content-divergence resolution. In\ncontent-divergence resolution, we use the common predecessor as the merge base\nfor resolving content divergence and there it can be possible that the merge\nbase is not the descendant of both the content-divergence changsets.\n\nThe code in content-divergence which does this is at:\nhttps:\/\/www.mercurial-scm.org\/repo\/evolve\/file\/b81fd1487e04\/hgext3rd\/evolve\/evolvecmd.py#l507","testPlan":"","lineCount":"5","dependsOn":[],"reviewers":[],"ccs":["spectral","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D3896#65986, @spectral wrote:\n> Any updates on this?  I'm poking at updating this function in core, and not too excited to have to also modify the copy in evolve that seems to have spawned :\/\n\nI am yet to write tests. Feel free to update the one in core, I will take care of the evolve copy.","author":"pulkit","id":"66180","dateCreated":"1534428512","dateModified":"1534428512"},{"type":"comment","comment":"Any updates on this?  I'm poking at updating this function in core, and not too excited to have to also modify the copy in evolve that seems to have spawned :\/","author":"spectral","id":"65987","dateCreated":"1534370496","dateModified":"1534370496"},{"type":"comment","comment":"Can you add some tests that make both `dirtyc1` and `dirtyc2` set, and\ntrigger copy tracing?\n\n> Since we can have both dirtyc1, and dirtyc2 true, I am not sure whether\n> this else should be turned into it's own if statement?\n\nNo idea. I doubt if the current copy tracing can handle such cases. From\nmy vague memory, the current algorithm relies on the fact that the pseudo\n`base` revision exists in between the `c1` and the `c2`.","author":"yuja","id":"60811","dateCreated":"1531138991","dateModified":"1531138991"},{"type":"inline","comment":"Since we can have both dirtyc1, and dirtyc2 true, I am not sure whether this else should be turned into it's own if statement?","replyTo":null,"isNewFile":"1","line":"496","lineLength":"0","path":"mercurial\/copies.py","diffId":"9471","author":"pulkit","id":"60802","dateCreated":"1531041256","dateModified":"1531041256"},{"type":"update","diffId":"9471","author":"pulkit","id":"60797","dateCreated":"1531041116","dateModified":"1531041116"}],"dateCreated":"1531041116","dateModified":"1534428512","status":"Needs Review"},{"id":"4053","callsign":"HG","title":"[RFC]hgweb: garbage collect on every request in hgweb_mod too","author":"pulkit","summary":"We recently updated to mercurial 4.6.2 on our servers and also increased number\nof requests to be made on server at one time. This made hgweb instance takes up\na lot of memory, sometime upto 50GB of memory when requests are made parallely.\n\nThis patch is motivated from\nhttps:\/\/www.mercurial-scm.org\/repo\/hg-committed\/rev\/ff2370a70fe8 which adds\ngc.collect() call for the server which serves multiple repositories.\n\nI tried profiling this fix, sometimes this shows less memory usage, sometimes\nmore, so I am not sure whether this is right and hence RFC tag.","testPlan":"","lineCount":"16","dependsOn":[],"reviewers":[],"ccs":["av6","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D4053#62855, @av6 wrote:\n> Are you sure you're not just using hgwebdir_mod? hgweb_mod is for cases when you don't use --web-conf flag, at least that seems to be the logic that `hgweb.createapp()` uses to pick one of the two modules.\n\nI checked and we are using hgwebdir_mod. When I was testing locally I was not using --web-conf flag, so maybe that's why I ran into `hgweb_mod`. The problem still exists though and we have limited the number of requests at once. Thanks!","author":"pulkit","id":"65973","dateCreated":"1534331436","dateModified":"1534331436"},{"type":"comment","comment":"Are you sure you're not just using hgwebdir_mod? hgweb_mod is for cases when you don't use --web-conf flag, at least that seems to be the logic that `hgweb.createapp()` uses to pick one of the two modules.","author":"av6","id":"62856","dateCreated":"1533231595","dateModified":"1533231595"},{"type":"update","diffId":"9792","author":"pulkit","id":"62851","dateCreated":"1533225478","dateModified":"1533225478"},{"type":"update","diffId":"9787","author":"pulkit","id":"62829","dateCreated":"1533219726","dateModified":"1533219726"}],"dateCreated":"1533219726","dateModified":"1534331436","status":"Needs Review"},{"id":"3986","callsign":"HG","title":"split: abort if there's an unfinished operation","author":"martinvonz","summary":"","testPlan":"","lineCount":"10","dependsOn":[],"reviewers":[],"ccs":["quark","mercurial-devel"],"actions":[{"type":"comment","comment":"I think a most flexible solution is to not do the check if there is nothing to rebase.","author":"quark","id":"62080","dateCreated":"1533137720","dateModified":"1533137720"},{"type":"comment","comment":"Oh, I should have said that I agree with not queuing this patch now. We can discuss what we want to do and do it on the default branch later.","author":"martinvonz","id":"61992","dateCreated":"1533018979","dateModified":"1533018979"},{"type":"comment","comment":">>! In D3986#61989, @quark wrote:\n> FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive.\n\nTwo thoughts:\n\n1. We had talked at Google about having the \"edit\" action create split markers if the user created multiple commits. Do you think that would address the FB users' use case?\n\n2. It seems very dangerous to not have this check at least when not using obsmarkers and there are descendants of the current commit (split then rebases the descendants), so I'd like to keep the check in at least that case.\n","author":"martinvonz","id":"61991","dateCreated":"1533014407","dateModified":"1533014407"},{"type":"comment","comment":"FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive.","author":"quark","id":"61990","dateCreated":"1533014171","dateModified":"1533014171"},{"type":"update","diffId":"9671","author":"martinvonz","id":"61978","dateCreated":"1532987112","dateModified":"1532987112"}],"dateCreated":"1532987112","dateModified":"1533137720","status":"Needs Review"},{"id":"3946","callsign":"HG","title":"obsolete: resolved ValueError for var containing 2 ':' chars(issue-5783)","author":"abhyudaypratap","summary":"feature Note accepts ':' chars\nSo metadata of obsmarker consists of more then 1 ':' char,\nThe content of the variable 'data' in this function is:\n'date:1518013344.878793 -3600\\x00ef1:0\\x00note:6c95ca::a1e17f\\x00p1:ed7673f73387b36521da58a87f08e02e4a795ded\\x00user:Denis Laxalde <xxx@yyy.zz>'\n\nresulting in giving a error ValueError (too many values to unpack) because we are trying to store multiple values into two variables key and value\n\nResolving this error by splitting the variable 'l' from the first occurence of ':'\nkey, value = l.split(\"\", 1)","testPlan":"","lineCount":"2","dependsOn":[],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"Looks good. Can you add a test?\n\nhttps:\/\/www.mercurial-scm.org\/wiki\/ContributingChanges#Coding_style_and_testing\n\nThe version 0 format can be enforced by `--config format.obsstore-version=0`.","author":"yuja","id":"61491","dateCreated":"1531661257","dateModified":"1531661257"},{"type":"update","diffId":"9596","author":"abhyudaypratap","id":"61478","dateCreated":"1531593829","dateModified":"1531593829"}],"dateCreated":"1531593829","dateModified":"1531661257","status":"Needs Review"},{"id":"3830","callsign":"HG","title":"rebase: suppress transaction warns during dry-run","author":"khanchi97","summary":"Suppressed warnings thrown while aborting a transaction during\ndryrun because these warnings does not sound safe to user.","testPlan":"","lineCount":"23","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"9593","author":"khanchi97","id":"61465","dateCreated":"1531549446","dateModified":"1531549446"},{"type":"update","diffId":"9501","author":"khanchi97","id":"60911","dateCreated":"1531233875","dateModified":"1531233875"},{"type":"update","diffId":"9384","author":"khanchi97","id":"60399","dateCreated":"1530438740","dateModified":"1530438740"},{"type":"update","diffId":"9359","author":"khanchi97","id":"60261","dateCreated":"1530295767","dateModified":"1530295767"},{"type":"update","diffId":"9347","author":"khanchi97","id":"60219","dateCreated":"1530216657","dateModified":"1530216657"},{"type":"update","diffId":"9269","author":"khanchi97","id":"59837","dateCreated":"1529835539","dateModified":"1529835539"},{"type":"update","diffId":"9267","author":"khanchi97","id":"59827","dateCreated":"1529832650","dateModified":"1529832650"}],"dateCreated":"1529832650","dateModified":"1531549447","status":"Needs Review"},{"id":"3670","callsign":"HG","title":"cmdutil: don't return statedetectionpredicate function from _getrepostate()","author":"pulkit","summary":"This is a part of refactoring which can lead us where we can unify\ncmdutil.STATES and cmdutil.unfinishedstates easily.","testPlan":"","lineCount":"4","dependsOn":["3669"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"plan-changes","author":"pulkit","id":"61257","dateCreated":"1531344976","dateModified":"1531344976"},{"type":"update","diffId":"8925","author":"pulkit","id":"57635","dateCreated":"1527632579","dateModified":"1527632579"}],"dateCreated":"1527632579","dateModified":"1531344976","status":"Changes Planned"},{"id":"3669","callsign":"HG","title":"cmdutil: have statefile names in STATES instead of functions","author":"pulkit","summary":"This will help us in unifying cmdutil.STATES and cmdutil.unfinishedstates as the\nchecking logic for STATES is moved to _getrepostate() and STATES now have just\nfilenames which is similar to unfinishedstates.","testPlan":"","lineCount":"21","dependsOn":[],"reviewers":[],"ccs":["martinvonz","mercurial-devel"],"actions":[{"type":"comment","comment":"I won't have time before the upcoming freeze to get this done.","author":"pulkit","id":"61256","dateCreated":"1531344957","dateModified":"1531344957"},{"type":"plan-changes","author":"pulkit","id":"61255","dateCreated":"1531344957","dateModified":"1531344957"},{"type":"inline","comment":"(Sorry, I missed this one too. I have turned off personal emails from phabricator and use mercurial-devel to keep track of people replying to me.)\n\nThe object sounds good API. I will try that.","replyTo":"58293","isNewFile":"1","line":"3210","lineLength":"0","path":"mercurial\/cmdutil.py","diffId":"8924","author":"pulkit","id":"60483","dateCreated":"1530480466","dateModified":"1530480466"},{"type":"inline","comment":"It's a bit more complicated, I agree, but I think it's better than the alternative. If it removes the need for clearable, it's not that much more complicated.\n\nAn alternative would be to create an object with [is]dirty(), allowcommit(), and clear() methods and have a function that creates such an object for file-based states (all but .hg\/merge?). That would reduce the duplication of fileexistspredicate(<name>) and clearfunction(<name>).\n\nPS. Sorry about the delay. I've been away.","replyTo":"57884","isNewFile":"1","line":"3210","lineLength":"0","path":"mercurial\/cmdutil.py","diffId":"8924","author":"martinvonz","id":"58293","dateCreated":"1528746902","dateModified":"1528746902"},{"type":"inline","comment":"Don't you think it's getting a bit complicated?","replyTo":"57834","isNewFile":"1","line":"3210","lineLength":"0","path":"mercurial\/cmdutil.py","diffId":"8924","author":"pulkit","id":"57884","dateCreated":"1528027688","dateModified":"1528027688"},{"type":"inline","comment":"We don't have to. We could add a `clearstatefn` function in addition to the `statedetectionpredicate`. Perhaps the `if not clearable and ...` stuff could move into the function in that case","replyTo":"57827","isNewFile":"1","line":"3210","lineLength":"0","path":"mercurial\/cmdutil.py","diffId":"8924","author":"martinvonz","id":"57834","dateCreated":"1527872876","dateModified":"1527872876"},{"type":"inline","comment":">How about instead making unfinishedstates more generic by supporting a predicate there\n> instead of the file? We could still allow files as well for BC for a little while.\n\n@martinvonz : because of above util.unlink() we have to keep the filenames in unfinishedstates. :(","replyTo":null,"isNewFile":"1","line":"3210","lineLength":"0","path":"mercurial\/cmdutil.py","diffId":"8924","author":"pulkit","id":"57827","dateCreated":"1527850226","dateModified":"1527850226"},{"type":"inline","comment":"The point of the STATES dict (as opposed to putting all the code here) seems to be to make it generic and extensible. Handling \"merge\" differently here seems like a step backwards. How about instead making unfinishedstates more generic by supporting a predicate there instead of the file? We could still allow files as well for BC for a little while.","replyTo":null,"isNewFile":"1","line":"649","lineLength":"1","path":"mercurial\/cmdutil.py","diffId":"8924","author":"martinvonz","id":"57645","dateCreated":"1527634784","dateModified":"1527634784"},{"type":"update","diffId":"8924","author":"pulkit","id":"57629","dateCreated":"1527632554","dateModified":"1527632554"}],"dateCreated":"1527632554","dateModified":"1531344957","status":"Changes Planned"},{"id":"3672","callsign":"HG","title":"retractboundary: add dryrun parameter","author":"khanchi97","summary":"Added the logic to find those csets whose phase will be changed\nwithout --dry-run and return those csets.","testPlan":"","lineCount":"66","dependsOn":[],"reviewers":[],"ccs":["yuja","pulkit","mercurial-devel"],"actions":[{"type":"inline","comment":"I think affected can be used here. Maybe @yuja might know better.\n\n@yuja we want to return a set of revs whose phase is changed by this function. Does affected looks like the correct set to you?","replyTo":"57830","isNewFile":"1","line":"417","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"pulkit","id":"61254","dateCreated":"1531344290","dateModified":"1531344290"},{"type":"update","diffId":"8960","author":"khanchi97","id":"57892","dateCreated":"1528034158","dateModified":"1528034158"},{"type":"update","diffId":"8959","author":"khanchi97","id":"57891","dateCreated":"1528033881","dateModified":"1528033881"},{"type":"inline","comment":"okay, will do this for 'advanceboundry' too","replyTo":"57825","isNewFile":"1","line":"511","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"khanchi97","id":"57833","dateCreated":"1527857439","dateModified":"1527857439"},{"type":"inline","comment":"yeah, I got it.","replyTo":"57824","isNewFile":"1","line":"430","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"khanchi97","id":"57832","dateCreated":"1527857439","dateModified":"1527857439"},{"type":"inline","comment":"okay","replyTo":"57823","isNewFile":"1","line":"395","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"khanchi97","id":"57831","dateCreated":"1527857439","dateModified":"1527857439"},{"type":"inline","comment":"Because I think this affected set is calculated after performing actions, when phases are changed. And calculating affected using new phaseroots. Am I missing something here?","replyTo":"57822","isNewFile":"1","line":"417","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"khanchi97","id":"57830","dateCreated":"1527857439","dateModified":"1527857439"},{"type":"inline","comment":"This should better be:\n\n`If dryrun is True, no actions will be performed\n\nreturns a set of revs whose phase is changed or should be changed`","replyTo":null,"isNewFile":"1","line":"511","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"pulkit","id":"57825","dateCreated":"1527845546","dateModified":"1527845546"},{"type":"inline","comment":"(Not sure which line I should put this comment on)\n\nJust like D3671, here also, the function should return the correct set of changes whose phase have been changed irrespective of the dryrun value passed.","replyTo":null,"isNewFile":"1","line":"430","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"pulkit","id":"57824","dateCreated":"1527845546","dateModified":"1527845546"},{"type":"inline","comment":"Add documentation about dry-run and the return value.","replyTo":null,"isNewFile":"1","line":"395","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"pulkit","id":"57823","dateCreated":"1527845546","dateModified":"1527845546"},{"type":"inline","comment":"Why are we not using this affected set here to find the changesets whose phase is changed?","replyTo":null,"isNewFile":"1","line":"417","lineLength":"0","path":"mercurial\/phases.py","diffId":"8948","author":"pulkit","id":"57822","dateCreated":"1527845546","dateModified":"1527845546"},{"type":"update","diffId":"8948","author":"khanchi97","id":"57812","dateCreated":"1527836390","dateModified":"1527836390"},{"type":"update","diffId":"8929","author":"khanchi97","id":"57663","dateCreated":"1527675912","dateModified":"1527675912"}],"dateCreated":"1527675912","dateModified":"1531344290","status":"Needs Review"},{"id":"3866","callsign":"HG","title":"histedit: use cbor to write histedit-state file","author":"pulkit","summary":"This patch starts using state.cmdstate.write() which uses cbor as serialization\nformat to write histedit-state files.\n\nCompatibility for reading old state files using new code is maintained.\n\nSome changes in test which depended on the format of histedit state file.","testPlan":"","lineCount":"64","dependsOn":[],"reviewers":["durin42"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"I am not confident to land some state format changes at this point in the cycle. Let's do it early in next cycle.","author":"pulkit","id":"60839","dateCreated":"1531161109","dateModified":"1531161109"},{"type":"plan-changes","author":"pulkit","id":"60838","dateCreated":"1531161109","dateModified":"1531161109"},{"type":"comment","comment":">>! In D3866#60421, @yuja wrote:\n> Queued the first 4 patches, thanks.\n> \n>>    $ HGEDITOR=\"sh $TESTTMP\/editplan.sh\" hg histedit --edit-plan\n>>    $ cat .hg\/histedit-state\n>> -  v1\n>> -  055a42cdd88768532f9cf79daa407fc8d138de9b\n>> -  3c6a8ed2ebe862cc949d2caa30775dd6f16fb799\n>> -  False\n>> -  3\n>> -  drop\n>> -  e860deea161a2f77de56603b340ebbb4536308ae\n>> -  drop\n>> -  652413bf663ef2a641cab26574e46d5f5a64a55a\n>> -  drop\n>> -  3c6a8ed2ebe862cc949d2caa30775dd6f16fb799\n>> -  0\n>> -  strip-backup\/177f92b77385-0ebe6a8f-histedit.hg\n>> +  2\n> \n> I know anything other than \"v1\" will make old hg crash, but I think the\n> version syntax should stay \"v%d\" (i.e. \"v2\" in this case.)\n\nYeah, I think we need to pass version number in the state.cmdstate.read(). Supporting rebasestate will also need similar tweak.\n> \n>>      def _write(self, fp):\n>> -        fp.write('v1\\n')\n>> -        fp.write('%s\\n' % node.hex(self.parentctxnode))\n>> -        fp.write('%s\\n' % node.hex(self.topmost))\n>> -        fp.write('%s\\n' % ('True' if self.keep else 'False'))\n>> -        fp.write('%d\\n' % len(self.actions))\n>> +        data = {'parentctxnode': self.parentctxnode,\n>> +                'topmost': self.topmost,\n>> +                'keep': self.keep,\n>> +                'backupfile': self.backupfile,\n>> +                'replacements': self.replacements}\n>> +        rules = []\n>>          for action in self.actions:\n>> -            fp.write('%s\\n' % action.tostate())\n>> -        fp.write('%d\\n' % len(self.replacements))\n>> -        for replacement in self.replacements:\n>> -            fp.write('%s%s\\n' % (node.hex(replacement[0]), ''.join(node.hex(r)\n>> -                for r in replacement[1])))\n>> -        backupfile = self.backupfile\n>> -        if not backupfile:\n>> -            backupfile = ''\n>> -        fp.write('%s\\n' % backupfile)\n>> +            rules.append(action.tostate().split('\\n'))\n>> +        rules = \"\\n\".join([\"%s %s\" % (verb, rest) for [verb, rest] in rules])\n> \n> Isn't it better to serialize `[(verb, rest)]` as is since CBOR can store that?\n\nYeah, it's better. I will do that.","author":"pulkit","id":"60480","dateCreated":"1530479460","dateModified":"1530479460"},{"type":"comment","comment":"Queued the first 4 patches, thanks.\n\n>    $ HGEDITOR=\"sh $TESTTMP\/editplan.sh\" hg histedit --edit-plan\n>    $ cat .hg\/histedit-state\n> -  v1\n> -  055a42cdd88768532f9cf79daa407fc8d138de9b\n> -  3c6a8ed2ebe862cc949d2caa30775dd6f16fb799\n> -  False\n> -  3\n> -  drop\n> -  e860deea161a2f77de56603b340ebbb4536308ae\n> -  drop\n> -  652413bf663ef2a641cab26574e46d5f5a64a55a\n> -  drop\n> -  3c6a8ed2ebe862cc949d2caa30775dd6f16fb799\n> -  0\n> -  strip-backup\/177f92b77385-0ebe6a8f-histedit.hg\n> +  2\n\nI know anything other than \"v1\" will make old hg crash, but I think the\nversion syntax should stay \"v%d\" (i.e. \"v2\" in this case.)\n\n>      def _write(self, fp):\n> -        fp.write('v1\\n')\n> -        fp.write('%s\\n' % node.hex(self.parentctxnode))\n> -        fp.write('%s\\n' % node.hex(self.topmost))\n> -        fp.write('%s\\n' % ('True' if self.keep else 'False'))\n> -        fp.write('%d\\n' % len(self.actions))\n> +        data = {'parentctxnode': self.parentctxnode,\n> +                'topmost': self.topmost,\n> +                'keep': self.keep,\n> +                'backupfile': self.backupfile,\n> +                'replacements': self.replacements}\n> +        rules = []\n>          for action in self.actions:\n> -            fp.write('%s\\n' % action.tostate())\n> -        fp.write('%d\\n' % len(self.replacements))\n> -        for replacement in self.replacements:\n> -            fp.write('%s%s\\n' % (node.hex(replacement[0]), ''.join(node.hex(r)\n> -                for r in replacement[1])))\n> -        backupfile = self.backupfile\n> -        if not backupfile:\n> -            backupfile = ''\n> -        fp.write('%s\\n' % backupfile)\n> +            rules.append(action.tostate().split('\\n'))\n> +        rules = \"\\n\".join([\"%s %s\" % (verb, rest) for [verb, rest] in rules])\n\nIsn't it better to serialize `[(verb, rest)]` as is since CBOR can store that?","author":"yuja","id":"60422","dateCreated":"1530448552","dateModified":"1530448552"},{"type":"update","diffId":"9378","author":"pulkit","id":"60359","dateCreated":"1530371419","dateModified":"1530371419"}],"dateCreated":"1530371419","dateModified":"1531161109","status":"Changes Planned"},{"id":"3650","callsign":"HG","title":"serve: add an option to open in the default browser","author":"nspanti-logilab","summary":"It is inspired by a similar functionality in pydoc. `-g`\/`--graphical` may not be adequate, the only other idea that I have is `-w`\/`--window`.","testPlan":"","lineCount":"42","dependsOn":[],"reviewers":[],"ccs":["yuja","pulkit","av6","durin42","mercurial-devel"],"actions":[{"type":"comment","comment":"(Resend because I forgot to remove the \"someone wrote:\" line again, sorry.)\n\n>   For laziness,  this patch could be also useful. It is also better for text shell beginners, because they may not know that they can combine commands like that (even if it is basic).\n\nFor laziness, we can add it to `[alias]`. I'm not a fan of adding lots of\none-off options since that's the source of man page bloat.\n\nHow about document the xdg-open example in `hg help serve -v`?","author":"yuja","id":"58867","dateCreated":"1529155285","dateModified":"1529155285"},{"type":"comment","comment":"For laziness,  this patch could be also useful. It is also better for text shell beginners, because they may not know that they can combine commands like that (even if it is basic). Moreover, you can still use `hg serve` in foreground or use it in background and give the result of `--print-url` to a non web browser application (but I imagine that there is a way to duplicate stdout to multiple programs). These are the advantages of this patch that I see over `--print-url` of D3649. It is better for convenience and require less knowledge for the user, but it is not a need. D3649 was precisely suggested to me because it can fulfill the functionality of the current patch and is more versatile.","author":"nspanti-logilab","id":"58735","dateCreated":"1529052032","dateModified":"1529052032"},{"type":"comment","comment":"Do we need this patch any more since D3649 has landed and we can do `xdg-open \"$(hg serve --print-url)\"`?","author":"pulkit","id":"58567","dateCreated":"1529005653","dateModified":"1529005653"},{"type":"comment","comment":"D3649 mentions `xdg-open \"$(hg serve --print-url)\"`, which shows that --print-url can nearly replace --graphical and is more versatile.","author":"av6","id":"57842","dateCreated":"1527944680","dateModified":"1527944680"},{"type":"comment","comment":"I don't love the flag name, and am -0 on the feature in general. All terminal emulators I've used in the last 10 years have URL detection logic and make clicking the link trivial...","author":"durin42","id":"57770","dateCreated":"1527794132","dateModified":"1527794132"},{"type":"update","diffId":"8881","author":"nspanti-logilab","id":"57359","dateCreated":"1527168904","dateModified":"1527168904"}],"dateCreated":"1527168904","dateModified":"1529155285","status":"Needs Review"},{"id":"2945","callsign":"HG","title":"state: add a magicheader to each state file","author":"pulkit","summary":"This patch adds a magic header to each state file written using CBOR format so\nthat we can distinguish between old state files and new one even if old state\nfiles get successfully parsed by cbor.","testPlan":"","lineCount":"1","dependsOn":[],"reviewers":[],"ccs":["jeffpc","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D2945#58586, @pulkit wrote:\n> There is a suggestion from @jeffpc to have a plain text header in statefiles like `HGStateFile` so that user can grep for them or look into files and know that they are state files. How does that sound?\n> (@jeffpc I am not sure I explained this correctly, it will be great if you can chime in.)\n\nI don't really care about the actual string value, I just think it is a good storage design practice to have every on-disk structure contain a magic value of some sort.  (Beware, I have a storage background and therefore opinions about these things... ;) )  This makes it easier to do all sort of data recovery should the need arise.  E.g.,\n\n  - if you know that a random file (e.g., from lost+found) is a hg state file, you can ignore\/delete it and just reclone your repos\n  - hg can detect some corruption better, and depending on the state file regenerate it or error out\n  - hg developers can more easily sort out what's what when looking at buffers\/files\/etc.\n  - as an added bonus, the magic can be used for format versioning\n\n\nFWIW, the three major things that I consider essential to good on-disk structures:\n\n  # magic numbers - see above\n  # checksums - possibly two checksums: one for the header and one for the payload\n  # back-pointers - see below\n\nBack-pointers allow you to tie the file\/buffer into the bigger context - be it which state file it is, or which repository it belongs to.  In this case a state file's back-pointer could be something like the repo-id + state-file-name stored in the state file's header.  (I realize that there is no repo-id, but in general some approximation of it tends to be better than nothing.)  This should make it painfully obvious what data one is dealing with and how to parse\/interpret it just by looking at the byte-stream without any other context.\n\n\nBy the way, I think that the magic should *not* be part of the CBOR payload but rather be at a fixed location in the file.  The easier it is to find, the easier it is to detect issues (and to avoid trying to decode bad\/malicious input).","author":"jeffpc","id":"58725","dateCreated":"1529024379","dateModified":"1529024509"},{"type":"comment","comment":"There is a suggestion from @jeffpc to have a plain text header in statefiles like `HGStateFile` so that user can grep for them or look into files and know that they are state files. How does that sound?\n(@jeffpc I am not sure I explained this correctly, it will be great if you can chime in.)","author":"pulkit","id":"58587","dateCreated":"1529007034","dateModified":"1529007034"},{"type":"comment","comment":"> There are some old state files, which don't have a version header on top\n> of them like graftstate. I need suggestion on how to handle them.\n\nIn that case, we would have to either do some heuristic (like histedit), or maintain\nold\/new state files (like mergestate.) Perhaps graft can do the latter?","author":"yuja","id":"47899","dateCreated":"1522244380","dateModified":"1522244380"},{"type":"comment","comment":">>! In D2945#47831, @yuja wrote:\n> I think the magic has to vary depending on the current state file format.\n> The state file must be backward\/forward compatible with the older\/newer formats.\n> \n> If the current magic is `2\\n` (and is parsed as `int(f.readline())`) for example, the\n> CBOR preamble would have to be `3\\n`. Otherwise, old hg client cant determine\n> whether the state file is corrupted or written by newer client.\n\nThere are some old state files, which don't have a version header on top of them like graftstate. I need suggestion on how to handle them.\n","author":"pulkit","id":"47892","dateCreated":"1522235138","dateModified":"1522235138"},{"type":"comment","comment":"I think the magic has to vary depending on the current state file format.\nThe state file must be backward\/forward compatible with the older\/newer formats.\n\nIf the current magic is `2\\n` (and is parsed as `int(f.readline())`) for example, the\nCBOR preamble would have to be `3\\n`. Otherwise, old hg client cant determine\nwhether the state file is corrupted or written by newer client.\n\nFWIW, last time I reviewed `simplekeyvaluefile`, I insisted that a parser should\ntake a file stream instead of a filename, so the caller can handle compatibility thingy.\n\n```\nwith open(\"statefile\", \"rb\") as fp:\n    try:\n        version = int(fp.readline())\n    except ValueError:\n        raise some nicer exception\n    if version == 2:\n        return readold(fp)\n    elif version == 3:\n        return readcbor(fp)\n```","author":"yuja","id":"47832","dateCreated":"1522155487","dateModified":"1522155487"},{"type":"update","diffId":"7299","author":"pulkit","id":"47624","dateCreated":"1522084159","dateModified":"1522084159"}],"dateCreated":"1522084159","dateModified":"1529024379","status":"Needs Review"},{"id":"1313","callsign":"HG","title":"dirstate: gate access to self._map.dirs","author":"mbolin","summary":"`_droppath()` already checks `\"dirs\" in self._map.__dict__` before accessing\n`self._map.dirs`. This updates `_addpath()` to be equally cautious.","testPlan":"","lineCount":"23","dependsOn":[],"reviewers":["mbthomas"],"ccs":["pulkit","mbthomas","durham","mercurial-devel"],"actions":[{"type":"comment","comment":"Do we need this anymore or can this be abandoned? (trying to close some not-required-any-more differentials)","author":"pulkit","id":"58571","dateCreated":"1529006100","dateModified":"1529006100"},{"type":"inline","comment":"I don't think it's safe to do this.  We're looking for clashes between files and directories, so we do need to look in self.dirs, even if that means generating it because we're accessing it for the first time.","replyTo":null,"isNewFile":"1","line":"405","lineLength":"0","path":"mercurial\/dirstate.py","diffId":"3267","author":"mbthomas","id":"21733","dateCreated":"1509750955","dateModified":"1509750955"},{"type":"reject","author":"mbthomas","id":"21732","dateCreated":"1509750955","dateModified":"1509750955"},{"type":"update","diffId":"3267","author":"mbolin","id":"21716","dateCreated":"1509749978","dateModified":"1509749978"}],"dateCreated":"1509749978","dateModified":"1529006100","status":"Needs Revision"},{"id":"3664","callsign":"HG","title":"graft: reuse the --edit value passed initially in `hg graft --continue` (BC)","author":"pulkit","summary":"This patch starts storing the value of --edit flag passed by the user initially\nwhen they runs `hg graft --edit`. We can now read the value from graftstate in\ncase of `--continue` and respect the value which user passed earlier.\n\nThe tests changes demonstrate the fix.","testPlan":"","lineCount":"28","dependsOn":["3663"],"reviewers":[],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"Queued the first two, thanks.\n\n>   This patch starts storing the value of --edit flag passed by the user initially\n>   when they runs `hg graft --edit`. We can now read the value from graftstate in\n>   case of `--continue` and respect the value which user passed earlier.\n\nI'm -0.5 on this since --edit is an option to change the interactive behavior,\nand I think we don't preserve such options across interrupted sessions.","author":"yuja","id":"58065","dateCreated":"1528200002","dateModified":"1528200002"},{"type":"update","diffId":"8909","author":"pulkit","id":"57568","dateCreated":"1527287139","dateModified":"1527287139"}],"dateCreated":"1527287139","dateModified":"1528200002","status":"Needs Review"},{"id":"3187","callsign":"HG","title":"phase: add dry-run functionality","author":"khanchi97","summary":"Added the logic to find those csets whose phase will be changed\n(while running without --dry-run). And show the list of those csets.","testPlan":"","lineCount":"173","dependsOn":[],"reviewers":["pulkit"],"ccs":["av6","mercurial-devel"],"actions":[{"type":"update","diffId":"8962","author":"khanchi97","id":"57894","dateCreated":"1528037274","dateModified":"1528037274"},{"type":"comment","comment":"Nice work! I like where how you simplified things from previous version.\n\nIf you look at the patch, this seems to do multiple things at once which are:\n\n  * adding dry-run argument to advanceboundary and retractboundary functions\n  * adding a new --dry-run flag to hg phase\n\nLet's break things up in individual patches so that we can improve more on individual pieces. Can you split this into a separate patch for adding dryrun argument to each function, i.e. one patch for adcanceboundary, one for retractboundary, and then one last patch which adds the new flag? That will be very much helpful in reviewing this work and also making incremental changes and moving forward step by step.","author":"pulkit","id":"57621","dateCreated":"1527622549","dateModified":"1527622549"},{"type":"comment","comment":"@pulkit Now I moved the logic for finding revs (those phase will change)  to advanceboundry and retractboundry function and for now it shows all nodes. I am working to show range instead. Take a look at this when you are free :)","author":"khanchi97","id":"57619","dateCreated":"1527584154","dateModified":"1527584154"},{"type":"update","diffId":"8896","author":"khanchi97","id":"57476","dateCreated":"1527280427","dateModified":"1527280427"},{"type":"comment","comment":">>! In D3187#57349, @khanchi97 wrote:\n> okay, but I have some queries like\n> 1. How about showing revision no. instead of cset id?\n\nI think we should show cset ids. If you want to with rev numbers, go with that. This should not be a blocker to get the initial patch in.\n> 2. And in this https:\/\/pastebin.com\/raw\/kWcr9xVK example if I change revision 2 phase to --secret then how it should print the range, I mean now we have branches in this range?\n> \n> Can we show that range like this:\n> \n> 0316ce92851d : : b385d13d5ed4  draft  ->  secret\n> 0316ce92851d : : 4ccc844d5454   draft  -> secret\n\nThere are two ways you can show the range in this case:\n\n1) 0316ce92851d::b385d13d5ed4 and f19b7f89f44e::4ccc844d5454\n2) 0316ce92851d::4ccc844d5454 and b385d13d5ed4\n\nLook into `hg help revsets` to understand what `::` means.","author":"pulkit","id":"57419","dateCreated":"1527196739","dateModified":"1527196739"},{"type":"comment","comment":"okay, but I have some queries like\n1. How about showing revision no. instead of cset id?\n2. And in this https:\/\/pastebin.com\/raw\/kWcr9xVK example if I change revision 2 phase to --secret then how it should print the range, I mean now we have branches in this range?\n\nCan we show that range like this:\n\n0316ce92851d : : b385d13d5ed4  draft  ->  secret\n0316ce92851d : : 4ccc844d5454   draft  -> secret","author":"khanchi97","id":"57349","dateCreated":"1527158527","dateModified":"1527158527"},{"type":"inline","comment":"This is not very much helpful. In such cases, how about showing the range of changesets, something like:\n```f7b1eb17ad24::925d80f479bb public -> draft\nb385d13d5ed4::fdc0253c25cf secret -> draft``` ","replyTo":null,"isNewFile":"1","line":"990","lineLength":"0","path":"tests\/test-phases.t","diffId":"7877","author":"pulkit","id":"57180","dateCreated":"1526844970","dateModified":"1526844970"},{"type":"inline","comment":"Since all the logic is copy-pasted from phases.advanceboundary and phases.retractboundary, why not we just pass the `--dry-run` option there and get the count from those functions only.","replyTo":null,"isNewFile":"1","line":"3898","lineLength":"0","path":"mercurial\/commands.py","diffId":"7877","author":"pulkit","id":"57179","dateCreated":"1526844970","dateModified":"1526844970"},{"type":"comment","comment":"@pulkit Can you please review it?","author":"khanchi97","id":"51519","dateCreated":"1523353338","dateModified":"1523353338"},{"type":"update","diffId":"7877","author":"khanchi97","id":"51174","dateCreated":"1523185235","dateModified":"1523185235"},{"type":"inline","comment":"`\"cannot use --dry-run without target phase\"`","replyTo":null,"isNewFile":"1","line":"3872","lineLength":"0","path":"mercurial\/commands.py","diffId":"7874","author":"av6","id":"51173","dateCreated":"1523167056","dateModified":"1523167056"},{"type":"update","diffId":"7874","author":"khanchi97","id":"51159","dateCreated":"1523101349","dateModified":"1523101349"},{"type":"update","diffId":"7873","author":"khanchi97","id":"51153","dateCreated":"1523100805","dateModified":"1523100805"}],"dateCreated":"1523100805","dateModified":"1528037274","status":"Needs Review"},{"id":"3445","callsign":"HG","title":"dispatch: validate return type from dispatch() return value","author":"indygreg","summary":"This commit adds type checking to the result of dispatch() so\nwe catch non-None and non-int values. This prevents crashes\nwhen we later try to \"& 255\" this value.\n\nThe Python 3 test failures introduced previously have all gone away.","testPlan":"","lineCount":"50","dependsOn":["3444"],"reviewers":["admin","durin42"],"ccs":["durin42","admin","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"(derp, that was me, but my password vault mis-fired and I got admin instead of me.)","author":"durin42","id":"57766","dateCreated":"1527793864","dateModified":"1527793864"},{"type":"reject","author":"durin42","id":"57765","dateCreated":"1527793864","dateModified":"1527793864"},{"type":"comment","comment":"This looks good, but needs rebased.","author":"admin","id":"57762","dateCreated":"1527793807","dateModified":"1527793807"},{"type":"reject","author":"admin","id":"57761","dateCreated":"1527793807","dateModified":"1527793807"},{"type":"update","diffId":"8654","author":"indygreg","id":"56035","dateCreated":"1526100492","dateModified":"1526100492"},{"type":"comment","comment":"IIRC, SystemExit is caught at callcatch and translated to a status code.\n\n> +    # The logic here attempts to mimic how CPython's pythonrun.c does things.\n> +    # Essentially:\n> +    #\n> +    # * Exit is controlled by returning a value or raising SystemExit.\n> +    # * An integer value exits with that exit code.\n> +    # * A value of ``None`` is interpreted as ``0``.\n> +    # * A non-integer, non-None value results in that value being printed\n> +    #   and an exit code of ``1``.\n> +    # * SystemExit can have a ``code`` attribute containing the exit value.\n>      try:\n> -        status = (dispatch(req) or 0)\n> +        code = dispatch(req) or 0\n>      except error.StdioError as e:\n>          err = e\n> -        status = -1\n> +        code = -1\n> +    except SystemExit as err:\n> +        try:\n> +            code = err.code\n> +            err = None\n> +        except AttributeError:","author":"yuja","id":"54925","dateCreated":"1525609762","dateModified":"1525609762"},{"type":"update","diffId":"8460","author":"indygreg","id":"54814","dateCreated":"1525579872","dateModified":"1525579872"}],"dateCreated":"1525579872","dateModified":"1527794332","status":"Needs Revision"},{"id":"3444","callsign":"HG","title":"tests: comprehensively test exit handling","author":"indygreg","summary":"Rust `hg` currently has some test failures around exit handling.\nThis commit establishes some centralized tests around exit handling so\nthat we can unify the behavior of our Rust frontend and `python`.\n\nThere are some added tests that use a value other than an integer\nor None for the exit code. The docs for sys.exit() say such a value\nis allowed. However, Mercurial currently crashes in this case. Upcoming\ncommits will teach Mercurial to handle these values.\n\nThis does introduce a few Python 3 test failures. However, this test\nalready has a few failures. And the failures being introduced should\nmostly go away with subsequent commits. So I think this is acceptable.","testPlan":"","lineCount":"91","dependsOn":[],"reviewers":["durin42"],"ccs":["durin42","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"This LG, esp with D3445 which appears to be its child, but D3445 still needs rebased AFAICT","author":"durin42","id":"57781","dateCreated":"1527794332","dateModified":"1527794332"},{"type":"accept","author":"durin42","id":"57779","dateCreated":"1527794332","dateModified":"1527794332"},{"type":"comment","comment":">   > I generally like the direction of this series, but I think there's no point\n>   >  to extend Mercurial's exit code handling to support all weird Python types.\n>   >\n>   > Only ints and (None for 0) are ever valid.\n>   \n>   \n>   The reason I did this is because from the context or `rhg`, we don't have CPython's default exit handling to fall back on. Our choices are:\n>   \n>   1. Reimplement CPython's exit\/error handling in Rust\n>   2. Reimplement CPython's exit\/error handling in Python in dispatch [so the end state is more well-defined]\n>   3. Do something crude in `rhg` when we hit special cases that CPython would normally deal with.\n>   \n>   Since extensions could do weird things, I figured 2 was the best option.\n\nI don't fully understand the situation in `rhg`, but maybe we can instead\nfix `scmutil.callcatch()` to either translate non-int SystemExit to integer\nor raise ProgrammingError as a bad use of sys.exit() in hg. No SystemExit\nshould be raised outside of the callcatch().\n\nI'm against allowing command functions to return any objects other than\nint or None because it's useless.","author":"yuja","id":"56045","dateCreated":"1526104337","dateModified":"1526104337"},{"type":"comment","comment":">>! In D3444#54922, @yuja wrote:\n> I generally like the direction of this series, but I think there's no point\n> to extend Mercurial's exit code handling to support all weird Python types.\n> \n> Only ints and (None for 0) are ever valid.\n\nThe reason I did this is because from the context or `rhg`, we don't have CPython's default exit handling to fall back on. Our choices are:\n\n1. Reimplement CPython's exit\/error handling in Rust\n2. Reimplement CPython's exit\/error handling in Python in dispatch [so the end state is more well-defined]\n3. Do something crude in `rhg` when we hit special cases that CPython would normally deal with.\n\nSince extensions could do weird things, I figured 2 was the best option.\n\nBut I'll take a look at this series again and re-evaluate if we can simplify things. I just thought I'd brain dump on what I'm thinking.","author":"indygreg","id":"56014","dateCreated":"1526097317","dateModified":"1526097317"},{"type":"comment","comment":"I generally like the direction of this series, but I think there's no point\nto extend Mercurial's exit code handling to support all weird Python types.\n\nOnly ints and (None for 0) are ever valid.","author":"yuja","id":"54923","dateCreated":"1525609756","dateModified":"1525609756"},{"type":"update","diffId":"8459","author":"indygreg","id":"54808","dateCreated":"1525579871","dateModified":"1525579871"}],"dateCreated":"1525579871","dateModified":"1527794332","status":"Accepted"},{"id":"3454","callsign":"HG","title":"Assign to result from block.","author":"kevincox","summary":"This is more idiomatic because you don't have uninitialized variables and has less typing.","testPlan":"","lineCount":"9","dependsOn":["3447"],"reviewers":["indygreg","durin42"],"ccs":["martinvonz","durin42","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"57759","dateCreated":"1527793653","dateModified":"1527793653"},{"type":"comment","comment":"It looks like this is based on top of D3447. So I'll just hook up the dependency and we'll land it as soon as my series is landed.","author":"indygreg","id":"56011","dateCreated":"1526097062","dateModified":"1526097062"},{"type":"accept","author":"indygreg","id":"56009","dateCreated":"1526097062","dateModified":"1526097062"},{"type":"comment","comment":"This doesn't apply. Looks like it's based on a version where exit code is 1 (line 193), but our main.rs seems to have always have had it set to 255.","author":"martinvonz","id":"55724","dateCreated":"1525900608","dateModified":"1525900608"},{"type":"update","diffId":"8471","author":"kevincox","id":"54912","dateCreated":"1525594657","dateModified":"1525594657"}],"dateCreated":"1525594657","dateModified":"1527793653","status":"Accepted"},{"id":"3447","callsign":"HG","title":"rust: make exit handling consistent with `hg`","author":"indygreg","summary":"Now that dispatch.run() handles special exit cases and always returns\nan exit code, Rust's (formerly lacking) invocation of dispatch.run() can\nhandle the return value with minimal hassle.\n\nIn addition, we change Rust to exit 1 instead of 255 in the case\nof unhandled errors, as that is actually what Python does.\n\nThis fixes a few test failures when running the test suite with rhg.","testPlan":"","lineCount":"22","dependsOn":["3446"],"reviewers":["kevincox","durin42"],"ccs":["durin42","kevincox","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"57757","dateCreated":"1527793647","dateModified":"1527793647"},{"type":"inline","comment":"s\/unreachable\/panic\/ since the code can never be hit as long as the python code returns the right type.\n\nAlso it might be a good idea to try to print out the value returned in the error message. Although if not easy it is probably not worth it.","replyTo":null,"isNewFile":"1","line":"204","lineLength":"0","path":"rust\/hgcli\/src\/main.rs","diffId":"8462","author":"kevincox","id":"54910","dateCreated":"1525593073","dateModified":"1525593073"},{"type":"accept","author":"kevincox","id":"54909","dateCreated":"1525593073","dateModified":"1525593073"},{"type":"update","diffId":"8462","author":"indygreg","id":"54834","dateCreated":"1525579874","dateModified":"1525579874"}],"dateCreated":"1525579874","dateModified":"1527793647","status":"Accepted"},{"id":"3446","callsign":"HG","title":"dispatch: move sys.exit() to caller (API)","author":"indygreg","summary":"Moving sys.exit() to the caller will make it easier to implement\nexit handling in Rust `hg` by eliminating the need to handle\nSystemExit in Rust.\n\n.. api::\n\n   dispatch.run() now returns an integer exit code instead of calling\n   sys.exit(). Callers of dispatch.run() must now exit.","testPlan":"","lineCount":"6","dependsOn":["3445"],"reviewers":["lothiraldan","durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"57755","dateCreated":"1527793642","dateModified":"1527793642"},{"type":"update","diffId":"8655","author":"indygreg","id":"56038","dateCreated":"1526100493","dateModified":"1526100493"},{"type":"accept","author":"lothiraldan","id":"54928","dateCreated":"1525677084","dateModified":"1525677084"},{"type":"update","diffId":"8461","author":"indygreg","id":"54824","dateCreated":"1525579873","dateModified":"1525579873"}],"dateCreated":"1525579873","dateModified":"1527793642","status":"Accepted"},{"id":"3663","callsign":"HG","title":"graft: add test showing --continue not preserving --edit passed earlier","author":"pulkit","summary":"Right now, if you run `hg graft --edit`, face some conflicts, resolve them and\nthen run `hg graft --continue`, you will see graft no longer pops up for the\neditor and you hate mercurial for not remembering arguments you passed earlier.\n\nUpcoming patch will fix this buggy behavior and this test will help us in\nrealizing those changes.","testPlan":"","lineCount":"41","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"8908","author":"pulkit","id":"57562","dateCreated":"1527287120","dateModified":"1527287120"}],"dateCreated":"1527287120","dateModified":"1527287308","status":"Needs Review"},{"id":"2875","callsign":"HG","title":"remotenames: introduce a config option to allow creation of remote bookmarks","author":"pulkit","summary":"This patch introduces another config option which if set to true, we can create\nnew bookmarks on the server using push command. An earlier patch added\ncapability to push to a certain bookmark on the server. If bookmark was not\nalready present on the server, we errored out. With\nremotenames.createremotebookmark config set, the push will create that bookmark\non the server.\n\nThis series serves as a great feature for people who use bookmarks as after this\nyou can push changesets to a bookmark which does not exists locally. In other\nwords, you can push your changesets to a bookmark without having it locally.\n\nThis series will help people in having a non-local bookmark workflow involving\nremotenames.\n\nThe functionality added in this patch is equivalent to --create flag to push\ncommand added by hgremotenames extension.","testPlan":"","lineCount":"166","dependsOn":[],"reviewers":["indygreg"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"indygreg","id":"52032","dateCreated":"1523468132","dateModified":"1523468132"},{"type":"update","diffId":"7288","author":"pulkit","id":"47564","dateCreated":"1522064875","dateModified":"1522064875"},{"type":"update","diffId":"7251","author":"pulkit","id":"47276","dateCreated":"1521704137","dateModified":"1521704137"},{"type":"update","diffId":"7105","author":"pulkit","id":"46425","dateCreated":"1521448583","dateModified":"1521448583"},{"type":"update","diffId":"7063","author":"pulkit","id":"46164","dateCreated":"1521121786","dateModified":"1521121786"}],"dateCreated":"1521121786","dateModified":"1526652340","status":"Accepted"},{"id":"2873","callsign":"HG","title":"remotenames: add functionality to override -B flag of push","author":"pulkit","summary":"This patch adds a new config option which can be used to override the `-B` flag\nof push command. If config is set to true, changesets will be pushed to that\nbookmark on the server. This is equivalent to `--to` flag of remotenames and\ninfinitepush.\n\nAfter this patch if config is set to true, the behavior will be:\n\n  * Normal push without -B flag: no behavior change\n  * specifying one bookmark using -B flag: changesets will be pushed to that\n        bookmark on the server, as explained above. Bookmark pushed will be on\n        the head most revision of the changesets pushed.\n  * specifying multiple bookmarks using -B flag: no behavior change, the same\n        behavior as it's today without this config option\n  * specifying multiple topologcial heads to push: no behvaior change\n\nThere needs some extra logic to update the remotenames state locally after the\npush since we know that the bookmark will now be at a known updated location.","testPlan":"","lineCount":"356","dependsOn":[],"reviewers":["indygreg"],"ccs":["smf","indygreg","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D2873#52100, @indygreg wrote:\n>>>! In D2873#52025, @smf wrote:\n>>>>! In D2873#52021, @indygreg wrote:\n>>> Looks good!\n>> \n>> I'm very heavily against this direction. Changing the behavior of push (even in this extension) is something I've always considered outside the scope of remotenames. Having another extension that changes push behavior (e.g. bookmark-push) is where I think this should go so that remotenames is just that: keeping track of remote names.\n> \n> I think there's room for this feature to live outside of remotenames. But currently I think it is the best place for it, since remotenames is the closest thing we have to... tracking remote names. We can always alias the old config option in the future if we move this functionality elsewhere.\n\nOne of the biggest regrets I have about the original remotenames, is the modifying of push (and some default) behavior. The `--to` is small enough (and I guess fine enough) for now but I absolutely and strongly believe that all the other behavior modifications should stay in an out-of-core repo for now. My goal is to split my remotenames repo to be based off of core's remotenames (basically only having the behavior changing patches there).","author":"smf","id":"52118","dateCreated":"1523482769","dateModified":"1523482769"},{"type":"comment","comment":">>! In D2873#52025, @smf wrote:\n>>>! In D2873#52021, @indygreg wrote:\n>> Looks good!\n> \n> I'm very heavily against this direction. Changing the behavior of push (even in this extension) is something I've always considered outside the scope of remotenames. Having another extension that changes push behavior (e.g. bookmark-push) is where I think this should go so that remotenames is just that: keeping track of remote names.\n\nI think there's room for this feature to live outside of remotenames. But currently I think it is the best place for it, since remotenames is the closest thing we have to... tracking remote names. We can always alias the old config option in the future if we move this functionality elsewhere.","author":"indygreg","id":"52100","dateCreated":"1523480112","dateModified":"1523480112"},{"type":"comment","comment":">>! In D2873#52021, @indygreg wrote:\n> Looks good!\n\nI'm very heavily against this direction. Changing the behavior of push (even in this extension) is something I've always considered outside the scope of remotenames. Having another extension that changes push behavior (e.g. bookmark-push) is where I think this should go so that remotenames is just that: keeping track of remote names.","author":"smf","id":"52026","dateCreated":"1523467971","dateModified":"1523467971"},{"type":"inline","comment":"Nit: \"exist\". This can be fixed in flight.","replyTo":null,"isNewFile":"1","line":"113","lineLength":"0","path":"hgext\/remotenames.py","diffId":"7286","author":"indygreg","id":"52023","dateCreated":"1523467769","dateModified":"1523467769"},{"type":"comment","comment":"Looks good!","author":"indygreg","id":"52022","dateCreated":"1523467769","dateModified":"1523467769"},{"type":"accept","author":"indygreg","id":"52021","dateCreated":"1523467769","dateModified":"1523467769"},{"type":"comment","comment":"A gentle reminder for reviewing this series. If this config option gets in, we can use it in infinitepush extension too where for now we have overridden `-B` flag in a hacky way.","author":"pulkit","id":"48737","dateCreated":"1522601487","dateModified":"1522601487"},{"type":"update","diffId":"7286","author":"pulkit","id":"47560","dateCreated":"1522064849","dateModified":"1522064849"},{"type":"inline","comment":"What happens if we're pushing multiple heads? I suspect this will choose a head\/revision arbitrarily - maybe depending on the `-r` arguments to `hg push`.\n\nI think we need to validate that the outgoing revs are in a single DAG head and we should then pick the rev that is the DAG head.\n\nPlease add test coverage for multiple `-r` arguments and `-r` arguments that resolve to multiple heads.","replyTo":null,"isNewFile":"1","line":"99","lineLength":"0","path":"hgext\/remotenames.py","diffId":"7249","author":"indygreg","id":"47382","dateCreated":"1521831360","dateModified":"1521831360"},{"type":"inline","comment":"Nit: what is `--create`?","replyTo":null,"isNewFile":"1","line":"101","lineLength":"0","path":"hgext\/remotenames.py","diffId":"7249","author":"indygreg","id":"47381","dateCreated":"1521831360","dateModified":"1521831360"},{"type":"inline","comment":"Strictly speaking, we should probably wrap `exchange._pushdiscoverybookmarks` so other extensions can get involved. But I think this is fine.","replyTo":null,"isNewFile":"1","line":"287","lineLength":"0","path":"hgext\/remotenames.py","diffId":"7249","author":"indygreg","id":"47380","dateCreated":"1521831360","dateModified":"1521831360"},{"type":"comment","comment":"I'm happy with this feature.\n\nBut the code needs work around multiple revisions\/heads before it can be queued.","author":"indygreg","id":"47379","dateCreated":"1521831360","dateModified":"1521831360"},{"type":"reject","author":"indygreg","id":"47378","dateCreated":"1521831360","dateModified":"1521831360"},{"type":"update","diffId":"7249","author":"pulkit","id":"47274","dateCreated":"1521704112","dateModified":"1521704112"},{"type":"update","diffId":"7103","author":"pulkit","id":"46423","dateCreated":"1521448561","dateModified":"1521448561"},{"type":"comment","comment":"I am not sure the functionality and config names should go to core or not, so I have introduced them in this extension. Also suggestions for better config names are welcome.","author":"pulkit","id":"46265","dateCreated":"1521212432","dateModified":"1521212432"},{"type":"update","diffId":"7061","author":"pulkit","id":"46148","dateCreated":"1521121763","dateModified":"1521121763"}],"dateCreated":"1521121763","dateModified":"1526652340","status":"Accepted"},{"id":"3565","callsign":"FBHGX","title":"sparse: delete now that it's in the core repo","author":"martinvonz","summary":"It was moved added to core repo in abd7dedbaa36 (sparse: vendor\nFacebook-developed extension, 2017-07-01).","testPlan":"","lineCount":"2706","dependsOn":[],"reviewers":["quark"],"ccs":["quark"],"actions":[{"type":"reject","author":"quark","id":"56456","dateCreated":"1526597213","dateModified":"1526597213"},{"type":"comment","comment":"I think there are still some differences. Namely the integration with `simplecache`, which is helpful for performance. Does the core version have something similar?","author":"quark","id":"56344","dateCreated":"1526429367","dateModified":"1526429592"},{"type":"update","diffId":"8703","author":"martinvonz","id":"56328","dateCreated":"1526428875","dateModified":"1526428875"}],"dateCreated":"1526428875","dateModified":"1526597213","status":"Needs Revision"},{"id":"3304","callsign":"HG","title":"formatter: add support for -Tcbor","author":"indygreg","summary":"The implementation in the formatter is hopefully pretty\nstraightforward.\n\nUnlike other formats, we don't emit a list\/array or need to\nhandle \"joining\" elements between emitted items. That's because\nCBOR doesn't require any joining element: you just read the\nnext byte to see what type it is then decode it. You do that for\nas long as there are bytes to read.\n\nAs long as we aren't nesting formatters, the choice to omit\nan outer container for data seems acceptable. If nothing else,\nit will make it easier for decoders who don't support streaming\nto decode data without buffering the entire array first.\n\nI'm a bit unsure about add --cbor support to the f tool by importing\nMercurial modules. It does work in the test environment. But there's\nno demand module importer, etc. Unlike the existing JSON and pickle\nformatters, there isn't an implementation in the standard library\nfor us to use. So unless we want to forgo parsing the CBOR (this\ndoesn't seem great because the data isn't human readable), we'll\nneed to import at least the CBOR package from mercurial.*.\n\nThis commit also doesn't implement -Tcbor for changeset printing.\nI'll have to figure that out...\n\nI added tests for -Tcbor for most of the instances of -Tjson in\nthe test harness.\n\n.. feature::\n\n   `--template\/-T cbor` can now be specified to emit data as CBOR.\n\n   (This feature is experimental and the data format may change.)","testPlan":"","lineCount":"419","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"plan-changes","author":"indygreg","id":"53405","dateCreated":"1523664767","dateModified":"1523664767"},{"type":"update","diffId":"8105","author":"indygreg","id":"52788","dateCreated":"1523600792","dateModified":"1523600792"}],"dateCreated":"1523600792","dateModified":"1523664767","status":"Changes Planned"},{"id":"2403","callsign":"HG","title":"stack: remove destutil.stackbase","author":"lothiraldan","summary":"Use directly stack.getstack in show stack command. Remove destutil.stackbase.\nImport a TODO from the show stack in the code.","testPlan":"","lineCount":"16","dependsOn":["2402"],"reviewers":[],"ccs":["indygreg","mercurial-devel"],"actions":[{"type":"update","diffId":"7736","author":"lothiraldan","id":"50324","dateCreated":"1522945351","dateModified":"1522945351"},{"type":"comment","comment":">>! In D2403#39460, @indygreg wrote:\n> Oh, I guess the series never did formerly define a revset for stack :\/\n> \n> I think there is room for one. We have the ability to mark revsets as experimental or internal, right? Could\/should we do that so we don't need `hg debugstack`?\n> \n> Anyway, I could probably queue this with some minor rework. But I'm going to hold off a bit and see if others have opinions.\n\nI have updated the series without using debugstack, thank you for the suggestion. I thought revset would were much harder to implement but turn out not so much harder.","author":"lothiraldan","id":"40956","dateCreated":"1519934450","dateModified":"1519934450"},{"type":"update","diffId":"6219","author":"lothiraldan","id":"40701","dateCreated":"1519862380","dateModified":"1519862380"},{"type":"comment","comment":"Oh, I guess the series never did formerly define a revset for stack :\/\n\nI think there is room for one. We have the ability to mark revsets as experimental or internal, right? Could\/should we do that so we don't need `hg debugstack`?\n\nAnyway, I could probably queue this with some minor rework. But I'm going to hold off a bit and see if others have opinions.","author":"indygreg","id":"39461","dateCreated":"1519440298","dateModified":"1519440298"},{"type":"update","diffId":"6017","author":"lothiraldan","id":"39366","dateCreated":"1519382238","dateModified":"1519382238"}],"dateCreated":"1519382238","dateModified":"1522945387","status":"Needs Review"},{"id":"2402","callsign":"HG","title":"stack: introduce an option to limit the selection on the current branch","author":"lothiraldan","summary":" ","testPlan":"","lineCount":"37","dependsOn":["2401"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"7735","author":"lothiraldan","id":"50323","dateCreated":"1522945345","dateModified":"1522945345"},{"type":"update","diffId":"6218","author":"lothiraldan","id":"40700","dateCreated":"1519862377","dateModified":"1519862377"},{"type":"update","diffId":"6016","author":"lothiraldan","id":"39357","dateCreated":"1519382234","dateModified":"1519382234"}],"dateCreated":"1519382234","dateModified":"1522945345","status":"Needs Review"},{"id":"2401","callsign":"HG","title":"stack: introduce an option to disable the restriction on ancestor","author":"lothiraldan","summary":"The default stack revset restrict on only the ancestors of a revision. Some\ntools might want to display the current stack even if the working directory\nparent is in the middle of the stack.\n\nAdd the `stack.restrict-ancestors` option to disable that.","testPlan":"","lineCount":"17","dependsOn":["2400"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"7734","author":"lothiraldan","id":"50322","dateCreated":"1522945341","dateModified":"1522945341"},{"type":"update","diffId":"6217","author":"lothiraldan","id":"40699","dateCreated":"1519862374","dateModified":"1519862374"},{"type":"update","diffId":"6015","author":"lothiraldan","id":"39347","dateCreated":"1519382229","dateModified":"1519382229"}],"dateCreated":"1519382229","dateModified":"1522945341","status":"Needs Review"},{"id":"2400","callsign":"HG","title":"stack: begin to make the stack revset configurable","author":"lothiraldan","summary":"First extrat the not-merge part in its own configuration knob `stack.not-\nmerge`.","testPlan":"","lineCount":"25","dependsOn":[],"reviewers":["indygreg"],"ccs":["indygreg","mercurial-devel"],"actions":[{"type":"update","diffId":"7733","author":"lothiraldan","id":"50320","dateCreated":"1522945336","dateModified":"1522945336"},{"type":"comment","comment":"The goal of this series is to define a clean API so that commands and tools can be built in a stack-definition agnostic way. It's not to define a one-size-fits-all stack definition.\n\nPeople and companies have different workflows and needs. Their definition of a stack will likely to be different to better match their workflow. I tried finding a way to configure stack as easily as possible. I have the impression that using configuration options is slightly easier than defining a custom extension. I also avoided using directly a revset from the configuration file as I'm not sure it would be the best way to express all situations.\n\nI don't know if the config options best place are in the `stack` section though.","author":"lothiraldan","id":"50310","dateCreated":"1522943035","dateModified":"1522943035"},{"type":"comment","comment":"Reading through the remainder of the series, I like the customization of stack evaluation. But the use of config options seems weird to me. It isn't clear why we need config options. It feels like these options should be passed in as function arguments. Now, it will be useful to test these variations. Maybe that does require config options. But until there is a user-facing need for these config options, It feels better to put them in `[devel]` or something like that.\n\nIs there a future consumer of these config options that justifies them being normal config options?","author":"indygreg","id":"46534","dateCreated":"1521490461","dateModified":"1521490461"},{"type":"reject","author":"indygreg","id":"46533","dateCreated":"1521490461","dateModified":"1521490461"},{"type":"inline","comment":"As I review just this patch, I question if we shouldn't just concatenate `and not ::merge()` to the revset string. But I know other changes are coming. I assume the final state justifies the extra complexity.","replyTo":null,"isNewFile":"1","line":"41","lineLength":"1","path":"mercurial\/stack.py","diffId":"6216","author":"indygreg","id":"46531","dateCreated":"1521490117","dateModified":"1521490117"},{"type":"comment","comment":"I'm not super keen on introducing a new `[stack]` config section. But I don't have any better ideas for where this should go. `[ui]` is my best idea, but I thought we decided we wanted to stop stuffing random stuff into `[ui]`. So I dunno.","author":"indygreg","id":"46530","dateCreated":"1521490117","dateModified":"1521490117"},{"type":"accept","author":"indygreg","id":"46529","dateCreated":"1521490117","dateModified":"1521490117"},{"type":"update","diffId":"6216","author":"lothiraldan","id":"40698","dateCreated":"1519862372","dateModified":"1519862372"},{"type":"update","diffId":"6014","author":"lothiraldan","id":"39337","dateCreated":"1519382224","dateModified":"1519382224"}],"dateCreated":"1519382224","dateModified":"1522945336","status":"Needs Review"},{"id":"2999","callsign":"HG","title":"infinitepush: use zope.interface to define indexapi interface","author":"pulkit","summary":"This patch makes indexapi use zope.interface which is now vendored with\nmercurial.","testPlan":"","lineCount":"20","dependsOn":[],"reviewers":["indygreg"],"ccs":["indygreg","mercurial-devel"],"actions":[{"type":"comment","comment":"Oh, when you add test coverage, watch out for `mysql.connector` being unavailable. You may want to register a fake module in `sys.modules['mysql.connector']` to ensure it always is available.","author":"indygreg","id":"48566","dateCreated":"1522517045","dateModified":"1522517045"},{"type":"inline","comment":"`Interface` classes don't define `self` on methods. So please drop `self` from all these methods.","replyTo":null,"isNewFile":"1","line":"25","lineLength":"0","path":"hgext\/infinitepush\/indexapi.py","diffId":"7466","author":"indygreg","id":"48564","dateCreated":"1522516965","dateModified":"1522516965"},{"type":"comment","comment":"Please also add test coverage to `test-check-interfaces.py`, otherwise these interfaces mean practically nothing. `zope.interface` doesn't perform run-time interface conformance tests unless you explicitly instruct it to. For now, we're going to verify interfaces in `test-check-interfaces.py`.","author":"indygreg","id":"48563","dateCreated":"1522516965","dateModified":"1522516965"},{"type":"reject","author":"indygreg","id":"48562","dateCreated":"1522516965","dateModified":"1522516965"},{"type":"update","diffId":"7466","author":"pulkit","id":"48513","dateCreated":"1522497241","dateModified":"1522497241"}],"dateCreated":"1522497241","dateModified":"1522517045","status":"Needs Revision"},{"id":"2623","callsign":"HG","title":"dispatch: adding config items for overriding flag defaults","author":"rdamazio","summary":"This introduces the new defaults format \"commandname.default.optionname\" which\ndirectly overrides the default of the option, instead of prepending the\ncommand-line option. This is meant to replace the [defaults] section which is\nalready deprecated in a manner that's easier and safer to use than creating\naliases.","testPlan":"","lineCount":"96","dependsOn":["2622"],"reviewers":["yuja"],"ccs":["dploch","mercurial-devel"],"actions":[{"type":"inline","comment":"I thought callables were meant to be used to generate the default default, not with overridden values?","replyTo":"43409","isNewFile":"1","line":"625","lineLength":"1","path":"mercurial\/dispatch.py","diffId":"6609","author":"rdamazio","id":"47743","dateCreated":"1522132208","dateModified":"1522132208"},{"type":"inline","comment":"Nobody should use the same *instance* on multiple flags. Even with the current flags, if you use e.g. the same list on many, that'll cause problems with listopt.\n","replyTo":"43410","isNewFile":"1","line":"639","lineLength":"1","path":"mercurial\/dispatch.py","diffId":"6609","author":"rdamazio","id":"47742","dateCreated":"1522132208","dateModified":"1522132208"},{"type":"inline","comment":"This makes me nervous.  What if someone re-uses a customopt instance in multiple commands?  i.e.:\n\nDATE_FLAG = mypkg.dateopt()\n...\n('b', 'before', DATE_FLAG, '')\n('a', 'after', 'DATE_FLAG', '')\n\nNow, setting commands.defaults.before=2018-03-05 also silently changes the default for 'after'.  I suspect we need to introduce a wrapper class like what I suggest on lines 625-625, that delegates and leaves the original default unchanged.  And either way, we should probably clarify in the docs on customopts what expected use of the class is (i.e., should we just forbid reuse, is 'oldstate' safe to mutate, etc.)","replyTo":null,"isNewFile":"1","line":"639","lineLength":"1","path":"mercurial\/dispatch.py","diffId":"6609","author":"dploch","id":"43410","dateCreated":"1520292544","dateModified":"1520292544"},{"type":"inline","comment":"This doesn't handle callables properly.  I wonder if the something like the following would work instead:\n\noldopt = fancyopts._defaultopt(olddefault)\nnewdefault = old.opt.newstate(olddefault, ui.config(\"commands\", cfgitem)\nc[idx] = (opt[0], opt[1], fancyopts._withnewdefault(oldopt, newdefault), opt[3])\n\nWhere '_withnewdefault' is a wrapper customopt that just changes the default.","replyTo":null,"isNewFile":"1","line":"625","lineLength":"1","path":"mercurial\/dispatch.py","diffId":"6609","author":"dploch","id":"43409","dateCreated":"1520292544","dateModified":"1520292544"},{"type":"inline","comment":"I think rdamazio's response is correct.  The type information for an opt exists only in the 'defaultvalue' slot in the tuple, so it needs to be extracted from there before reading the config.  I don't have a strong opinion as to where this code should go - 'ui' does seem marginally more appropriate than 'fancyopts', since it keeps 'fancyopts' low-level and not depending on 'ui'.","replyTo":"42582","isNewFile":"1","line":"624","lineLength":"0","path":"mercurial\/dispatch.py","diffId":"6523","author":"dploch","id":"43408","dateCreated":"1520292544","dateModified":"1520292544"},{"type":"inline","comment":"Ah, makes sense. See if this addresses that case satisfactorily - it still has the caveat of not being able to \"reset\" container types, but that's true of the command line as well (if you have a list flag with a non-empty default, there's no way to remove that default item).","replyTo":"42770","isNewFile":"1","line":"624","lineLength":"0","path":"mercurial\/dispatch.py","diffId":"6523","author":"rdamazio","id":"43071","dateCreated":"1520195950","dateModified":"1520195950"},{"type":"update","diffId":"6609","author":"rdamazio","id":"43064","dateCreated":"1520195818","dateModified":"1520195818"},{"type":"inline","comment":"IIUC, an extension author may implement its own customopt subclasses, and\nput them into the command table, so we can't make ui.configtyped to\nsupport all of them.","replyTo":"42686","isNewFile":"1","line":"624","lineLength":"0","path":"mercurial\/dispatch.py","diffId":"6523","author":"yuja","id":"42770","dateCreated":"1520183736","dateModified":"1520183736"},{"type":"inline","comment":"You're right, I had the plain logic inverted in my head. Removed.","replyTo":"42581","isNewFile":"1","line":"390","lineLength":"0","path":"mercurial\/ui.py","diffId":"6523","author":"rdamazio","id":"42687","dateCreated":"1520181261","dateModified":"1520181261"},{"type":"inline","comment":"The issue is that customopt (and all its children) assume the value type is already the correct one, and thus do not perform any conversion. Since we're parsing values from the config file, the conversion is desired to ensure they don't all end up as text - the config{bool,int,etc} methods called by configtyped perform the proper conversion. In most cases (all commands that declare default values) no conversio is needed since those already have the correct type.\n","replyTo":"42582","isNewFile":"1","line":"624","lineLength":"0","path":"mercurial\/dispatch.py","diffId":"6523","author":"rdamazio","id":"42686","dateCreated":"1520181261","dateModified":"1520181261"},{"type":"update","diffId":"6548","author":"rdamazio","id":"42684","dateCreated":"1520181250","dateModified":"1520181250"},{"type":"inline","comment":"Maybe this type conversion can be a `fancyopt.customopt` method since we've\nrefactored the default handling by D2090?\n\n```\n# no idea if _defaultopt() should be made public or the whole commands.default handling\n# should be moved to fancyopts\nx = fancyopts._defaultopt(olddefault)\nnewdefault = x.configdefault(ui, cmd, optname, ...)\n```\n\n@dploch, any suggestions?","replyTo":null,"isNewFile":"1","line":"624","lineLength":"0","path":"mercurial\/dispatch.py","diffId":"6523","author":"yuja","id":"42582","dateCreated":"1520173297","dateModified":"1520173297"},{"type":"inline","comment":"Perhaps this is noop since `[commands]` is removed at all if `ui.plain()` returns True.","replyTo":null,"isNewFile":"1","line":"390","lineLength":"0","path":"mercurial\/ui.py","diffId":"6523","author":"yuja","id":"42581","dateCreated":"1520173297","dateModified":"1520173297"},{"type":"reject","author":"yuja","id":"42578","dateCreated":"1520173297","dateModified":"1520173297"},{"type":"comment","comment":"FYI this is a change I had previously sent to the list as 60b3222e01f96f91ece7eda9681a89bf3bb930a6, and Yuya reviewed . I just had never followed up on it.","author":"rdamazio","id":"42436","dateCreated":"1520122245","dateModified":"1520122245"},{"type":"update","diffId":"6523","author":"rdamazio","id":"42435","dateCreated":"1520121514","dateModified":"1520121514"},{"type":"update","diffId":"6521","author":"rdamazio","id":"42421","dateCreated":"1520121282","dateModified":"1520121282"}],"dateCreated":"1520121282","dateModified":"1522132208","status":"Needs Review"},{"id":"2057","callsign":"HG","title":"rust implementation of hg status","author":"Ivzhh","summary":"* implementation of revlog v1\n* parsing changelog, manifest, dirstate\n* use .hgignore in repo root\n* comparable performance with current hg status (Linux & Mac: slightly faster, Windows: slightly slower)\n* use hg r-status as subcommand, in this case, bypass python engine","testPlan":"","lineCount":"3066","dependsOn":[],"reviewers":["kevincox"],"ccs":["quark","yuja","glandium","krbullock","indygreg","durin42","kevincox","mercurial-devel"],"actions":[{"type":"inline","comment":"I meant safe not as it it didn't need the unsafe keyword, but in that the use of the `unsafe` block is safe.\n\nIt should really be called the `trust_me,_I_know_this_is_safe` block. But since you are not getting the compiler checking it is often useful to add a comment why the action you are performing is correct. In this case it is correct because the caller initializes this variable before the function is called.","replyTo":"46950","isNewFile":"1","line":"91","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"47428","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"Actually I didn't realize that RwLock doesn't get a regular `get()` since it is doing a compile time borrow check. https:\/\/doc.rust-lang.org\/std\/sync\/struct.RwLock.html#method.get_mut. My mistake, the code is fine.","replyTo":"46960","isNewFile":"1","line":"136","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"47427","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"Does it make sense to make `DirStateEntry.mtime` be a `std::time::SystemTime` and convert upon reading the structure in?\n\nIf not I would prefer doing the conversion here:\n\n```\nelse if mtd.modified().unwrap() == UNIX_EPOCH + Duration::from_secs(dir_entry.mtime as u64) {\n```\n\n(Maybe extract the system time to higher up, or even a helper function on dir_entry)","replyTo":null,"isNewFile":"1","line":"263","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"7188","author":"kevincox","id":"47426","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"Sorry, I misunderstood the logic. You can do this:\n\n```\ndiff -r ccc683587fdb rust\/hgstorage\/src\/dirstate.rs\n--- a\/rust\/hgstorage\/src\/dirstate.rs\tSat Mar 24 10:05:53 2018 +0000\n+++ b\/rust\/hgstorage\/src\/dirstate.rs\tSat Mar 24 10:14:58 2018 +0000\n@@ -184,8 +184,7 @@\n                         continue;\n                     }\n \n-                    if self.dir_state_map.contains_key(rel_path) {\n-                        let dir_entry = &self.dir_state_map[rel_path];\n+                    if let Some(dir_entry) = self.dir_state_map.get(rel_path) {\n                         files_not_in_walkdir.remove(rel_path);\n                         DirState::check_status(&mut res, abs_path, rel_path, dir_entry);\n                     } else if !matcher.check_path_ignored(rel_path.to_str().unwrap()) {\n```","replyTo":"46959","isNewFile":"1","line":"170","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"47425","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"Switch the return type to `std::io::Result` and then you can have\n\n```\nlet metadata = p.metadata()?;\nlet mtime = metadata.modified()?;\n\/\/ ...\n```","replyTo":null,"isNewFile":"1","line":"103","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"7188","author":"kevincox","id":"47424","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"A link to the mentioned wiki page would be very helpful to readers.","replyTo":null,"isNewFile":"1","line":"50","lineLength":"0","path":"rust\/hgstorage\/src\/config.rs","diffId":"7188","author":"kevincox","id":"47423","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"These are `HashSet`'s which don't have a defined iterator order. IIRC the python implementation sorts the results which is probably desirable.","replyTo":null,"isNewFile":"1","line":"260","lineLength":"0","path":"rust\/hgcli\/src\/main.rs","diffId":"7188","author":"kevincox","id":"47422","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"If this computation only depends on `len` it would be nice to put it in a helper function.","replyTo":null,"isNewFile":"1","line":"105","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"7188","author":"kevincox","id":"47421","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"inline","comment":"I get that, but I still think it makes the code easier to read when the python-interop and the logic as separated where it is easy to do so.","replyTo":"46947","isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"47420","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"comment","comment":"The latest changes are looking really good. I have a couple more comments but I didn't have time for a full review. I'll try to get more reviewed tomorrow. It seems that you still have a lot of stuff still in-flight so I'll try to slowly review the changes as I have time. If you want input\/feedback on any particular part just ask and I will prioritize it.\n\nThis change is very large so it might be worth splitting off a smaller component and getting that submitted first. However I do realize that for starting out it is often helpful to get some actual use cases implemented before committing the base structures.","author":"kevincox","id":"47419","dateCreated":"1521888284","dateModified":"1521888284"},{"type":"comment","comment":">>! In D2057#46980, @Ivzhh wrote:\n>>>! In D2057#46726, @yuja wrote:\n>>>> I think the only place where you would need to do os-specific code is when\n>>>> doing serialization and serialization\n>>> \n>>> Yes, that will be feasible in strictly typed language like Rust.\n>> \n>> To be clear, I meant serialization\/deserialization between filesystem path and\n>> internal dirstate\/manifest path, not between dirstate storage and in-memory\n>> dirstate object.\n> \n> I guess your suggestion is like this: @yuja\n> \n> 1. if it is windows and the code page is MBCS, try to decode the paths read from manifest and dirstate into unicode equivalent\n> 2. use utf internally and with rust IO api\n> 3. when writing back to dirstate and manifest, encode utf to MBCS\n\nNo. My suggestion is:\n\n1. keep manifest\/dirstate paths as bytes (which are probably wrapped by some type, say HgPath)\n2. but we want to use Rust's standard library for I\/O\n3. so, add utility function\/trait to convert HgPath to Path\/PathBuf, where MBCS-Wide conversion\n   will occur.\n\nI think raw byte paths will be needed to build store paths (e.g. `.hg\/store\/data\/~2eclang-format.i`).\n\nhttps:\/\/www.mercurial-scm.org\/repo\/hg\/file\/4.5.2\/mercurial\/store.py","author":"yuja","id":"47287","dateCreated":"1521730814","dateModified":"1521730814"},{"type":"comment","comment":">>! In D2057#46726, @yuja wrote:\n>>> I think the only place where you would need to do os-specific code is when\n>>> doing serialization and serialization\n>> \n>> Yes, that will be feasible in strictly typed language like Rust.\n> \n> To be clear, I meant serialization\/deserialization between filesystem path and\n> internal dirstate\/manifest path, not between dirstate storage and in-memory\n> dirstate object.\n\nI guess your suggestion is like this: @yuja\n\n1. if it is windows and the code page is MBCS, try to decode the paths read from manifest and dirstate into unicode equivalent\n2. use utf internally and with rust IO api\n3. when writing back to dirstate and manifest, encode utf to MBCS\n\nPlease let me know if I have misunderstanding. Thank you!","author":"Ivzhh","id":"46981","dateCreated":"1521662441","dateModified":"1521662461"},{"type":"inline","comment":"I guess I did this because I met some empty change delta in the beginning. I think I won't try to parallelize unzip for now.","replyTo":"43866","isNewFile":"1","line":"290","lineLength":"3","path":"rust\/hgstorage\/src\/revlog_v1.rs","diffId":"6724","author":"Ivzhh","id":"46964","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I think it explains why in mercurial repo, rust version is significantly faster. I am working on cpu future, but I did not finalize design style yet. I will keep working on that.","replyTo":"43867","isNewFile":"1","line":"279","lineLength":"0","path":"rust\/hgstorage\/src\/revlog_v1.rs","diffId":"6724","author":"Ivzhh","id":"46963","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"This part, including the stream-style, is from python part. I will update later with xi-rope.","replyTo":"43969","isNewFile":"1","line":"51","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"Ivzhh","id":"46962","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I borrow this logic as whole from python code. It will need sometime to re-translate to non-pointer-arithmetic way.","replyTo":"43949","isNewFile":"1","line":"14","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"Ivzhh","id":"46961","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I think LRU will update reference count (or timestamp) when the data is accessed.","replyTo":"43942","isNewFile":"1","line":"136","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"Ivzhh","id":"46960","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I kind of get borrow check compile error here. Later I use Occupied() when possible.","replyTo":"43930","isNewFile":"1","line":"170","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"Ivzhh","id":"46959","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I add the error handling back","replyTo":"43923","isNewFile":"1","line":"161","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"Ivzhh","id":"46958","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"For the filter, I follow the example in the walkdir doc. I guess what I want is to skip the dir for later recursive visiting. ","replyTo":"43921","isNewFile":"1","line":"152","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"Ivzhh","id":"46957","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I think dir state needs to 1. read existing one; 2. create one if not exits; maybe private for now.","replyTo":"43916","isNewFile":"1","line":"108","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"Ivzhh","id":"46956","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I remember the python hg uses the name, in the beginning, I tried to replicate py-hg's behaviour. But I think it needs to be renamed. I agree with you.","replyTo":"43928","isNewFile":"1","line":"48","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"Ivzhh","id":"46955","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I like to_owned(), I will them in later occasions. Thank you!","replyTo":"43913","isNewFile":"1","line":"78","lineLength":"0","path":"rust\/hgstorage\/src\/config.rs","diffId":"6724","author":"Ivzhh","id":"46954","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"Sure, I will use v1 only for now. In the beginning I kinda over designed this part.","replyTo":"43865","isNewFile":"1","line":"95","lineLength":"0","path":"rust\/hgstorage\/src\/config.rs","diffId":"6724","author":"Ivzhh","id":"46953","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I guess I will use the rest info later. hg seems put some meta data in the commit comments. I will keep it for now. Thank you!","replyTo":"43911","isNewFile":"1","line":"31","lineLength":"0","path":"rust\/hgstorage\/src\/changelog.rs","diffId":"6724","author":"Ivzhh","id":"46952","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"Thank you for the suggestion! I guess I need to extend clap later to support hg style command line. Right now whenever clap cannot handle the argument parsing, I will redirect the arguments to hg directly.","replyTo":"43864","isNewFile":"1","line":"233","lineLength":"28","path":"rust\/hgcli\/src\/main.rs","diffId":"6724","author":"Ivzhh","id":"46951","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"when I removed the unsafe, I got error: error[E0133]: use of mutable static requires unsafe function or block","replyTo":"43908","isNewFile":"1","line":"91","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"Ivzhh","id":"46950","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"I guess it is because NLL. When I started the work, rust compiler reported borrow check error on this part. I later read an article talking about NLL update in rust. But before that, I use the braces to avoid the error.","replyTo":"43901","isNewFile":"1","line":"46","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"Ivzhh","id":"46949","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"pad is a bool, however when I checked it in hg-python, int are passed to the function. I guess I need to update cpython wrapper for this, a more broad logic conversion.","replyTo":"43900","isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"Ivzhh","id":"46948","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"This crate is my previous try to integrate rust into hg. Right now I guess mine main pursue is to add hg r-* commands for rust. I will follow your suggestion when I am implementing the wire protocol and reuse the code for pure rust crate.","replyTo":"43897","isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"Ivzhh","id":"46947","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"inline","comment":"It should be any &[u8], but the current cpython crate doesn't wrap for &[u8]. I think I need to fork and add that part. I put it in my checklist now.","replyTo":"43898","isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"Ivzhh","id":"46946","dateCreated":"1521658541","dateModified":"1521658541"},{"type":"comment","comment":"  - add revlog and mpatch facilities\n  - add changelog parsing\n  - add manifest parsing\n  - path encoding for data store\n  - add dirstate and matcher facilities\n  - add local repository and the supporting modules\n  - use cargo fmt to format code\n  - add hg r-status command\n  - bincode 1.0.0 is a bit slow in my test\n  - delay pattern matching during dir walk\n  - optimize out trie and enable CoreXL profiling\n  - use hashmap\n  - remove thread pool\n  - rust default read is not buf-ed, this is the key of slowness\n  - change to globset\n  - convert glob to regex\n  - hg ignore patterns are all converted to regex (as hg does), and now it is faster\n  - filter dir early to prevent walking\n  - Update matcher mod after testing Mozilla unified repo\n  - bug fix: use byte literals instead of numbers\n  - hg store path encoding is per byte style, update code according to Kevin Cox's comments\n  - update matcher testing according to Match interface change\n  - If clap fails to recognize r-* subcommands, then run python-version hg\n  - changelog coding style revised\n  - remove legacy revlog v0 and unfinished v2.\n  - partially revise the dirstate reviews\n  - remove duplicated build.rs, let the executable module guarantee the python\n  - use cursor in base85 encoding, reducing raw index-math\n  - use cursor in base85 decoding, reducing raw index-math\n  - dirstate update according to review comments\n  - config update according to review comments\n  - mpatch rename to more meaningful names\n  - simplify matcher as when there is no syntax named in the beginning, use regexp\n  - local repo coding style update\n  - dirstate coding style update\n  - manifest coding style update\n","author":"Ivzhh","id":"46944","dateCreated":"1521656608","dateModified":"1521656608"},{"type":"update","diffId":"7188","author":"Ivzhh","id":"46942","dateCreated":"1521656608","dateModified":"1521656608"},{"type":"comment","comment":"Ah, I forgot to consider the python interop. Now the need for that crate makes sense. Thanks for explaining.","author":"kevincox","id":"46733","dateCreated":"1521627628","dateModified":"1521627628"},{"type":"comment","comment":">> I think the only place where you would need to do os-specific code is when\n>> doing serialization and serialization\n> \n> Yes, that will be feasible in strictly typed language like Rust.\n\nTo be clear, I meant serialization\/deserialization between filesystem path and\ninternal dirstate\/manifest path, not between dirstate storage and in-memory\ndirstate object.","author":"yuja","id":"46726","dateCreated":"1521613817","dateModified":"1521613817"},{"type":"comment","comment":"> I think the only place where you would need to do os-specific code is when\n> doing serialization and serialization\n\nYes, that will be feasible in strictly typed language like Rust.\n\n> which I think should be handled by https:\/\/doc.rust-lang.org\/std\/os\/unix\/ffi\/trait.OsStringExt.html\n> and https:\/\/doc.rust-lang.org\/std\/os\/windows\/ffi\/trait.OsStringExt.html.\n\nNot true for Windows because Rust uses Unicode (UTF-16-ish) API, whereas\nPython 2 does ANSI. We need to convert a \"wide\" string to a locale-dependent string.\n\nMaybe the local-encoding crate will do that for us?\n\n","author":"yuja","id":"46723","dateCreated":"1521607475","dateModified":"1521607475"},{"type":"comment","comment":"I'm not a windows expert but it seems like the rust OsStr, Path and filesystem APIs should handle these conversions for you. I think the only place where you would need to do os-specific code is when doing serialization and serialization which I think should be handled by https:\/\/doc.rust-lang.org\/std\/os\/unix\/ffi\/trait.OsStringExt.html and https:\/\/doc.rust-lang.org\/std\/os\/windows\/ffi\/trait.OsStringExt.html.","author":"kevincox","id":"46685","dateCreated":"1521577349","dateModified":"1521577349"},{"type":"comment","comment":"https:\/\/crates.io\/crates\/local-encoding seems to be the right choice.","author":"quark","id":"46681","dateCreated":"1521573831","dateModified":"1521573831"},{"type":"comment","comment":"> I am looking at Mozilla's rust winapi bindings, let me see if I can directly wrap around [winapi::um::fileapi::FindFirstFileA](https:\/\/docs.rs\/winapi\/*\/x86_64-pc-windows-msvc\/winapi\/um\/fileapi\/fn.FindFirstFileA.html)\n\nThat's probably a hard way. I was thinking of something converting\nbetween OsStr (i.e. Path) and MBCS bytes by using Win32 API, instead\nof calling out the \"A\" API.\n\nhttps:\/\/msdn.microsoft.com\/en-us\/library\/windows\/desktop\/dd319072(v=vs.85).aspx\n\nWe don't do that in Python, but Rust's type system will help making it right.","author":"yuja","id":"44688","dateCreated":"1520680806","dateModified":"1520680806"},{"type":"comment","comment":">>! In D2057#44269, @yuja wrote:\n>>> Reading that page it seems to claim that filenames should be utf8, not bytes. If utf8, this is what the code does, but if it is bytes that definitely won't work.\n>> \n>> IIRC it's bytes everyplace except Windows, where we pretend utf8 is real?\n> \n> It's MBCS (i.e. ANSI multi-byte characters) on Windows. The plain was to support\n> both MBCS and UTF-8-variant on Windows, but that isn't a thing yet.\n> \n> Perhaps we'll have to write a platform compatibility layer (or serialization\/deserialization\n> layer) on top of the Rust's file API, something like vfs.py we have in Python code.\n\nThank you for confirming that, I am a bit confusing when I read Encoding Plan wiki page. I am looking at Mozilla's rust winapi bindings, let me see if I can directly wrap around [winapi::um::fileapi::FindFirstFileA](https:\/\/docs.rs\/winapi\/*\/x86_64-pc-windows-msvc\/winapi\/um\/fileapi\/fn.FindFirstFileA.html)","author":"Ivzhh","id":"44295","dateCreated":"1520618349","dateModified":"1520618349"},{"type":"comment","comment":">> Reading that page it seems to claim that filenames should be utf8, not bytes. If utf8, this is what the code does, but if it is bytes that definitely won't work.\n> \n> IIRC it's bytes everyplace except Windows, where we pretend utf8 is real?\n\nIt's MBCS (i.e. ANSI multi-byte characters) on Windows. The plain was to support\nboth MBCS and UTF-8-variant on Windows, but that isn't a thing yet.\n\nPerhaps we'll have to write a platform compatibility layer (or serialization\/deserialization\nlayer) on top of the Rust's file API, something like vfs.py we have in Python code.","author":"yuja","id":"44270","dateCreated":"1520598781","dateModified":"1520598781"},{"type":"comment","comment":"Hi everyone,\n\nThank you for your encouragements and comments! I will follow up with all comments and update the code soon.\n\n@indygreg It is a great idea to test on Mozilla repo, actually I found several things interesting:\n\n1. I found a bug in my code (shame on me): because I did not use byte literal, and I made a typo. This triggers problem in Mozilla unified repo\n2. A regexp pattern in hgignore in Mozilla unified repo is not supported by rust's regex crate, a.k.a. \"(?!)\". I choose to ignore these unsupported patterns.\n3. My version is slower in this repo: 70s (hg) and 90s (mine). CodeXL reveals that the mpatch::collect() function uses 63% of the running time. I think I need to optimize it somehow.\n\nI totally agree with @kevincox that I did not sort well on char\/u8\/str\/String\/Path\/PathBuf. The first bug is caused by this. I need to improve them.\n\nThank you everyone!","author":"Ivzhh","id":"44180","dateCreated":"1520558265","dateModified":"1520558265"},{"type":"comment","comment":"Rust has platform independent types [[ https:\/\/doc.rust-lang.org\/stable\/std\/path\/struct.PathBuf.html | `PathBuf` ]] and [[ https:\/\/doc.rust-lang.org\/stable\/std\/path\/struct.Path.html | `&Path` ]] for paths and [[ https:\/\/doc.rust-lang.org\/stable\/std\/ffi\/struct.OsString.html | `OsString` ]] and [[ https:\/\/doc.rust-lang.org\/stable\/std\/ffi\/struct.OsStr.html | `&OsStr` ]] for strings (owned and references respectively. They do have os-specific extensions but as long as you don't use them it should be cross platform. That being said, if you are serializing and deserializing them you may need to write some platform dependant code.","author":"kevincox","id":"43991","dateCreated":"1520536377","dateModified":"1520536377"},{"type":"comment","comment":">>! In D2057#43989, @durin42 wrote:\n>>>! In D2057#43988, @kevincox wrote:\n>>>>! In D2057#43987, @durin42 wrote:\n>>> \n>>> Mercurial tries to be principled about always treating filenames as bytes. AIUI https:\/\/www.mercurial-scm.org\/wiki\/WindowsUTF8Plan is still the plan of record there?\n>> \n>> Reading that page it seems to claim that filenames should be utf8, not bytes. If utf8, this is what the code does, but if it is bytes that definitely won't work.\n> \n> IIRC it's bytes everyplace except Windows, where we pretend utf8 is real?\n> \n> We may have to make adjustments to this plan on macOS with APFS, but I'm not sure about that yet.\n\nI think we want to express a path as a dedicated type which has different underlying storage depending on the platform (bytes on Linux, UTF-16 on Windows). All filesystem operations should take a `Path` instance to operate on. This is the only way to cleanly round trip filenames between the OS, the application, and back to the OS. That leaves us with the hard problem of normalizing Mercurial's storage representation of paths (bytes) with the operating system's. But this world is strictly better than today, where we lose path data from the OS because we use POSIX APIs.\n\nFWIW, Python 3 rewrote the I\/O layer to use Win32 APIs everywhere. Combined with the `pathlib` types, I'm pretty sure Python 3 can round trip paths on Windows. I also think Rust's path type(s) have OS-dependent functionality.","author":"indygreg","id":"43990","dateCreated":"1520534077","dateModified":"1520534077"},{"type":"comment","comment":">>! In D2057#43988, @kevincox wrote:\n>>>! In D2057#43987, @durin42 wrote:\n>> \n>> Mercurial tries to be principled about always treating filenames as bytes. AIUI https:\/\/www.mercurial-scm.org\/wiki\/WindowsUTF8Plan is still the plan of record there?\n> \n> Reading that page it seems to claim that filenames should be utf8, not bytes. If utf8, this is what the code does, but if it is bytes that definitely won't work.\n\nIIRC it's bytes everyplace except Windows, where we pretend utf8 is real?\n\nWe may have to make adjustments to this plan on macOS with APFS, but I'm not sure about that yet.","author":"durin42","id":"43989","dateCreated":"1520533145","dateModified":"1520533145"},{"type":"comment","comment":">>! In D2057#43987, @durin42 wrote:\n> \n> Mercurial tries to be principled about always treating filenames as bytes. AIUI https:\/\/www.mercurial-scm.org\/wiki\/WindowsUTF8Plan is still the plan of record there?\n\nReading that page it seems to claim that filenames should be utf8, not bytes. If utf8, this is what the code does, but if it is bytes that definitely won't work.","author":"kevincox","id":"43988","dateCreated":"1520532520","dateModified":"1520532520"},{"type":"comment","comment":">>! In D2057#43892, @kevincox wrote:\n> On a higher level, all of these code appears to be treating file names as strings. This isn't really true and will disallow some valid file names. Maybe we should stick with bytes throughout. Of course this makes windows filepaths difficult because they are actually (utf16) strings.\n\nMercurial tries to be principled about always treating filenames as bytes. AIUI https:\/\/www.mercurial-scm.org\/wiki\/WindowsUTF8Plan is still the plan of record there?","author":"durin42","id":"43987","dateCreated":"1520531899","dateModified":"1520531899"},{"type":"inline","comment":"Take a `&str`.","replyTo":null,"isNewFile":"1","line":"62","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43985","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nfn escape(out: &mut String, b: char) {\n    unimplemented!()\n}\n\npub fn encode_path(path: &str) -> String {\n    let mut out = String::with_capacity(path.len());\n\n    for c in path.bytes() {\n        let c = c as char;\n        match c {\n            'A'...'Z' => {\n                out.push('_');\n                out.push(c.to_ascii_lowercase());\n            }\n            '\\\\' | ':' | '*' | '?' | '\"' | '<' | '>' | '|' => {\n                escape(&mut out, c);\n            }\n            \/\/ The rest of the printable range.\n            ' '...'~' => {\n                out.push(c);\n            }\n            _ => {\n                escape(&mut out, c);\n            }\n        }\n    }\n\n    out\n}\n```\nhttps:\/\/godbolt.org\/g\/3WCQs3","replyTo":null,"isNewFile":"1","line":"57","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43984","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Don't pass a `char` by reference. Also it seems your function wants a `u8`.","replyTo":null,"isNewFile":"1","line":"11","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43983","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Use a String.","replyTo":null,"isNewFile":"1","line":"35","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43982","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`encode_file_name`?","replyTo":null,"isNewFile":"1","line":"34","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43981","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Take a `&str`","replyTo":null,"isNewFile":"1","line":"34","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43980","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\np.ends_with(\".i\") || p.ends_with(\".d\")\n```","replyTo":null,"isNewFile":"1","line":"25","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43979","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"This isn't necessary.","replyTo":null,"isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43978","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I don't think you need this.","replyTo":null,"isNewFile":"1","line":"22","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43977","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`Vec<char>` is odd. Is there any reason not to use a `String` or `Vec<u8>`","replyTo":null,"isNewFile":"1","line":"11","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43976","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"c should be a `u8`.","replyTo":null,"isNewFile":"1","line":"7","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43975","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"const HEX_DIGIT: [u8; 16] = *b\"0123456789abcdef\";","replyTo":null,"isNewFile":"1","line":"5","lineLength":"0","path":"rust\/hgstorage\/src\/path_encoding.rs","diffId":"6724","author":"kevincox","id":"43974","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nassert!(!frags.is_empty());\n```","replyTo":null,"isNewFile":"1","line":"137","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43973","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Please explain.","replyTo":null,"isNewFile":"1","line":"120","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43972","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Make this one line and don't bother renaming.","replyTo":null,"isNewFile":"1","line":"86","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43971","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nfor &Fragment{frag_len, frag_ofs} in list.iter().rev()\n```","replyTo":null,"isNewFile":"1","line":"68","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43970","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"It seems weird to take a cursor to a vec if you are just going to do an absolute seek. Can it work with `&mut [u8]`?","replyTo":null,"isNewFile":"1","line":"51","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43969","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`vec![0; count]` works. (The arguments might be the other way around).","replyTo":null,"isNewFile":"1","line":"54","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43968","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`mov` is overly shortened and generic.","replyTo":null,"isNewFile":"1","line":"51","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43967","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`pull` is very generic.","replyTo":null,"isNewFile":"1","line":"35","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43966","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nstruct Fragment {\n    len: u32,\n    offset: u32,\n}\n```","replyTo":null,"isNewFile":"1","line":"24","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43965","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/f\/fragment\/","replyTo":null,"isNewFile":"1","line":"40","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43964","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"If you are unwrapping the `pop` there is no need for the prior check.","replyTo":null,"isNewFile":"1","line":"40","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43963","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Maybe it's just me but I think it is more common to put the source before the destination.","replyTo":null,"isNewFile":"1","line":"35","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43962","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nassert!(!src.is_empty())\n```","replyTo":null,"isNewFile":"1","line":"39","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43961","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Spell these out please.","replyTo":null,"isNewFile":"1","line":"13","lineLength":"0","path":"rust\/hgstorage\/src\/mpatch.rs","diffId":"6724","author":"kevincox","id":"43960","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would do `self.inner.map(|m| m.is_match(rp)).unwrap_or(false)` but this is fine.","replyTo":null,"isNewFile":"1","line":"200","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43959","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/rp\/path\/","replyTo":null,"isNewFile":"1","line":"195","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43958","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/relglob\/relative_glob_re\/","replyTo":null,"isNewFile":"1","line":"108","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43957","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Is this a warning or error? You might want to switch to `panic!`.","replyTo":null,"isNewFile":"1","line":"159","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43956","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would move this into the following match because it dedupes the `starts_with` check and puts the logic closer together.","replyTo":null,"isNewFile":"1","line":"160","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43955","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/ln\/line\/","replyTo":null,"isNewFile":"1","line":"143","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43954","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Better name please.","replyTo":null,"isNewFile":"1","line":"131","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43953","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"You should be able to do `&string` rather then `string.as_str()` as it coerces. ","replyTo":null,"isNewFile":"1","line":"111","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43952","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"If you are just doing one call just return the result.","replyTo":null,"isNewFile":"1","line":"111","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43951","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"If you are going to call `String.as_str()` just take a `&str`.","replyTo":null,"isNewFile":"1","line":"108","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43950","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Can you manage a `&[u8]` rather then pointer arithmetic for the whole string. It will make me feel better and will probably be easier to read.","replyTo":null,"isNewFile":"1","line":"14","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43949","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Might be worth calling `String::with_capacity(pat.len())` since it will be at least that long.","replyTo":null,"isNewFile":"1","line":"10","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43948","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/pat\/glob\/","replyTo":null,"isNewFile":"1","line":"9","lineLength":"0","path":"rust\/hgstorage\/src\/matcher.rs","diffId":"6724","author":"kevincox","id":"43947","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"What are these numbers?","replyTo":null,"isNewFile":"1","line":"49","lineLength":"0","path":"rust\/hgstorage\/src\/manifest.rs","diffId":"6724","author":"kevincox","id":"43946","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/ent\/entry\/","replyTo":null,"isNewFile":"1","line":"42","lineLength":"0","path":"rust\/hgstorage\/src\/manifest.rs","diffId":"6724","author":"kevincox","id":"43945","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"What are these magic numbers?","replyTo":null,"isNewFile":"1","line":"33","lineLength":"0","path":"rust\/hgstorage\/src\/manifest.rs","diffId":"6724","author":"kevincox","id":"43944","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"This test has no assetions. Consider calling it `test_create_...` or something to indicate that you are just checking for panics.","replyTo":null,"isNewFile":"1","line":"155","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43943","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Why does it need to be mutable to clone?","replyTo":null,"isNewFile":"1","line":"136","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43942","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/fp\/path\/","replyTo":null,"isNewFile":"1","line":"121","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43941","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`gd` is cryptic.","replyTo":null,"isNewFile":"1","line":"129","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43940","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nassert!(abspath.exists(), \"path not exists: {:?}\", abspath);\n```","replyTo":null,"isNewFile":"1","line":"127","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43939","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nwhile !root.join(\".hg\").exists() {\n    root = root.parent().expect(\".hg folder not found\");\n}\n```","replyTo":null,"isNewFile":"1","line":"66","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43938","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would replace the condition with.\n\n```\nassert!(dot_hg_path.exists(), \".hg folder not found for the path given by -R argument: {:?}\", p);\n```","replyTo":null,"isNewFile":"1","line":"50","lineLength":"0","path":"rust\/hgstorage\/src\/local_repo.rs","diffId":"6724","author":"kevincox","id":"43937","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"You can add a later `.arg(dst)` to support non-utf8 paths instead of converting to a str here.","replyTo":null,"isNewFile":"1","line":"54","lineLength":"0","path":"rust\/hgstorage\/src\/lib.rs","diffId":"6724","author":"kevincox","id":"43936","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"In rust we generally avoid brackets around `as` as it is very tightly binding.","replyTo":null,"isNewFile":"1","line":"206","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43935","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Please use a better name for `sent`.","replyTo":null,"isNewFile":"1","line":"199","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43934","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"You can use the entry api here.","replyTo":null,"isNewFile":"1","line":"184","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43933","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/rem\/path\/ or remaining_path.","replyTo":null,"isNewFile":"1","line":"183","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43932","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Use an `else if`.","replyTo":null,"isNewFile":"1","line":"175","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43931","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"You could do the following for a slight performance win and save a line.\n\n```\nif let Occupied(entry) = self.dmap.entry(relpath) {\n   ...\n}\n```","replyTo":null,"isNewFile":"1","line":"170","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43930","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I recommend not renaming this. It is confusing.","replyTo":null,"isNewFile":"1","line":"5","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43929","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"This could have a better name.","replyTo":null,"isNewFile":"1","line":"48","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43928","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```\nlet mut grey = Set::new();\ngrey.extend(self.dmap.keys().map(|s| s.as_path()));\n```\n\nAlso I would pick a name like `undiscovered_paths` or something. `grey` is cryptic.","replyTo":null,"isNewFile":"1","line":"146","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43927","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would also put this filter above. But more importantly all `_is_bad()` does is check for file types. So it seems like the former filter is redundant with this one.","replyTo":null,"isNewFile":"1","line":"169","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43926","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would move this filter beside the filter in the loop.","replyTo":null,"isNewFile":"1","line":"167","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43925","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would just call this `path` or `pathbuf`.","replyTo":null,"isNewFile":"1","line":"162","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43924","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Please explain why you are ignoring the error condition.","replyTo":null,"isNewFile":"1","line":"161","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43923","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"This is probably worth a helper function.","replyTo":null,"isNewFile":"1","line":"155","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43922","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would prefer doing the filter before the loop and storing it in a variable.","replyTo":null,"isNewFile":"1","line":"152","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43921","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"s\/mtc\/matcher\/","replyTo":null,"isNewFile":"1","line":"141","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43920","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Don't use `_` prefix for privates. Rely on rust viability. \n\nAlso `is_bad` isn't very informative.","replyTo":null,"isNewFile":"1","line":"130","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43919","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Is ignoring duplicate entries desired? It might be worth a comment explaining why.","replyTo":null,"isNewFile":"1","line":"125","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43918","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"This should Probably return a `Result<Self>` and pass the error to the caller.","replyTo":null,"isNewFile":"1","line":"87","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43917","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"1. Does this function need to be public? It seems internal to the constructor.\n1. If it doesn't need to be I would prefer it return the Map so that you don't have a partial-constructed DirState.","replyTo":null,"isNewFile":"1","line":"108","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43916","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"I would skip this check and rely on `p.metadata()`. Just switch `.unwrap()` to `.expect()` with a nicer message. This also handles race conditions more nicely.","replyTo":null,"isNewFile":"1","line":"90","lineLength":"0","path":"rust\/hgstorage\/src\/dirstate.rs","diffId":"6724","author":"kevincox","id":"43915","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Is this used yet? It probably also needs some documentation because I don't really understand the fields (but I do have little domain knowledge).","replyTo":null,"isNewFile":"1","line":"49","lineLength":"0","path":"rust\/hgstorage\/src\/config.rs","diffId":"6724","author":"kevincox","id":"43914","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"If you are just going to convert to String I would recommend taking a String argument.\n\nAlso prefer `.to_owned()` over `.to_string()`.","replyTo":null,"isNewFile":"1","line":"78","lineLength":"0","path":"rust\/hgstorage\/src\/config.rs","diffId":"6724","author":"kevincox","id":"43913","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Just put `msg: content` in the struct construction.","replyTo":null,"isNewFile":"1","line":"33","lineLength":"0","path":"rust\/hgstorage\/src\/changelog.rs","diffId":"6724","author":"kevincox","id":"43912","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"If you aren't using the value I would prefer `truncate(NodeId::hex_len())`","replyTo":null,"isNewFile":"1","line":"31","lineLength":"0","path":"rust\/hgstorage\/src\/changelog.rs","diffId":"6724","author":"kevincox","id":"43911","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Passing a message as a third argument is really useful.","replyTo":null,"isNewFile":"1","line":"24","lineLength":"0","path":"rust\/hgstorage\/src\/changelog.rs","diffId":"6724","author":"kevincox","id":"43910","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"Let rust do the overflow checking.\n\n```\nacc = acc.checked_mul(85)\n    .ok_or_else(|| {\n        PyErr::new::<exc::ValueError, _>(\n            py,\n            format!(\"bad base85 character at position {}\", i))\n    })?;","replyTo":null,"isNewFile":"1","line":"152","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43909","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"This is probably worth a comment that this is safe because D85DEC is required to be initialized before this function is called.","replyTo":null,"isNewFile":"1","line":"91","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43908","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"```while !ptext.is_empty()```","replyTo":null,"isNewFile":"1","line":"52","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43907","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"It might be best to use a [[ https:\/\/doc.rust-lang.org\/stable\/std\/io\/struct.Cursor.html | `std::io::Cursor` ]] and let it drack `dst_off` for your.","replyTo":null,"isNewFile":"1","line":"47","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43906","dateCreated":"1520530210","dateModified":"1520530210"},{"type":"inline","comment":"`ptext` isn't very descriptive. ","replyTo":null,"isNewFile":"1","line":"45","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43905","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"Tracking len manually is a smell. Why not drop it and use `ptest.is_empty()`.","replyTo":null,"isNewFile":"1","line":"63","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43904","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"I would prefer the name `chunk` or even `accum` is a lot mode obvious to me than `acc`.","replyTo":null,"isNewFile":"1","line":"54","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43903","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"I suspect this type annotation isn't required.","replyTo":null,"isNewFile":"1","line":"47","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43902","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"Why the braces here?","replyTo":null,"isNewFile":"1","line":"46","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43901","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"IIUC pad is only ever checked `== 0`. Can it be made into a bool?","replyTo":null,"isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43900","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"I would just combine these into one line as the name `ch` isn't adding much.","replyTo":null,"isNewFile":"1","line":"58","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43899","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"`&str` can only hold valid utf8 data? Does it make more sense to have `&[u8]` here for a list of bytes?","replyTo":null,"isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43898","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"Would it be possible to separate the decode from the python objects. I'm thinking two helper functions.\n\n```\nfn b85_required_len(text: &str) -> usize\nfn b85_encode(text: &str, pad: i32, out: &mut [u8]) -> Result<()>\n```\n\n","replyTo":null,"isNewFile":"1","line":"23","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43897","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"```\nfor i in &[24, 16, 8, 0]\n```","replyTo":null,"isNewFile":"1","line":"56","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43896","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"I prefer something like this: https:\/\/play.rust-lang.org\/?gist=5ca18a5b95335600e911b8f9310ea5c7&version=stable\n\nI doubt lazy_static is too slow. Otherwise we can stay like this until const functions get implemented.\n\nEither way note:\n* I changed the type of B85CHARS to an array as opposed to an array ref.\n* The loop condition is much nicer.","replyTo":null,"isNewFile":"1","line":"21","lineLength":"0","path":"rust\/hgbase85\/src\/base85.rs","diffId":"6724","author":"kevincox","id":"43895","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"inline","comment":"If this is going to be reused I would move it into it's own crate. It seems like everything here could be boiled down to a single function call in main.","replyTo":"43863","isNewFile":"1","line":"1","lineLength":"0","path":"rust\/hgbase85\/build.rs","diffId":"6724","author":"kevincox","id":"43894","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"comment","comment":"I will try to finish the review later, but it might be quicker if you incorporate some of the changes first since a lot of them are repeated many times. Overall it looks good, there are a couple of things that i would highlight to make the code easier to read.\n\n* Prefer more descriptive variable names.\n* If you can, avoid \"pointer\" arithmetic. Cursors and slices are nice and have great convenience methods.\n* Group your flow control and filtering more.\n* Try to keep your types straight. In rust using the right types helps catch errors. So be aware of `char` vs `u8` vs `String` vs `Vec<char>` vs `Vec<u8>`.\n\nOn a higher level, all of these code appears to be treating file names as strings. This isn't really true and will disallow some valid file names. Maybe we should stick with bytes throughout. Of course this makes windows filepaths difficult because they are actually (utf16) strings.","author":"kevincox","id":"43893","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"reject","author":"kevincox","id":"43892","dateCreated":"1520530209","dateModified":"1520530209"},{"type":"comment","comment":"Doesn't mononoke have code to read revlogs already?","author":"glandium","id":"43869","dateCreated":"1520495348","dateModified":"1520495348"},{"type":"inline","comment":"IIRC, core Mercurial keeps an open file handle on revlogs and ensures we don't run out of file handles by not keeping too many revlogs open at the same time. For scanning operations, not having to open and close the file handles all the time will make a difference for performance. Also, core Mercurial loads the entirety of the `.i` file into memory. That's a scaling problem for large revlogs. But it does make performance of index lookups really fast.","replyTo":null,"isNewFile":"1","line":"279","lineLength":"0","path":"rust\/hgstorage\/src\/revlog_v1.rs","diffId":"6724","author":"indygreg","id":"43867","dateCreated":"1520494272","dateModified":"1520494272"},{"type":"inline","comment":"A thread pool to help with zlib decompression should go a long way here.\n\nProbably too early to think about this, but we'll likely eventually want a global thread pool for doing I\/O and CPU expensive tasks, such as reading chunks from a revlog and decompressing them.\n\nFWIW, we're going to radically alter the storage format in order to better support shallow clones. But that work hasn't started yet. I still think there is a benefit to implementing the revlog code in Rust though.","replyTo":null,"isNewFile":"1","line":"290","lineLength":"3","path":"rust\/hgstorage\/src\/revlog_v1.rs","diffId":"6724","author":"indygreg","id":"43866","dateCreated":"1520494272","dateModified":"1520494272"},{"type":"inline","comment":"I would not worry about supporting v0 or v2 at this time. v0 is only important for backwards compatibility with ancient repos. And v2 never got off the ground.","replyTo":null,"isNewFile":"1","line":"95","lineLength":"0","path":"rust\/hgstorage\/src\/config.rs","diffId":"6724","author":"indygreg","id":"43865","dateCreated":"1520494272","dateModified":"1520494272"},{"type":"inline","comment":"This is definitely nifty and an impressive achievement \\o\/\n\nThe `r-` commands for testing pure Rust code paths are an interesting idea!\n\nI think I'm OK with including support for this in `hgcli`. But I think the code should live in a separate file so it doesn't pollute `main()`. And it should be behind a Cargo feature flag so we maintain compatibility with `hg` as much as possible by default.\n\nAlso, Mercurial's command line parser is extremely wonky and has some questionable behavior. If the intent is to make `rhg` compatible with `hg`, we would need to preserve this horrible behavior. We'll likely have to write a custom argument parser because of how quirky Mercurial's argument parser is :(","replyTo":null,"isNewFile":"1","line":"233","lineLength":"28","path":"rust\/hgcli\/src\/main.rs","diffId":"6724","author":"indygreg","id":"43864","dateCreated":"1520494272","dateModified":"1520494272"},{"type":"inline","comment":"I see this file was copied. There's nothing wrong with that. But does this mean we will need a custom build.rs for each Rust package doing Python? If that's the case, then I would prefer to isolate all our rust-cpython code to a single package, if possible. I'm guessing that could be challenging due to crossing create boundaries. I'm sure there are placed where we don't want to expose symbols outside the crate.\n\nI'm curious how others feel about this.","replyTo":null,"isNewFile":"1","line":"1","lineLength":"0","path":"rust\/hgbase85\/build.rs","diffId":"6724","author":"indygreg","id":"43863","dateCreated":"1520494272","dateModified":"1520494272"},{"type":"comment","comment":"First of all - wow! Thanks for writing all this code. There's definitely a lot to work with. And work with it we will!\n\nThis is definitely too big to review as one commit. If you could do *any* work to split it up, it would be greatly appreciated. I'd focus on the pure Rust pieces first. Everything needed to open revlogs would be great!\n\nYou may find our custom Phabricator extensions (linked from https:\/\/www.mercurial-scm.org\/wiki\/Phabricator) useful for submitting series of commits to Phabricator.\n\nRegarding the performance, that's pretty good! The dirstate code is some of the most optimized code in Mercurial. There are some gnarly Python C hacks to make it fast. Some of those tricks involve using special system calls to walk directories to minimize the number of system calls. I'm not sure if the crate you imported has those optimizations. (I wouldn't be surprised either way.) I wouldn't worry too much about performance at this juncture. But I suspect we could make the Rust code another 50% faster with some tweaking. It would also be interesting to test on a larger repo, say https:\/\/hg.mozilla.org\/mozilla-unified. Also, I believe there are hooks in the dirstate code to use Watchman (fsmonitor). Those hooks are critical in order to achieve peak performance on large repositories.\n\nSince you seem to be proficient at writing lots of Rust code, if you are looking for another project, may I suggest porting `chg` to Rust? That code is in `contrib\/chg`. That might be the easiest component to actually ship in Rust since it is a standalone binary that doesn't link against Python. But we shouldn't get ahead of ourselves :)\n\nAnyway, it is late for me and I need to detach from my computer. I'm sure others will have things to say as well...","author":"indygreg","id":"43862","dateCreated":"1520494272","dateModified":"1520494272"},{"type":"comment","comment":"Hi all,\n\nBased on the discussion a few weeks ago, I come up with a solution for review and discussion. After reading the Oxidation plan, the first thought is to bypass python engine and current plugin system IFF on request. If user (maybe background checker of IDE) request r-* subcommands, then hg gives rust implementations instead of python's. So I try to make hg r-status as fast as possible. The submitted version has comparable performance (as an example of the performance, not evidence, on my MacBook, in hg's own repo, hg r-status 150ms, and hg status 220ms). I am using CodeXL to profile the performance, and plan to use Future.rs to make the loading parallel and maybe 30ms faster.\n\nThe implementation originates from hg python implementation, because the python version is really fast. I tried to split into small changes, however, I eventually to combine all hgstorage module as one commit.\n\nThank you for your comments!","author":"Ivzhh","id":"43861","dateCreated":"1520491361","dateModified":"1520491361"},{"type":"comment","comment":"  - merge with stable\n  - translate base85.c into rust code\n  - move hgbase85 into independent module\n  - add hgstorage crate\n  - hg status implementation in rust\n","author":"Ivzhh","id":"43856","dateCreated":"1520490633","dateModified":"1520490633"},{"type":"update","diffId":"6724","author":"Ivzhh","id":"43855","dateCreated":"1520490633","dateModified":"1520490633"},{"type":"comment","comment":"Thank you @indygreg!\n\nThe OxidationPlan is my best reference when I started to make a move, and this thread is even more helpful. I am really interested in exploring this ;-) In 2014 I was trying to change the hg backend storage to Postgres, a silly and failed experiment.\n\nAnyway, I will save everyone's time and stop talking. I will come back later with a more meaningful implementation.","author":"Ivzhh","id":"34977","dateCreated":"1518075333","dateModified":"1518075333"},{"type":"comment","comment":"To be honest, we're not yet sure what we'll decide for the Python -> Rust bridge. The problem is summarized in the `Rust <=> Python Interop` section on https:\/\/www.mercurial-scm.org\/wiki\/OxidationPlan.\n\nI suspect at some level we'll need a CPython extension for CPython for performance reasons (especially for high volume function calls). PyPy obviously uses CFFI. I think the ideal outcome is we can write Rust that exposes a C API and use CFFI natively on PyPy and something like `cbindgen` + `Milksnake` to auto-generate a CPython extension that acts as a wrapper around the C API exposed by Rust. I'm not sure if anyone has invented this exact wheel yet. If not, it's probably faster to use `rust-cpython`. Maybe several months from now we have enough Rust and maintaining `rust-cpython` is painful enough that we pursue the auto-generated CPython extension route.\n\nWhat I'm trying to say is you have a green field to explore! But at this juncture, perfect is the enemy of done. We'll be happy with any forward progress, even failed experiments.","author":"indygreg","id":"34976","dateCreated":"1518074550","dateModified":"1518074550"},{"type":"comment","comment":"As the author of this patch, actually I have the same concern. I started to translate base85 as baby steps to find a way of integrating rust and cpython, on my side, Today I modify setup.py, policy.py and makefile to run hg's test suit with the new base85. For myself, it is only proof of concept.\n\nMaybe I should take another way: translate more python modules into CFFI-style, and let CFFI call rust implementation. And gradually change more implementations of python modules with corresponding cffi-style, while keep the python interface the same. My own hope is the rust routines will be able to call each other and eventually run some __basic__ tasks without calling python part. And the rust still lazily provides info to python interface for extensions etc.\n\nI am exploring this way now, and hope the findings will be useful for community to make decision.\n\nThank you all for the comments!","author":"Ivzhh","id":"34975","dateCreated":"1518070365","dateModified":"1518070365"},{"type":"comment","comment":"What would be the advantage of taking this? Since we already have the C implementation, it's not likely to gain us any performance. On the other hand, it might make a good test case for integrating Rust and Python, finding the right API boundaries and experimenting with different approaches, precisely \/\/because\/\/ we already have a C implementation. @indygreg @durin42 what are your thoughts about it?\n\n","author":"krbullock","id":"34910","dateCreated":"1518062354","dateModified":"1518062354"},{"type":"comment","comment":"I agree with the splitting comments :) In fact there might already be a base85 crate which can be used: https:\/\/docs.rs\/zero85. Either way I'll hold off on the review, feel free to ping me when you are ready for me to take a look.","author":"kevincox","id":"34640","dateCreated":"1518001891","dateModified":"1518001891"},{"type":"comment","comment":"Thank you @indygreg for your detailed explanation!\n\nI understand the process now, and I will go back reading the developer's guide thoroughly again. I will try my best to provide a relatively clean stack of patches.\n\nThank you for you time!","author":"Ivzhh","id":"34561","dateCreated":"1517972031","dateModified":"1517972031"},{"type":"comment","comment":"We generally prefer that patches to Mercurial be small and do a single thing. This makes it easier to review and understand changes, since each change can be evaluated in isolation. If you submit changesets together using `hg phabsend`, they automatically show up as a \/\/stack\/\/ in Phabricator. And if changesets at the bottom of the stack are ready to land, we generally land those without waiting for the entire stack to land. This enables forward progress to be made and this is generally better for everyone than waiting until a series of commits is perfect before adding any of them.\n\nWhat that means is you should ideally split this work into smaller parts. For example:\n\n  # Add the pure Rust code\/crate\n  # Add the Python Rust code\/crate\n  # Build system \/ module policy changes\n\nI'm not sure of the order of things though. Since this is the first Rust extension, it's not clear what needs to be implemented in what order. I'm fine looking at a large commit if things are too tightly coupled to separate. But you should strive to make smaller commits.\n\n","author":"indygreg","id":"34557","dateCreated":"1517970792","dateModified":"1517970792"},{"type":"comment","comment":"Sure, thank you for the comments! I can definitely prepare makefile and setup.py to make the building process work with rust part. I am planning to change the policy.py module to support and try to load rust modules and run all the tests. I will submit a new patch after finishing these two tasks.\n\nAfter reading wiki\/OxidationPlan again, I plan to change to cffi for better compatibility (pypy and others), and try to build algorithms in pure rust. Shall I wait till migrating to cffi based solution now and resubmit this patch with all three changes (building, testing, and cffi)?\n\nThank you!","author":"Ivzhh","id":"34556","dateCreated":"1517970271","dateModified":"1517970271"},{"type":"comment","comment":"Yes, we should definitely split things into multiple crates. Small, narrowly-focused crates does seem to be the Rust way, after all.\n\n`hgcli` should be for things specific to the Rust implementation of `hg`. I think this can also include the feature set of `chg` (once we've ported `chg` to Rust).\n\nI definitely support separating the \"pure Rust\" from the \"Python Rust\" via a crate boundary. It is generally useful to have Rust that isn't bound to Python because it will facilitate reuse outside of Python contexts. For example, someone could implement a Mercurial wire protocol server in pure Rust without needing to worry about Python. Of course, we're likely to encounter areas where we really want tight coupling in order to achieve optimal performance in Python. So we may have to design APIs on the pure Rust side to facilitate CPython use. I'm OK with that.\n\nAs for how many crates to have, I don't have super strong opinions. I could see us putting every little component\/subsystem in its own crate. I could also see us putting everything in one large crate. I don't think it is worth deciding at this early juncture. API design and ability to be reused outside its originally intended purpose is the important property to strive for. I think that has more to do with how the code is authored rather than which crates things are in.\n\nA missing piece of this patch is the build system and module loader integration. We have a \/\/module policy\/\/ that dictates which implementation of a Python module we use. We probably want to introduce a `rust` policy that uses Rust-based modules where available and falls back to the `cext` modules\/policy if a Rust module isn't available. We also need to figure out how to integrate Rust into `setup.py`. But I think the build system bit can be deferred until we're actually ready to ship Rust, which is still a bit of ways off. I'm happy for the workflow to be \/\/run cargo in order to load Rust modules\/\/ for the time being. But if you can implement `Makefile` and\/or `setup.py` integration to build these Rust extensions, that would be awesome.","author":"indygreg","id":"34484","dateCreated":"1517947275","dateModified":"1517947275"},{"type":"comment","comment":"I am open to the three-crates plan. Oirginally I have hgcli and hgext separately, and I was planning to use CFFI mode. I am a pypy user too, so I will be willing to provide a python C API free crate for pypy and others.","author":"Ivzhh","id":"34443","dateCreated":"1517928889","dateModified":"1517944524"},{"type":"inline","comment":"I think I'd like to separate things a bit more and have a Python-free module, and then a glue module that we can use to call into the pure Rust. Part of the reason is that in my perfect world we won't use the cpython crate for speedups so they can be used from pypy as well. Separating them at least makes it easier to have an extern \"C\" version of the method that can be used from cffi instead of only through the CPython API.\n\n(Not sure what opinions others have. It's likely that I'll attempt this approach in the near future as part of a continued attempt to speed up `hg diff`.)","replyTo":null,"isNewFile":"1","line":"22","lineLength":"0","path":"rust\/hgcli\/src\/hgext\/base85.rs","diffId":"5238","author":"durin42","id":"34390","dateCreated":"1517913293","dateModified":"1517913293"},{"type":"comment","comment":"I'd be curious to see what @indygreg has to say about this, maybe wait on his input before doing any work in response to my feedback?\n\nI do wonder if we should have at least three crates:\n\n # hgcli\n # libmercurial\n # hgcext\n\nThe first one would be the command-line entry point, the last could use the cpython API, and libmercurial would be \"pure rust\" and open the door to eventually having a libhg or something that exports C functions and would be suitable for cffi and linking into other binaries?","author":"durin42","id":"34389","dateCreated":"1517913293","dateModified":"1517913293"},{"type":"update","diffId":"5238","author":"Ivzhh","id":"34367","dateCreated":"1517869861","dateModified":"1517869861"}],"dateCreated":"1517869861","dateModified":"1521888284","status":"Needs Review"},{"id":"2884","callsign":"HG","title":"wireproto: experimental command to emit file data","author":"indygreg","summary":"Partial clones will require new wire protocol functionality to\nretrieve repository data. The remotefilelog extensions - which\nimplements various aspects of partial clone - adds a handful of\nwire protocol commands:\n\ngetflogheads\n   Obtain heads of a filelog\ngetfile\n   Obtain data for an individual file revision\ngetfiles\n   Batch version of getfile\ngetpackv1\n   Obtain a \"pack file\" containing index and data on multiple\n   files\n\n(among others)\n\nRecently, the wire protocol has gained support for \"obtain repository\ndata\" in the form of overloading the \"getbundle\" wire protocol\ncommand. This is arguaby OK in the context of \"all data is attached\nto bundles\" and \"bundles are a self-contained representation of\ncomplete repository data.\" But partial clone invalidates these\nassumptions because in a partial clone world, we no longer can assume\nthings like \"the client has all the base revisions.\"\n\nIn a partial clone world, we'll need wire protocol commands that allow\nclients to obtain specific pieces of data with vastly different\naccess patterns. For example, a client may want to obtain \"index\"\ndata but keep the fulltext data on the server. Or vice-versa. Or a\nclient may wish to fetch all revisions of a specific file but only\nthe latest revision of another. These access patterns will be\ndifficult to shoehorn into single, powerful commands (like\n\"getbundle\"). Even if we could, doing that isn't wise from a server\nimplementation perspective because it makes implementing scalable\nservers hard. We want server-side commands to be small and simple\nso alternate server implementations can come into existence more\neasily.\n\nThis is one reason why the frame-based wire protocol I'm implementing\nsupports command pipelining and out-of-order responses. This\nproperty will enable clients performing complex operations to send\ncommand streams containing dozens or even hundreds of small command\nrequests to servers.\n\nAnyway, this commit implements an experimental wire protocol command\nfor \"get files data.\" Essentially, you give it a changeset revision\nyou are interested in and it spits back all the files and their data\nin that revision, as fulltexts.\n\nThis command is just one way a server could emit data for files.\nA variation of this command that accepts specific file paths and nodes\nwhose data is to be retrieved would also be useful. And I imagine we'll\neventually implement that. It would also be useful to emit index\ndata. Or have each file blob be individually compressed. (Right now\ncompression is performed on the whole stream because that's how the\nwire protocol currently works - but I have plans to evolve the frame\nbased protocol to do new and novel things here.)\n\nI'm not even sure this variation of the wire protocol command is a\ngood one to have! One reason I want to start with this command is\nthat it seems like a useful primitive. For example, with this\ncommand, one could build a client that is able to realize a working\ndirectory from a single wire protocol request: you can literally\nstream the response to this command and turn the data into files on\nthe filesystem with minimal stream processing!\n\nAs implemented, this command is effectively a benchmark of revlog\nreading and\/or compression. On the mozilla-unified repository when\noperating on revision c488b8d0e074efb490ebca32db68eb77871bfd2f (a\nrecent revision of mozilla-central, the head of Firefox development),\nmy i7-6700K yields the following:\n\n* no compression: 1478MB;  ~94s wall; ~56s CPU\n* zstd level 3:    343MB;  ~97s wall; ~57s CPU\n* zlib level 6:    367MB; ~116s wall; ~74s CPU\n\nFor comparison, `hg bundle --base null -r c488b8d0e0 -t zstd-v2`\n(which approximates what `hg clone -r` would be doing on the server)\nyields:\n\n  1397MB; ~624s wall; ~225s CPU\n\nOf course, these are vastly different operations. But this does\ndemonstrate that if your use case of version control is \"check out\nrevision X\" and you were previously relying on `hg clone` [without\nstream clone bundles] to do that, this wire protocol command\nis overall much more efficient on servers. It's worth noting that\nthe use case of version control for many automated systems *is*\n\"check out revision X.\" So I think providing a clone mode that can\nrealize a working copy as fast as possible is a worthwhile feature\nto have!","testPlan":"","lineCount":"335","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"comment","comment":"This needs rebasing. Please hold off reviewing.","author":"indygreg","id":"47297","dateCreated":"1521732096","dateModified":"1521732096"},{"type":"plan-changes","author":"indygreg","id":"47296","dateCreated":"1521732096","dateModified":"1521732096"},{"type":"update","diffId":"7150","author":"indygreg","id":"46609","dateCreated":"1521503993","dateModified":"1521503993"},{"type":"update","diffId":"7081","author":"indygreg","id":"46289","dateCreated":"1521241628","dateModified":"1521241628"}],"dateCreated":"1521241628","dateModified":"1521732096","status":"Changes Planned"},{"id":"2588","callsign":"HG","title":"commit: adds multiline commit message support(issue5616)","author":"sangeet259","summary":"The earlier functionality used to ignore the all but last -m flag's value.\nIt used to store the arguments information in a state dict and then overwrites each\nsubsequent value of -m in the 'message' key. This patch intercepts the message flag and\nchecks if it is already empty. In case it is not empty, add the current value of -m flag to\nthe message key with a leading '\\n' character. This makes every subsequent passed -m flag\nas the new line message of the commit.","testPlan":"","lineCount":"28","dependsOn":[],"reviewers":[],"ccs":["durin42","tom.prince","yuja","pulkit","jeffpc","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D2588#44645, @sangeet259 wrote:\n> Since the current code just overwrites message each time with the newer. What can be done to avoid losing the earlier message values?\n\nYou should look how we handle multiple `--rev` flags. That will help you in this case.","author":"pulkit","id":"44677","dateCreated":"1520666278","dateModified":"1520666278"},{"type":"comment","comment":"Since the current code just overwrites message each time with the newer. What can be done to avoid losing the earlier message values?\n","author":"sangeet259","id":"44645","dateCreated":"1520655918","dateModified":"1520655918"},{"type":"inline","comment":"agreed","replyTo":"42705","isNewFile":"1","line":"847","lineLength":"0","path":"tests\/test-commit.t","diffId":"6537","author":"durin42","id":"43618","dateCreated":"1520437801","dateModified":"1520437801"},{"type":"comment","comment":"@pulkit Yeah, this rather a not so elegant hack. How can it be parsed in hg commit? \nAs the first message passed is overwritten by the second one at this step only.  :\/\n\n@yuja I think maybe subclassing the customopt may be a fair choice.","author":"sangeet259","id":"43614","dateCreated":"1520437520","dateModified":"1520437520"},{"type":"inline","comment":"Right. Alternatively, we could add a subclass of customopt, but I don't know which\nwould be nicer.\n\nFWIW, I'm kinda -1 on this feature, but I have no strong opinion and Git is the\ncurrent standard.","replyTo":"42704","isNewFile":"1","line":"365","lineLength":"0","path":"mercurial\/fancyopts.py","diffId":"6537","author":"yuja","id":"42772","dateCreated":"1520184244","dateModified":"1520184244"},{"type":"inline","comment":"starting with a newline seems awkward.","replyTo":null,"isNewFile":"1","line":"847","lineLength":"0","path":"tests\/test-commit.t","diffId":"6537","author":"pulkit","id":"42705","dateCreated":"1520181862","dateModified":"1520181862"},{"type":"inline","comment":"I think this is not the right place to have this hack. We should have this as a part of `hg commit` code rather.","replyTo":null,"isNewFile":"1","line":"365","lineLength":"0","path":"mercurial\/fancyopts.py","diffId":"6537","author":"pulkit","id":"42704","dateCreated":"1520181862","dateModified":"1520181862"},{"type":"update","diffId":"6537","author":"sangeet259","id":"42559","dateCreated":"1520149348","dateModified":"1520149348"},{"type":"comment","comment":"@jeffpc That means two new lines. Shall I edit this patch to effect that?\n","author":"sangeet259","id":"42558","dateCreated":"1520142981","dateModified":"1520147672"},{"type":"update","diffId":"6536","author":"sangeet259","id":"42557","dateCreated":"1520139879","dateModified":"1520139879"},{"type":"comment","author":"sangeet259","id":"41893","dateCreated":"1520098879","dateModified":"1520098898"},{"type":"comment","comment":"FWIW, this is slightly different behavior from what git does.  There, each -m is added as a separate *paragraph*.  IOW,\n\n\n```\n$ git commit -m \"first\" -m \"second\"\n```\n\ncreates:\n\n```\nfirst\n\nsecond\n```","author":"jeffpc","id":"41892","dateCreated":"1520098727","dateModified":"1520098727"},{"type":"update","diffId":"6438","author":"sangeet259","id":"41882","dateCreated":"1520098029","dateModified":"1520098029"}],"dateCreated":"1520098029","dateModified":"1520666278","status":"Needs Review"},{"id":"2681","callsign":"HG","title":"[PoC] scmutil: support local only obsolescence","author":"indygreg","summary":"Now that we have a config option for enabling local-only obsolescence,\nit is time to do something with it.\n\nThis commit teaches cleanupnodes() - which is called after rewrite\noperations - to handle local only obsolescence mode.\n\nIn this mode, we create a backup bundle of the obsoleted changesets -\njust like what happens if obsolescence is disabled. But we don't strip\nthe repo: we keep the original changesets around in a non-visible state.\n\nThe new code verifies that no unstable changesets are introduced in\nlocal-only obsolescence mode.\n\nThe new code hackily only runs if the action is \"amend.\" The intent\nis to make this conditional only on the feature option. However,\ndoing that would have significant test fallout. So we limit to \"amend\"\nfor now.\n\nTODO:\n\n* Better test coverage (I think the \"(testcase !)\" syntax might be\n  subtly wrong by flagging output as optional and not required).\n* Delete obsolescence markers when we pull and unbundle from the\n  bundle.\n* Support pulling locally-hidden heads.","testPlan":"","lineCount":"143","dependsOn":["2680"],"reviewers":[],"ccs":["mharbison72","mercurial-devel"],"actions":[{"type":"comment","comment":"re: the \"(testcase !)\" syntax- I agree that it would be better if \"(false !)\" means the line is *not* present, instead of optional.\n\nI made an attempt to do that, but somehow I came up with a test in test-run-tests.t that failed there, but the exact same test ran fine in another *.t.  I wondered if it was a case of run-tests.py processing it for a test inside test-run-tests.t, and then the main instance of run-tests.py re-processing it.  If I can find that code, I can post it if you think it might be useful.  But I've long forgotten the nuance in that code. ","author":"mharbison72","id":"43337","dateCreated":"1520216552","dateModified":"1520216552"},{"type":"update","diffId":"6639","author":"indygreg","id":"43226","dateCreated":"1520210577","dateModified":"1520210577"}],"dateCreated":"1520210577","dateModified":"1520216552","status":"Needs Review"},{"id":"2682","callsign":"HG","title":"[PoC] changegroup: delete obs markers when applying changegroup","author":"indygreg","summary":"In local-only obsolescence mode, our short-term hack to unhide a\nchangeset is to delete obsolescence markers causing it to be hidden.\nWe need to do this every time a changeset is introduced into the\nrepository.\n\nI was hoping we could implement the unhide logic once, around\ntransaction close time. However, it appears that we'll need to\nteach every mechanism that introduces changesets to unhide\nchangesets because of interaction between those mechanisms and\nvisibility. For example, changegroup application no-ops on incoming\nchangesets that are present but hidden. The code that scans for\n\"new\" changesets is based on changesets between the old and new\nchangelog length. Since the unhidden changeset is possibly older\nthan the old changelog length, we need to either track unhides\nexplicitly or deal with them specially.\n\nThis commit teaches changegroup application to record which changesets\nare in the incoming changegroup so it can scan for relevant\nobsolescence markers after changegroup applications and delete\ntheir markers.\n\nI'm not convinced this is the best approach to the problem. But it's\na start.","testPlan":"","lineCount":"27","dependsOn":["2681"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"6640","author":"indygreg","id":"43236","dateCreated":"1520210580","dateModified":"1520210580"}],"dateCreated":"1520210580","dateModified":"1520210580","status":"Needs Review"},{"id":"2680","callsign":"HG","title":"[PoC] obsolete: make markers database writable if local-only mode enabled","author":"indygreg","summary":" ","testPlan":"","lineCount":"4","dependsOn":["2679"],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"6638","author":"indygreg","id":"43217","dateCreated":"1520210574","dateModified":"1520210574"}],"dateCreated":"1520210574","dateModified":"1520210577","status":"Needs Review"},{"id":"2622","callsign":"HG","title":"ui: adding a generic method to read config items with an arbitrary type","author":"rdamazio","summary":"This can be used for reading many config options of various types where the\ntype of each is known in some other structure (e.g. options matching command\nflags).","testPlan":"","lineCount":"10","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"6520","author":"rdamazio","id":"42415","dateCreated":"1520121279","dateModified":"1520121279"}],"dateCreated":"1520121279","dateModified":"1520121282","status":"Needs Review"},{"id":"2079","callsign":"HG","title":"color: honor NO_COLOR","author":"indygreg","summary":"The http:\/\/no-color.org\/ initiative is trying to get programs that\nemit color by default to honor a NO_COLOR environment variable to\ndisable color.\n\nI think that's a good idea. So this commit implements support for\nNO_COLOR.\n\nI'm not sure if the precedence of settings is proper here. Right now,\nNO_COLOR overrides config settings set by hgrc or --config. But it\ndoesn't override --color. I can see an argument for honoring\n--config as well. Same for hgrc (since color is enabled by default\nthese days). But the existing logic\/precedence is unclear to me. So\nI went with an easy implementation.","testPlan":"","lineCount":"43","dependsOn":[],"reviewers":["lothiraldan","yuja"],"ccs":["durin42","martinvonz","yuja","quark","lothiraldan","mercurial-devel"],"actions":[{"type":"comment","comment":"(just clarify the current state of this patch)","author":"yuja","id":"37633","dateCreated":"1518697359","dateModified":"1518697359"},{"type":"reject","author":"yuja","id":"37632","dateCreated":"1518697359","dateModified":"1518697359"},{"type":"comment","comment":"The goal was to allow users to override system default using environment variables. So a separate `[systemdefaults]` (proposed by @durin42) becomes unnecessary.","author":"quark","id":"35160","dateCreated":"1518290016","dateModified":"1518290016"},{"type":"comment","comment":">>! In D2079#35154, @yuja wrote:\n>> I'm not sure if the precedence of settings is proper here.\n> \n> Perhaps it should be placed at the same level as `$EDITOR` (i.e. envrcitems)?\n\nI haven't bothered checking what that means for precedence, but I have an argument for giving NO_COLOR higher precedence than at least the system config: we set the system config for all our users at Google and some may want to override with NO_COLOR. I know someone (Jun? Yuya?) did some work related to precedence of EDITOR a while ago, but I don't remember what the goal of that was.\n","author":"martinvonz","id":"35157","dateCreated":"1518279995","dateModified":"1518279995"},{"type":"comment","comment":"> I'm not sure if the precedence of settings is proper here.\n\nPerhaps it should be placed at the same level as `$EDITOR` (i.e. envrcitems)?\n\nAnd can you update help\/color and environment?","author":"yuja","id":"35155","dateCreated":"1518265384","dateModified":"1518265384"},{"type":"comment","comment":"You might want to let run-tests.py drop NO_COLOR for tests.","author":"quark","id":"34711","dateCreated":"1518036117","dateModified":"1518036117"},{"type":"comment","comment":":+1: Hurrah for standards!","author":"lothiraldan","id":"34709","dateCreated":"1518024955","dateModified":"1518024955"},{"type":"accept","author":"lothiraldan","id":"34708","dateCreated":"1518024955","dateModified":"1518024955"},{"type":"update","diffId":"5298","author":"indygreg","id":"34702","dateCreated":"1518023858","dateModified":"1518023858"}],"dateCreated":"1518023858","dateModified":"1518697359","status":"Needs Revision"},{"id":"2259","callsign":"HG","title":"py3: use pycompat.bytestr to convert int\/bytes to bytes","author":"pulkit","summary":"The item value can be integer or can be bytes, so cannot use \"%d\" here.","testPlan":"","lineCount":"2","dependsOn":[],"reviewers":["yuja"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"comment","comment":"> The item value can be integer or can be bytes, so cannot use \"%d\" here.\n\nSounds like a bug. IIUC, the item should be a byte string because it is\npassed to `ui.progress(item=)`. Can you take a look?","author":"yuja","id":"37455","dateCreated":"1518614063","dateModified":"1518614063"},{"type":"reject","author":"yuja","id":"37454","dateCreated":"1518614063","dateModified":"1518614063"},{"type":"update","diffId":"5699","author":"pulkit","id":"37333","dateCreated":"1518607500","dateModified":"1518607500"}],"dateCreated":"1518607500","dateModified":"1518614064","status":"Needs Revision"},{"id":"2158","callsign":"HG","title":"py3: use raw string for open() mode","author":"indygreg","summary":" ","testPlan":"","lineCount":"8","dependsOn":[],"reviewers":[],"ccs":["yuja","pulkit","mercurial-devel"],"actions":[{"type":"comment","comment":"I wanna leave it with no prefix as possible. I think we'll have to bulk-replace\n`''`s to `b''`s at some point so we can leverage static analysis tools, where\n`r''` will be unneeded.","author":"yuja","id":"35990","dateCreated":"1518432079","dateModified":"1518432079"},{"type":"comment","comment":"Looks like a better approach will be to revert this change: https:\/\/www.mercurial-scm.org\/repo\/hg\/rev\/7c54917b31f6. I did that in favor of pycompat.open() and now I think it's better to revert that change. ","author":"pulkit","id":"35944","dateCreated":"1518420826","dateModified":"1518420826"},{"type":"update","diffId":"5459","author":"indygreg","id":"35745","dateCreated":"1518402936","dateModified":"1518402936"}],"dateCreated":"1518402936","dateModified":"1518432079","status":"Needs Review"},{"id":"1936","callsign":"FBHGX","title":"p4fastimport: report more information about unsupported p4 file actions","author":"hollisb","summary":"No matter what, users and developers need this information to understand the\nproblem.","testPlan":"","lineCount":"3","dependsOn":[],"reviewers":["dsp"],"ccs":[],"actions":[{"type":"comment","comment":"I will have a followup patch to handle 'purge' file actions at some point, but it's not yet clear to me how to do it in the most useful and nonsurprising way. :-) In the meantime, this is a useful step.","author":"hollisb","id":"32642","dateCreated":"1516666023","dateModified":"1516666023"},{"type":"update","diffId":"5000","author":"hollisb","id":"32637","dateCreated":"1516665895","dateModified":"1516665895"}],"dateCreated":"1516665895","dateModified":"1516666023","status":"Needs Review"},{"id":"1649","callsign":"FBHGX","title":"infinitepush: add logic to support old clients on the basis of pushkey part","author":"pulkit","summary":"This patch adds logic to check whether a push is an infinitepush or not from\nan old client or client who don't have infinitepush client logic.","testPlan":"","lineCount":"60","dependsOn":[],"reviewers":["durham"],"ccs":[],"actions":[{"type":"comment","comment":"Status update: While adding tests, I found that I am reading the part twice, once for adding in bundlepart and once for the copied part. Since I can't read that twice, I need to do better here with the logic involved.","author":"pulkit","id":"31242","dateCreated":"1515664035","dateModified":"1515664064"},{"type":"inline","comment":"Can we add a comment saying this could require a lot of memory, and that we might want to move this to being stored on disk in the future?","replyTo":null,"isNewFile":"1","line":"1080","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4342","author":"durham","id":"30893","dateCreated":"1515514134","dateModified":"1515514134"},{"type":"inline","comment":"I'd make it clear that this will have performance impact.","replyTo":null,"isNewFile":"1","line":"1055","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4342","author":"durham","id":"30892","dateCreated":"1515514134","dateModified":"1515514134"},{"type":"inline","comment":"I'd rename this `supportoldclients`, since it's a server configuration.","replyTo":null,"isNewFile":"1","line":"1108","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4342","author":"durham","id":"30891","dateCreated":"1515514134","dateModified":"1515514134"},{"type":"comment","comment":"Could this have a test? Is there a config knob to disable bundle2 or force bundle1?","author":"durham","id":"30890","dateCreated":"1515514134","dateModified":"1515514134"},{"type":"reject","author":"durham","id":"30889","dateCreated":"1515514134","dateModified":"1515514134"},{"type":"update","diffId":"4342","author":"pulkit","id":"28287","dateCreated":"1512952476","dateModified":"1512952476"}],"dateCreated":"1512952476","dateModified":"1515664035","status":"Needs Revision"},{"id":"1779","callsign":"HG","title":"unionrepo: use named attributes on revlog index entries","author":"indygreg","summary":"This appears to be the last user of the offsets in core (as far as\nthe test harness was able to reveal).","testPlan":"","lineCount":"11","dependsOn":["1778"],"reviewers":["durin42"],"ccs":["durin42","mercurial-devel"],"actions":[{"type":"comment","comment":"I think we should hold off landing until the native C type is ready. I don't like shipping a performance regression on such low-level code without any other user benefit to offset it. The assumption here is that I'm the only one who will absorb pain from this series lingering. I'm willing to take that hit.","author":"indygreg","id":"31193","dateCreated":"1515640397","dateModified":"1515640397"},{"type":"comment","comment":"Happy to see these land, but waiting for any objections from others.","author":"durin42","id":"31088","dateCreated":"1515624896","dateModified":"1515624896"},{"type":"accept","author":"durin42","id":"31087","dateCreated":"1515624896","dateModified":"1515624896"},{"type":"update","diffId":"4640","author":"indygreg","id":"30186","dateCreated":"1514334979","dateModified":"1514334979"}],"dateCreated":"1514334979","dateModified":"1515640397","status":"Accepted"},{"id":"1778","callsign":"HG","title":"debugcommands: use named attributes on revlog index entries","author":"indygreg","summary":" ","testPlan":"","lineCount":"16","dependsOn":["1777"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31084","dateCreated":"1515624896","dateModified":"1515624896"},{"type":"update","diffId":"4741","author":"indygreg","id":"30870","dateCreated":"1515227185","dateModified":"1515227185"},{"type":"update","diffId":"4639","author":"indygreg","id":"30177","dateCreated":"1514334977","dateModified":"1514334977"}],"dateCreated":"1514334977","dateModified":"1515624896","status":"Accepted"},{"id":"1777","callsign":"HG","title":"upgrade: use named attributes on revlog index entries","author":"indygreg","summary":" ","testPlan":"","lineCount":"6","dependsOn":["1776"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31082","dateCreated":"1515624895","dateModified":"1515624895"},{"type":"update","diffId":"4638","author":"indygreg","id":"30168","dateCreated":"1514334975","dateModified":"1514334975"}],"dateCreated":"1514334974","dateModified":"1515624895","status":"Accepted"},{"id":"1776","callsign":"HG","title":"bundlerepo: use named attributes on revlog index entries","author":"indygreg","summary":" ","testPlan":"","lineCount":"4","dependsOn":["1775"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31080","dateCreated":"1515624894","dateModified":"1515624894"},{"type":"update","diffId":"4637","author":"indygreg","id":"30159","dateCreated":"1514334972","dateModified":"1514334972"}],"dateCreated":"1514334972","dateModified":"1515624894","status":"Accepted"},{"id":"1775","callsign":"HG","title":"dagutil: use named attributes on revlog index entries","author":"indygreg","summary":"Continuing the transition away from tuples.","testPlan":"","lineCount":"20","dependsOn":["1774"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31078","dateCreated":"1515624893","dateModified":"1515624893"},{"type":"update","diffId":"4636","author":"indygreg","id":"30149","dateCreated":"1514334970","dateModified":"1514334970"}],"dateCreated":"1514334970","dateModified":"1515624893","status":"Accepted"},{"id":"1774","callsign":"HG","title":"repoview: use named attributes on revlog index entries","author":"indygreg","summary":"We want to remove __getitem__ support from index entries. Port\na usage in repoview.","testPlan":"","lineCount":"2","dependsOn":["1773"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31076","dateCreated":"1515624893","dateModified":"1515624893"},{"type":"update","diffId":"4740","author":"indygreg","id":"30869","dateCreated":"1515227182","dateModified":"1515227182"},{"type":"update","diffId":"4635","author":"indygreg","id":"30139","dateCreated":"1514334968","dateModified":"1514334968"}],"dateCreated":"1514334968","dateModified":"1515624893","status":"Accepted"},{"id":"1773","callsign":"HG","title":"revlog: use named attributes on revlog index entries","author":"indygreg","summary":"Now that we're using a dedicated type for index entries everywhere,\nwe can access fields in them by name instead of integer offset.\n\nThis change has a significant impact on performance on the Firefox\nrepository. (Values are from before refactor, parent commit, this\ncommit.)\n\n$ HGMODULEPOLICY=c hg perfrevset '::tip'\n! wall 0.755869 comb 0.750000 user 0.750000 sys 0.000000 (best of 13)\n! wall 1.011107 comb 1.010000 user 1.010000 sys 0.000000 (best of 10)\n! wall 0.864906 comb 0.860000 user 0.860000 sys 0.000000 (best of 11)\n\n$ HGMODULEPOLICY=py hg perfrevset '::tip'\n! wall 1.366281 comb 1.360000 user 1.360000 sys 0.000000 (best of 7)\n! wall 1.860068 comb 1.860000 user 1.860000 sys 0.000000 (best of 5)\n! wall 1.672432 comb 1.680000 user 1.670000 sys 0.010000 (best of 6)\n\nAnd with PyPy:\n\n! wall 0.163141 comb 0.160000 user 0.160000 sys 0.000000 (best of 56)\n! wall 0.154325 comb 0.160000 user 0.160000 sys 0.000000 (best of 54)\n! wall 0.155534 comb 0.160000 user 0.160000 sys 0.000000 (best of 53)\n\nThe C extension is ~15% slower than before the refactor. This is a\nbit unfortunate. That is a bit steep price to pay for more readable\ncode and the establishment of a formal interface for index entries.\n\nHowever, all is not lost! Because we're now using a custom type and\nconforming to a yet-to-be-formally-defined interface, there's nothing\npreventing us from implementing a backed-by-C custom type for revlog\nentries. This type could lazily resolve PyObject instances, which\nshould result in a massive performance boost for operations that\ndon't need to access all fields of the index entry. This is easier\ndone *after* we drop all uses of tuples and their API for referring\nto index entries.","testPlan":"","lineCount":"56","dependsOn":["1772"],"reviewers":["durin42"],"ccs":["durin42","yuja","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31074","dateCreated":"1515624892","dateModified":"1515624892"},{"type":"comment","comment":">>! In D1773#30628, @yuja wrote:\n>> However, it is quite large and I suspect it will take a bit more effort to finish it.\n> \n> Isn't that something like `dirstateTupleType`? If we had a native type, we wouldn't\n> need D1767, D1768, and probably D1769. If it can get rid of refcounting business,\n> reviewing this series will be much fun.\n\nI don't feel strongly about the approach. My bias is to land this whole series as-is. The \"lazy struct\" should be fairly easily done as a followup.\n\nThe refcounting of the type looks okay to me.","author":"durin42","id":"31061","dateCreated":"1515624811","dateModified":"1515624811"},{"type":"comment","comment":"> However, it is quite large and I suspect it will take a bit more effort to finish it.\n\nIsn't that something like `dirstateTupleType`? If we had a native type, we wouldn't\nneed D1767, D1768, and probably D1769. If it can get rid of refcounting business,\nreviewing this series will be much fun.","author":"yuja","id":"30628","dateCreated":"1515131007","dateModified":"1515131007"},{"type":"comment","comment":">>! In D1773#30283, @yuja wrote:\n> Not reviewed the series yet, but can't we just start with a custom type\n> backed by C so we don't have to import back IndexV1Entry from Python?\n\nThat's possible. I do have a work-in-progress patch to the C code to implement such a type.\n\nHowever, it is quite large and I suspect it will take a bit more effort to finish it. The end result of this series gets us into a state where the C type can be swapped in with minimal effort. I have a soft preference for implementing the type in C as a follow-up. But I can refactor the series if wanted. Or someone can review this series without accepting it and I'll add the C type later.","author":"indygreg","id":"30285","dateCreated":"1514487399","dateModified":"1514487399"},{"type":"comment","comment":"> Because we're now using a custom type and conforming to\n> a yet-to-be-formally-defined interface, there's nothing\n> preventing us from implementing a backed-by-C custom type\n> for revlog entries. \n\nNot reviewed the series yet, but can't we just start with a custom type\nbacked by C so we don't have to import back IndexV1Entry from Python?","author":"yuja","id":"30284","dateCreated":"1514469876","dateModified":"1514469876"},{"type":"update","diffId":"4634","author":"indygreg","id":"30129","dateCreated":"1514334966","dateModified":"1514334966"}],"dateCreated":"1514334966","dateModified":"1515624892","status":"Accepted"},{"id":"1772","callsign":"HG","title":"tests: port revlog index code to modern API","author":"indygreg","summary":"All revlog index parsers are now using our new type to\nrepresent index entries. We can now undo the custom type\ncomparison code we implemented to see us through the transition.\n\nIn addition, the code has been ported to use named attributes\ninstead of field offsets.","testPlan":"","lineCount":"48","dependsOn":["1771"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31072","dateCreated":"1515624891","dateModified":"1515624891"},{"type":"update","diffId":"4739","author":"indygreg","id":"30867","dateCreated":"1515227180","dateModified":"1515227180"},{"type":"update","diffId":"4633","author":"indygreg","id":"30119","dateCreated":"1514334964","dateModified":"1514334964"}],"dateCreated":"1514334964","dateModified":"1515624891","status":"Accepted"},{"id":"1771","callsign":"HG","title":"revlog: pass index entry type into packentry() (API)","author":"indygreg","summary":"packentry() currently accepts tuples. Let's pass in index entry types\ninstead.\n\nThe censor extension was calling into this low-level code. It has\nbeen refactored to use our new type and to look up fields in index\nentries by name instead of offset.","testPlan":"","lineCount":"34","dependsOn":["1770"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31070","dateCreated":"1515624891","dateModified":"1515624891"},{"type":"update","diffId":"4632","author":"indygreg","id":"30109","dateCreated":"1514334962","dateModified":"1514334962"}],"dateCreated":"1514334962","dateModified":"1515624891","status":"Accepted"},{"id":"1770","callsign":"HG","title":"revlog: use revlog index entry type for version 0 revlogs","author":"indygreg","summary":"The pure Python parser for version 1 revlogs uses it. Let's\nplug it into version 0 revlogs as well.","testPlan":"","lineCount":"9","dependsOn":["1769"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31068","dateCreated":"1515624890","dateModified":"1515624890"},{"type":"update","diffId":"4631","author":"indygreg","id":"30099","dateCreated":"1514334959","dateModified":"1514334959"}],"dateCreated":"1514334959","dateModified":"1515624890","status":"Accepted"},{"id":"1769","callsign":"HG","title":"cext: use dedicated type for index entries","author":"indygreg","summary":"Now that we have a handle on our type to represent revlog index\nentries, let's use it.\n\nThis commit essentially consists of porting code from PyTuple to\nPyObject.\n\nAs part of porting the code, we now retrieve elements in the entry\ntype by named attribute instead of integer index.\n\nBefore, PyTuple_* APIs allowed us to retrieve a borrowed reference\nto PyObject elements. We can no longer do this via the PyObject_*\nAPIs for a type not implemented in C. This required extra refcount\nmanipulation in various places.\n\nThe C extension is now emitting the new type. And because various\ncode is still accessing index entry elements via __getitem__, we\nsee a performance regression in the Firefox repository:\n\n$ hg perfrevset '::tip'\n! wall 0.755869 comb 0.750000 user 0.750000 sys 0.000000 (best of 13)\n! wall 1.011107 comb 1.010000 user 1.010000 sys 0.000000 (best of 10)\n\nWe will claw back this regression in subsequent commits by accessing\nfields by name instead of index.\n\nThe version of the \"parsers\" C extension has been incremented to\nreflect the change in behavior.","testPlan":"","lineCount":"123","dependsOn":["1768"],"reviewers":["yuja","durin42"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31067","dateCreated":"1515624889","dateModified":"1515624889"},{"type":"update","diffId":"4738","author":"indygreg","id":"30864","dateCreated":"1515227178","dateModified":"1515227178"},{"type":"inline","comment":"No error reported to the caller.\n\nAttributeError would be set automatically.","replyTo":null,"isNewFile":"1","line":"1788","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4630","author":"yuja","id":"30618","dateCreated":"1515129734","dateModified":"1515129734"},{"type":"inline","comment":"I slightly prefer `goto bail` instead of `result = NULL; goto cleanup` pairs.","replyTo":null,"isNewFile":"1","line":"327","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4630","author":"yuja","id":"30617","dateCreated":"1515129734","dateModified":"1515129734"},{"type":"inline","comment":"This is tricky, but looks okay. Alternatively, we could inc\/decref borrowed `obj`.","replyTo":null,"isNewFile":"1","line":"321","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4630","author":"yuja","id":"30616","dateCreated":"1515129734","dateModified":"1515129734"},{"type":"inline","comment":"Perhaps AttributeError would be set by `PyObject_GetAttrString()`.","replyTo":null,"isNewFile":"1","line":"141","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4630","author":"yuja","id":"30615","dateCreated":"1515129734","dateModified":"1515129734"},{"type":"reject","author":"yuja","id":"30614","dateCreated":"1515129734","dateModified":"1515129734"},{"type":"update","diffId":"4630","author":"indygreg","id":"30089","dateCreated":"1514334957","dateModified":"1514334957"}],"dateCreated":"1514334957","dateModified":"1515624889","status":"Needs Review"},{"id":"1768","callsign":"HG","title":"cext: obtain reference to index entry type","author":"indygreg","summary":"We recently introduced a dedicated type for index entries in the\npure Python implementation.\n\nThis commit tells the revlog C code about that type.\n\nWe register the type on the parsers module so it is exposed to\nimporters of the module.\n\nIn addition, we store a reference to the type on revlog index\ninstances. In theory, we could grab the reference from the\nmodule. However, this requires a fair bit of C code. It is easier\nto just re-import the original module and get a ref from there. This\nalso avoids problems with caching a type on a reload()d module.","testPlan":"","lineCount":"35","dependsOn":["1767"],"reviewers":["yuja","durin42"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31066","dateCreated":"1515624888","dateModified":"1515624888"},{"type":"update","diffId":"4737","author":"indygreg","id":"30861","dateCreated":"1515227177","dateModified":"1515227177"},{"type":"inline","comment":"In theory, there could be a mismatch.\n\nIf this module is loaded, its `IndexV1Entry` will refer to whatever `mercurial.pure.parsers.IndexV1Entry` is. If `mercurial.pure.parsers` is then reloaded and its `IndexV1Entry` changes and a revlog index type is created, its `IndexV1Entry` will be the new one from the reloaded `mercurial.pure.parsers`.\n\nSince I plan to replace the Python-implemented type with a C backed type, I'm inclined to not care about this.","replyTo":"30611","isNewFile":"1","line":"2117","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4629","author":"indygreg","id":"30845","dateCreated":"1515222660","dateModified":"1515222660"},{"type":"inline","comment":"Can we be sure that this `IndexV1Entry` is identical to `self->entrytype`\nafter reloading Python modules?","replyTo":null,"isNewFile":"1","line":"2117","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4629","author":"yuja","id":"30611","dateCreated":"1515128067","dateModified":"1515128067"},{"type":"comment","comment":"> We hold off incrementing the version of the \"parsers\" extension\n> because nothing in core relies on the new API yet.\n\nIt's really minor nit, but we have to increment the version since new\ncompiled module doesn't work with old `pure.parsers` module, which\nprovides no IndexV1Entry type.","author":"yuja","id":"30610","dateCreated":"1515128067","dateModified":"1515128067"},{"type":"reject","author":"yuja","id":"30609","dateCreated":"1515128067","dateModified":"1515128067"},{"type":"update","diffId":"4629","author":"indygreg","id":"30079","dateCreated":"1514334955","dateModified":"1514334955"}],"dateCreated":"1514334955","dateModified":"1515624888","status":"Needs Review"},{"id":"1767","callsign":"HG","title":"cext: make nullentry a member of index types","author":"indygreg","summary":"An upcoming commit will change the type of index entries from tuple\nto something else. This type may not be initialized\/available at\nmodule init time.\n\nWe prepare for this future change by making null entries a per-instance\nvariable on the index type.\n\nIn theory, this does add some overhead (a new 8-tuple per index\ninstance). However, the overhead should be negligible compared to\nthe run-time overhead of creating an index entry for each revision\nin the index.","testPlan":"","lineCount":"19","dependsOn":["1766"],"reviewers":["yuja","durin42"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31065","dateCreated":"1515624888","dateModified":"1515624888"},{"type":"update","diffId":"4736","author":"indygreg","id":"30859","dateCreated":"1515227176","dateModified":"1515227176"},{"type":"inline","comment":"This comment shouldn't be moved. We need to NULLify all attributes, but don't\nhave to create PyObject.","replyTo":null,"isNewFile":"1","line":"1876","lineLength":"0","path":"mercurial\/cext\/revlog.c","diffId":"4628","author":"yuja","id":"30606","dateCreated":"1515124415","dateModified":"1515124415"},{"type":"reject","author":"yuja","id":"30605","dateCreated":"1515124415","dateModified":"1515124415"},{"type":"update","diffId":"4628","author":"indygreg","id":"30069","dateCreated":"1514334953","dateModified":"1514334953"}],"dateCreated":"1514334953","dateModified":"1515624888","status":"Needs Review"},{"id":"1766","callsign":"HG","title":"cext: rename variable describing format for index entries","author":"indygreg","summary":"\"tuple_format\" is ambiguous.","testPlan":"","lineCount":"6","dependsOn":["1765"],"reviewers":["durin42"],"ccs":["mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31063","dateCreated":"1515624887","dateModified":"1515624887"},{"type":"update","diffId":"4627","author":"indygreg","id":"30059","dateCreated":"1514334951","dateModified":"1514334951"}],"dateCreated":"1514334951","dateModified":"1515624887","status":"Accepted"},{"id":"1765","callsign":"HG","title":"parsers: use an attr-derived class for revlog index entries","author":"indygreg","summary":"Currently, revlog index entries are tuples.\n\nThis commit introduces a new type to represent revlog v1 index\nentries. The pure Python parser has been converted to use it.\n\nTo provide backwards compatibility with existing code (including the\nC extension), the type has a __getitem__ to facilitate index\nlookups. The intent is to remove this __getitem__ once all consumers\nare using named attributes.\n\nSince the pure Python index parser is now using our new type,\ntest-parseindex2.py had to be updated to deal with the type mismatch.\nOnce all index parsers are converted and the new type\/interface is\nubiquitous, we can restore the simplicity of test-parseindex2.py. We\nalso had to (temporarily) add \"# no-check-code\" to test-parseindex2.py\nto allow the import of the pure module. This will be removed once the C\nextension is ported.\n\nBecause consumers are going through an extra Python function call to\n__getitem__ to resolve attributes by index, this change regresses\nperformance on a simple DAG walking revset for the Firefox repository:\n\n$ HGMODULEPOLICY=py hg perfrevset '::tip'\n! wall 1.366281 comb 1.360000 user 1.360000 sys 0.000000 (best of 7)\n! wall 1.860068 comb 1.860000 user 1.860000 sys 0.000000 (best of 5)\n\nUsing PyPy, a major regression is not apparent:\n\n! wall 0.163141 comb 0.160000 user 0.160000 sys 0.000000 (best of 56)\n! wall 0.154325 comb 0.160000 user 0.160000 sys 0.000000 (best of 54)","testPlan":"","lineCount":"70","dependsOn":[],"reviewers":["yuja","durin42"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"accept","author":"durin42","id":"31062","dateCreated":"1515624886","dateModified":"1515624886"},{"type":"update","diffId":"4735","author":"indygreg","id":"30856","dateCreated":"1515227175","dateModified":"1515227175"},{"type":"inline","comment":"Perhaps you mean `list(map(...))` instead of a list of one element?","replyTo":null,"isNewFile":"1","line":"182","lineLength":"0","path":"tests\/test-parseindex2.py","diffId":"4626","author":"yuja","id":"30602","dateCreated":"1515124211","dateModified":"1515124211"},{"type":"reject","author":"yuja","id":"30601","dateCreated":"1515124211","dateModified":"1515124211"},{"type":"update","diffId":"4626","author":"indygreg","id":"30049","dateCreated":"1514334949","dateModified":"1514334949"}],"dateCreated":"1514334949","dateModified":"1515624886","status":"Needs Review"},{"id":"1714","callsign":"FBHGX","title":"distutils_rust: use atomic replace to install the .so file","author":"quark","summary":"Python loads .so using mmap. Rewriting a .so in-place when there is a Python\nprocess with that .so mmap-ed could crash that Python process. Therefore\nlet's avoid rewriting the destination .so in-place.\n\nThis was discovered by a txnclose Python hook I used to keep binaries\nup-to-date. It caused segfault after building the Rust extensions currently\nloaded by the Python process running the hook.","testPlan":"","lineCount":"5","dependsOn":[],"reviewers":["mbthomas"],"ccs":[],"actions":[{"type":"accept","author":"mbthomas","id":"30880","dateCreated":"1515440159","dateModified":"1515440159"},{"type":"update","diffId":"4529","author":"quark","id":"29324","dateCreated":"1513624671","dateModified":"1513624671"}],"dateCreated":"1513624671","dateModified":"1515440159","status":"Accepted"},{"id":"1828","callsign":"FBHGX","title":"morestatus: sync the extension with the logic moved to core","author":"pulkit","summary":"All the functionality of the morestatus extension was moved to core except the\nupdate part. The update part hacks around the update command and stores the\nargument passed before the update. This patch drops the code which was moved to\ncore, wraps the code in core to support the update state functionality. The\nsupport for update in extension is bit hacky as functions which returns helpful\nmessage for each state, does not take a repo argument in core.\n\nEven after this patch, the config options morestatus.show and\nmorestatus.skipstates works the same way as they used to be.\n\nThere are some newlines changes because of bit change in format of output in\ncore.","testPlan":"","lineCount":"209","dependsOn":[],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4734","author":"pulkit","id":"30852","dateCreated":"1515225678","dateModified":"1515225678"}],"dateCreated":"1515225678","dateModified":"1515225678","status":"Needs Review"},{"id":"1821","callsign":"FBHGX","title":"treemanifest: subclass remotetreedatastore from generatingdatastore","author":"singhsrb","summary":"Introducing class generatingdatastore to represent all stores like\nremotetreedatastore which generate the trees when they are not found in the\nshared store, add them to the shared store, and thereafter, repeat the original\noperation on the shared store expecting it to succeed.","testPlan":"Ran all the tests.","lineCount":"50","dependsOn":["1820"],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4721","author":"singhsrb","id":"30753","dateCreated":"1515197877","dateModified":"1515197877"}],"dateCreated":"1515197877","dateModified":"1515197910","status":"Needs Review"},{"id":"1820","callsign":"FBHGX","title":"treemanifest: refactor remotetreedatastore call hierarchy","author":"singhsrb","summary":"The plan is to eventually subclass remotetreedatastore and this\nrefactor sets us up nicely for that.","testPlan":"Ran all the tests.","lineCount":"13","dependsOn":[],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4720","author":"singhsrb","id":"30747","dateCreated":"1515195853","dateModified":"1515195853"}],"dateCreated":"1515195853","dateModified":"1515197910","status":"Needs Review"},{"id":"1805","callsign":"FBHGX","title":"sparse: don't materialize sparse files during IMM","author":"phillco","summary":"There's no need to do this and not doing so speeds up IMM tremendously when the sparse profile had to be adjusted.","testPlan":"I ran an IMM before and after this change. Both succeeded but the later version was\nmuch faster.","lineCount":"10","dependsOn":[],"reviewers":["quark","durham"],"ccs":["durham"],"actions":[{"type":"update","diffId":"4701","author":"phillco","id":"30626","dateCreated":"1515130813","dateModified":"1515130813"},{"type":"inline","comment":"\"mutable\" is tricky since technically on the on-disk working context is mutable too.","replyTo":"30565","isNewFile":"1","line":"82","lineLength":"0","path":"hgext3rd\/fbsparse.py","diffId":"4691","author":"phillco","id":"30625","dateCreated":"1515130763","dateModified":"1515130763"},{"type":"inline","comment":"maybe \"working context\" would work","replyTo":"30564","isNewFile":"1","line":"82","lineLength":"0","path":"hgext3rd\/fbsparse.py","diffId":"4691","author":"phillco","id":"30565","dateCreated":"1515098574","dateModified":"1515098574"},{"type":"inline","comment":"Looks fine. It might be nice to come up with some better terminology. I think of \"working copy\" as always referring to the physical on disk one, so maybe we need some other term for a mutable context (of which working copy would be one type).","replyTo":null,"isNewFile":"1","line":"82","lineLength":"0","path":"hgext3rd\/fbsparse.py","diffId":"4691","author":"durham","id":"30564","dateCreated":"1515097649","dateModified":"1515097649"},{"type":"update","diffId":"4691","author":"phillco","id":"30563","dateCreated":"1515097415","dateModified":"1515097415"},{"type":"comment","comment":"I added a comment and also filed T24918295 for the wider task around allowing lazy filectx writes (but as Durham mentioned that's a strict improvement on the status quo).","author":"phillco","id":"30562","dateCreated":"1515097338","dateModified":"1515097338"},{"type":"update","diffId":"4690","author":"phillco","id":"30561","dateCreated":"1515097206","dateModified":"1515097206"},{"type":"comment","comment":"I'll add a comment.","author":"phillco","id":"30534","dateCreated":"1515093676","dateModified":"1515093676"},{"type":"comment","comment":"Discussed this in person. My concerns were that this would allow large action lists to propagate up and cause excess remotefilelog actions.  Phil's response was that A) this only applies to rebases for now, and any action in the rebase is going to require downloading anyway (when it the sparse profile gets temporarily expanded below), and B) any action on a in memory context should probably not be filtered by sparseness anyway.  I think the invariant in B is reasonable, and if we see it causing problems like A we can reevaluate how to fix that problem to meet invariant B.","author":"durham","id":"30533","dateCreated":"1515092819","dateModified":"1515092819"},{"type":"accept","author":"durham","id":"30532","dateCreated":"1515092819","dateModified":"1515092819"},{"type":"accept","author":"quark","id":"30529","dateCreated":"1515090793","dateModified":"1515090793"},{"type":"update","diffId":"4687","author":"phillco","id":"30524","dateCreated":"1515088883","dateModified":"1515088883"}],"dateCreated":"1515088883","dateModified":"1515130813","status":"Accepted"},{"id":"1743","callsign":null,"title":"p4fastimport: allow sync commits only when imported repository is up-to-date","author":"dsp","summary":"Previously we allowed a sync commit to happen at any time, but imported the\nfull repository to bring it into sync. This is slow for very large repositories\nand might be accidentally triggered. We change this behavior to only do a sync\ncommit if only the imported client changed but nothing else.","testPlan":"  cd tests\n  python ..\/..\/hg-crew\/tests\/run-tests.py test-p4fastimport-*.t test-check*.t","lineCount":"282","dependsOn":["1742"],"reviewers":["kaleyh"],"ccs":["kaleyh"],"actions":[{"type":"inline","comment":"that can be a good idea","replyTo":"30496","isNewFile":"1","line":"134","lineLength":"0","path":"tests\/test-p4fastimport-blobcommit.t","diffId":"4577","author":"kaleyh","id":"30509","dateCreated":"1515016570","dateModified":"1515016570"},{"type":"accept","author":"kaleyh","id":"30508","dateCreated":"1515016570","dateModified":"1515016570"},{"type":"inline","comment":"In case `p4fastimport` uses the new client-spec, it behaves like before: if a file changes it will happily included it. So what we want to do is: use the new-spec only after p4syncimport changed. Maybe in an upcoming change we can save information about the clientspec in Mercurial to automatically detect a change in the p4fastimport case","replyTo":"29849","isNewFile":"1","line":"134","lineLength":"0","path":"tests\/test-p4fastimport-blobcommit.t","diffId":"4577","author":"dsp","id":"30496","dateCreated":"1514922124","dateModified":"1514922124"},{"type":"request-review","author":"dsp","id":"30494","dateCreated":"1514921883","dateModified":"1514921883"},{"type":"inline","comment":"Yes, using the old clientspec it will be able to update it.","replyTo":"29849","isNewFile":"1","line":"134","lineLength":"0","path":"tests\/test-p4fastimport-blobcommit.t","diffId":"4577","author":"dsp","id":"30493","dateCreated":"1514921870","dateModified":"1514921870"},{"type":"inline","comment":"What client will it use if we fall back to `fast import` ? Since CL 5 touches files that are not in the current client spec, will `fast import` be able to update the repo to CL5?","replyTo":null,"isNewFile":"1","line":"134","lineLength":"0","path":"tests\/test-p4fastimport-blobcommit.t","diffId":"4577","author":"kaleyh","id":"29849","dateCreated":"1513982220","dateModified":"1513982220"},{"type":"reject","author":"kaleyh","id":"29848","dateCreated":"1513982220","dateModified":"1513982220"},{"type":"update","diffId":"4577","author":"dsp","id":"29750","dateCreated":"1513905522","dateModified":"1513905522"}],"dateCreated":"1513905522","dateModified":"1515016570","status":"Accepted"},{"id":"1787","callsign":null,"title":"rebase: turn off IMM if any rebased paths match a config","author":"phillco","summary":" ","testPlan":"","lineCount":"21","dependsOn":["1786"],"reviewers":["quark"],"ccs":["quark"],"actions":[{"type":"update","diffId":"4678","author":"phillco","id":"30456","dateCreated":"1514512002","dateModified":"1514512002"},{"type":"update","diffId":"4664","author":"phillco","id":"30334","dateCreated":"1514502802","dateModified":"1514502802"},{"type":"inline","comment":"Could you make this a regular expression?","replyTo":null,"isNewFile":"1","line":"914","lineLength":"0","path":"hgext\/rebase.py","diffId":"4663","author":"quark","id":"30332","dateCreated":"1514500915","dateModified":"1514500915"},{"type":"accept","author":"quark","id":"30331","dateCreated":"1514500915","dateModified":"1514500915"},{"type":"update","diffId":"4663","author":"phillco","id":"30317","dateCreated":"1514500517","dateModified":"1514500517"}],"dateCreated":"1514500517","dateModified":"1514512002","status":"Accepted"},{"id":"1786","callsign":null,"title":"rebase: extract _shoulddisableimm for clarity","author":"phillco","summary":" ","testPlan":"","lineCount":"41","dependsOn":["1785"],"reviewers":["quark"],"ccs":[],"actions":[{"type":"accept","author":"quark","id":"30328","dateCreated":"1514500793","dateModified":"1514500793"},{"type":"update","diffId":"4662","author":"phillco","id":"30310","dateCreated":"1514500514","dateModified":"1514500514"}],"dateCreated":"1514500514","dateModified":"1514500793","status":"Accepted"},{"id":"1785","callsign":null,"title":"rebase: log why we didn't use IMM","author":"phillco","summary":"In preparation for adding more conditions that will disable IMM, let's make\nthis framework more extensible and log the reason IMM wasn't used.\n\nThe `whynotimm` variable name was inspired by the `why_not_eden` name in\n`hg\/eden\/__init__.py`.","testPlan":"","lineCount":"26","dependsOn":[],"reviewers":["quark"],"ccs":[],"actions":[{"type":"inline","comment":"same here","replyTo":null,"isNewFile":"1","line":"996","lineLength":"0","path":"hgext\/rebase.py","diffId":"4661","author":"quark","id":"30326","dateCreated":"1514500758","dateModified":"1514500758"},{"type":"inline","comment":"+3 spaces","replyTo":null,"isNewFile":"1","line":"798","lineLength":"0","path":"hgext\/rebase.py","diffId":"4661","author":"quark","id":"30325","dateCreated":"1514500758","dateModified":"1514500758"},{"type":"accept","author":"quark","id":"30324","dateCreated":"1514500758","dateModified":"1514500758"},{"type":"update","diffId":"4661","author":"phillco","id":"30305","dateCreated":"1514498645","dateModified":"1514498645"}],"dateCreated":"1514498645","dateModified":"1514500758","status":"Accepted"},{"id":"1753","callsign":"HG","title":"streamclone: preserve remote phases (issue5648)","author":"indygreg","summary":"As the tests added by the previous changeset demonstrate, stream clones\nwere never taught about the existence of phases. As a result, all\nchangesets applied via stream clone were made public, even if they\nwere draft (or even secret) on the remote.\n\nThis commit integrates phases knowledge into stream clones.\n\nAs the inline comment explains, because there are scenarios where\nwe can't disambiguate phases support, the resulting phase data may\nnot match the server exactly. However, I believe the remaining\nareas of buggy behavior are confined to secret changesets. Secret\nchangesets aren't common. And transferring them via stream clones\neither requires a buggy Mercurial server or a specially-configured\nserver. I think it will require stream clone support in bundle2\nbefore we can properly handle secret phases for stream clones.\n\nIt \/might\/ be acceptable to force all local changesets to secret\nand then promote to draft or public from remote phases data. However,\nI was having trouble implementing this. Existing phases code doesn't\nseem geared towards supporting this scenario and I didn't want to\nincur a lot of extra work to refactor the phases code. Perfect is\nthe enemy of good: I'm inclined to tackle secret phase as part of\nsupporting stream clones in bundle2.\n\nThis change introduces a `roots(all())` revset, which will require\na linear scan of the changelog during clone bundles. On a Firefox\nrepo, this may slow down stream clones by ~1s. Again, support for\nstream clones in bundle2 should help here.\n\n.. fix::\n\n   Draft changeset phase is now preserved during a stream clone.\n\n   Before, all changesets pulled via a stream clone would have a\n   public phase, even if they were draft on the remote and the remote\n   was non-publishing.","testPlan":"","lineCount":"64","dependsOn":["1752"],"reviewers":["yuja"],"ccs":["yuja","mercurial-devel"],"actions":[{"type":"inline","comment":"Perhaps the remote sends back actual phases data even if it is a publishing server.\nThat's probably why `exchange._pullapplyphases()` checks 'publishing' flag.","replyTo":"30215","isNewFile":"1","line":"191","lineLength":"0","path":"mercurial\/streamclone.py","diffId":"4603","author":"yuja","id":"30280","dateCreated":"1514466877","dateModified":"1514466877"},{"type":"inline","comment":"Maybe.\n\nMy reasoning here was that if the remote advertises phases data, then it is phases aware and the code below will ensure phases are adjusted appropriately. We certainly could special case the mixed phase + publishing case and skip all phase adjustment.","replyTo":"29973","isNewFile":"1","line":"191","lineLength":"0","path":"mercurial\/streamclone.py","diffId":"4603","author":"indygreg","id":"30215","dateCreated":"1514399658","dateModified":"1514399658"},{"type":"inline","comment":"It seems odd that `remotephases` data aren't used at all, but\nI'm not sure.","replyTo":null,"isNewFile":"1","line":"200","lineLength":"0","path":"mercurial\/streamclone.py","diffId":"4603","author":"yuja","id":"29974","dateCreated":"1514293502","dateModified":"1514293502"},{"type":"inline","comment":"Shouldn't we test `remotephases.get('publishing', False)` for\nmixed-phase + publishing server?\n\n","replyTo":null,"isNewFile":"1","line":"191","lineLength":"0","path":"mercurial\/streamclone.py","diffId":"4603","author":"yuja","id":"29973","dateCreated":"1514293502","dateModified":"1514293502"},{"type":"reject","author":"yuja","id":"29972","dateCreated":"1514293502","dateModified":"1514293502"},{"type":"update","diffId":"4603","author":"indygreg","id":"29886","dateCreated":"1514138810","dateModified":"1514138810"}],"dateCreated":"1514138810","dateModified":"1514466877","status":"Needs Revision"},{"id":"1784","callsign":"FBHGX","title":"fbamend: autorestack children for simple rebases","author":"marco.leogrande","summary":"Today, if you run 'hg amend' while in the middle of a stack of\ncommits, it amends the commit and leaves the top of the stack\nbehind. Users then have to run 'hg amend --restack' or 'hg restack' to\nbring the old top of the stack onto the new version of the commit.\n\nAdd heuristic code so that an automatic restack can be performed if\namending a commit did not change its manifest, nor did it leave behind\na dirty working copy. This optimization can be avoided by providing\nthe --no-rebase commandline option.\n\nFix the existing tests that relied on the previous behaviour (so their\noriginal intent is kept), and add new ones to cover the new heuristic.","testPlan":"","lineCount":"107","dependsOn":[],"reviewers":["quark"],"ccs":["quark"],"actions":[{"type":"comment","comment":"Great!","author":"quark","id":"30274","dateCreated":"1514435622","dateModified":"1514435622"},{"type":"accept","author":"quark","id":"30273","dateCreated":"1514435622","dateModified":"1514435622"},{"type":"update","diffId":"4657","author":"marco.leogrande","id":"30271","dateCreated":"1514428200","dateModified":"1514428200"},{"type":"inline","comment":"`debugbuilddag` creates empty commits that requires explicit \"add\" if you changed \"b\". That's doable by using `hg amend -A b` here.","replyTo":null,"isNewFile":"1","line":"899","lineLength":"0","path":"tests\/test-fbamend-restack.t","diffId":"4656","author":"quark","id":"30267","dateCreated":"1514426580","dateModified":"1514426580"},{"type":"inline","comment":"`hg debugbuilddag '+3'` is a more efficient way to create multiple commits. You can use `hg update 'tip^'` in the next line to update to the second commit. That said, I'm fine with just using `mkcommit`.","replyTo":null,"isNewFile":"1","line":"873","lineLength":"2","path":"tests\/test-fbamend-restack.t","diffId":"4656","author":"quark","id":"30266","dateCreated":"1514426580","dateModified":"1514426580"},{"type":"inline","comment":"Since this is user-facing and not everyone knows what \"manifest\" is. It's more friendly to avoid the terminology. Power users may want to disable the feature (ex. if they want to amend multiple commits and then just use restack once to fix them all) but it's not obvious how. Maybe something like \"(auto-rebasing descendants, use --no-rebase to disable this)\"\n\nNote \"children\" and \"descendants\" are different in hg. See `hg help revset` for details.\n","replyTo":null,"isNewFile":"1","line":"278","lineLength":"1","path":"hgext3rd\/fbamend\/__init__.py","diffId":"4656","author":"quark","id":"30265","dateCreated":"1514426580","dateModified":"1514426580"},{"type":"comment","comment":"This looks pretty good. I just have a small request about the user-facing message.","author":"quark","id":"30264","dateCreated":"1514426580","dateModified":"1514426580"},{"type":"reject","author":"quark","id":"30263","dateCreated":"1514426580","dateModified":"1514426580"},{"type":"update","diffId":"4656","author":"marco.leogrande","id":"30258","dateCreated":"1514424219","dateModified":"1514424219"}],"dateCreated":"1514424219","dateModified":"1514435622","status":"Accepted"},{"id":"1752","callsign":"HG","title":"tests: show phases aren't preserved part of streaming clone (issue5648)","author":"indygreg","summary":"draft and secret changesets are promoted to public changesets when\ntransferred via a stream clone. That's not desirable behavior. Add\ntests demonstrating it.\n\nAs far as I can tell, this buggy behavior has been present since\nphases were introduced. Stream clone predated phases (1.7 versus 1.9)\nand stream clone was never taught to be phase aware.","testPlan":"","lineCount":"65","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"4602","author":"indygreg","id":"29880","dateCreated":"1514138808","dateModified":"1514138808"}],"dateCreated":"1514138808","dateModified":"1514138810","status":"Needs Review"},{"id":"1742","callsign":null,"title":"p4fastimport: return the last changelist number that affects the client view","author":"dsp","summary":"Previously we returned the last changelist number of any change a\nclient can see. This includes changes outside of the files specified in the\nview. We now return the last changelist number of files affected by the client\nview.","testPlan":"python ..\/..\/hg-crew\/tests\/run-tests.py test-check* test-p4fastimport*","lineCount":"3","dependsOn":["1741"],"reviewers":["quark"],"ccs":[],"actions":[{"type":"accept","author":"quark","id":"29766","dateCreated":"1513913174","dateModified":"1513913174"},{"type":"update","diffId":"4576","author":"dsp","id":"29741","dateCreated":"1513905502","dateModified":"1513905502"}],"dateCreated":"1513905502","dateModified":"1513913174","status":"Accepted"},{"id":"1741","callsign":null,"title":"p4fastimport: fix symlink test on MacOS","author":"dsp","summary":"On MacOS the resulting symlinks do have a differnt mode and a slightly\ndifferent formatting due to the use of BSD ls.","testPlan":"Ran\n\n  python ..\/..\/hg-crew\/tests\/run-tests.py test-check* test-p4fastimport*\n\nand see it fail on MacOS. After the fix ran it again and see it worked","lineCount":"4","dependsOn":[],"reviewers":["quark"],"ccs":[],"actions":[{"type":"accept","author":"quark","id":"29764","dateCreated":"1513913128","dateModified":"1513913128"},{"type":"update","diffId":"4575","author":"dsp","id":"29736","dateCreated":"1513905500","dateModified":"1513905500"}],"dateCreated":"1513905500","dateModified":"1513913128","status":"Accepted"},{"id":"1621","callsign":"HG","title":"transaction: encodes tuples in changes['phases'] as 4 bit ints","author":"joerg.sonnenberger","summary":"changes['phases'] contains tuples for the phase transitions, which\nprovides a non-trivial overhead in Python. Replace this with a Python\ndictionary containing 4 bit integers. Provide accessors to centralize\nchanges['phases'] procsessing in one place.\n\nOn average, this improves user time for issue5691 by 1% and peak RSS by\n3MB.","testPlan":"","lineCount":"78","dependsOn":[],"reviewers":["quark"],"ccs":["yuja","quark","mercurial-devel"],"actions":[{"type":"comment","comment":"When thinking about it again, I believe providing a way to disable `tr.chanages['phases']` is a better way to solve this issue. If we cannot disable that automatically from what hooks are used, we can still provide a config option to disable that.","author":"quark","id":"29293","dateCreated":"1513404110","dateModified":"1513404110"},{"type":"resign","author":"quark","id":"29292","dateCreated":"1513404110","dateModified":"1513404110"},{"type":"comment","comment":">>! In D1621#28387, @joerg.sonnenberger wrote:\n> The bitset version has shown already that optimizing this is worthwhile and can eliminate up to 10% of the total size of the transaction object.\n\nIIRC, Jun said a plain intbitset wouldn't be optimal for all scenarios, and I agree\nwith that. Also, it isn't a standard Python library.\n\nI think the current way of recording phase change is too ad-hoc if it does iterate\nall incoming nodes to build `(old, new)` phases pairs. Instead, can't we reconstruct\nthem from DAG + old\/new phase roots, for example?\n\nIf the current `tr.changes['phases']` is only used by hooks and third-party\nextensions, it can be opt-in feature.","author":"yuja","id":"28507","dateCreated":"1513084873","dateModified":"1513084873"},{"type":"comment","comment":"The bitset version has shown already that optimizing this is worthwhile and can eliminate up to 10% of the total size of the transaction object.\n\nThe change as is primarily gets the interfaces in place, so that outside code can be adjusted.","author":"joerg.sonnenberger","id":"28387","dateCreated":"1513015530","dateModified":"1513015530"},{"type":"comment","comment":">>! In D1621#28285, @joerg.sonnenberger wrote:\n> This version should be committable. It introduces the necessary API for isolating further changes and gives a small improvement already. I'll be looking at provider a memory and time efficient sparce vector next, that's where the real benefits will be.\n\nI think it's better to hold this change off until we can get a real performance or\nmemory-space win. The current number, \"peak RSS by 3MB\", won't buy much\ncompared to the API complexity this patch will introduce.\n\nRegarding the API, I think `tr.changes[key]` is the source of the problem. It allows\nfree read\/write access to arbitrary data, which is hard to gradually improve the\nunderlying data structure or algorithm.\n\nNoob quesiton. Can't we completely switch of `tr.changes['phases']` when it's\nunnecessary?","author":"yuja","id":"28324","dateCreated":"1513002345","dateModified":"1513002345"},{"type":"comment","comment":"This version should be committable. It introduces the necessary API for isolating further changes and gives a small improvement already. I'll be looking at provider a memory and time efficient sparce vector next, that's where the real benefits will be.","author":"joerg.sonnenberger","id":"28285","dateCreated":"1512940391","dateModified":"1512940391"},{"type":"update","diffId":"4341","author":"joerg.sonnenberger","id":"28282","dateCreated":"1512940262","dateModified":"1512940262"},{"type":"comment","comment":"> Original code: 485s \/ 584MB\n> Set version: 501s \/ 582MB\n> intbitset: 478s \/ 563MB\n\nI'm not sure how to read this. Do we only get -2\/584MB better space\nconsumption against the original simplest implementation?","author":"yuja","id":"27976","dateCreated":"1512825094","dateModified":"1512825094"},{"type":"comment","comment":"That said, I think the usage of list of sets is smart and this change looks good to me.","author":"quark","id":"27917","dateCreated":"1512779148","dateModified":"1512779148"},{"type":"accept","author":"quark","id":"27916","dateCreated":"1512779148","dateModified":"1512779148"},{"type":"inline","comment":"Since this hook is the only user of `tr.changes['phases']`. I'd suggest disabling calculating `tr.changes['phases']` if the hook does not exist.","replyTo":null,"isNewFile":"1","line":"1243","lineLength":"0","path":"mercurial\/localrepo.py","diffId":"4278","author":"quark","id":"27915","dateCreated":"1512778979","dateModified":"1512778979"},{"type":"comment","comment":"This is a Proof-of-Concept and with a follow-up in D1622 to use a C implementation for the bitset.\n\nOriginal code: 485s \/ 584MB\nSet version: 501s \/ 582MB\nintbitset: 478s \/ 563MB\n\n","author":"joerg.sonnenberger","id":"27912","dateCreated":"1512778236","dateModified":"1512778236"},{"type":"update","diffId":"4278","author":"joerg.sonnenberger","id":"27897","dateCreated":"1512777987","dateModified":"1512777987"}],"dateCreated":"1512777987","dateModified":"1513404110","status":"Needs Review"},{"id":"1518","callsign":"FBHGX","title":"nodemap: move some methods to changelog utils","author":"quark","summary":"Those methods and constants will be reused by another module.","testPlan":"","lineCount":"68","dependsOn":[],"reviewers":["jsgf"],"ccs":["jsgf"],"actions":[{"type":"update","diffId":"4461","author":"quark","id":"28995","dateCreated":"1513307716","dateModified":"1513307716"},{"type":"update","diffId":"4455","author":"quark","id":"28981","dateCreated":"1513304499","dateModified":"1513304499"},{"type":"inline","comment":"```\nif rev > i32::MAX as u64 {\n```\n\nYou may need to `use std::i32;`","replyTo":null,"isNewFile":"1","line":"13","lineLength":"0","path":"rust\/indexes\/src\/utils.rs","diffId":"3880","author":"jsgf","id":"27451","dateCreated":"1512667504","dateModified":"1512667504"},{"type":"inline","comment":"(driveby) You can use `b'a'` to get a character value as a `u8`. so `b'a'...b'f' => ch - b'a',`, etc","replyTo":null,"isNewFile":"1","line":"190","lineLength":"2","path":"rust\/indexes\/src\/nodemap.rs","diffId":"3880","author":"jsgf","id":"27450","dateCreated":"1512667504","dateModified":"1512667504"},{"type":"reject","author":"jsgf","id":"27449","dateCreated":"1512667504","dateModified":"1512667504"},{"type":"update","diffId":"3880","author":"quark","id":"25601","dateCreated":"1511807450","dateModified":"1511807450"}],"dateCreated":"1511807450","dateModified":"1513385306","status":"Needs Review"},{"id":"1521","callsign":"FBHGX","title":"clindex: use childmap to calculate phases","author":"quark","summary":"Calculating phases is O(len(changelog)) since it scans revisions starting\nwith min(draft()) (unfiltered). Use the childmap so it is actually\nO(len(not public())).\n\nThis saves 100+ms for a fbsource repo created in late 2015.\n\nBesides, the old phases code build a O(len(changelog)) Python list for\nrev -> phase queries. This patch does not build such list and saves\nO(len(changelog)) memory.","testPlan":"With verify mode on, run core hg tests and make sure there is no\ninconsistent cases with the original phases implementation.","lineCount":"38","dependsOn":["1520"],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4458","author":"quark","id":"28985","dateCreated":"1513304505","dateModified":"1513304505"},{"type":"update","diffId":"3883","author":"quark","id":"25627","dateCreated":"1511807456","dateModified":"1511807456"}],"dateCreated":"1511807456","dateModified":"1513385283","status":"Needs Review"},{"id":"1700","callsign":"HG","title":"logtoprocess: pass ui in runshellcommand","author":"lothiraldan","summary":"We are gonna read a configuration specific to Windows, instead of adding a\nuseless arguments for runshellcommand on linux, pass the ui object to read it\ndirectly.","testPlan":"","lineCount":"6","dependsOn":[],"reviewers":[],"ccs":["mercurial-devel"],"actions":[{"type":"update","diffId":"4467","author":"lothiraldan","id":"29023","dateCreated":"1513332655","dateModified":"1513332655"}],"dateCreated":"1513332655","dateModified":"1513332916","status":"Needs Review"},{"id":"1520","callsign":"FBHGX","title":"clindex: integrate Rust childmap","author":"quark","summary":"Like nodemap, maintain the Rust childmap in clindex. The childmap is pretty\ncompact - only 10% the size of changelog.i in fbsource.","testPlan":"","lineCount":"92","dependsOn":["1519"],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4457","author":"quark","id":"28984","dateCreated":"1513304503","dateModified":"1513304503"},{"type":"update","diffId":"3882","author":"quark","id":"25618","dateCreated":"1511807454","dateModified":"1511807454"}],"dateCreated":"1511807454","dateModified":"1513307719","status":"Needs Review"},{"id":"1519","callsign":"FBHGX","title":"childmap: add a map for efficient children query","author":"quark","summary":" ","testPlan":"","lineCount":"509","dependsOn":["1518"],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4462","author":"quark","id":"28998","dateCreated":"1513307718","dateModified":"1513307718"},{"type":"update","diffId":"4456","author":"quark","id":"28983","dateCreated":"1513304501","dateModified":"1513304501"},{"type":"update","diffId":"3881","author":"quark","id":"25610","dateCreated":"1511807452","dateModified":"1511807452"}],"dateCreated":"1511807452","dateModified":"1513307718","status":"Needs Review"},{"id":"1330","callsign":"FBHGX","title":"hgext3rd: add hg continue and hg abort","author":"phillco","summary":"I hate having to remember and type which command I need to abort or continue.\nWhy make the user do that work? Life is short, and we already know what\nstatefiles exist and how to deal with them.\n\nWe could even have it loop until no statefiles are left, to deal with issues\nwhere both a rebase state and a merge state are left.","testPlan":"","lineCount":"63","dependsOn":[],"reviewers":["quark","durham"],"ccs":["durham","quark"],"actions":[{"type":"inline","comment":"Yeh, that's fair. It's a shame merge (the command) doesn't have a distinct statefile from merge.update (the function). Since we don't need to support the `hg merge` case at FB, I'll just have it detect the merge state file and print something in that case.","replyTo":"22386","isNewFile":"1","line":"68","lineLength":"0","path":"hgext3rd\/conflictinfo.py","diffId":"3348","author":"phillco","id":"22398","dateCreated":"1510247720","dateModified":"1510247720"},{"type":"inline","comment":"Can we print a message saying what we're continueing\/aborting?  Like \"continuing rebase (via hg rebase --continue) ...\" or \"aborting merge (via hg update --clean) ...\".  That way users know what action is being continued and knows what actually happening so they can figure out how to undo it if necessary.","replyTo":null,"isNewFile":"1","line":"34","lineLength":"0","path":"hgext3rd\/continue.py","diffId":"3348","author":"durham","id":"22387","dateCreated":"1510245420","dateModified":"1510245420"},{"type":"inline","comment":"Is merge\/state used in any case other than hg merge? I have this feeling it is?  If so, update --clean could lose user data and I don't think it's necessarily clear that 'hg abort' would do that.","replyTo":null,"isNewFile":"1","line":"68","lineLength":"0","path":"hgext3rd\/conflictinfo.py","diffId":"3348","author":"durham","id":"22386","dateCreated":"1510245420","dateModified":"1510245420"},{"type":"comment","comment":"Probably needs a test once it's not a POC","author":"durham","id":"22385","dateCreated":"1510245420","dateModified":"1510245420"},{"type":"reject","author":"durham","id":"22384","dateCreated":"1510245420","dateModified":"1510245420"},{"type":"inline","comment":"Add the `from __future__ import absolute_import` here.","replyTo":null,"isNewFile":"1","line":"7","lineLength":"0","path":"hgext3rd\/continue.py","diffId":"3348","author":"quark","id":"22268","dateCreated":"1510169291","dateModified":"1510169291"},{"type":"inline","comment":"Use `from . import conflicttinfo` instead.","replyTo":null,"isNewFile":"1","line":"20","lineLength":"0","path":"hgext3rd\/continue.py","diffId":"3348","author":"quark","id":"22267","dateCreated":"1510169291","dateModified":"1510169291"},{"type":"update","diffId":"3348","author":"phillco","id":"22256","dateCreated":"1510162410","dateModified":"1510162410"},{"type":"inline","comment":"It might be obviated by your suggestion. I think it's related to dispatching twice. I'll debug it more if we actually want to go this way.","replyTo":"22072","isNewFile":"1","line":"127","lineLength":"1","path":"hgext3rd\/undo.py","diffId":"3317","author":"phillco","id":"22075","dateCreated":"1510092299","dateModified":"1510092299"},{"type":"inline","comment":"That might work better. I'll try it.","replyTo":"22071","isNewFile":"1","line":"27","lineLength":"0","path":"hgext3rd\/continue.py","diffId":"3317","author":"phillco","id":"22074","dateCreated":"1510092299","dateModified":"1510092299"},{"type":"inline","comment":"Why is this change?","replyTo":null,"isNewFile":"1","line":"127","lineLength":"1","path":"hgext3rd\/undo.py","diffId":"3317","author":"quark","id":"22072","dateCreated":"1510092104","dateModified":"1510092104"},{"type":"inline","comment":"Instead of issuing a new dispatch request, you can lookup the command function using `cmdutil.findcmd` and execute that function directly.","replyTo":null,"isNewFile":"1","line":"27","lineLength":"0","path":"hgext3rd\/continue.py","diffId":"3317","author":"quark","id":"22071","dateCreated":"1510092104","dateModified":"1510092104"},{"type":"reject","author":"quark","id":"22070","dateCreated":"1510092104","dateModified":"1510092104"},{"type":"update","diffId":"3317","author":"phillco","id":"22034","dateCreated":"1510080495","dateModified":"1510080495"},{"type":"update","diffId":"3316","author":"phillco","id":"22033","dateCreated":"1510080441","dateModified":"1510080441"},{"type":"update","diffId":"3315","author":"phillco","id":"22029","dateCreated":"1510080374","dateModified":"1510080374"}],"dateCreated":"1510080374","dateModified":"1513209943","status":"Needs Revision"},{"id":"1665","callsign":"FBHGX","title":"perftweaks: pass a correct revgen to branchcache.update","author":"quark","summary":"The revgen parameter cannot be null. Otherwise the \"for i in None\" code path\nwill be executed if disablebranchcache is False while disablebranchcache2 is\nTrue.","testPlan":"","lineCount":"2","dependsOn":[],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"4373","author":"quark","id":"28483","dateCreated":"1513039161","dateModified":"1513039161"}],"dateCreated":"1513039161","dateModified":"1513039161","status":"Needs Review"},{"id":"1622","callsign":"HG","title":"[PoC] transaction: Use intbitset for implementing changes['phase']","author":"joerg.sonnenberger","summary":" ","testPlan":"","lineCount":"4","dependsOn":["1621"],"reviewers":["yuja"],"ccs":["yuja","quark","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D1622#27981, @joerg.sonnenberger wrote:\n> Like I said, this is primarily a proof of concept. I'm still playing with different approaches\n\nAh, okay. I've added [PoC] to the subject so this won't be queued by mistake.\n\nFWIW, we generally don't move codes to C unless there is significant improvement.\n\n","author":"yuja","id":"28278","dateCreated":"1512904090","dateModified":"1512904090"},{"type":"comment","comment":"Like I said, this is primarily a proof of concept. I'm still playing with different approaches and I don't think intbitset is a good fit for other reasons, but it worked the best from the various pre-existing implementations.","author":"joerg.sonnenberger","id":"27981","dateCreated":"1512832551","dateModified":"1512832551"},{"type":"comment","comment":"> Although this is definitely better for the clone case. intbitset does not seem to implement segmented bitsets so the memory usage could in theory be worse for other cases.\n\nPerhaps. And if we need to iterate a sparse bitset, the performance would\nbe way worse.\n","author":"yuja","id":"27979","dateCreated":"1512825512","dateModified":"1512825512"},{"type":"reject","author":"yuja","id":"27978","dateCreated":"1512825512","dateModified":"1512825512"},{"type":"inline","comment":"It's still worthwhile to have `set()` as a fallback. So the code runs in pure python or pypy environment","replyTo":null,"isNewFile":"1","line":"1283","lineLength":"0","path":"mercurial\/localrepo.py","diffId":"4279","author":"quark","id":"27920","dateCreated":"1512779474","dateModified":"1512779474"},{"type":"comment","comment":"Although this is definitely better for the clone case. intbitset does not seem to implement segmented bitsets so the memory usage could in theory be worse for other cases.","author":"quark","id":"27919","dateCreated":"1512779474","dateModified":"1512779474"},{"type":"update","diffId":"4279","author":"joerg.sonnenberger","id":"27903","dateCreated":"1512777992","dateModified":"1512777992"}],"dateCreated":"1512777992","dateModified":"1512904090","status":"Needs Revision"},{"id":"1618","callsign":"FBHGX","title":"infinitepush: write backup state file atomically","author":"stash","summary":"","testPlan":"Run infinitepush tests","lineCount":"2","dependsOn":[],"reviewers":["mbthomas","quark"],"ccs":["quark"],"actions":[{"type":"inline","comment":"`json.dump({...}, f)` could avoid creating the temporary string. Although it probably does not make a visible difference here.","replyTo":null,"isNewFile":"1","line":"842","lineLength":"0","path":"infinitepush\/backupcommands.py","diffId":"4255","author":"quark","id":"27946","dateCreated":"1512788509","dateModified":"1512788509"},{"type":"accept","author":"quark","id":"27945","dateCreated":"1512788509","dateModified":"1512788509"},{"type":"update","diffId":"4255","author":"stash","id":"27810","dateCreated":"1512751899","dateModified":"1512751899"}],"dateCreated":"1512751899","dateModified":"1512788509","status":"Accepted"},{"id":"1593","callsign":"FBHGX","title":"infinitepush: remove duplicated logic for storing changegroups","author":"pulkit","summary":"Before this patch, we had same code in parthandler for scratchbranchparttype and\nprocesspart where we override bundle2.processpart and add storing changegroup\nlogic if we get scratchbranchparttype.\n\nSince we have all this logic in parthandler, we can just go ahead and process\nthe scratchbranchparttype instead of adding it in processparts().","testPlan":"","lineCount":"24","dependsOn":[],"reviewers":["durham"],"ccs":[],"actions":[{"type":"inline","comment":"Ah, thanks for the explanation. I got confused by the exact same code and variable names.","replyTo":"27688","isNewFile":"0","line":"1125","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4121","author":"pulkit","id":"27689","dateCreated":"1512694616","dateModified":"1512694616"},{"type":"inline","comment":"This one is storing the entire bundler though.  So every part that was added to the bundler above is in the infinitepush stored bundle.  The standard scratchbranchparttype part handler would result in a bundle that only contained the changegroup part.  So the new code allows us to produce a bundle that contain parts like obsmarkers and stuff.","replyTo":"27659","isNewFile":"0","line":"1125","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4121","author":"durham","id":"27688","dateCreated":"1512693851","dateModified":"1512693851"},{"type":"inline","comment":"@durham I am referring to this part handler part. It has the same logic which I deleted above.","replyTo":null,"isNewFile":"0","line":"1254","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4121","author":"pulkit","id":"27660","dateCreated":"1512685256","dateModified":"1512685256"},{"type":"inline","comment":"There is part handler defined for that already which has exact same logic which I just deleted. The only difference I see is that, in this case, we are storing changegroup in the end, while that won't be executed in the end.","replyTo":"27630","isNewFile":"0","line":"1125","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4121","author":"pulkit","id":"27659","dateCreated":"1512685256","dateModified":"1512685256"},{"type":"inline","comment":"If we delete this code, when does this bundler get processed? I think the purpose of having this serialization logic is so that every other part in the bundle gets processed above first, and then we serialize it here.  Without this code here, then the bundler is just thrown away and all the parts that were added to it are lost, and the only serialization ends up being from the scratchbranchparttype processing, which doesn't handle the other parts.\n\nOr am I forgetting something?","replyTo":null,"isNewFile":"0","line":"1125","lineLength":"0","path":"infinitepush\/__init__.py","diffId":"4121","author":"durham","id":"27630","dateCreated":"1512683960","dateModified":"1512683960"},{"type":"reject","author":"durham","id":"27629","dateCreated":"1512683960","dateModified":"1512683960"},{"type":"comment","comment":"All the `test-infinitepush-*` skips for me except one, so I am not sure whether this breaks something or not. Any help on how can I run the test locally will be of great help.","author":"pulkit","id":"27072","dateCreated":"1512501221","dateModified":"1512501221"},{"type":"update","diffId":"4121","author":"pulkit","id":"27067","dateCreated":"1512501082","dateModified":"1512501082"}],"dateCreated":"1512501082","dateModified":"1512694616","status":"Needs Revision"},{"id":"1594","callsign":"FBHGX","title":"prune: only prompt uncommit when revs = ['.']","author":"quark","summary":"This is a follow-up of D1335.\n\n`uncommit` only works for the dot revision. Therefore the advice shouldn't\nbe visible when stripping other revisions.\n\nBesides, added missing i18n functions and added a test.","testPlan":"","lineCount":"40","dependsOn":[],"reviewers":["mitrandir"],"ccs":[],"actions":[{"type":"update","diffId":"4122","author":"quark","id":"27080","dateCreated":"1512504540","dateModified":"1512504540"}],"dateCreated":"1512504540","dateModified":"1512506757","status":"Needs Review"},{"id":"1542","callsign":"FBHGX","title":"fbamend: prevent amending only some changes with --rebase\/fixup","author":"tja","summary":"When calling hg amend --rebase <some files>,\na subsequent rebase fails if <some files> doesn't cover\nall the changes in the working copy.\n\nAs there is currently no code for shelving\/unshelving\nthe remaining changes, let's switch off this\ncombination of options for now, to avoid\ngetting people into failed rebase situations.\n\n--fixup can't work for the same reasons.","testPlan":"$ cd fb-hgext\/tests rt\n# Ran 232 tests, 21 skipped, 0 failed.","lineCount":"9","dependsOn":[],"reviewers":["quark"],"ccs":["quark"],"actions":[{"type":"comment","comment":"Probably also defend against:\n\n    --interactive\n    --include\n    --exclude\n\n","author":"quark","id":"26055","dateCreated":"1511984854","dateModified":"1511984871"},{"type":"accept","author":"quark","id":"26054","dateCreated":"1511984854","dateModified":"1511984854"},{"type":"update","diffId":"3961","author":"tja","id":"26014","dateCreated":"1511965164","dateModified":"1511965164"}],"dateCreated":"1511965164","dateModified":"1511984854","status":"Accepted"},{"id":"1312","callsign":"FBHGX","title":"packfiles: add hg debugpackstatus","author":"phillco","summary":"@akushner thought it'd be helpful to have a dedicated debug command to run if packfile unpleasantness is suspected, and I thought it'd be useful too.\n\nAlso added some missing metrics on remotefilelog stores.","testPlan":"","lineCount":"171","dependsOn":[],"reviewers":["singhsrb","durham"],"ccs":["quark","durham","akushner"],"actions":[{"type":"inline","comment":"Interesting, I didn't know you could chain them. I'll take the shorter way.","replyTo":"25994","isNewFile":"1","line":"385","lineLength":"2","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"phillco","id":"26005","dateCreated":"1511936991","dateModified":"1511936991"},{"type":"inline","comment":"Yeah, it doesn't matter today but I was looking ahead if we were to generalize this function \/ move it into a util. Then I'd expect it to behave the Ruby way too (or at least have a different name, like `filterfalsy`).","replyTo":"25993","isNewFile":"1","line":"377","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"phillco","id":"26004","dateCreated":"1511936991","dateModified":"1511936991"},{"type":"inline","comment":"Maybe more common in Python:\n\n  [p for s in store.stores if s for p in getpaths(s)]\n\nIt's much shorter. Although I personally do not enjoy list comprehensive that much.","replyTo":null,"isNewFile":"1","line":"385","lineLength":"2","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"quark","id":"25994","dateCreated":"1511927497","dateModified":"1511927497"},{"type":"inline","comment":"Yes. Whether `0` or `[]` should be `False` is a separate topic (I personally prefer the Ruby\/Lua way - only `nil` and `false` are False). It seems you're using it to filter paths, which is fine I guess?","replyTo":"25992","isNewFile":"1","line":"377","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"quark","id":"25993","dateCreated":"1511927497","dateModified":"1511927497"},{"type":"inline","comment":"@quark looks like that removes other falsy values too, like 0. But, I guess that is desirable?","replyTo":"25933","isNewFile":"1","line":"377","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"phillco","id":"25992","dateCreated":"1511921930","dateModified":"1511921930"},{"type":"inline","comment":"clever, thx","replyTo":"25934","isNewFile":"1","line":"47","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3887","author":"phillco","id":"25991","dateCreated":"1511921930","dateModified":"1511921930"},{"type":"inline","comment":"No need to split.","replyTo":"25657","isNewFile":"1","line":"202","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"quark","id":"25935","dateCreated":"1511917343","dateModified":"1511917343"},{"type":"inline","comment":"Maybe just `count = len(list(self._listkeys())` since that's shorter and does not need placeholders","replyTo":null,"isNewFile":"1","line":"47","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3887","author":"quark","id":"25934","dateCreated":"1511917343","dateModified":"1511917343"},{"type":"inline","comment":"Could you use `filter(None, list)`? It is more common in python.","replyTo":"25931","isNewFile":"1","line":"377","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"quark","id":"25933","dateCreated":"1511917343","dateModified":"1511917343"},{"type":"inline","comment":"It's based on Ruby\/Underscore.js's name for the same function. Then again, who ever said Ruby was a paragon of naming?","replyTo":"25918","isNewFile":"1","line":"377","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"phillco","id":"25931","dateCreated":"1511916796","dateModified":"1511916796"},{"type":"inline","comment":"I'd use the words \"File Data Store\" and \"File History Store\" in the user facing code.  content and metadata were old terms and should probably be replaced throughout the code.","replyTo":null,"isNewFile":"1","line":"416","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"durham","id":"25919","dateCreated":"1511915533","dateModified":"1511915533"},{"type":"inline","comment":"I'd rename this 'removenone' or something.","replyTo":null,"isNewFile":"1","line":"377","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"durham","id":"25918","dateCreated":"1511915533","dateModified":"1511915533"},{"type":"accept","author":"durham","id":"25917","dateCreated":"1511915533","dateModified":"1511915533"},{"type":"inline","comment":"Not really related, but I noticed that `debugdatapack` aborted too early if one of the paths had any errors. I could split this out if you think it's warranted.","replyTo":null,"isNewFile":"1","line":"202","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3887","author":"phillco","id":"25657","dateCreated":"1511813176","dateModified":"1511813176"},{"type":"comment","comment":"I flushed this out a bit since the last change, adding `getmetrics()` to `datapackstore` and printing the paths for remotefilelog stores, too.","author":"phillco","id":"25656","dateCreated":"1511813176","dateModified":"1511813176"},{"type":"update","diffId":"3887","author":"phillco","id":"25655","dateCreated":"1511812988","dateModified":"1511812988"},{"type":"update","diffId":"3886","author":"phillco","id":"25654","dateCreated":"1511812858","dateModified":"1511812858"},{"type":"plan-changes","author":"phillco","id":"23792","dateCreated":"1510814137","dateModified":"1510814137"},{"type":"update","diffId":"3564","author":"phillco","id":"23790","dateCreated":"1510813934","dateModified":"1510813934"},{"type":"inline","comment":"os.path.join(self._getrootpath(), fnhashhex[:2], fnhashhex[2:]) would be the more platform agnostic way of doing this.","replyTo":null,"isNewFile":"1","line":"58","lineLength":"1","path":"remotefilelog\/basestore.py","diffId":"3509","author":"durham","id":"23657","dateCreated":"1510790200","dateModified":"1510790200"},{"type":"comment","comment":"Needs a test","author":"durham","id":"23656","dateCreated":"1510790200","dateModified":"1510790200"},{"type":"reject","author":"durham","id":"23655","dateCreated":"1510790200","dateModified":"1510790200"},{"type":"inline","comment":"From our IRL chat, added `verbose=False`.","replyTo":"21913","isNewFile":"1","line":"58","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3289","author":"phillco","id":"23471","dateCreated":"1510716288","dateModified":"1510716288"},{"type":"comment","comment":"Ready for another look. Please check my C.","author":"phillco","id":"23470","dateCreated":"1510716288","dateModified":"1510716288"},{"type":"update","diffId":"3509","author":"phillco","id":"23468","dateCreated":"1510716229","dateModified":"1510716229"},{"type":"update","diffId":"3507","author":"phillco","id":"23465","dateCreated":"1510715278","dateModified":"1510715278"},{"type":"update","diffId":"3506","author":"phillco","id":"23464","dateCreated":"1510715111","dateModified":"1510715111"},{"type":"comment","comment":".","author":"phillco","id":"22115","dateCreated":"1510119235","dateModified":"1510119235"},{"type":"plan-changes","author":"phillco","id":"22114","dateCreated":"1510119235","dateModified":"1510119235"},{"type":"update","diffId":"3331","author":"phillco","id":"22109","dateCreated":"1510119227","dateModified":"1510119227"},{"type":"inline","comment":"We may want a try\/catch around all of these metric functions that call _getfiles.  _getfiles could throw an exception if the directory isn't readable for some reason, and we don't want metric logging code to bring down the process.  Or we add the try\/catch to _getfiles or _listkeys and print a warning if the directory is inaccesible, then return an empty list.","replyTo":null,"isNewFile":"1","line":"45","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3289","author":"durham","id":"21916","dateCreated":"1509995914","dateModified":"1509995914"},{"type":"inline","comment":"If we're just getting the file size, we can use _listkeys to get the information necessary to compute the file path to get the size.","replyTo":null,"isNewFile":"1","line":"54","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3289","author":"durham","id":"21915","dateCreated":"1509995914","dateModified":"1509995914"},{"type":"inline","comment":"If we're just counting, we can use _listkeys() instead, so we don't have to resolve the filenames.","replyTo":null,"isNewFile":"1","line":"46","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3289","author":"durham","id":"21914","dateCreated":"1509995914","dateModified":"1509995914"},{"type":"inline","comment":"Isn't getmetrics called at store creation time now?  By your previous diff.  If so, getnumfiles is expensive right?  How do we ensure that we don't accidentally call getnumfiles every time we want to log metrics.","replyTo":null,"isNewFile":"1","line":"58","lineLength":"0","path":"remotefilelog\/basestore.py","diffId":"3289","author":"durham","id":"21913","dateCreated":"1509995914","dateModified":"1509995914"},{"type":"inline","comment":"I'd write out the full name `debugpackstatus`.  `st` isn't a super common acronym in the code base.","replyTo":null,"isNewFile":"1","line":"271","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3289","author":"durham","id":"21912","dateCreated":"1509995914","dateModified":"1509995914"},{"type":"reject","author":"durham","id":"21911","dateCreated":"1509995914","dateModified":"1509995914"},{"type":"update","diffId":"3289","author":"phillco","id":"21864","dateCreated":"1509935138","dateModified":"1509935138"},{"type":"update","diffId":"3266","author":"phillco","id":"21700","dateCreated":"1509736600","dateModified":"1509736600"}],"dateCreated":"1509736600","dateModified":"1511936991","status":"Accepted"},{"id":"1524","callsign":"FBHGX","title":"morestatus: drop the extension as it was moved to core","author":"pulkit","summary":"This patch drops the morestatus extension as the functionality was directly\nmoved to core as `hg status -v` or can be used by setting config\n`commands.status.verbose` to True.\n\nNote: The update part of the morestatus was not ported to core as that wraps\nupdate command to save the args and dropping the extensions results in\nfunctionality lose of showing conflict state of hg update. But I think that\ncan't happen at Fb as `hg update` aborts if the working directory is dirty as\nmentioned in tweakdefaults.py.","testPlan":"","lineCount":"441","dependsOn":[],"reviewers":["quark"],"ccs":["quark"],"actions":[{"type":"comment","comment":"The update part can happen if users pressed Ctrl+C during a long update. So we still want that feature.","author":"quark","id":"25871","dateCreated":"1511910092","dateModified":"1511910092"},{"type":"reject","author":"quark","id":"25870","dateCreated":"1511910092","dateModified":"1511910092"},{"type":"update","diffId":"3896","author":"pulkit","id":"25678","dateCreated":"1511819079","dateModified":"1511819079"}],"dateCreated":"1511819079","dateModified":"1511910092","status":"Needs Revision"},{"id":"1525","callsign":"FBHGX","title":"fold: support user template in json output","author":"pulkit","summary":"This patch syncs the JSON output of fold command with that of core Mercurial\nextensions. For reference: https:\/\/phab.mercurial-scm.org\/D1293","testPlan":"","lineCount":"8","dependsOn":["1524"],"reviewers":[],"ccs":[],"actions":[{"type":"update","diffId":"3897","author":"pulkit","id":"25683","dateCreated":"1511819085","dateModified":"1511819085"}],"dateCreated":"1511819085","dateModified":"1511819085","status":"Needs Review"},{"id":"1506","callsign":"HG","title":"dagop: handle IndexError when using wdir() in dag range","author":"swhitaker","summary":"Using wdir() in a dag range revset can crash Mercurial. For example:\n\n    hg status --rev '.^::wdir()\n\nrevlog.c reports an IndexError in this instance, but it isn't caught\nby the calling code. This change adds IndexError to the set of exception\ntypes the calling code catches. When an IndexError is caught, the code\nfalls back to calling the pure Python implementation of reachableroots,\nwhich fails gracefully.","testPlan":"$ hg status --rev '.::wdir()'\nabort: working directory revision cannot be specified","lineCount":"2","dependsOn":[],"reviewers":["mbthomas","yuja"],"ccs":["ryanmce","yuja","mercurial-devel"],"actions":[{"type":"comment","comment":">>! In D1506#25509, @ryanmce wrote:\n> but ideally, wouldn't this be supported?\n\nYeah, this case, `includepath=True`, won't be difficult to handle. If reachableroots() raised\nWdirUnsupportedError, drop wdir revision from `y` of `x::y`, add parents instead, rerun\n`x::(y - wdir() + parents(wdir()))`, and append wdir to the result.","author":"yuja","id":"25511","dateCreated":"1511704872","dateModified":"1511704872"},{"type":"comment","comment":"I understand that fixing the crash is a good first step, but ideally, wouldn't this be supported? Is there a reason it's particularly hard to support?","author":"ryanmce","id":"25510","dateCreated":"1511689355","dateModified":"1511689355"},{"type":"comment","comment":"I think it's better to fail fast instead of trying the slow path which is supposed\nto raise WdirUnsupported exception.\n\n> $ hg status --rev '.::wdir()'\n> abort: working directory revision cannot be specified\n\nCan you add test?","author":"yuja","id":"25487","dateCreated":"1511582067","dateModified":"1511582067"},{"type":"reject","author":"yuja","id":"25486","dateCreated":"1511582067","dateModified":"1511582067"},{"type":"accept","author":"mbthomas","id":"25372","dateCreated":"1511541089","dateModified":"1511541089"},{"type":"update","diffId":"3813","author":"swhitaker","id":"25358","dateCreated":"1511525215","dateModified":"1511525215"}],"dateCreated":"1511525215","dateModified":"1511704872","status":"Needs Revision"},{"id":"474","callsign":"FBHGX","title":"perftweaks: store rev to node mapping for preloading","author":"mbthomas","summary":"Change perftweaks to store the node-to-rev mapping for interesting\nrevisions, rather than just the rev numbers.\n\nPreviously this was used to prepopulate the changelog's node-to-rev\nlookup trie, however since we only stored the revision numbers this\nstill required looking at the revlog index contents in order to\nread out the node hash.\n\nWith these changes, the trie can be prepopulated without touching\nthe index.\n\nOn its own, this gives only a modest performance increase, however\nwhen combined with using mmap for the revlog index (coming in\nanother diff), it gives a noticable improvment on repos with very\nlarge revlogs, as we no longer need to touch large portions of the\nrevlog index on every invocation.\n\nWhen loading the cache data, we check that the rev numbers are\nin range for the revlog, and drop any entries that are out of\nrange.  The assumption is that a node hash won't be reassigned to\nanother rev index.  The other way round ought to be ok, as the\nold hash ought to be abandoned if it's no longer part of the\nrevlog.  If there's any more checking needed, please suggest in\nthe review comments.","testPlan":"Re-run unit tests.\nGenerate cache data on a large repo and verify indexes can be\npreloaded without touching the index contents.\nRun with mmap change to verify perf improvement.","lineCount":"64","dependsOn":[],"reviewers":["durham"],"ccs":["quark"],"actions":[{"type":"comment","comment":"This is no longer needed after D1472.","author":"quark","id":"25010","dateCreated":"1511320901","dateModified":"1511320901"},{"type":"inline","comment":"Is this better than `revstr, node = line.split(':')`?\n\nAlso, mercurial generally avoids using `_` for unused variables, because `_` is already the function name for the string internationalization function.  I usually use `x` or some such","replyTo":null,"isNewFile":"1","line":"223","lineLength":"0","path":"hgext3rd\/perftweaks.py","diffId":"1155","author":"durham","id":"8042","dateCreated":"1503593933","dateModified":"1503593933"},{"type":"comment","comment":"I think we want to be pretty conservative about cache invalidation initially.  If we get the map wrong, we could end up reading entirely incorrect data out of the changelog and associating it with the incorrect node.  A few ideas:\n\n- We could initially treat the cache as risky, and instead of using the data we could just confirm that the data is always correct, by comparing the getnode(rev) result with our stored node->rev. If our cache doesn't match the truth, print a ui.develwarn so we see it.  Once we have confidence, we can actually use the map result instead of calling getnode(rev).\n- We should invalidate the entire cache when `repo.destroyed()` is called.  That is the function called at the end of a strip, to let extensions perform invalidation like this.\n- Maybe we could only use the cached mappings for commits older than `tip - 10000`.  Any node that claims to be newer than tip-10000 we could do getnode(rev) and put the actual node value in the nodemap instead.  Since the The top of the changelog is where the most churn happens and where the most risk will be, this should help prevent most bad cache issues and shouldn't add much IO slow down (10k revs is only 620KB of .i file)","author":"durham","id":"8041","dateCreated":"1503593933","dateModified":"1503593933"},{"type":"reject","author":"durham","id":"8040","dateCreated":"1503593933","dateModified":"1503593933"},{"type":"update","diffId":"1155","author":"mbthomas","id":"7443","dateCreated":"1503406015","dateModified":"1503406015"}],"dateCreated":"1503406015","dateModified":"1511320901","status":"Needs Revision"},{"id":"1453","callsign":"FBHGX","title":"remotefilelog: never deadlock on writing to a pipe","author":"ikostia","summary":"Instead of guesstimating that 10000 (or any fixed number) steps\nalways fit in a buffer, we can just count the bytes as we write.\n\nDepends on D1436","testPlan":"- not tested yet","lineCount":"28","dependsOn":[],"reviewers":["durham"],"ccs":["durham","wlis"],"actions":[{"type":"inline","comment":"`i += 1`","replyTo":null,"isNewFile":"1","line":"238","lineLength":"0","path":"remotefilelog\/fileserverclient.py","diffId":"3663","author":"durham","id":"24394","dateCreated":"1511203049","dateModified":"1511203049"},{"type":"comment","comment":"Have you tested the performance impact of this change?  Previously we would issue 10k at a time, now if the buffer is 65k and if each entry is 100 bytes (40 byte hash + 60 byte path) then we're only doing 650 at a time.  You may need to set `remotefilelog.cacheprocess=` to force it to fallback to normal ssh fetching to execute this code path in bulk.","author":"durham","id":"24393","dateCreated":"1511203049","dateModified":"1511203049"},{"type":"reject","author":"durham","id":"24392","dateCreated":"1511203049","dateModified":"1511203049"},{"type":"comment","comment":"remove unnecessary condition","author":"ikostia","id":"24339","dateCreated":"1511198823","dateModified":"1511198823"},{"type":"update","diffId":"3663","author":"ikostia","id":"24338","dateCreated":"1511198823","dateModified":"1511198823"},{"type":"inline","comment":"Is there a way to get this value from the OS, in case someone has some custom setting for the default pipe size?","replyTo":null,"isNewFile":"1","line":"372","lineLength":"0","path":"remotefilelog\/fileserverclient.py","diffId":"3630","author":"wlis","id":"24303","dateCreated":"1511198212","dateModified":"1511198212"},{"type":"inline","comment":"Probably remove the \"True\"","replyTo":null,"isNewFile":"1","line":"230","lineLength":"0","path":"remotefilelog\/fileserverclient.py","diffId":"3630","author":"wlis","id":"24302","dateCreated":"1511198212","dateModified":"1511198212"},{"type":"update","diffId":"3630","author":"ikostia","id":"24226","dateCreated":"1511125192","dateModified":"1511125192"}],"dateCreated":"1511125192","dateModified":"1511203049","status":"Needs Revision"},{"id":"1423","callsign":"FBHGX","title":"debugdatapack: add more stats, and --summary","author":"phillco","summary":"- Use byte and comma formatters\n- In addition to each filename, print stats for each packfile, and for everything together (if numpackfiles > 1)\n- Add a `--summary` option which hides all the nodes and filename totals, which can be very noisy for huge packs, and only shows the packfile\/grand-total lines.\n\nExample output: https:\/\/phabricator.intern.facebook.com\/P58641463","testPlan":"","lineCount":"577","dependsOn":[],"reviewers":["durham"],"ccs":["durham"],"actions":[{"type":"inline","comment":"It's not obvious what the '?' means on its own.  Maybe write out \"missing blob sizes\" or something","replyTo":null,"isNewFile":"1","line":"57","lineLength":"0","path":"tests\/test-treemanifest-server.t","diffId":"3512","author":"durham","id":"23653","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"Same here for files vs something else.","replyTo":null,"isNewFile":"1","line":"312","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23652","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"Instead of \"unique files\" maybe say \"unique paths\", since it could also represent trees, and eventually other things.","replyTo":null,"isNewFile":"1","line":"304","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23651","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"I'd move the new total up one line, and the above newline down one.  So\n```\nw:\nNode          Delta Base    Delta Length  Blob Size\nbb6ccd5dceaa  000000000000  2 bytes       2 bytes\nTotal:                      2 bytes       2 bytes   (0.0% bigger)\n\nx:\nNode ....\n```\n\nThat way the separation between files is more visible.","replyTo":null,"isNewFile":"1","line":"160","lineLength":"0","path":"tests\/test-remotefilelog-bgprefetch.t","diffId":"3512","author":"durham","id":"23650","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"This whole section (lines 253-297) is becoming a bit of a mess.  We should refactor it to be something like:\n```\ndef getfileentries(entryiter)\n    lastfilename = None\n    entries = []\n    for filename, node, deltabase, deltalen in entryiter:\n        if lastfilename is not None and filename != lastfilename:\n            yield lastfilename, entries\n            entries = []\n        lastfilename = filename\n        entries.append((node, deltabase, deltalen))\n\n    if lastfilename is not None:\n        yield lastfilename, entries    \n...\nentryiter = dpack.iterentries()\nfor filename, entries in getfileentries(entryiter):\n   # Print header\n   for entry in entries:\n      # print entry\n   # print summary\n```\nSo we can untangle the filename != lastfilename logic and the post-loop logic to handle the last case.","replyTo":null,"isNewFile":"1","line":"297","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23649","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"I'd move this two lines up.  It's not related to metadata but it's right between the metadata reading and using.","replyTo":null,"isNewFile":"1","line":"281","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23648","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"We should probably move the contents of this loop to another function.  Not in this diff of course.","replyTo":null,"isNewFile":"1","line":"225","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23647","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"Debugdatapack is getting big.  I'd at least move this inner function out to be a top level function. To start to reduce complexity.","replyTo":null,"isNewFile":"1","line":"219","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23646","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"inline","comment":"not quite alphabetical","replyTo":null,"isNewFile":"1","line":"9","lineLength":"0","path":"remotefilelog\/debugcommands.py","diffId":"3512","author":"durham","id":"23645","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"reject","author":"durham","id":"23644","dateCreated":"1510789627","dateModified":"1510789627"},{"type":"update","diffId":"3512","author":"phillco","id":"23492","dateCreated":"1510730331","dateModified":"1510730331"}],"dateCreated":"1510730331","dateModified":"1510789627","status":"Needs Revision"},{"id":"1371","callsign":"HG","title":"global: remove redundant parenthesis","author":"indygreg","summary":"My code editor was spewing several warnings for redundant\nparenthesis. It supports easily fixing them. So I just did it\nglobally.\n\nWhat redundant parenthesis are left are in 3rd party code or\nare needed around string literals so our style checker doesn't\ncomplain about the lack of _().","testPlan":"","lineCount":"490","dependsOn":[],"reviewers":["yuja"],"ccs":["yuja","dlax","mercurial-devel"],"actions":[{"type":"comment","comment":"I used my editor's feature to fix violations. That's probably what introduced the whitespace changes. If only Mercurial conformed to PEP-8 style...","author":"indygreg","id":"22888","dateCreated":"1510591352","dateModified":"1510591352"},{"type":"inline","comment":"I don't like this sort of changes because here a tuple is a\ndata structure used thoroughly, not an arbitrary set of values\nto be returned.","replyTo":null,"isNewFile":"0","line":"298","lineLength":"0","path":"mercurial\/revsetlang.py","diffId":"3426","author":"yuja","id":"22867","dateCreated":"1510580851","dateModified":"1510580851"},{"type":"reject","author":"yuja","id":"22866","dateCreated":"1510580851","dateModified":"1510580851"},{"type":"inline","comment":"I'd keep this one as it makes it clearer that we return a generator. Arguably, that's nitpicking.","replyTo":null,"isNewFile":"1","line":"319","lineLength":"0","path":"mercurial\/bookmarks.py","diffId":"3426","author":"dlax","id":"22834","dateCreated":"1510561193","dateModified":"1510561193"},{"type":"inline","comment":"Spurious indentation changes here as well.","replyTo":null,"isNewFile":"1","line":"337","lineLength":"0","path":"hgext\/hgk.py","diffId":"3426","author":"dlax","id":"22833","dateCreated":"1510561193","dateModified":"1510561193"},{"type":"inline","comment":"Why this extra indentation?","replyTo":null,"isNewFile":"1","line":"79","lineLength":"0","path":"hgext\/hgk.py","diffId":"3426","author":"dlax","id":"22832","dateCreated":"1510561193","dateModified":"1510561193"},{"type":"comment","comment":"LGTM modulo a few nits. Nice cleanup.","author":"dlax","id":"22831","dateCreated":"1510561193","dateModified":"1510561193"},{"type":"update","diffId":"3426","author":"indygreg","id":"22733","dateCreated":"1510455062","dateModified":"1510455062"}],"dateCreated":"1510455062","dateModified":"1510591352","status":"Needs Revision"},{"id":"1361","callsign":"NRWHG","title":"exchange: set \"known\" property in generic override","author":"martinvonz","summary":" ","testPlan":"","lineCount":"17","dependsOn":[],"reviewers":["durin42"],"ccs":[],"actions":[{"type":"accept","author":"durin42","id":"22631","dateCreated":"1510350907","dateModified":"1510350907"},{"type":"update","diffId":"3403","author":"martinvonz","id":"22572","dateCreated":"1510342722","dateModified":"1510342722"}],"dateCreated":"1510342722","dateModified":"1510350907","status":"Accepted"},{"id":"1362","callsign":"NRWHG","title":"tracked: access narrowpats from repo instead of re-reading","author":"martinvonz","summary":"This is how we do it throughout the rest of the file.","testPlan":"","lineCount":"2","dependsOn":["1361"],"reviewers":["durin42"],"ccs":[],"actions":[{"type":"accept","author":"durin42","id":"22629","dateCreated":"1510350886","dateModified":"1510350886"},{"type":"update","diffId":"3404","author":"martinvonz","id":"22579","dateCreated":"1510342722","dateModified":"1510342722"}],"dateCreated":"1510342722","dateModified":"1510350886","status":"Accepted"},{"id":"1363","callsign":"NRWHG","title":"widening: stop passing old{in,ex}clude to _widen()","author":"martinvonz","summary":"The values are easily (and efficiently) accessible on the repo\ninstance, and not passing them will make simplify an upcoming patch.","testPlan":"","lineCount":"7","dependsOn":["1362"],"reviewers":["durin42"],"ccs":[],"actions":[{"type":"accept","author":"durin42","id":"22627","dateCreated":"1510350876","dateModified":"1510350876"},{"type":"update","diffId":"3405","author":"martinvonz","id":"22587","dateCreated":"1510342723","dateModified":"1510342723"}],"dateCreated":"1510342723","dateModified":"1510350876","status":"Accepted"},{"id":"1360","callsign":"NRWHG","title":"exchange: set {,old}{in,ex}cludepats in generic override","author":"martinvonz","summary":"With this patch, one can safely call exchange.pull() and it will pass\nall necessary parameters to the server.\n\nI think we may want to change the parameters so lack of\nold{in,ex}cludepats means that they're the same as the current\nones. Then widening would instead add new{in,ex}cludepats. But let's\ndiscuss that later.","testPlan":"","lineCount":"49","dependsOn":[],"reviewers":["durin42"],"ccs":[],"actions":[{"type":"accept","author":"durin42","id":"22625","dateCreated":"1510350770","dateModified":"1510350770"},{"type":"update","diffId":"3402","author":"martinvonz","id":"22569","dateCreated":"1510342711","dateModified":"1510342711"}],"dateCreated":"1510342711","dateModified":"1510350770","status":"Accepted"},{"id":"829","callsign":"FBHGX","title":"tweakdefaults: improve basic help text","author":"mbthomas","summary":"The default help ('hg help' or 'hg --help') shows only the built-in commands.\nWith all of our extensions, this is not a sensible list to show.  It also\nlists the enabled extensions, which is a long list that is not very useful\nto users.\n\nWe override the help command in the following circumstances:\n\n  * `hg`, or `hg non-existent-command`, to show a much smaller list of commands.\n  * `hg help`, or `hg --help`, to show the full list of relevant commands.\n\nOther invocations of `hg help` are not affected.","testPlan":"","lineCount":"88","dependsOn":[],"reviewers":["ryanmce"],"ccs":["quark"],"actions":[{"type":"comment","comment":"Going to think about this a bit more.  It may be worth considering what improvements we can make to upstream instead.","author":"mbthomas","id":"16244","dateCreated":"1507280551","dateModified":"1507280551"},{"type":"plan-changes","author":"mbthomas","id":"16243","dateCreated":"1507280551","dateModified":"1507280551"},{"type":"inline","comment":"If we still do this out-of-core, these could be config options.","replyTo":null,"isNewFile":"1","line":"113","lineLength":"9","path":"hgext3rd\/tweakdefaults.py","diffId":"2137","author":"quark","id":"14123","dateCreated":"1506624833","dateModified":"1506624833"},{"type":"comment","comment":"When thinking about it again, it seems desirable to show extension commands even without `-v`.\n\nI also think the upstream wants the alternative behavior too. Otherwise `rebase` not shown up in `hg help` just seems strange. It could be gated by a config option (ex. `commands.help.showextensioncommands`) to satisfy old users.\n\nWith `-v`, we can show commands marked as `EXPERIMENTAL`, `ADVANCED`, `DEPRECATED`. This is consistent with command flags.","author":"quark","id":"14122","dateCreated":"1506624833","dateModified":"1506624833"},{"type":"inline","comment":"This seems to be a copy-paste from core Mercurial to replace part of its function. Usually we avoid doing that unless the feature is urgent.\n\nConsider:\n\n - Get this feature done directly in upstream (I think `-v` is reasonable)\n\nOr:\n\n - Split upstream function so we can wrap it without code duplication. See 45e02cfad4bd for an example.","replyTo":null,"isNewFile":"1","line":"245","lineLength":"64","path":"hgext3rd\/tweakdefaults.py","diffId":"2137","author":"quark","id":"14121","dateCreated":"1506624349","dateModified":"1506624349"},{"type":"inline","comment":"We no longer support Python 2.6, the set literal syntax is preferred:\n\n  helpcommandsshort = {'add', ...}","replyTo":null,"isNewFile":"1","line":"113","lineLength":"0","path":"hgext3rd\/tweakdefaults.py","diffId":"2137","author":"quark","id":"14120","dateCreated":"1506624349","dateModified":"1506624349"},{"type":"update","diffId":"2137","author":"mbthomas","id":"14004","dateCreated":"1506601060","dateModified":"1506601060"},{"type":"comment","comment":"Feel free to bikeshed the list of commands that are presented.","author":"mbthomas","id":"14003","dateCreated":"1506600917","dateModified":"1506600917"},{"type":"update","diffId":"2136","author":"mbthomas","id":"13998","dateCreated":"1506600866","dateModified":"1506600866"}],"dateCreated":"1506600866","dateModified":"1507280551","status":"Changes Planned"}],"profiles":[{"userName":"Alphare","realName":"Rapha\u00ebl Gom\u00e8s","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/74zfnarnpu77pgb5ufn2\/PHID-FILE-phy5jthitdg34o7vi4jm\/profile"},{"userName":"Kwan","realName":"Ian Moody","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/ke4vmsvidxhzweqq7fff\/PHID-FILE-xvs6trcqn3ilmqltxxrh\/profile"},{"userName":"vmillet","realName":"Valentin MILLET","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/5xgwhoao6jcquytuocbv\/PHID-FILE-5xez2bw2ksu4jlz32z4x\/alphanumeric_lato-white_V.png-_faa38c-0%2C0%2C0%2C0.png"},{"userName":"angel.ezquerra","realName":"Angel Ezquerra","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/xw2pljwr7c5qppevxwp3\/PHID-FILE-23lixqcrrtkfnt6ptp7q\/profile"},{"userName":"akshjain.jain74","realName":"Akshit Jain","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/aog4aqpnrg77aa6x3tbq\/PHID-FILE-r6jnssqiofp6w5b2w6ai\/profile"},{"userName":"gracinet","realName":"Georges Racinet","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/r72gjgi7klfbj2ommqfv\/PHID-FILE-pz7pa7iieutmkr7ingr2\/profile"},{"userName":"marcink","realName":"Marcin K","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/6g4sm6aciqqkub3aava4\/PHID-FILE-uys7rbgtunddicsxojma\/alphanumeric_lato-dark_M.png-_ec9da1-255%2C255%2C255%2C0.4.png"},{"userName":"taapas1128","realName":"Taapas Agrawal","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/mbrmqjwif5qd3ecmx552\/PHID-FILE-2akdn5ykj5qdezcwklio\/profile"},{"userName":"navaneeth.suresh","realName":"Navaneeth Suresh","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/g4iuo6vv7ihx4s5x4yiw\/PHID-FILE-w2gpm7jnlyqy4ftumr3h\/profile"},{"userName":"Zharaskhan","realName":"Zharaskhan","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/lcpedijyswyhguzwsmh6\/PHID-FILE-ymiw54ac73atesbarttu\/alphanumeric_lato-white_Z.png-_6bafb6-0%2C0%2C0%2C0.3.png"},{"userName":"abhyudaypratap","realName":"ABHYUDAY PRATAP SINGH","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/fhyoa4ylarfj4mjjsfnz\/PHID-FILE-gdiilvqk6dvaelqttevu\/alphanumeric_lato-white_A.png-_7867a3-0%2C0%2C0%2C0.png"},{"userName":"nspanti-logilab","realName":"Nicola Spanti","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/2szz77xfd5ejbn5ipcfr\/PHID-FILE-6ltvplbn3fcn7r5ogoqm\/alphanumeric_lato-white_N.png-_4e5632-0%2C0%2C0%2C0.3.png"},{"userName":"jeffpc","realName":"Jeff Sipek","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/tdb3ls7h66j7dh5upryy\/PHID-FILE-7uafys6btqxf3dd33pey\/alphanumeric_lato-white_J.png-_b1c8eb-0%2C0%2C0%2C0.3.png"},{"userName":"sheehan","realName":"Connor Sheehan","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/xos732z337wctb7orxn2\/PHID-FILE-imgmr7hs6lhgmhnyhuim\/profile"},{"userName":"sangeet259","realName":"Sangeet Kumar Mishra","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/w2t3qtjbkq6i7d4fiflb\/PHID-FILE-pjpjz4ab55pgexyec3j2\/alphanumeric_lato-dark_S.png-_4e5632-255%2C255%2C255%2C0.4.png"},{"userName":"Ivzhh","realName":"Sheng Mao","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/762wysb4ooe3ekoga43a\/PHID-FILE-zur24kxarfkspo26ir67\/profile"},{"userName":"khanchi97","realName":"Sushil khanchi","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/3pp56o77ancwuv65wlhu\/PHID-FILE-c2txpmsbutyxgjyde2zp\/profile"},{"userName":"kevincox","realName":"Kevin Cox","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/sbp5kmlbv6vamvjkmjy5\/PHID-FILE-knnjmppp4vpzcxpqmkwh\/profile"},{"userName":"dploch","realName":"Daniel Ploch","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/ociwxv6qntytpb6zdxls\/PHID-FILE-m4wajbifgsqubz5w6r4u\/profile"},{"userName":"tom.prince","realName":"Tom Prince","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/afbz4m4ohutpjetr3tql\/PHID-FILE-rblbnvxfl47fyw546ocf\/profile"},{"userName":"marco.leogrande","realName":"Marco Leogrande","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/tkvibdelmgssnv4ebov7\/PHID-FILE-tfjptcanefutqscooi75\/profile"},{"userName":"kaleyh","realName":"Kaley Zhihui Huang","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/clcmxxq7nzpdqhqeze35\/PHID-FILE-enqeoiscacbj3quvmu5v\/profile"},{"userName":"joerg.sonnenberger","realName":"Joerg Sonnenberger","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/r6zqtnrvelifbtppj4mu\/PHID-FILE-orm5fypdgkwptokuvhu5\/profile"},{"userName":"tja","realName":"Thomas Jacob","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/lwnnvur42bobvgmv7c54\/PHID-FILE-ztcsvphl242bhhrawoeh\/alphanumeric_aleo-white_T.png-_335862-0%2C0%2C0%2C0.png"},{"userName":"wlis","realName":"Wojciech Lis","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/qksokzpep5fnbwl4cxnv\/PHID-FILE-4snkiib4rpc643dsuvgs\/profile"},{"userName":"markand","realName":"David Demelier","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/v5ibglquzd3qe4b3fxzp\/PHID-FILE-ra4iu3zvlvimurhularx\/profile"},{"userName":"av6","realName":"Anton Shestakov","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/hbjxchhduli6jrz3wy53\/PHID-FILE-hixj32uzzbjuvjsax6e3\/profile"},{"userName":"foozy","realName":"Katsunori FUJIWARA","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/uxmk3ymbn5cplhrcc3ox\/PHID-FILE-eyxzcwqdufk55nuzrkui\/profile"},{"userName":"dlax","realName":"Denis Laxalde","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/llz4fftev4b7zckiqfvi\/PHID-FILE-d7t77nx6n56nzytddceb\/profile"},{"userName":"hollisb","realName":"Hollis Blanchard","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/iggfsbubv47fw5tdrrwe\/PHID-FILE-a57xt2zd72jp64xezauu\/alphanumeric_lato-white_H.png-_335862-255%2C255%2C255%2C0.7.png"},{"userName":"singhsrb","realName":"Saurabh Singh","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/bp7zbulgy4snhr3ou6z4\/PHID-FILE-dvujqtbp56tzyuttwvwp\/profile"},{"userName":"philpep","realName":"Philippe Pepiot","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/boj5wqy2tcfzm4b3x5py\/PHID-FILE-6nfhwshmtwghgvfcnttu\/profile"},{"userName":"mbolin","realName":"Michael Bolin","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/a4aw73weeriuryfkpvbx\/PHID-FILE-nk3y36i25zsmgf7anqqh\/profile"},{"userName":"hooper","realName":"Danny Hooper","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/3xis26hjezfqq4wckvgd\/PHID-FILE-mc6rpdu52jzz2pqlfi3k\/profile"},{"userName":"glandium","realName":"Mike Hommey","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/wexe6n4s2bpojsuxutj6\/PHID-FILE-angxhhuxuyx7rg7mniop\/alphanumeric_aleo-white_G.png-_6c8548-255%2C255%2C255%2C0.4.png"},{"userName":"mbthomas","realName":"Mark Thomas","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/ceuosb7vyo3urrgvwvnm\/PHID-FILE-ffbbyima2mbsxuqqisjf\/profile"},{"userName":"swhitaker","realName":"Simon Whitaker","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/rejzev6zgxqpmlisheps\/PHID-FILE-4mav5wnholgu7gerlvk6\/profile"},{"userName":"mjpieters","realName":"Martijn Pieters","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/lcpb6ee667oiti6xdnc4\/PHID-FILE-6okmi7uyvn6ygzcdj3mm\/profile"},{"userName":"rdamazio","realName":"Rodrigo Damazio Bovendorp","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/4a77tfxnpjbpt2ggycfj\/PHID-FILE-lsili2yioao6o54nuevs\/profile"},{"userName":"mharbison72","realName":"Matt Harbison","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/exavetnjpwt74m5ctwqc\/PHID-FILE-a6gptxixmw2meahkn2ad\/profile"},{"userName":"ikostia","realName":"Kostia Balytskyi","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/7zljfaajqc5fwpgggoxv\/PHID-FILE-6jwkzbmu4cf22o35mx3k\/profile"},{"userName":"lothiraldan","realName":"Boris Feld","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/m3bla7ufl3cjmnym5xat\/PHID-FILE-kigxoxqookrqrhpspjit\/profile"},{"userName":"stash","realName":"Stanislau Hlebik","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/wf3xb2kovxyqypqtp2rz\/PHID-FILE-akocypfziwimghtqh4iu\/alphanumeric_lato-dark_S.png-_9166aa-255%2C255%2C255%2C0.4.png"},{"userName":"indygreg","realName":"Gregory Szorc","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/nf3veituwivx24ctdwf6\/PHID-FILE-b2sr2l6owww6nd3m2kml\/profile"},{"userName":"dsp","realName":"David Soria Parra","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/xrjhk4aswt4nlwofuz2i\/PHID-FILE-rjdjfgxnzlwhx3iqgl3a\/profile"},{"userName":"spectral","realName":"Kyle Lippincott","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/afmemikabk26zacyrve3\/PHID-FILE-c7do5pqxf7rpec3jj3qs\/profile"},{"userName":"marmoute","realName":"Pierre-Yves David","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/jrrr5pb4i6myu4p2mwkw\/PHID-FILE-wfypibpyx5fjrbombyhl\/profile"},{"userName":"yuja","realName":"Yuya Nishihara","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/kyyyaiumhfkcjjtysphq\/PHID-FILE-iujngvd4rkw4tyyogag4\/profile"},{"userName":"ryanmce","realName":"Ryan McElroy","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/acfbd4z6nesfd76wnnj5\/PHID-FILE-k26xnkr6nvkc5l6jsscc\/profile"},{"userName":"pulkit","realName":"Pulkit Goyal","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/67mfdmcxxo6hghy7bxoq\/PHID-FILE-swcwmgf52vkrkmcqjnwd\/profile"},{"userName":"smf","realName":"Sean Farley","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/tbwekyw6pglxsobywzco\/PHID-FILE-hdxjtngw5tp2k5dbysdt\/profile"},{"userName":"durham","realName":"Durham Goode","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/tbr2anpbd33oiyqeijif\/PHID-FILE-g363nrrxd6paer5ugcpw\/profile"},{"userName":"jsgf","realName":"Jeremy Fitzhardinge","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/6ihycyjpnngswp5u3tum\/PHID-FILE-4x5bowxqnm7tdk27to2v\/profile"},{"userName":"martinvonz","realName":"Martin von Zweigbergk","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/llyfr65e22jrp77s6ufm\/PHID-FILE-fggemwj53prdzf5tnsir\/profile"},{"userName":"quark","realName":"Jun Wu","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/yhgthtf3uk3yamwaqfbv\/PHID-FILE-ntlso5gq5tmxn6qqmqhq\/profile"},{"userName":"phillco","realName":"Phil Cohen","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/s6v7x5h734dqbi4pkii6\/PHID-FILE-dcp3elsshux2rxyfb2g3\/profile"},{"userName":"krbullock","realName":"Kevin Bullock","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/cak2ma7v7iz7ac522on2\/PHID-FILE-achi52mww6qbb5dslmow\/profile"},{"userName":"durin42","realName":"Augie Fackler","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/fxdzcgfaiyjyat5yx6wn\/PHID-FILE-wab3a6a3bynn7dobtpoz\/profile"},{"userName":"admin","realName":"Administrator","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/ax2ohnusy6xhxcsictnf\/PHID-FILE-earziycgjj2v67gz3vq4\/alphanumeric_lato-white_A.png-_335862-0%2C0%2C0%2C0.3.png"},{"userName":"mercurial-devel","realName":"mercurial-devel@mercurial-scm.org","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/uxfm523cqrdxtqfl55gh\/PHID-FILE-igq3uy3gdohueaer3qxy\/alphanumeric_aleo-white_M.png-_335862-255%2C255%2C255%2C0.7.png"},{"userName":"mitrandir","realName":"Mateusz Jakub Kwapich","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/3og26nizhmuzz7vtuiob\/PHID-FILE-q3vx3ix5yiu5gs6umqvx\/profile"},{"userName":"akushner","realName":"Aaron Kushner","image":"https:\/\/phab.mercurial-scm.org\/file\/data\/z5rynd6nw66bxxba2mjl\/PHID-FILE-tgtgg2xrru4t4ezofo2k\/profile"}]}}