compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
=================================================================Testautomaticunstabilityresolutionformultipleadvancedcases=================================================================Therearededicatedtestcaseforeachinstability,butthisfilechecksomebasiccaseforeachtype.XXXdispatchingeachthesetestcaseinappropriatefilewouldmakesense.$cat>>$HGRCPATH<<EOF>[defaults]>amend=-d"0 0">[extensions]>hgext.rebase=>EOF$echo"evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/">>$HGRCPATH$glog(){>hglog-G--template \>'{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n'"$@">}Testevolveremovingtheorphanchangesetbeingevolved$hginitempty$cdempty$echoa>a$hgci-Amaddaa$echob>b$hgci-Amaddbb$echoa>>a$hgci-mchangea$hgbookmarkchangea$hgup11filesupdated,0filesmerged,0filesremoved,0filesunresolved(leavingbookmarkchangea)$echoa>>a$hgamend-mchangea1neworphanchangesets$hgevolve-v--confirmmove:[2]changeaatop:[3]changeaperformevolve?[Ny]nabort:evolveabortedbyuser[255]$echoy|hgevolve-v--confirm--configui.interactive=Truemove:[2]changeaatop:[3]changeaperformevolve?[Ny]yhgrebase-rcce2c55b8965-dfb9d051ec0a4resolvingmanifestsevolutionof2:cce2c55b8965creatednochangestocommit$glog--hidden@3:fb9d051ec0a4@default(draft)bk:[changea]changea||x2:cce2c55b8965@default(draft)bk:[]changea|||x1:102a90ea7b4a@default(draft)bk:[]addb|/o0:07f494440405@default(draft)bk:[]adda$hgdebugobsolete102a90ea7b4a3361e4082ed620918c261189a36afb9d051ec0a450a4aa2ffc8c324979832ef880650(ThuJan0100:00:001970+0000){'ef1':'9','operation':'amend','user':'test'}cce2c55b896511e0b6e04173c9450ba822ebc7400{102a90ea7b4a3361e4082ed620918c261189a36a}(ThuJan0100:00:001970+0000){'ef1':'0','operation':'evolve','user':'test'}Testevolveoforphanthatrunintoconflict$lsab$hgpdiffadiff-r07f494440405a---a/aThuJan0100:00:001970+0000+++b/aThuJan0100:00:001970+0000@@-1,1+1,2@@a+a$echo'newer a'>>a$hgci-m'newer a'$hggdowngdownhavebeendeprecatedinfavorofprevious1filesupdated,0filesmerged,0filesremoved,0filesunresolved[3]changea$echo'a'>a$hgamend1neworphanchangesets$hgevolvemove:[4]neweraatop:[5]changeamergingawarning:conflictswhilemerginga!(edit,thenuse'hg resolve --mark')fixconflictsandsee`hghelpevolve.interrupted`[1]$hgrevert-r"orphan()"a$hgdiffdiff-r66719795a494a---a/aThuJan0100:00:001970+0000+++b/aThuJan0100:00:001970+0000@@-1,1+1,3@@a+a+newera$hgevolve--continueabort:unresolvedmergeconflicts(see'hg help resolve')[255]$hgresolve-ma(nomoreunresolvedfiles)continue:hgevolve--continue$hgevolve--continueevolving4:3655f0f50885"newer a"workingdirectoryisnowat1cf0aacfd363Stabilizephase-divergentchangesetswithadifferentparent============================================================(thesame-parentcaseishandledintest-evolve.t)$glog@6:1cf0aacfd363@default(draft)bk:[]newera|o5:66719795a494@default(draft)bk:[changea]changea|o0:07f494440405@default(draft)bk:[]addaAddanothercommit$hggdowngdownhavebeendeprecatedinfavorofprevious1filesupdated,0filesmerged,0filesremoved,0filesunresolved[5]changea$echo'c'>c$hgaddc$hgcommit-m'add c'creatednewheadGetasuccessorsof8onit$hgpick1cf0aacfd363picking6:1cf0aacfd363"newer a"Addrealchangetothesuccessors$echo'babar'>>a$hgamendMakeprecursorspublic$hgphase--hidden--public1cf0aacfd3631newphase-divergentchangesets$glog@9:99c21c89bcef@default(draft)bk:[]newera|o7:7bc2f5967f5e@default(draft)bk:[]addc||o6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]addaStabilize!$hgevolve--any--dry-run--phase-divergentrecreate:[9]neweraatop:[6]newerahgrebase--rev99c21c89bcef--dest66719795a494;hgupdate1cf0aacfd363;hgrevert--all--rev99c21c89bcef;hgcommit--msg"phase-divergent update to 99c21c89bcef"$hgevolve--any--confirm--phase-divergentrecreate:[9]neweraatop:[6]neweraperformevolve?[Ny]nabort:evolveabortedbyuser[255]$echoy|hgevolve--any--confirm--configui.interactive=True--phase-divergentrecreate:[9]neweraatop:[6]neweraperformevolve?[Ny]yrebasingtodestinationparent:66719795a494committedas8fc63fe1f297workingdirectoryisnowat8fc63fe1f297$glog@11:8fc63fe1f297@default(draft)bk:[]phase-divergentupdateto1cf0aacfd363:||o7:7bc2f5967f5e@default(draft)bk:[]addc||o|6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]adda$hgexp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82phase-divergentupdateto1cf0aacfd363:neweradiff-r1cf0aacfd363-r8fc63fe1f297a---a/aThuJan0100:00:001970+0000+++b/aThuJan0100:00:001970+0000@@-1,3+1,4@@aanewera+babarStabilizecontent-divergentchangesetswithsameparent=======================================================$rma.orig$hgup7bc2f5967f5e2filesupdated,0filesmerged,0filesremoved,0filesunresolved$cat<<EOF>>a>flore>arthur>zephir>some>less>conflict>EOF$hgci-m'More addition'$glog@12:3932c176bbaa@default(draft)bk:[]Moreaddition||o11:8fc63fe1f297@default(draft)bk:[]phase-divergentupdateto1cf0aacfd363:||o|7:7bc2f5967f5e@default(draft)bk:[]addc|||o6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]adda$echo'babar'>>a$hgamend$hgup--hidden3932c176bbaa1filesupdated,0filesmerged,0filesremoved,0filesunresolvedupdatedtohiddenchangeset3932c176bbaa(hiddenrevision'3932c176bbaa'wasrewrittenas:d2f173e25686)workingdirectoryparentisobsolete!(3932c176bbaa)(use'hg evolve'toupdatetoitssuccessor:d2f173e25686)$mvaa.old$echo'jungle'>a$cata.old>>a$rma.old$hgamend2newcontent-divergentchangesets$glog@14:eacc9c8240fe@default(draft)bk:[]Moreaddition||*13:d2f173e25686@default(draft)bk:[]Moreaddition|/|o11:8fc63fe1f297@default(draft)bk:[]phase-divergentupdateto1cf0aacfd363:||o|7:7bc2f5967f5e@default(draft)bk:[]addc|||o6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]addaStabilizeit$hgevolve-qn--confirm--content-divergentmerge:[14]Moreadditionwith:[13]Moreadditionbase:[12]Moreadditionperformevolve?[Ny]nabort:evolveabortedbyuser[255]$echoy|hgevolve-qn--confirm--configui.interactive=True--content-divergentmerge:[14]Moreadditionwith:[13]Moreadditionbase:[12]Moreadditionperformevolve?[Ny]yhgupdate-ceacc9c8240fe&&hgmerged2f173e25686&&hgcommit-m"auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&&hgup-C3932c176bbaa&&hgrevert--all--revtip&&hgcommit-m"`hg log -r eacc9c8240fe --template={desc}`";$hgevolve-v--content-divergentmerge:[14]Moreadditionwith:[13]Moreadditionbase:[12]Moreadditionmerging"other"content-divergentchangeset'd2f173e25686'resolvingmanifestsmerginga0filesupdated,1filesmerged,0filesremoved,0filesunresolvedcommittingfiles:acommittingmanifestcommittingchangelogworkingdirectoryisnowat4d6ed26797bc$hgst$glog@15:4d6ed26797bc@default(draft)bk:[]Moreaddition||o11:8fc63fe1f297@default(draft)bk:[]phase-divergentupdateto1cf0aacfd363:||o|7:7bc2f5967f5e@default(draft)bk:[]addc|||o6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]adda$hgsummaryparent:15:4d6ed26797bctipMoreadditionbranch:defaultcommit:(clean)update:2newchangesets,2branchheads(merge)phases:3draft$hgexport. # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID 4d6ed26797bc392c0099e48402a5134e669f1a60 # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407cedMoreadditiondiff-r7bc2f5967f5e-r4d6ed26797bca---a/aThuJan0100:00:001970+0000+++b/aThuJan0100:00:001970+0000@@-1,1+1,9@@+junglea+flore+arthur+zephir+some+less+conflict+babarCheckconflictduringcontent-divergenceresolution---------------------------------------------------$hgup--hidden3932c176bbaa1filesupdated,0filesmerged,0filesremoved,0filesunresolvedupdatedtohiddenchangeset3932c176bbaa(hiddenrevision'3932c176bbaa'wasrewrittenas:4d6ed26797bc)workingdirectoryparentisobsolete!(3932c176bbaa)(use'hg evolve'toupdatetoitssuccessor:4d6ed26797bc)$echo'gotta break'>>a$hgamend2newcontent-divergentchangesets# reamend so that the case is not the first precursor.$hgamend-m"More addition (2)"$hgphase'contentdivergent()'15:draft17:draft$glog@17:0b336205a5d0@default(draft)bk:[]Moreaddition(2)||*15:4d6ed26797bc@default(draft)bk:[]Moreaddition|/|o11:8fc63fe1f297@default(draft)bk:[]phase-divergentupdateto1cf0aacfd363:||o|7:7bc2f5967f5e@default(draft)bk:[]addc|||o6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]adda$hgevolve-qn--content-divergenthgupdate-c0b336205a5d0&&hgmerge4d6ed26797bc&&hgcommit-m"auto merge resolving conflict between 0b336205a5d0 and 4d6ed26797bc"&&hgup-C3932c176bbaa&&hgrevert--all--revtip&&hgcommit-m"`hg log -r 0b336205a5d0 --template={desc}`";$hgevolve--content-divergentmerge:[17]Moreaddition(2)with:[15]Moreadditionbase:[12]Moreadditionmerging"other"content-divergentchangeset'4d6ed26797bc'mergingawarning:conflictswhilemerginga!(edit,thenuse'hg resolve --mark')0filesupdated,0filesmerged,0filesremoved,1filesunresolvedfixconflictsandsee`hghelpevolve.interrupted`[1]$cat>a<<EOF>jungle>a>flore>arthur>zephir>some>less>conflict>babar>EOF$hgresolve-m(nomoreunresolvedfiles)continue:hgevolve--continue$hgevolve--continueworkingdirectoryisnowate8746835a2a1$glog@18:e8746835a2a1@default(draft)bk:[]Moreaddition(2)||o11:8fc63fe1f297@default(draft)bk:[]phase-divergentupdateto1cf0aacfd363:||o|7:7bc2f5967f5e@default(draft)bk:[]addc|||o6:1cf0aacfd363@default(public)bk:[]newera|/o5:66719795a494@default(public)bk:[changea]changea|o0:07f494440405@default(public)bk:[]adda$hgexp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID e8746835a2a13122bc8c0ed84fe4ee35649af25d # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407cedMoreaddition(2)diff-r7bc2f5967f5e-re8746835a2a1a---a/aThuJan0100:00:001970+0000+++b/aThuJan0100:00:001970+0000@@-1,1+1,9@@+junglea+flore+arthur+zephir+some+less+conflict+babar