File: //usr/lib64/python2.7/site-packages/hgext/extdiff.pyc
�
1�3\c @@ s7 d Z d d l m Z d d l Z d d l Z d d l Z d d l Z d d l m Z d d l m
Z
m Z d d l m
Z
m Z m Z m Z m Z m Z m Z m Z m Z d d l m Z m Z i Z e j e � Z i Z e j e � Z e d d d
d d e �e d
d d
d d e �d Z d � Z d � Z! d d g e d � e d � f d d g e d � e d � f d d d e d � e d � f d d d e d � f g e j" e j# Z$ e d d d d e d! � e d" � f g e$ e d# � d$ e j% d% e �d& � � Z& d' e' f d( � � YZ( d) � Z) e( g Z* d S(* s� 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
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).
i ( t absolute_importN( t _( t nullidt short( t archivalt cmdutilt errort filemerget formattert pycompatt registrart scmutilt util( t procutilt
stringutilt extdiffs opts\..*t defaultt t generics
diff-toolss
.*\.diffargs$s ships-with-hg-corec C@ s� t j j | j � } | d k r* d } n | d k rO d | t | � f } n t j j | | � } t j | � g } | d k r� | j t d � t
| � t | � f � n | j t d � t
| � � | r�| j j d d t
� t j | | | d d t j | | � d
| �x� t | � D]r } t j | � }
| j d |
� | d k r#t j j | |
� } | j | | j | � t j | � f � q#q#Wn | | f S(
s� 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 t roots %s.%ss( making snapshot of %d files from rev %s
s3 making snapshot of %d files from working directory
t uit archivemetat filest matchfnt subreposs %s
N( t ost patht basenameR t NoneR t joint mkdirt noteR t lenR t setconfigt FalseR t archiveR t
matchfilest sortedR t pconvertt appendt wjoint lstat( R t repoR t nodet tmproott listsubrepost dirnamet baset
fnsandstatt fnt wfnt dest( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt snapshotv s2
2c / @ s� | j d � } | j d � } d | k � | rT | rT t d � } t j | � � nr | r� t j | | d � } | j � | j � } }
n; t j | | � \ } } | s� | d j � }
n
| t
}
| j � } |
j � } | j � }
� r| t
k rt � qn | j d � } t j
| |
| | � } | j d � r�| r]t j t d � � � n |
d k r6t j t d � � � q6n� t t | j | |
| d | �d
� \ } } } � r�t t | j | |
| d | �d
� \ } } } n t � t � t � } } } | | B| B| B} | | B| B} | s6d St j d d
� } zv| j d � s~| | B| | B| B} t | | | | | | � d } d | | j � } � r�| | B| | B| B} t | | | | | | � d } d | | j � } n d } d } g } d } d }! |
rOt | | | |
| | � d }" d | |
j � }! nE t | � d k r�t | | | d | | � \ }" } n d }" | j } | }# | }$ |! }% t | � d k rRt j | j � � }& t j j | | |& � } |& | }# t j j | � s
t j } n � rVt j j | | |& � } |& | }$ t j j | � sVt j } qVn t j j | |" |& � }" |& |! }% qRn� d }' t j | d i � �O }( t! j" | | | j � | |
j � g |( d | j# j$ | |' � d | �Wd QXt! j% | | |' � }# t! j% | |
|' � }% | j# j$ | |# � } | j# j$ | |% � }" d } d }$ g } i | d 6| d 6| d 6|# d 6|$ d 6|% d 6|" d 6| j d 6� � � f d � }) d }* � r�t& j' |* | � r�| d 7} n t& j( |* |) | � } | j) d! t j* | � | f � | j+ | d" | d# d �x� | D]� \ }+ }, }- t j, |+ � }. |. t- j. |- t- j. k s�|. j/ |- j/ k s�|. j0 d$ @|- j0 d$ @k r'| j) d% |, |+ f � t j1 |+ |, � q'q'Wd SWd | j2 t d& � � t3 j4 | � Xd S(' s
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
t revt changes $parent2s2 cannot specify --rev and --change at the same timeR t patchs& --patch cannot be used with --subreposs --patch requires two revisionsR- i i t prefixs extdiff.s @%dR i s hg-%h.patchR t
fntemplatet matchNt parentt parent1t parent2t plabel1t plabel2t clabelt childR c @ sJ | j d � } | j d � } � r5 | d k r5 | S| t j � | � S( Ni i R= ( t groupR
t
shellquote( R: t pret key( t do3wayt replace( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt quote# s
sJ (['"]?)([^\s'"$]*)\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1s $parent1 $childs running %r in %s
t cwdt
blockedtagi@ s6 file changed while diffing. Overwriting: %s (src: %s)
s cleaning up temp directory
(5 t getR R t AbortR t revsingleR t p1t p2t revpairR R+ R" R: t mapt sett statusR t mkdtempR4 R5 R R R t localpatht popR R R t isfilet devnullR t
nullformatterR t exportt vfst reljoint makefilenamet ret searcht subt debugt bytestrt systemR) t statt ST_MTIMEt st_sizet st_modet copyfileR t shutilt rmtree(/ R R* t cmdlinet patst optst revsR6 t msgt ctx2t ctx1at ctx1bt node1at node1bt node2R t matchert mod_at add_at rem_at mod_bt add_bt rem_bt modaddt commonR, t dir1a_filest dir1at rev1at dir1b_filest dir1bt rev1bR0 t dir2roott rev2t dir2t label1at label1bt label2t common_filet templatet fmRH t regext copy_fnt
working_fnt stt cpstat( ( RF RG s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt dodiff� s�
&
t ot options! pass option to comparison programt OPTt rR5 t revisiont REVt cR6 s change made by revisionR7 s! compare patches for two revisionst pt programs comparison program to runt CMDs hg extdiff [OPT]... [FILE]...t helpcategoryt inferrepoc O@ s� t j | � } | j d � } | j d � } | sK d } | pE d g } n d j t t j | g | � � } t | | | | | � S( s use 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. To
pass additional options to the program, use -o/--option. These
will be passed before the names of the directories to compare.
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.R� R� t diffs -Nprut ( R t byteskwargsRK R RQ R
RC R� ( R R* Rl Rm R� R� Rk ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyR Q s "t savedcmdc B@ s e Z d Z d � Z d � Z RS( s� 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.
c C@ sD t j | � } | j i t j t j | � � d 6;_ | | _ d S( NR ( R t escapestrt __doc__R t sysstrt uireprt _cmdline( t selfR Rk t docpath( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt __init__� s (c O@ s^ t j | � } d j t t j | d � � } | rA d | } n t | | | j | | | � S( NR� R� ( R R� R RQ R
RC R� R� ( R� R R* Rl Rm t options( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt __call__� s
( t __name__t
__module__R� R� R� ( ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyR� q s
c C@ s� x�| j d � D]�\ } } t j | � } | j d � r� | d } | s� t j | � } | d k r� t j | | � pz | } q� n | j d d | � } t j
| � } | rL| d | 7} qLn� | j d � r� q nu | r| } t t j
| � � d k } nK t j | � } | d k r7t j | | � p1| } n t j
| � } t } | s�| j d | d � p{| j d | d � } | r�| d | 7} q�n t | t t d
� | d t j d t �t | | � � q Wd S(
NR s cmd.i s opts.R� i s
diff-toolss .diffargss merge-toolss hg %s [OPTION]... [FILE]...R� R� ( t configitemsR t
expandpatht
startswithR
t findexeR R t findexternaltoolt configRC R R t
shlexsplitR" t commandt extdiffoptsR t CATEGORY_FILE_CONTENTSt TrueR� ( R t cmdR t diffoptsRk t args( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt uisetup� s<
(+ R� t
__future__R R R^ Ri Rd t mercurial.i18nR t mercurial.nodeR R t mercurialR R R R R R R
R R t mercurial.utilsR
R t cmdtableR� t configtablet
configitemR� R t
testedwithR4 R� t walkoptst subrepooptsR� R� R t objectR� R� t
i18nfunctions( ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt <module>B s@ @ % ��! &