\ծ 2dZddlZddlZddlZddlZddlZddlmZddlm Z m Z ddl m Z m Z mZmZmZmZmZmZmZmZmZddlmZmZiZej6eZiZej:eZeddd d edd d edddd eddd dZdZdZ daB command to allow external programs to compare revisions The extdiff Mercurial extension allows you to use external programs to compare revisions, or revision with working directory. The external diff programs are called with a configurable set of options and two non-option arguments: paths to directories containing snapshots of files to compare. If there is more than one file being compared and the "child" revision is the working directory, any modifications made in the external diff program will be copied back to the working directory from the temporary directory. The extdiff extension also allows you to configure new diff commands, so you do not need to type :hg:`extdiff -p kdiff3` always. :: [extdiff] # add new command that runs GNU diff(1) in 'context diff' mode cdiff = gdiff -Nprc5 ## or the old way: #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 # add new command called meld, runs meld (no need to name twice). If # the meld executable is not available, the meld tool in [merge-tools] # will be used, if available meld = # add new command called vimdiff, runs gvimdiff with DirDiff plugin # (see http://www.vim.org/scripts/script.php?script_id=102) Non # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc vimdiff = gvim -f "+next" \ "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" Tool arguments can include variables that are expanded at runtime:: $parent1, $plabel1 - filename, descriptive label of first parent $child, $clabel - filename, descriptive label of child revision $parent2, $plabel2 - filename, descriptive label of second parent $root - repository root $parent is an alias for $parent1. The extdiff extension will look in your [diff-tools] and [merge-tools] sections for diff tool arguments, when none are specified in [extdiff]. :: [extdiff] kdiff3 = [diff-tools] kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child If a program has a graphical interface, it might be interesting to tell Mercurial about it. It will prevent the program from being mistakenly used in a terminal-only environment (such as an SSH terminal session), and will make :hg:`extdiff --per-file` open multiple file diffs at once instead of one by one (if you still want to open file diffs one by one, you can use the --confirm option). Declaring that a tool has a graphical interface can be done with the ``gui`` flag next to where ``diffargs`` are specified: :: [diff-tools] kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child kdiff3.gui = true You can use -I/-X and list of file or directory names like normal :hg:`diff` command. The extdiff extension makes snapshots of only needed files, so running the external diff program will actually be pretty fast (at least faster than having to compare the entire tree). N)_)nullrevshort) archivalcmdutilencodingerror filemerge formatter logcmdutilpycompat registrarscmutilutil)procutil stringutilextdiffsopts\..*T)defaultgenericsgui\..*)r diff-toolss .*\.diffargs$s.*\.gui$sships-with-hg-corec ptjj|j}|dk(rd}|d|t |fz}tjj ||}tj |g}|2|jtdt|t |fzn&|jtdt|z|r|jjdddtj|||d tj||| t!|D]} t#j$| } |jd | z|/tjj || } |j'| |j)| tj*| f||fS) zsnapshot files as of some revision if not using snapshot, -I/-X does not work and recursive diff in tools like kdiff3 and meld displays too many files.rroots%s.%ss(making snapshot of %d files from rev %s s3making snapshot of %d files from working directory suis archivemetaFsfiles)matchsubreposs %s )ospathbasenamerootrjoinmkdirnoterlenui setconfigrarchiver matchfilessortedrpconvertappendwjoinlstat) r$repofilesnodetmproot listsubreposdirnamebase fnsandstatfnwfndests 1usr/lib/python3.12/site-packages/hgext/extdiff.pysnapshotr9syggtyy)G#~ guT{33 77<< )DHHTNJ   : ;5z5;' (  E F5z    %7    $$T51!  -B--#C GGIO $|ww||D#.!!4B$"HI  J rc  ||||||||d  fd} d} stj| |s|dz }tj| | |S)N)sparentsparent1parent2splabel1splabel2schildsclabelrc|jd}|jd}s|dk(r|S|tj|zS)Nr;)groupr shellquote)rprekeydo3wayreplaces r8quotezformatcmdline..quotesFkk!nkk!n#+JX((666rsJ(['"]?)([^\s'"$]*)\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1s $parent1 $child)researchsub) cmdline repo_rootrCparent1plabel1parent2plabel2childclabelrEregexrDs ` @r8 formatcmdlinerRsd G7 E  "))E73&& 66% ((rc tj|}tjtj|dtj tj |tjtj|}|S)zflike 'procutil.system', but returns the Popen object directly so we don't have to wait on it. T)shell close_fdsenvcwd) r shellenviron subprocessPopen tonativestrclosefds tonativeenvr rapply)cmdenvironrWrVprocs r8_systembackgroundrbsg    (C   S!##   % OOH00# 6  D Krc *g}t|}tt|D]-\}}tjj ||}|| z}tjj |stj}d}d}|rTtjj | |}|| z}tjj |stj}tjj | |}|| z}|rtd||dz|fz}td}|jd||fz}|dk(rf|dk(ra|j|dD].\}}|jd|tj|fz0|jd||fz}|dk(ra|dk(rn|dk(r|d k(rnt||||||||| }|s|s?|j!d tj"||fz|j%||d |j!dtj"||fzt'||}|j)|0|r3|j+d 5|D]}|j- dddyy#1swYyxYw)Nrsdiff %s (%d of %d)sZ[Yns?]$$ &Yes, show diff$$ &No, skip this diff$$ &Skip remaining diffs$$ &? (display help)s%s %sr>s%s - %s rr=rCrKrLrMrNrOrPrunning %r in %s rrW blockedtags running %r in %s (backgrounded) )rW)r# enumerater(rrr isfiler osdevnullr promptchoiceextractchoiceswriterlowerrRdebugbytestrsystemrbr*timeblockedsectionwait)rIrJr$guitoolrCconfirm commonfilesr0dir1adir1bdir2rev1arev1brev2 waitprocs totalfilesidx commonfilepath1alabel1apath1blabel1bpath2label2 difffiles responsesrct curcmdlineras r8_runperfilediffrs&I[!J$VK%89ZeZ0u$ww~~f%''F WW\\%4F 5(G77>>&)!++ T:.d" /0a4I (IIy+A ABAAv1f " 1 1) ?  k5::<(  $JH D yy{D&$))+wI!L " Vq $BfdGXNj99GG F 88K  v;! ..6KGGLL%=E!E)G77>>%( ** We[A%-ww~~e,$..E77<<$    II HHZ('',,w.28"'',,w.dh- "$.R'" 4== !R %6 6~~+&BJJ,>? HH/2 = ``` entry: cmd: command/tool name path: path to the tool cmdline: the command which should be run isgui: whether the tool uses GUI or not Reads all external tools related configs, whether it be extdiff section, diff-tools or merge-tools section, or its specified in an old format or the latest format. scmd.Nropts.rgui.rdFs .diffargs)rs merge-toolss.gui) r expandpath startswithrfindexer findexternaltoolconfigr@ configboolr#r shlexsplit) r$r_rdiffoptsrIrrBsectionargss r8_gettooldetailsrs$ ??4 D ~~g!"g##C(D| 11"c:Ac99ZC8%%d+  th &G j'C-8 G8..w781>( #s~~g'> $3BT$B!T7E   N , - 3 77  4% (  * 0r)NN)F)/rrrFrrrYmercurial.i18nrmercurial.noderr mercurialrrrr r r r r rrrmercurial.utilsrrcmdtabler configtable configitem testedwithr9rRrbrrrrwalkopts subrepooptsrrrrrr i18nfunctionsrrr8r$s\JZ       )  H % !Y ! !+ .             # ,^')T fR BR jGZ    2 3 fI   vr156& B gsA677D eS!23QwZ@ y#q!; ?6K&'// #1 #1L  D5%p * r