6h${|SSKJr SSKrSSKrSSKrSSKrSSKJr SSKJ r J r J r SSK J r JrJr SSKJr \R$r\R(rSrS rS rS rS rS rSrSrSrSrSr Sr!Sr"Sr#Sr$Sr%Sr&Sr'Sr(Sr)Sr*Sr+"SS5r,\,"S S \*S!9r-\,"SS \*S!9r.\,"S"S \)S!9r/\,"S#S \+S!9r0\,"S$5r1\,"S5r2\,"S%S \)S!9r3\,"S&S \)S!9r4\,"S'5r5\,"S(5r6\,"S5r7\,"S)5r8\,"S*5r9\,"S+S S,9r:\,"S-S S,9r;\,"S.S S,9r<\,"S/S \+S!9r=\,"S0S \)S!9r>\7\9\6\54r?"S1S25r@"S3S4\@5rA"S5S6\@5rBS7rCg)8) annotationsN)_)binhexnullrev)error filemergeutil)hashutilc\URS5nUSSUSS-nSRU5$)N)splitjoin)databitss 6/usr/lib/python3/dist-packages/mercurial/mergestate.py _droponoders5 ::e D 9tBCy D ::d cXR5RR:Xa[R"X5$X$N)repo nodeconstantsnullhexr absentfilectx)hexnodectxfs r_filectxorabsentr! s2((***222&&s..v rLOlfFCPurspusprotRdmDsaddedsremovedsmodifiedc\rSrSrSr\R "5r\R "5rS Sjr Sr Sr Sr Sr S rS rg) MergeActionharepresent an "action" merge need to take for a given file Attributes: _short: internal representation used to identify each action no_op: True if the action does affect the file content or tracking status narrow_safe: True if the action can be safely used for a file outside of the narrow set changes: The types of changes that this actions involves. This is a work in progress and not all actions have one yet. In addition, some requires user changes and cannot be fully decided. The value currently available are: - ADDED: the files is new in both parents - REMOVED: the files existed in one parent and is getting removed - MODIFIED: the files existed in at least one parent and is getting changed NcXlURRU5 X lUR(aURRU5 X0lX@lgr)_short ALL_ACTIONSaddno_op NO_OP_ACTIONS narrow_safechanges)selfshortr8r:r;s r__init__MergeAction.__init__sF  T" ::    " "4 (& rc,[UR5$r)hashr5r<s r__hash__MergeAction.__hash__sDKK  rc>SURRS5-$)NzMergeAction<%s>ascii)r5decoderBs r__repr__MergeAction.__repr__s 4;;#5#5g#>>>rcUR$rr5rBs r __bytes__MergeAction.__bytes__s {{rcjUcg[U[5(deURUR:H$NF) isinstancer2r5r<others r__eq__MergeAction.__eq__s0 =%----{{ell**rc4URUR:$rrKrQs r__lt__MergeAction.__lt__s{{U\\))r)r5r;r:r8)FFN)__name__ __module__ __qualname____firstlineno____doc__weakrefWeakSetr6r9r>rCrHrLrSrV__static_attributes__rrr2r2hs?.//#KOO%M!?+ *rr2T)r:r;agpsamcsdcscdsdgsdmk)r8skasknescmc@\rSrSrSrSrSrS Sjr\RS5r \RS5r \RS 5r \RS 5r S rS r\S 5rSrSrSrSrSrSrSrSrSrSrSrSrSrSrSr Sr!Sr"Sr#g)!_mergestate_baseaetrack 3-way merge state of individual files The merge state is stored on disk when needed. Two files are used: one with an old format (version 1), and one with a new format (version 2). Version 2 stores a superset of the data in version 1, including new kinds of records in the future. For more about the new format, see the documentation for `_readrecordsv2`. Each record can contain arbitrary content, and has an associated type. This `type` should be a letter. If `type` is uppercase, the record is mandatory: versions of Mercurial that don't support it should abort. If `type` is lowercase, the record can be safely ignored. Currently known records: L: the node of the "local" part of the merge (hexified version) O: the node of the "other" part of the merge (hexified version) F: a file to be merged entry C: a change/delete or delete/change conflict P: a path conflict (file vs directory) f: a (filename, dictionary) tuple of optional values for a given file l: the labels for the parts of the merge. Merge record states (stored in self._state, indexed by filename): u: unresolved conflict r: resolved conflict pu: unresolved path conflict (file conflicts with directory) pr: resolved path conflict o: file was merged in favor of other parent of merge (DEPRECATED) The resolve command transitions between 'u' and 'r' for conflicts and 'pu' and 'pr' for path conflicts. cXl0Ul[R"[5UlSUlSUlSUl0Ul SUl g)zVInitialize the merge state. Do not use this directly! Instead call read() or clean().NF) _repo_state collections defaultdictdict _stateextras_local_other_labels_results_dirty)r<rs rr>_mergestate_base.__init__sH  '33D9     rcgrr`rBs rreset_mergestate_base.resets rNc(XlX lX0lgr)rqrrrs)r<noderRlabelss rstart_mergestate_base.starts   rcdURcSn[R"U5eUR$)Ns(local accessed but self._local isn't set)rqr ProgrammingErrorr<msgs rlocal_mergestate_base.local, ;; =C((- -{{rc4URUR$r)rkrrBs rlocalctx_mergestate_base.localctx zz$**%%rcdURcSn[R"U5eUR$)Ns(other accessed but self._other isn't set)rrr rrs rrR_mergestate_base.otherrrc4URUR$r)rkrRrBs rotherctx_mergestate_base.otherctxrrcd[UR5=(d [UR5$)zWhether mergestate is active. Returns True if there appears to be mergestate. This is a rough proxy for "is a merge in progress." )boolrqrlrBs ractive_mergestate_base.actives! DKK 5D$55rcg)z*Write current state on disk (if necessary)Nr`rBs rcommit_mergestate_base.commit!src\[[R"U5R55$)zMhash the path of a local file context for storage in the .hg/merge directory.)rr sha1digest)paths r getlocalkey_mergestate_base.getlocalkey$s! 8==&--/00rc[5erNotImplementedErrorr<fctxlocalkeys r _make_backup_mergestate_base._make_backup+ !##rc[5errr<rrflagss r_restore_backup _mergestate_base._restore_backup.rrc :UR5(a!URRRnO4[R UR 55nURX5 [UUR 5UR 5[UR55UR 5[UR55UR5/URU'[UR55URUS'SUlg)zadd a new (potentially?) conflicting file the merge state fcl: file context for local, fco: file context for remote, fca: file context for ancestors, fd: file path of the resulting merge. note: also write the local version to the `.hg/merge` directory. ancestorlinknodeTN)isabsentrkrr mergestaterrrMERGE_RECORD_UNRESOLVEDrfilenoderrlr{rpru)r<fclfcofcafdrs rr7_mergestate_base.add1s <<>>zz//77H!--chhj9H   c , #  HHJ HHJ    HHJ    IIK   B69_"12 rc<[X#/URU'SUlg)zadd a new conflicting path to the merge state path: the path that conflicts frename: the filename the conflicting file was renamed to forigin: origin of the file ('l' or 'r' for local/remote) TN)MERGE_RECORD_UNRESOLVED_PATHrlru)r<rfrenameforigins raddpathconflict _mergestate_base.addpathconflictLs :7L D rcNURURU5 SUlg)z@stores information which is required at commit into _stateextrasTN)rpupdateru)r<rrs r addcommitinfo_mergestate_base.addcommitinfoUs$ $&&t, rcXR;$rrlr<dfiles r __contains___mergestate_base.__contains__[s ##rc&URUS$)Nrrrs r __getitem___mergestate_base.__getitem__^s{{5!!$$rc>[[UR55$r)itersortedrlrBs r__iter___mergestate_base.__iter__asF4;;'((rc6URR5$r)rlkeysrBs rfiles_mergestate_base.filesds{{!!rc4X RUS'SUlg)NrT)rlru)r<rstates rmark_mergestate_base.markgs % E1 rc## URR5HupUS[[4;dMUv M g7f)z%Obtain the paths of unresolved files.rN)rlitemsrr)r<r entrys r unresolved_mergestate_base.unresolvedks> ))+HAQx', ,s 1A AcUR$)z8return all extras information stored with the mergestaterprBs r allextras_mergestate_base.allextrasus   rc URU$)z?return extras stored with the mergestate for the given filenamer)r<filenames rextras_mergestate_base.extrasys  **rc PX[[4;agURUnUupEpgppURURn UR U5n U R S5nU(aURUnOSn[XRU5n[XU 5nURRXxUS9nUR5nUR5nSU U-U-;adSU U-U-;aXUR5[:Xa8U U:wa2URRR[S5U-5 OU U:XaUn XPRRR :waUR#X!X[5 OX!R%SS 9 UR'U5(d$URU S UR(U'SUlg[,R,"URUUR.UUUUUR0S 9unnU(dUR3U[5 SnU(a#UR55(a[6nOT[8nOMUR55(a[:nO1UR55(aXR<;a[>nO[@nUU4UR(U'U$) z@run merge process for dfile Returns the exit code of the merge.rrN)fileid changectxxr$sQwarning: cannot merge flags for %s without common ancestor - keeping local flags T) ignoremissing)NN)r|)!MERGE_RECORD_RESOLVEDLEGACY_RECORD_DRIVER_RESOLVEDrlrkrrrgetr!filectxrrevruiwarnrrrrremovecmprtrur rqrsrr ACTION_FORGET ACTION_REMOVE ACTION_GETrACTION_ADD_MODIFIED ACTION_ADD)r<rwctx stateentryrrlfileafileanodeofileonoderoctxr anccommitnodeactxfcdrrflofla merge_retdeletedactions rresolve_mergestate_base.resolve}sY ; ! )  [[' DNAuUzz$++&U# #67 ::m,DDxu5uE2jj   Eiikiik 53;$ $US[35F)FwwyG#  ""K # zz//77 7  h > K  T  2wws|| E"#-DMM% DK&00 JJ  KK    <<   7 IIe2 3 ||~~''||~~#MM)0F'F(&0 ercSupnURR5H-upEUcUS- nMUS:XdMU[:XaUS- nM(US- nM/ XU4$)zCreturn counts for updated, merged and removed files in this session)rrrrr)rtvaluesr)r<updatedmergedremovedrrs rcounts_mergestate_base.countssc$+ --/IAy1 a]*qLGaKF0''rcF[[UR555$)z0get unresolved count for this merge (persistent))lenlistrrBs runresolvedcount _mergestate_base.unresolvedcounts4)*++rc [/[/[/[/[/0nUR R 5H#unup4UcM XRUSS45 M% U$)z2return lists of actions to perform on the dirstateNs merge result)rrrrrrtrappend)r<actionsr r rs rr_mergestate_base.actionssg 2 2     #mm113NA{!&&4'AB4r)rursrqrrrkrtrlrpr)$rXrYrZr[r\r>rxr}r propertycacherrrRrrr staticmethodrrrr7rrrrrrrrrrrr rrr_r`rrrhrhs D$     &&   &&6911 $$6 $%)"!+Sj (, rrhc\rSrSrSrSr\S5r\S5rSr Sr Sr S r S r S rS rS rSrSrSrSrSrSrg)ris merge/states merge/state2c<[U5nUR5 U$)zHInitialize a brand new merge state, removing any existing state on disk.)rrxrmss rcleanmergestate.cleans    rc<[U5nUR5 U$)z1Initialize the merge state, reading it from disk.)r_readrs rreadmergestate.reads    rc[5nUR5nUGHup4U[:Xa[U5UlM"U[ :Xa[U5UlM>U[:XaMJU[[[[[4;aLURS5nUS[:XaSURUSS'MUSSUR US'MU[":XakURSS5upgURS5n0n Sn U [%U5:a"XS-XU 'U S- n U [%U5:aM"XRU'GM*U[&:Xa>URSS5n U V s/sHn [%U 5S:dMU PM sn UlGMrUR+5(aGMUR-U5 GM U(a[.R0"U5egs sn f)zAnalyse each record content to restore a serialized state from disk This function process "record" entry produced by the de-serialization of on disk file. rrsotherrsfilenode-sourceN)set _readrecords RECORD_LOCALrrq RECORD_OTHERrrLEGACY_MERGE_DRIVER_STATE RECORD_MERGEDRECORD_CHANGEDELETE_CONFLICTRECORD_PATH_CONFLICTLEGACY_MERGE_DRIVER_MERGELEGACY_RECORD_RESOLVED_OTHERrMERGE_RECORD_MERGED_OTHERrprlRECORD_FILE_VALUESr RECORD_LABELSrsislowerr7r UnsupportedMergeRecords) r< unsupportedrecordsrtyperecordrr rawextras extrapartsrir|ls rr!mergestate._reads e ##%$ME $!&k ,&!&k 33,$), ||E*777EMD%%d1g./AB+/8DKKQ(,,&,ll5!&<#&__U3 #j/),61u,=Fa=)FA#j/)/5!!(+-'eQ/+1@6aSVaZ6@ ]]__&I%L // < <  As 'G>GcUR5nUR5nURX5(aU$URSR 5SnUR [ UR545 [U5HRupEUS[:XdMUSRS5nURSS5 USSRU54X'MT U$)abRead merge state from disk and return a list of record (TYPE, data) We read data from both v1 and v2 files and decide which one to use. V1 has been used by version prior to 2.9.1 and contains less data than v2. We read both versions and check if no data in v2 contradicts v1. If there is not contradiction we can safely assume that both v1 and v2 were written at the same time and use the extract data in v2. If there is contradiction we ignore v2 content as we assume an old version of Mercurial has overwritten the mergestate file and left an old v2 file around. returns list of record [(TYPE, data), ...]Nrrrrrr) _readrecordsv1_readrecordsv2 _v1v2matchrkparentsrr)r enumerater+rinsertr)r< v1records v2recordsmctxidxr rs rr'mergestate._readrecords7s'') '') ??9 0 0  ::d#++-b1D   lDHHJ7 8$I.Q4=(Q4::e,DKKC(&'dEJJt,<%=IN /  rc[5nUHUnUS[:XaURU5 M#US[:XdM2UR[[ US545 MW UH nXC;dM g g)NrrFT)r&r(r7r+r)r<rErFoldv2recs rrAmergestate._v1v2matchYsjC1v% #Q=( =*SV*<=>  Crc8/nURRUR5n[U5HAup4US:XaUR [ USS45 M'UR [ USS45 MC UR5 U$![a U$f=f)zread on disk merge state for version 1 file returns list of record [(TYPE, data), ...] Note: the "F" data from this file are one entry short (no "other file node" entry) rNr) rkvfs statepathv1rCrr(r+closeFileNotFoundError)r<r6r r;r<s rr?mergestate._readrecordsv1gs  t//0A!! 6NNL!CR :NNM1Sb6#:; % GGI!   sBB BBc/nURRUR5nUR5nSn[ U5nXE:a[X4US-nUS- n[ SX4US-5SnUS- nX4XG-nXG- nU[ :Xa USSUSSpURXh45 XE:aM[UR5 U$![a U$f=f)aread on disk merge state for version 2 file This format is a list of arbitrary records of the form: [type][length][content] `type` is a single character, `length` is a 4 byte integer, and `content` is an arbitrary byte sequence of length `length`. Mercurial versions prior to 3.7 have a bug where if there are unsupported mandatory merge records, attempting to clear out the merge state with hg update --clean or similar aborts. The 't' record type works around that by writing out what those versions treat as an advisory record, but later versions interpret as special: the first character is the 'real' record type and everything onwards is the data. Returns list of records [(TYPE, data), ...].rrs>IN) rkrO statepathv2r"r_unpackRECORD_OVERRIDErrQrR) r<r6r roffendr7lengthr8s rr@mergestate._readrecordsv2|s$  t//0A668DCd)C)37+q C!G(=>qAqS\3 O+$*1QK6/) GGI!   sB B8&B88 CCcxUR(a)UR5nURU5 SUlggrO)ru _makerecords _writerecordsr<r6s rrmergestate.commits1 ;;'')G   w 'DK rc/nUR[[UR545 UR[[UR 545 UR R5Hup#US[[4;a,UR[SRU/U-545 MDUSURRR:Xd'USURRR:Xa,UR[SRU/U-545 MUR[ SRU/U-545 M [#UR$R55HFup$SRSUR555nUR[&SX%4-45 MH UR(b2SRUR(5nUR[*U45 U$)Nrrrc32# UH upSX4-v M g7f)%s%sNr`).0kvs r *mergestate._makerecords..s#/=tq QF"~sre)rr(rrqr)rrrlrrMERGE_RECORD_RESOLVED_PATHr-rrkrrr,r+rrpr1rsr2)r<r6rrhrr9r|s rr^mergestate._makerecordss c$++&678 c$++&678  ;;,,.KHt,* )5::xj1n+EF! 00888Q44::33;;; 15::xj1n3MN  uzz8*q./IJK//0!'t'8'8'>'>'@ A H #/5||~#I NN#Y(1F%FG  !B << #ZZ -F NNM62 3rcHURU5 URU5 g)z,Write current state on disk (both v1 and v2)N)_writerecordsv1_writerecordsv2r`s rr_mergestate._writerecordss W% W%rcpURRURS5n[U5n[ U5nUS[ :XdeUR [UR5S-5 UH.upVU[:XdMUR S[U5-5 M0 UR5 g)z/Write current state on disk in a version 1 filewbr s%s N) rkrOrPrnextr(writerrqr+rrQ)r<r6r irecordslrecordsr7rs rrnmergestate._writerecordsv1s JJNN4++U 3=>{l*** DKK 5()#KE %*T"223$  rc P[[[4nURR UR S5nUHYupE[ U5S:XdeXB;a [SXE4-pTS[ U5-nUR[Xd[ U5U55 M[ UR5 g)ziWrite current state on disk in a version 2 file See the docstring for _readrecordsv2 for why we use 't'.rrrs%s%ss>sI%isN) r(r)r+rkrOrVrrXru_packrQ)r<r6 allowlistr keyrformats rromergestate._writerecordsv2s "<? JJNN4++U 3 ICs8q= =#+W{-BTT*F GGE&s4y$7 8 !  rcrURRRSU-UR55 gNsmerge/)rkrOrurrs rrmergestate._make_backups% Y1499;?rcURRSU-5nURUR5U5 SSS5 g!,(df  g=fr)rkrOrur")r<rrrr s rrmergestate._restore_backups9 ZZ^^I0 1Q JJqvvx '2 1 1s !A  Acx[R"URRR S5S5 g)NsmergeT)shutilrmtreerkrOrrBs rrxmergestate.resets# djjnn))(3T:r)rursrqrrN)rXrYrZr[rPrVrrr"r!r'rAr?r@rr^r_rnrorrrxr_r`rrrrsx K!K /=b D *%N +Z&  @(;rrc4^\rSrSrU4SjrSrSrSrU=r$) memmergestateic2>[TU]U5 0Ulgr)superr>_backups)r<r __class__s rr>memmergestate.__init__s  rc>UR5URU'gr)rrrs rrmemmergestate._make_backups"&))+ hrcBURURUU5 gr)rurrs rrmemmergestate._restore_backup s 4==*E2r)r) rXrYrZr[r>rrr_ __classcell__)rs@rrrs.33rrcURnURnUR[/5HupgnU(a U"USSS9 MU"USSS9 M! UR[/5HupgnU"USSS9 M UR[ /5H:upgnUupU"USSS9 UR X5 X:Xa U"U SSS9 M2U"U SSS9 M< UR[/5HupgnU"USSS9 M UR[/5H upgnU(a U"USSSS9 MU"USSS9 M" UR[/5HupgnU"USSSS9 M UR[/5HupgnM UR[/5HupgnM UR[/5HupgnM UR[/5HcupgnU(a@URU5n U R=(a U R (+n U"UU SSS9 MMU(aX6OSn U"USSU S9 Me UR["/5HupgnUupnnnU(aNX:Hn U"UU SSS9 X:wa:U(aU"USSS9 X:waUR X5 MMUR X5 M`MbX:Xa U"USSSS9 U(dMyU"USSS9 M UR[$/5HEupgnUun nU(a#U"USSS9 U"U SSS9 UR X5 M5U"USSS9 U"U SSS9 MG UR[&/5H5upgnUun nU(aU"USSS9 UR X5 M-U"USSS9 M7 g)z$record merge actions to the dirstateTF) p1_tracked wc_tracked)rrpossibly_dirty)rrp2_infoN)rrparentfiledata)dirstate update_filerrrACTION_PATH_CONFLICT_RESOLVEcopyrr ACTION_EXEC ACTION_KEEPACTION_KEEP_ABSENTACTION_KEEP_NEWr get_entry any_trackedadded ACTION_MERGEACTION_DIR_RENAME_MOVE_LOCALACTION_LOCAL_DIR_RENAME_GET)rr branchmerge getfiledatarrr argsrf0origf0 old_entryrrf1f2famoveancflags r recordupdatesr s}}H&&K M26   du = e > 7 M26 A%E:7 $@"E  A%D9 f < t > u ?F J3 A%D94 $7<   dtD  e = = K4 A$4M5 K4  5 $6;  < OR8  9 J3   **1-I"..Fy3FJ %  0;[^N -  4* L"5  $D# J %   xtF7MM"(MM"( w$4tB5UC=6B $@"E D  e = t > MM" dt < u ?F $?D D  e = MM" dt < Er)D __future__rrmrstructr]i18nrr{rrrr r r utilsr packrzunpackrWrr!r(r)r2r1r+r,r-rrrrkr0rXr/rr*r. CHANGE_ADDEDCHANGE_REMOVEDCHANGE_MODIFIEDr2rrrrACTION_PATH_CONFLICTrrACTION_CREATEDACTION_DELETED_CHANGEDACTION_CHANGED_DELETEDrrrrrrrACTION_CREATED_MERGECONVERT_MERGE_ACTIONSrhrrrr`rrrs "     --    # $" !  $ $   4*4*nDdNK DdNK 4 F 4 I "4(*51! t\Tt\J$U+$U+4 )%0*51$d+ !d3e40$D/J " t\  jjZ K;!K;\ 3$ 3=r