Ӂ5LۡddlZddlZddlZddlZddlmZddlmZmZm Z ddl m Z m Z m Z ddlmZej Zej$ZdZdZd Zd Zd Zd Zd ZdZdZdZdZdZdZ dZ!dZ"dZ#dZ$dZ%dZ&dZ'dZ(dZ)GddZ*e*d de( Z+e*dde( Z,e*d!de' Z-e*d"de) Z.e*d#Z/e*dZ0e*d$de' Z1e*d%de' Z2e*d&Z3e*d'Z4e*dZ5e*d(Z6e*d)Z7e*d*d+Z8e*d,d+Z9e*d-d+Z:e*d.de) Z;e*d/de' ZGd2d3e>Z?Gd4d5e>Z@d6ZAy)7N)_)binhexnullrev)error filemergeutil)hashutilc\|jd}|dd|ddz}dj|S)N)splitjoin)databitss 8usr/lib/python3.12/site-packages/mercurial/mergestate.py _droponoders5 ::e D 9tBCy D ::d c||jjjk(rtj||S||SN)repo nodeconstantsnullhexr absentfilectx)hexnodectxfs r_filectxorabsentr s8#((***222&&sA..1v rLOlfFCPurspusprotRdmDsaddedsremovedsmodifiedczeZdZdZej Zej Zd dZdZ dZ dZ dZ dZ y) MergeActiona#represent 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 Nc||_|jj|||_|jr|jj|||_||_yr)_short ALL_ACTIONSaddno_op NO_OP_ACTIONS narrow_safechanges)selfshortr6r8r9s r__init__zMergeAction.__init__sN  T" ::    " "4 (& rc,t|jSr)hashr3r:s r__hash__zMergeAction.__hash__sDKK  rc>d|jjdzS)NzMergeAction<%s>ascii)r3decoder?s r__repr__zMergeAction.__repr__s 4;;#5#5g#>>>rc|jSrr3r?s r __bytes__zMergeAction.__bytes__s {{rc^|yt|tsJ|j|jk(SNF) isinstancer1r3r:others r__eq__zMergeAction.__eq__s- =%---{{ell**rc4|j|jkSrrFrKs r__lt__zMergeAction.__lt__s{{U\\))r)FFN)__name__ __module__ __qualname____doc__weakrefWeakSetr4r7r<r@rDrGrMrOrrr1r1fsC."'//#K#GOO%M!?+ *rr1T)r8r9agpsamcsdcscdsdgsdmk)r6skasknescmc6eZdZdZdZdZddZejdZ ejdZ ejdZ ejd Z d Z d Zed Zd ZdZdZdZdZdZdZdZdZdZdZdZdZdZdZdZ dZ!y)_mergestate_baseatrack 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. c||_i|_tjt|_d|_d|_d|_i|_ d|_ y)z^Initialize 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<z_mergestate_base.__init__sJ  '33D9     rcyrrVr?s rresetz_mergestate_base.resets rNc.||_||_||_yr)rfrgrh)r:noderLlabelss rstartz_mergestate_base.starts   rc`|jd}tj||jS)Ns(local accessed but self._local isn't set)rfrProgrammingErrorr:msgs rlocalz_mergestate_base.local, ;; =C((- -{{rc4|j|jSr)r`rur?s rlocalctxz_mergestate_base.localctxzz$**%%rc`|jd}tj||jS)Ns(other accessed but self._other isn't set)rgrrrrss rrLz_mergestate_base.other rvrc4|j|jSr)r`rLr?s rotherctxz_mergestate_base.otherctxryrcZt|jxst|jS)zWhether mergestate is active. Returns True if there appears to be mergestate. This is a rough proxy for "is a merge in progress." )boolrfrar?s ractivez_mergestate_base.actives! DKK 5D$55rcy)z*Write current state on disk (if necessary)NrVr?s rcommitz_mergestate_base.commitsrcZttj|jS)zUhash the path of a local file context for storage in the .hg/merge directory.)rr sha1digest)paths r getlocalkeyz_mergestate_base.getlocalkey"s! 8==&--/00rctrNotImplementedErrorr:fctxlocalkeys r _make_backupz_mergestate_base._make_backup) !##rctrrr:rrflagss r_restore_backupz _mergestate_base._restore_backup,rrc 2|jr!|jjj}n5tj |j }|j||t||j |j t|j|j t|j|jg|j|<t|j|j|d<d|_y)a/add 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)isabsentr`rr mergestaterrrMERGE_RECORD_UNRESOLVEDrfilenoderrarnrerj)r:fclfcofcafdrs rr5z_mergestate_base.add/s <<>zz//77H!--chhj9H   c8 , #  HHJ HHJ    HHJ    IIK   B69_"12 rc>t||g|j|<d|_y)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_PATHrarj)r:rfrenameforigins raddpathconflictz _mergestate_base.addpathconflictJs :7GL D rcN|j|j|d|_y)zHstores information which is required at commit into _stateextrasTN)reupdaterj)r:rrs r addcommitinfoz_mergestate_base.addcommitinfoSs$ $&&t, rc||jvSrrar:dfiles r __contains__z_mergestate_base.__contains__Ys ##rc&|j|dS)Nrrrs r __getitem__z_mergestate_base.__getitem__\s{{5!!$$rc>tt|jSr)itersortedrar?s r__iter__z_mergestate_base.__iter___sF4;;'((rc6|jjSr)rakeysr?s rfilesz_mergestate_base.filesbs{{!!rc6||j|d<d|_y)NrT)rarj)r:rstates rmarkz_mergestate_base.markes % E1 rc#|K|jjD]\}}|dttfvs|yw)z%Obtain the paths of unresolved files.rN)raitemsrr)r:rentrys r unresolvedz_mergestate_base.unresolvedisA ))+HAuQx', ,s2<<c|jS)z8return all extras information stored with the mergestaterer?s r allextrasz_mergestate_base.allextrasss   rc |j|S)z?return extras stored with the mergestate for the given filenamer)r:filenames rextrasz_mergestate_base.extrasws  **rc ||ttfvry|j|}|\}}}}}} } } |j|j} |j |} | j d}|r|j|}nd}t|||}t| | | }|jj|||}|j}|j}d| |z|zvr_d| |z|zvrU|jtk(r7| |k7r2|jjjtd|zn| |k(r|} ||jjj k7r|j#|||| n||j%d |j'|s$|j|=d |j(|<d|_yt-j,|j||j.|||||j0 \}}|s|j3|td}|r|j5rt6}nIt8}nB|j5rt:}n+|j5r||j<vrt>}nt@}||f|j(|<|S) zHrun 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)ro)!MERGE_RECORD_RESOLVEDLEGACY_RECORD_DRIVER_RESOLVEDrar`rgrgetr filectxrrevruiwarnrrrrremovecmprirjr rfrhrr ACTION_FORGET ACTION_REMOVE ACTION_GETrxACTION_ADD_MODIFIED ACTION_ADD)r:rwctx stateentryrrlfileafileanodeofileonoderoctxr anccommitnodeactxfcdrrflofla merge_retdeletedactions rresolvez_mergestate_base.resolve{sk ; ! )  [[' DNAxueUEzz$++&U# #67 ::m,DDxu5udE2jj  u Eiikiik 53;$ $US[35F)FwwyG#  ""K # tzz//77 7  eh > K  T  2wws| E"#-DMM% DK&00 JJ  KK    <<   7 IIe2 3 ||~''||~#DMM)0F'F(&0 ercd\}}}|jjD]'\}}||dz }|dk(s|tk(r|dz }#|dz })|||fS)zKreturn counts for updated, merged and removed files in this session)rrrrr)rivaluesr)r:updatedmergedremovedrrs rcountsz_mergestate_base.countssi$+ --/IAvy1 a]*qLGaKF0''rcFtt|jS)z0get unresolved count for this merge (persistent))lenlistrr?s runresolvedcountz _mergestate_base.unresolvedcounts4)*++rc tgtgtgtgtgi}|j j D]"\}\}}| ||j|ddf$|S)z2return lists of actions to perform on the dirstateNs merge result)rrrrrrirappend)r:actionsrrrs rrz_mergestate_base.actionssk 2 2     #mm113NA{6!&&4'AB4rr)"rPrQrRrSr<rlrpr propertycacherurxrLr|rr staticmethodrrrr5rrrrrrrrrrrrrrrVrrr^r^s D$     &&   &&6911 $$6 $%)"!+Sj (, rr^ceZdZdZdZedZedZdZdZ dZ dZ d Z d Z d Zd Zd ZdZdZdZdZy)rs merge/states merge/state2c<t|}|j|S)zPInitialize a brand new merge state, removing any existing state on disk.)rrlrmss rcleanzmergestate.cleans    rc<t|}|j|S)z1Initialize the merge state, reading it from disk.)r_readrs rreadzmergestate.reads    rct}|j}|D]\}}|tk(rt||_!|t k(rt||_;|tk(rE|tttttfvrI|jd}|dtk(rd|j|dd<|dd|j |d<|t"k(rk|jdd\}}|jd}i} d} | t%|kr"|| dz| || <| dz } | t%|kr"| |j|<|t&k(r8|jdd} | D cgc]} t%| dkDs| c} |_`|j+rr|j-||rt/j0|ycc} w)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. r rsotherrsfilenode-sourceN)set _readrecords RECORD_LOCALrrf RECORD_OTHERrgLEGACY_MERGE_DRIVER_STATE RECORD_MERGEDRECORD_CHANGEDELETE_CONFLICTRECORD_PATH_CONFLICTLEGACY_MERGE_DRIVER_MERGELEGACY_RECORD_RESOLVED_OTHERrMERGE_RECORD_MERGED_OTHERreraRECORD_FILE_VALUESr RECORD_LABELSrhislowerr5rUnsupportedMergeRecords) r: unsupportedrecordsrtyperecordrr rawextras extrapartsrirols rrzmergestate._reads e ##%$ME6 $!&k ,&!&k 33,$), ||E*777EMD%%d1g./AB+/8DKKQ(,,&,ll5!&<#)&__U3 #j/),6q1u,=F:a=)FA#j/)/5!!(+-'eQ/+1@6aSVaZ6@ ]]_&I%L // < <  As F;/F;c|j}|j}|j||r|S|jdj d}|j t |jft|D]Q\}}|dtk(s|djd}|jdd|ddj|f||<S|S)aRead 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), ...]Nrrrr rr) _readrecordsv1_readrecordsv2 _v1v2matchr`parentsrrr enumeraterrinsertr)r: v1records v2recordsmctxidxrrs rrzmergestate._readrecords6s'') '') ??9i 0  ::d#++-b1D   lDHHJ7 8$I.QQ4=(Q4::e,DKKC(&'dEJJt,<%=IcN /  rct}|D]P}|dtk(r|j|!|dtk(s.|jtt |dfR|D]}||vsyy)NrrFT)rrr5rr)r:rroldv2recs rrzmergestate._v1v2matchXslC1v% #Q=( =*SV*<=>  C%rc0g} |jj|j}t|D]?\}}|dk(r|j t |ddf&|j t |ddfA|j|S#t$rY|SwxYw)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) r`vfs statepathv1rrrrcloseFileNotFoundError)r:rrrrs rrzmergestate._readrecordsv1fs  t//0A!! 16NNL!CR :NNM1Sb6#:; % GGI!   sBB BBcg} |jj|j}|j}d}t |}||kr`|||dz}|dz }t d|||dzd}|dz }||||z}||z }|t k(r |dd|dd}}|j||f||kr`|j|S#t$rY|SwxYw)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) r`r$ statepathv2rr_unpackRECORD_OVERRIDErr&r') r:rrroffendrlengthrs rrzmergestate._readrecordsv2{s$  t//0A668DCd)C)S37+q SC!G(=>qAqcS6\3v O+$*1QK6Ev/) GGI!   sB&B=+B== C  C cn|jr)|j}|j|d|_yyrI)rj _makerecords _writerecordsr:rs rrzmergestate.commits1 ;;'')G   w 'DK rcg}|jtt|jf|jtt|j f|j jD]\}}|dttfvr+|jtdj|g|zfB|d|jjjk(s&|d|jjjk(r+|jtdj|g|zf|jt dj|g|zft#|j$jD]G\}}djd|jD}|jt&d||fzfI|j(2dj|j(}|jt*|f|S)Nrr rc30K|]\}}d||fzyw)%s%sNrV).0kvs r z*mergestate._makerecords..s!#/=tq! QF"~sr7)rrrrfrrgrarrMERGE_RECORD_RESOLVED_PATHrrr`rrrrrrer rhr )r:rrr:rrros rr1zmergestate._makerecordss c$++&678 c$++&678  ;;,,.KHat,* )5::xj1n+EF! 00888Q44::33;;; 15::xj1n3MN  uzz8*q./IJK//0!'t'8'8'>'>'@ A Hf #/5||~#I NN#Y(I1F%FG  !B << #ZZ -F NNM62 3rcH|j||j|y)z,Write current state on disk (both v1 and v2)N)_writerecordsv1_writerecordsv2r3s rr2zmergestate._writerecordss W% W%rch|jj|jd}t|}t |}|dt k(sJ|j t|jdz|D],\}}|tk(s|j dt|z.|jy)z/Write current state on disk in a version 1 filewbr s%s N) r`r$r%rnextrwriterrfrrr&)r:rrirecordslrecordsrrs rr>zmergestate._writerecordsv1s JJNN4++U 3=>{l*** DKK 5()#KE4 %*T"223$  rc Ptttf}|jj |j d}|D]Z\}}t |dk(sJ||vr td||fz}}dt |z}|jt||t ||\|jy)zqWrite current state on disk in a version 2 file See the docstring for _readrecordsv2 for why we use 't'.rArs%s%ss>sI%isN) rrrr`r$r*rr,rD_packr&)r:r allowlistrkeyrformats rr?zmergestate._writerecordsv2s "<? JJNN4++U 3 ICs8q= =)#+WT{-BTT*F GGE&#s4y$7 8 !  rcr|jjjd|z|jyNsmerge/)r`r$rDrrs rrzmergestate._make_backups% Y1499;?rc|jjd|z5}|j|j|dddy#1swYyxYwrM)r`r$rDr)r:rrrrs rrzmergestate._restore_backups9 ZZ^^I0 1Q JJqvvx '2 1 1s !A  Acvtj|jjj ddy)NsmergeT)shutilrmtreer`r$rr?s rrlzmergestate.resets# djjnn))(3T:rN)rPrQrRr%r*rrrrrrrrrr1r2r>r?rrrlrVrrrrsx K!K /=b D *%N +Z&  @(;rrc*eZdZfdZdZdZxZS) memmergestatec:tt| |i|_yr)superrSr<_backups)r:r __class__s rr<zmemmergestate.__init__s mT+D1 rc>|j|j|<yr)rrVrs rrzmemmergestate._make_backups"&))+ hrcB|j|j||yr)rDrVrs rrzmemmergestate._restore_backups 4==*E2r)rPrQrRr<rr __classcell__)rWs@rrSrSs.3rrSc |jtgD]E\}}}|r|jj|dd(|jj|ddG|jtgD]$\}}}|jj|dd&|jt gD]\}}}|\}}|jj|dd|jj ||||k(r|jj|ddj|jj|dd|jtgD]$\}}}|jj|dd&|jtgD]F\}}}|r |jj|ddd)|jj|ddH|jtgD]%\}}}|jj|ddd'|jtgD]\}}}|jtgD]\}}}|jtgD]\}}}|jtgD]\}}}|rV|jj|} | jxr | j } |jj|| dd_|r||nd} |jj|dd| |jt"gD]\}}}|\} } }}}|r| |k(} |jj|| dd| | k7s;|r|jj| dd| |k7r|jj | |}|jj | || |k(r|jj|ddd|s|jj| dd|jt$gD]\}}}|\}}|rY|jj|dd|jj|dd|jj ||g|jj|dd|jj|dd|jt&gD]f\}}}|\}}|r;|jj|dd|jj ||I|jj|ddhy)z$record merge actions to the dirstateTF) p1_tracked wc_tracked)r\r]possibly_dirty)r\r]p2_infoN)r\r]parentfiledata)rrdirstate update_filerACTION_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 getfiledatarargsrtf0origf0 old_entryr\r`f1f2famoveancflags r recordupdatesr{ s M26 4  MM % %aDU % K MM % %aEe % L 7 M26 4 !!!%!H7 $@"E 4 V !!!$!G 61% < MM % %bTe % L MM % %bUu % MF J3 4 !!!$!G4 $7< 4  MM % %dtD &  MM % %aEd % K = K4 4 !! $4 " 5  K4 4 5 $6; 4 < OR8 4 9 J3 4  //2I"..Fy3FJ MM % %% & 0;[^N MM % %- & 4* L"5 4 $BD# qJ MM % %% &  RxMM--t.7MM&&r1-MM&&r1-Qw ))$4* ))5U*A6J $@"E 4D  MM % %aEd % K MM % %bTe % L MM  r1 % MM % %aDT % J MM % %bUu % MF $?D 4D  MM % %aEd % K MM  r1 % MM % %aDT % J Er)BrbrPstructrTi18nrrnrrrrr r utilsr packrHunpackr+rr rrr r rrrrrrr<rr,rrrr CHANGE_ADDEDCHANGE_REMOVEDCHANGE_MODIFIEDr1rrrrACTION_PATH_CONFLICTrcrACTION_CREATEDACTION_DELETED_CHANGEDACTION_CHANGED_DELETEDrlrnrmrfrgrhreACTION_CREATED_MERGECONVERT_MERGE_ACTIONSr^rrSr{rVrrrs      --    # $" !  $ $   4*4*nDdNK DdNK 4 F 4 I "4(*51! t\Tt\J$U+$U+4 )%0*51$d+ !d3e40$D/J " t\  jjZ L;!L;^ 3$ 3BKr