File: //usr/lib/python2.7/dist-packages/hgext/extdiff.pyc
ó
ÛXc @@ sÑ 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 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 i Z e j e ƒ Z 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 ƒ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.
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 commandst errort filemerget scmutilt utils 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]u } t j | ƒ }
| j d |
ƒ | d k r#t j j | |
ƒ } | j | | j | ƒ t j | ƒ 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.t 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 lstatt st_mtime( R
t repoR t nodet tmproott listsubrepost dirnamet baset
fns_and_mtimet fnt wfnt dest( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt snapshot] s4
c * @ sS | j d ƒ } | j d ƒ } d | k ‰ | rT | rT 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 | j d ƒ } t j | | | | ƒ } | j d ƒ r`| r9t j t d ƒ ƒ ‚ n | d" k rt j t d ƒ ƒ ‚ qn² t t | j | | | d | ƒd
ƒ \ }
} } ˆ rËt t | j |
| | d | ƒd
ƒ \ } } } n t ƒ t ƒ t ƒ } } } |
| B| B| B} | | B| B} | sd St j d d
ƒ } z| j d ƒ sZ|
| 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 ƒ } nE t | ƒ d k rat | | | d" | | ƒ \ } } n d } | j } | } | }! | }" t | ƒ d k r t j | j ƒ ƒ }# t j j | | |# ƒ } |# | } t j j | ƒ sét j } n ˆ r2t j j | | |# ƒ } |# | }! t j j | ƒ s2t j } q2n t j j | | |# ƒ } |# | }" q n± d }$ t! j" | | | j ƒ | | j ƒ g d | j# j$ | |$ ƒ d | ƒt! 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 | | f ƒ | j* | d | ƒxY | D]Q \ }' }( }) t j+ |' ƒ j, |) k rÑ| j) d! |( |' f ƒ t j- |' |( ƒ qÑqÑWd SWd" | j. t d# ƒ ƒ t/ j0 | ƒ 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.patcht templatet matcht parentt parent1t parent2t plabel1t plabel2t clabelt childR c @ sJ | j d ƒ } | j d ƒ } ˆ r5 | d k r5 | S| t j ˆ | ƒ S( Ni i R7 ( t groupR
t
shellquote( R4 t pret key( t do3wayt replace( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt quote s
sJ (['"]?)([^\s'"$]*)\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1s $parent1 $childs running %r in %s
t cwds6 file changed while diffing. Overwriting: %s (src: %s)
Ns cleaning up temp directory
(1 t getR R t AbortR t revsingleR R% t changelogt parentst revpairt dirstatet p2R R R4 t mapt sett statust tempfilet mkdtempR. R/ R R R
t localpatht popR R R t isfilet devnullR t exportt vfst reljoint makefilenamet ret searcht subt debugt systemR" R# t copyfileR t shutilt rmtree(* R
R$ t cmdlinet patst optst revsR0 t msgt node2t node1at node1bR t 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_fileR3 RB t regext copy_fnt
working_fnt mtime( ( R@ RA s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt dodiffƒ sÒ
)
t ot options! pass option to comparison programt OPTt rR/ t revisiont REVt cR0 R s change made by revisionR1 s! compare patches for two revisionst extdifft pt programs comparison program to runt CMDs hg extdiff [OPT]... [FILE]...t inferrepoc O@ st | j d ƒ } | j d ƒ } | s< d } | p6 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 ( RD R RL R
R= Rƒ ( R
R$ Rb Rc R R… Ra ( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyR‹ ) 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@ s< | j d ƒ } | j i t j | ƒ d 6| _ | | _ d S( Ns
string-escapeR ( t encodet __doc__R
t uireprt _cmdline( t selfR Ra t docpath( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt __init__V s c O@ sO d j t t j | d ƒ ƒ } | r2 d | } n t | | | j | | | ƒ S( NR‘ R… ( R RL R
R= Rƒ R– ( R— R
R$ Rb Rc t options( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt __call__] s
( t __name__t
__module__R” R™ R› ( ( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyR’ G 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 | d ƒ } t j | ƒ } | rO| d | 7} qOnŠ | j d ƒ rÚ q nu | r| } t
t j | ƒ ƒ d k } nK t j | ƒ } | d k r:t j | | ƒ p4| } n t j | ƒ } t
} | s›| j d | d ƒ p~| j d
| d ƒ } | r›| d | 7} q›n t | t t d ƒ | d t ƒt | | ƒ ƒ q Wd S(
NR‹ s cmd.i s opts.R R‘ i s
diff-toolss .diffargss merge-toolss hg %s [OPTION]... [FILE]...R ( t configitemsR
t
expandpatht
startswitht findexeR R t findexternaltoolt configR= R t shlext splitR t commandt extdiffoptsR t TrueR’ ( R
t cmdR t diffoptsRa t args( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt uisetupc s:
($ R” t
__future__R R RY R¤ R_ RO t mercurial.i18nR t mercurial.nodeR R t mercurialR R R R R R R
t cmdtableR¦ t
testedwithR. Rƒ R t walkoptst subrepooptsR§ R¨ R‹ t objectR’ R¬ t
i18nfunctions( ( ( s1 /usr/lib/python2.7/dist-packages/hgext/extdiff.pyt <module>= s. 4
& ¤ƒ! %