HEX

File: //usr/lib/python3/dist-packages/hgext/__pycache__/extdiff.cpython-310.pyc
o

�]Lb�c�@s0dZddlmZddlZddlZddlZddlZddlZddlm	Z	ddl
mZmZddl
mZmZmZmZmZmZmZmZmZmZmZddlmZmZiZe�e�ZiZe�e�Zedd	d
dd�edd
dd�eddddd�edddd�dZ dd�Z!dd�Z"dGdd�Z#dd�Z$dd�Z%dd�Z&dHd d!�Z'd"d#ge	d$�e	d%�fd&d'ge	d(�e	d)�fd
d*d
e	d+�e	d,�fd
d-d
e	d.�e	d/�fd0d1d
e	d2�e	d)�fd
d3de	d4�fd
d5de	d6�fd
d7de	d8�fgej(ej)Z*edd9d:d
e	d;�e	d<�fge*e	d=�ej+dd>�d?d@��Z,GdAdB�dBe-�Z.dCdD�Z/dEdF�Z0e.gZ1dS)IaBcommand 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).
�)�absolute_importN)�_)�nullrev�short)�archival�cmdutil�encoding�error�	filemerge�	formatter�
logcmdutil�pycompat�	registrar�scmutil�util)�procutil�
stringutil�extdiffsopts\..*�T)�default�genericsgui\..*)r�
diff-toolss
.*\.diffargs$s.*\.gui$sships-with-hg-corec	Cstj�|j�}|dkr
d}|durd|t|�f}tj�||�}t�|�g}|dur;|�td�t	|�t|�f�n|�td�t	|��|r�|j
�ddd	�tj
|||d
t�||�|d�t|�D]'}	t�|	�}
|�d|
�|dur�tj�||
�}|�||�|	�t�|�f�qc||fS)
z�snapshot 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.r�rootNs%s.%ss(making snapshot of %d files from rev %s
s3making snapshot of %d files from working directory
suisarchivemetaFsfiles)�match�subreposs  %s
)�os�path�basename�rootr�join�mkdir�noter�len�ui�	setconfigr�archiver�
matchfiles�sortedr�pconvert�append�wjoin�lstat)r#�repo�files�node�tmproot�listsubrepos�dirname�base�
fnsandstat�fn�wfn�dest�r7�//usr/lib/python3/dist-packages/hgext/extdiff.py�snapshot�sJ
����
�	
�r9c		sN||||||||d����fdd�}	d}
�s t�|
|�s |d7}t�|
|	|�S)N)sparentsparent1�parent2splabel1splabel2schildsclabelrcs6|�d�}|�d�}�s|dkr|S|t��|�S)N��r:)�groupr�
shellquote)r�pre�key��do3way�replacer7r8�quote�s


zformatcmdline.<locals>.quotesJ(['"]?)([^\s'"$]*)\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1s $parent1 $child)�re�search�sub)�cmdline�	repo_rootrB�parent1�plabel1�parent2�plabel2�child�clabelrD�regexr7rAr8�
formatcmdline�s�	�rQc	Cs:t�|�}tjt�|�dtjt�|�t�tj|�d�}|S)zflike 'procutil.system', but returns the Popen object directly
    so we don't have to wait on it.
    T)�shell�	close_fds�env�cwd)	r�shellenviron�
subprocess�Popen�tonativestr�closefds�tonativeenvr
�rapply)�cmd�environrUrT�procr7r7r8�_systembackground�s
�r`cCsg}t|�}tt|��D]�\}}tj�||�}||}tj�|�s$tj}d}d}|r>tj�|	|�}||}tj�|�s>tj}tj�|
|�}||
}|r�t	d�||d|f}t	d�}|�
d||f�}|dkr�|dkr�|�|�dD]\}}|�d|t
�|�f�qr|�
d||f�}|dksk|dkr�n|dkr�q|d	kr�n>t|||||||||d
�	}|s�|s�|�dt�|�|f�|j||dd
�q|�dt�|�|f�t||d�}|�|�q|�r|�d��|D]}|��q�Wd�dS1s�wYdSdS)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;�rBrJrKrLrMrNrO�running %r in %s
r�rU�
blockedtags running %r in %s (backgrounded)
)rU)r"�	enumerater'rrr�isfiler
�	osdevnullr�promptchoice�extractchoices�writer�lowerrQ�debug�bytestr�systemr`r)�timeblockedsection�wait)rHrIr#�guitoolrB�confirm�commonfilesr/�dir1a�dir1b�dir2�rev1a�rev1b�rev2�	waitprocs�
totalfiles�idx�
commonfile�path1a�label1a�path1b�label1b�path2�label2�	difffiles�	responses�r�c�t�
curcmdliner_r7r7r8�_runperfilediffs��������
�"��r�c
Cs�d}t�|di��!}tj|||��||��g||j�||�|d�Wd�n1s-wYt�|||�}	t�|||�}
|j�||	�}|j�||
�}t||j	d||	dd||
d�	}|�
dt�|�|f�|j
||dd�dS)	Nshg-%h.patchr)�
fntemplaterFrbrcrdra)r�
nullformatterr�export�rev�vfs�reljoin�makefilenamerQrrmr
rnro)
r#r,�node1�node2r/�matcherrH�template�fm�label1r��file1�file2r7r7r8�	diffpatchks8���
r�c'Csj|
�d�}|j|||d�}t|j�t|j�t|j�}
}}|r:|j|||d�}t|j�t|j�t|j�}}}nt�t�t�}}}|
|B|B|B}||B|B}|sWdS|
|B||B|B}t||||��||�d}|��durvdnd|��}|r�||B|
|B|B}t||||��||�d}d|��}nd}d}g}d}d}|��dur�t||||��||�d}d|��}nt	|�dkr�t|||d||�\}}nd}|j
}|} |}!|}"|
�d��sOt	|�dk�r,t�|�
��}#tj�|||#�}|#|} tj�|��stj}|�r tj�|||#�}|#|}!tj�|��s tj}tj�|||#�}|#|}"t||j
||| ||!||"d�	}|�d	t�|�|f�|j||d
d�n*t||j
||	||
�d�||tj�||�|�rltj�||�ndtj�||�|||d
�|D]7\}$}%}t�|$�}&|&tj|tjk�s�|&j|jk�s�|&jd@|jd@k�r�|�d|%|$f�t�|$|%��q{dS)N�subrepos)r0rrs@%dra�per_filerbrcrrd�confirm)rrrBrsrtr/rurvrwrxryrz�@s6file changed while diffing. Overwriting: %s (src: %s)
)�get�status�set�modified�added�removedr9r.r�r"rr�	localpath�poprrrrgr
rhrQrmrnror�r+�stat�ST_MTIME�st_size�st_mode�copyfile)'r#r,�ctx1a�ctx1b�ctx2r�r/rHrBrr�optsr�st�mod_a�add_a�rem_a�stb�mod_b�add_b�rem_b�modadd�common�dir1a_filesrurx�dir1b_filesrvryr3�dir2rootrzrwr�r�r��common_file�copy_fn�
working_fn�cpstatr7r7r8�diffrevs�s�
"�����
	���r�FcCs�t�|dd�|�d�}|�d�}|�d�}|�d�}	d|v}
|	r2t�||	d�}|��|��}}
n7|s6|rTt�||g|gd�}t�||d�}|t	}
t�||d�}nt�
||�\}}|se|d��}
n|t	}
|
rs|
��t	krsd}
t�|||�}|�d	�r�|�d
�r�t
�td���|�d�r�t
�td
���|��dur�t
�td���tjdd�}z;|�d	�r�t|||��|��|||�W|�td��t�|�St||||
|||||
||�W|�td��t�|�S|�td��t�|�w)a
Do the actual diff:

    - copy to a temp structure if diffing 2 internal revisions
    - copy to a temp structure if diffing working revision with
      another one and more than 1 file is changed
    - just invoke the diff for a single file in the working dir
    �rev�change�from�tos$parent2NsnowarnF�patchr�s&--patch cannot be used with --subreposr�s&--patch cannot be used with --per-files--patch requires two revisionssextdiff.)�prefixscleaning up temp directory
)r�check_at_most_one_argr�r�	revsingle�p1�p2r�unhidehashlikerevsr�revpairr�rr	�Abortrr.r
�mkdtempr�r!�shutil�rmtreer�)r#r,rH�patsr�rr�revs�from_rev�to_rev�changerBr�r�r�r�r/r7r7r8�dodiff!sp	



�



����r��o�options!pass option to comparison programsOPT�rr�srevision (DEPRECATED)sREVr�srevision to diff fromsREV1r�srevision to diff tosREV2�cr�schange made by revisionsper-files/compare each file instead of revision snapshotsr�s3prompt user before each external program invocationr�s!compare patches for two revisions�p�programscomparison program to runsCMDshg extdiff [OPT]... [FILE]...��helpcategory�	inferrepocOsXt�|�}|�d�}|�d�}|sd}|pdg}d�ttj|g|��}t|||||�S)aPuse external program to diff repository (or selected files)

    Show differences between revisions for the specified files, using
    an external program. The default program used is diff, with
    default options "-Npru".

    To select a different program, use the -p/--program option. The
    program will be passed the names of two directories to compare,
    unless the --per-file option is specified (see below). To pass
    additional options to the program, use -o/--option. These will be
    passed before the names of the directories or files to compare.

    The --from, --to, and --change options work the same way they do for
    :hg:`diff`.

    The --per-file option runs the external program repeatedly on each
    file to diff, instead of once on two directories. By default,
    this happens one by one, where the next file diff is open in the
    external program only once the previous external program (for the
    previous file diff) has exited. If the external program has a
    graphical interface, it can open all the file diffs at once instead
    of one by one. See :hg:`help -e extdiff` for information about how
    to tell Mercurial that a given program has a graphical interface.

    The --confirm option will prompt the user before each invocation of
    the external program. It is ignored if --per-file isn't specified.
    r�r�sdiffs-Npru� )r
�byteskwargsr�r�maprr>r�)r#r,r�r��program�optionrHr7r7r8�extdiff�s
&


r�c@s eZdZdZdd�Zdd�ZdS)�savedcmda�use external program to diff repository (or selected files)

    Show differences between revisions for the specified files, using
    the following program::

        %(path)s

    When two revision arguments are given, then changes are shown
    between those revisions. If only one revision is specified then
    that revision is compared to the working directory, and, when no
    revisions are specified, the working directory files are compared
    to its parent.
    cCs@t�|��dd�}|jdt�t�|��i;_||_||_dS)Ns\\�\r)	r�	escapestrrC�__doc__r
�sysstr�uirepr�_cmdline�_isgui)�selfrrH�isgui�docpathr7r7r8�__init__�s
zsavedcmd.__init__cOsHt�|�}d�ttj|d��}|rd|}t|||j||||jd�S)Nr�r�)rr)	r
r�rr�rr>r�r�r�)r�r#r,r�r��optionsr7r7r8�__call__�s
�zsavedcmd.__call__N)�__name__�
__module__�__qualname__r�r�r�r7r7r7r8r��s	r�c	Cs<t�|�}|�d�rA|dd�}|s#t�|�}|dur#t�||�p"|}|�dd|�}t�|�}|r8|d|7}|�	dd|�}n.|rO|}t
t�|��dk}nt�|�}|dur`t�||�p_|}t�|�}d	}|�	dd|�}|s�|d
}dD] }|�||�}|r�|d|7}|dur�|�	||d�p�d	}nqw||||fS)
a�
    returns following things for a
    ```
    [extdiff]
    <cmd> = <path>
    ```
    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.�Nr�opts.r��gui.raFs	.diffargs)rsmerge-toolss.gui)
r�
expandpath�
startswithr�findexer
�findexternaltool�configr>�
configboolr"r
�
shlexsplit)	r#r]r�diffoptsrHr�r@�section�argsr7r7r8�_gettooldetails�s@





�rcCsr|�d�D]1\}}|�d�s|�d�rqt|||�\}}}}t|tdd�td�|tjdd�t|||��qdS)Nrr�r�shg %s [OPTION]... [FILE]...Tr�)�configitemsr�r�command�extdiffoptsr�CATEGORY_FILE_CONTENTSr�)r#r]rrHr�r7r7r8�uisetups

�
��r)NN)F)2r��
__future__rrrEr�r�rW�mercurial.i18nr�mercurial.noderr�	mercurialrrrr	r
rrr
rrr�mercurial.utilsrr�cmdtabler�configtable�
configitem�
testedwithr9rQr`r�r�r�r��walkopts�subrepooptsr	r
r��objectr�rr�
i18nfunctionsr7r7r7r8�<module>s�L4


����
/
*i!
M������� ���

&"8