korsygfhrtzangaiide
Elepffwdsff
/
lib64
/
python2.7
/
site-packages
/
hgext
/
Upload FileeE
HOME
� Hq�Qc @ sh d 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 d d l Z d d l Z d d l Z d d l Z d d l Z d Z d � Z d � Z d � Z i e d d d e d � e d � f d d g e d � e d � f d d g e d � e d � f d d d e d � e d � f g e j e d � f d 6Z d � Z e j d 7_ 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. 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 vdiff, runs kdiff3 vdiff = kdiff3 # add new command called meld, runs meld (no need to name twice) 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 _( t shortt nullid( t scmutilR t utilt commandst encodingNt internalc C s t j j | j � } | d k r* d } n | d k rO d | t | � f } n t j j | | � } t j | � | d k r� | j t d � t | � t | � f � n | j t d � t | � � t j | � } g } | | } x| D]} t j | � } | | k rq� n | j d | � t j j | | � } | | } | j | | j � � } d | j � k r�| j | | � n8 | j | | � d | j � k r�t j | t t � n | d k r� | j | | j | � t j | � j f � q� q� W| | 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.t t roots %s.%ss( making snapshot of %d files from rev %s s3 making snapshot of %d files from working directory s %s t lt xN( t ost patht basenameR t NoneR t joint mkdirt noteR t lenR t openerR t pconvertt wwritedatat datat flagst symlinkt writet setflagst Falset Truet appendt wjoint lstatt st_mtime( t uit repot filest nodet tmproott dirnamet baset wopenert fns_and_mtimet ctxt fnt wfnt destt fctxR ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt snapshotG s@ c + s? | j d � } | j d � } d j | � } d | k � | rc | rc t d � } t j | � � nr | r� t j | | d � j � } | j j | � \ } } n6 t j | | � \ } } | s� | j j � } n t } � r� | t k r� t � q� n t j | | | | � } t t | j | | | � d � \ } } } � rkt t | j | | | � d � \ } } } n t � t � t � } } } | | B| B| B} | | B| B} | s�d St j d d � } zS| | B| | B| B} t | | | | | � d } d | | j � } � r\| | B| | B| B} t | | | | | � d } d | | j � } n d } d } g } d } d } | r�t | | | | | � d } d | | j � } nB t | � d k r�t | | | d | � \ } } n d } | j } | }! | }" | }# t | � d k r�t j | j � � }$ t j j | | |$ � } |$ | }! t j j | � snt j } n � r�t j j | | |$ � } |$ | }" t j j | � s�t j } q�n t j j | | |$ � } |$ | }# n t d | d | d | d |! d |" d |# d | d | j � � � � f d � }% d }& � rWt! j" |& | � rW| d 7} n t! j# |& |% | � } t j$ | � d | }' | j% d |' | f � t j& |' d | d | j' �xY | D]Q \ }( }) }* t j( |( � j) |* k r�| j% d |) |( f � t j* |( |) � q�q�Wd SWd | j+ t d � � t, j- | � 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 changet s $parent2s2 cannot specify --rev and --change at the same timei i t prefixs extdiff.s @%dR i t parentt parent1t parent2t plabel1t plabel2t clabelt childR c s8 | j � d } � r' | d k r' d St j � | � S( Ni R7 R ( t groupR t shellquote( t matcht key( t do3wayt replace( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt quote� s s6 \$(parent2|parent1?|child|plabel1|plabel2|clabel|root)s $parent1 $childs running %r in %s t cwdt outs6 file changed while diffing. Overwriting: %s (src: %s) Ns cleaning up temp directory (. t getR R R t AbortR t revsingleR R% t changelogt parentst revpairt dirstatet p2R R R> t mapt sett statust tempfilet mkdtempR0 R1 R R t localpatht popR R t isfilet devnullt dictt ret searcht subR= t debugt systemt foutR R! t copyfileR t shutilt rmtree(+ R" R# t diffcmdt diffoptst patst optst revsR2 t argst msgt node2t node1at node1bt matchert mod_at add_at rem_at mod_bt add_bt rem_bt modaddt commonR& t dir1a_filest dir1at rev1at dir1b_filest dir1bt rev1bR* t dir2roott rev2t dir2t label1at label1bt label2t common_fileRB t regext cmdlinet copy_fnt working_fnt mtime( ( R@ RA s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt dodiffo s� +. ! c O sU | j d � } | j d � } | s< d } | p6 d g } n 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.t programt optiont diffs -Npru( RE R� ( R" R# Rb Rc R� R� ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt extdiff� s t pR� R s comparison program to runt CMDt oR� s! pass option to comparison programt OPTt rR1 t revisiont REVt cR2 s change made by revisions hg extdiff [OPT]... [FILE]...R� c C sW xP| j d � D]?\ } } | j d � ru | d } | sD | } n | j d d | d � } | rl | g po g } nI | j d � r� q n4 | r� t j | � } | j d � } n | g } } | g k r| j d | d � p� | j d | d � } | rt j | � } qn d � } | | | | � t d d d t d � | f t | <q Wd S( NR� s cmd.i s opts.R i s diff-toolss .diffargss merge-toolsc sM � � f d � } t d � t d t j � � � } | j t j � | _ | S( s' use closure to save diff command to usec s! t | | � � | d | | � S( NR� ( R� ( R" R# Rb Rc ( Ra R ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt mydiff1 s s� use %(path)s to diff repository (or selected files) Show differences between revisions for the specified files, using the %(path)s program. 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 RV R t uireprt decodeR t __doc__( t cmdR Ra R� t doc( ( Ra R s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt save/ s i s hg %s [OPTION]... [FILE]...( t configitemst startswitht configt shlext splitRS t cmdtableR ( R" R� R Ra Re R� ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt uisetup s, s extdiff( R� t mercurial.i18nR t mercurial.nodeR R t mercurialR R R R R R� R^ RP RW t testedwithR0 R� R� t walkoptsR� R� t inferrepo( ( ( s3 /usr/lib64/python2.7/site-packages/hgext/extdiff.pyt <module>> s, (< ( � 5