-=[ Mr. Bumblebee ]=-
_Indonesia_
Pc
@@ s 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 e e d d d l
m Z d d l m
Z
m Z m Z d Z d e j f d YZ d
e j f d YZ e d d e d
Z e d Z d Z e d Z d d e d Z d d d d d d d d e d Z d Z d Z d e f d YZ! d e f d YZ" d e! f d YZ# d e! f d YZ$ d e! f d YZ% d! e! f d" YZ& d# e f d$ YZ' e Z( e( j) d% e' d S(& i ( t absolute_importN( t lazy_imports
import errno
import subprocess
import tempfile
from bzrlib import (
cleanup,
cmdline,
controldir,
errors,
osutils,
patiencediff,
textfile,
timestamp,
views,
)
from bzrlib.workingtree import WorkingTree
from bzrlib.i18n import gettext
( t Registry( t muttert notet warningi t
AtTemplatec B@ s e Z d Z d Z RS( s* Templating class that uses @ instead of $.t @( t __name__t
__module__t __doc__t delimiter( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR 6 s t _PrematchedMatcherc B@ s e Z d Z d Z RS( s< Allow SequenceMatcher operations to use predetermined blocksc C@ s) t j | d d | | _ d | _ d S( N( t difflibt SequenceMatchert Nonet matching_blockst opcodes( t selfR ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt __init__D s ( R R R
R ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR A s t utf8c C@ sK | r | r d S| t k r; t j | t j | n | d k rS t j } n t j | | d | j | d d | j | d d | d | } t | } t | d k r d S| s | d j
d d | d <n# | s | d j
d
d | d <n x: | D]2 }
| j |
|
j d s| j d
qqW| j d d S( Nt fromfilet replacet tofilet nt sequencematcheri i s -1,0s -0,0s +1,0s +0,0s
s
\ No newline at end of file
(
t Falset textfilet check_text_linesR t patiencedifft PatienceSequenceMatchert unified_difft encodet listt lenR t writet endswith( t old_filenamet oldlinest new_filenamet newlinest to_filet allow_binaryt sequence_matchert
path_encodingt
context_linest udt line( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt
internal_diffJ s.
c
C@ s | ra i } t j j d } | d
k r7 | | d <n d | d <d | d <d | d <t j } n d
} d
} y1 t j | d t j d t j d | d | } Wn@ t k
r } | j t j k r t
j t | n n X| S( sA Spawn the externall diff process, and return the child handle.
:param diffcmd: The command list to spawn
:param capture_errors: Capture stderr as well as setting LANG=C
and LC_ALL=C. This lets us read and understand the output of diff,
and respond to any errors.
:return: A Popen object.
t PATHt Ct LANGUAGEt LANGt LC_ALLt stdint stdoutt stderrt envN(
t ost environt getR t
subprocesst PIPEt Popent OSErrort errnot ENOENTt errorst NoDifft str( t diffcmdt capture_errorsR9 t pathR8 t pipet e( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _spawn_external_diffy s,
c C@ s | j t j d d \ } } t j d d \ } } t j | d }
t j | d } zq|
j | | j | |
j | j | s g } n t j d k r | j d } | j d } n d d | | d | | d g } xp d
d d d
d d d d d d d d d d d g D]. }
x$ | D] } | j
|
r-Pq-q-Wq Pq W| j d | ru| j | n t
| d t } | j \ } } | j } | d 7} | d k ru| } t
| d t } | j \ } } | j | d | j d k rt j d | f n | j d d d } t j d | t j } | d! k rnt j d | f qud! Sn | j | | d& k r| d k rd" | } n
d# | } t j d$ | | f n Wd! |
j | j y t j | Wn; t k
r4} | j t j f k r5t d% | | q5n Xy t j | Wn9 t k
r| j t j f k rt d% | | qn XXd! S(' s; Display a diff by calling out to the external diff program.t prefixs
bzr-diff-old-s
bzr-diff-new-t wbt win32t mbcst diffs --labels --binarys -cs -us -Cs -Us -es --eds -qs --briefs --normals -ns --rcss -ys --side-by-sides -Ds --ifdefRG s
i sf external diff failed with exit code 2 when run with LANG=C and LC_ALL=C, but not when run natively: %ri i s ^(binary )?files.*differ$s2 external diff failed with exit code 2; command: %rNs signal %ds exit code %ds) external diff failed with %s; command: %rs& Failed to delete temporary file: %s %s( i i ( t flusht tempfilet mkstempR: t fdopent
writelinest closet syst platformR t
startswitht appendt extendRK t Truet communicatet
returncodeR R# RC t BzrErrort splitt ret matcht IR t removeR@ RA RB R ( R% R& R' R( R) t diff_optst oldtmp_fdt old_abspatht newtmp_fdt new_abspatht oldtmpft newtmpfRF t st jRI t outt errt rct
lang_c_outt
first_linet mt msgRJ ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt
external_diff s
c @ sk d } d } | d k r t | d k rR | d } | d k rR | j } qR n t | d k r | d } | d k r | j } q q n g } t } t }
| d k s t | d k r d } t }
n; | d k r | d k r | } t } n | d } | d } f d } g }
| d k r3| } n t j j | \ } } } | | | |
r| d k r| d k r| rt j | | n |
j
| n t | | | } | } | d k r| } n | | k rMt j j | \ } } } | | | |
rM| d k rM| d k r:| r:t j | | n |
j
| qMn t | | | d | d k } | } | r| d k r| j | d | } n |
j
| t |
d k r%d }
| d k r%| j r%| r%| j j } | r"| }
t j | } t t d | q"q%n d } | d k rU| | | f k rU| f } n | | | | |
| f S(
s4 Get the trees and specific files to diff given a list of paths.
This method works out the trees to be diff'ed and the files of
interest within those trees.
:param path_list:
the list of arguments passed to the diff command
:param revision_specs:
Zero, one or two RevisionSpecs from the diff command line,
saying what revisions to compare.
:param old_url:
The url of the old branch or tree. If None, the tree to use is
taken from the first path, if any, or the current working tree.
:param new_url:
The url of the new branch or tree. If None, the tree to use is
taken from the first path, if any, or the current working tree.
:param add_cleanup:
a callable like Command.add_cleanup. get_trees_and_branches_to_diff
will register cleanups that must be run to unlock the trees, etc.
:param apply_view:
if True and a view is set, apply the view or check that the paths
are within it
:returns:
a tuple of (old_tree, new_tree, old_branch, new_branch,
specific_files, extra_trees) where extra_trees is a sequence of
additional trees to search in for file-ids. The trees and branches
will be read-locked until the cleanups registered via the add_cleanup
param are run.
i i u .c @ sP | d k r& | j | j n& | d k rL | j | j n d S( N( R t lock_readt unlock( t wtt br( t add_cleanup( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt lock_tree_or_branch] s
t t basis_is_defaultt
apply_views+ *** Ignoring files outside view. View is %sN( R R" t
get_branchR\ R t
controldirt
ControlDirt open_containing_tree_or_brancht viewst check_path_in_viewRZ t _get_tree_to_difft safe_relpath_filesR[ t supports_viewst lookup_viewt view_display_strR t gettext( t path_listt revision_specst old_urlt new_urlRz R~ t old_revision_spect new_revision_spect other_pathst make_paths_wt_relativet consider_relpatht default_locationR{ t specific_filest working_treet brancht relpatht old_treet
old_brancht new_treet
new_brancht
view_filest view_strt extra_trees( ( Rz s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt% get_trees_and_branches_to_diff_locked# s
c C@ s| | d k r$ | d k r$ | j } n | d k s? | j d k ro | rh | d k r[ | j S| j Sqo | Sn | j | S( N( R R t spect
basis_treet as_tree( R t treeR R} ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s
s a/s b/c C@ s | d k r t } n |
d k r* t }
n | j z | d k ra x | D] } | j qJ Wn | j z> |
j | | | | | | | | d | }
|
j | | SWd | j | d k r x | D] } | j q Wn XWd | j Xd S( s Show in text form the changes from one tree to another.
:param to_file: The output stream.
:param specific_files: Include only changes to these files - None for all
changes.
:param external_diff_options: If set, use an external GNU diff and pass
these options.
:param extra_trees: If set, more Trees to use for looking up file ids
:param path_encoding: If set, the path will be encoded as specified,
otherwise is supposed to be utf8
:param format_cls: Formatter class (DiffTree subclass)
R- N( R t DEFAULT_CONTEXT_AMOUNTt DiffTreeRv t from_trees_optionst show_diffRw ( R R R) R t external_diff_optionst old_labelt new_labelR R, t usingt
format_clst contextR t differ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt show_diff_trees s,
c C@ s@ y | j | | } Wn t j k
r2 d } n Xt j | S( s7 Returns a timestamp suitable for use in a patch header.i ( t get_file_mtimeRC t FileTimestampUnavailablet timestampt format_patch_date( R t file_idRH t mtime( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _patch_header_date s
c C@ sH i d t 6d t 6d d 6} | | k r@ d | | | | f g Sg Sd S( Ns +xs -xs ??s %s to %s( R\ R R ( t old_is_xt new_is_xt descr( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt get_executable_change s t DiffPathc B@ sS e Z d Z d Z d Z d Z d d Z d Z e d Z e
d Z RS( s/ Base type for command object that compare filest CANNOT_DIFFt CHANGEDt UNCHANGEDs utf-8c C@ s( | | _ | | _ | | _ | | _ d S( s) Constructor.
:param old_tree: The tree to show as the old tree in the comparison
:param new_tree: The tree to show as new in the comparison
:param to_file: The file to write comparison data to
:param path_encoding: The character encoding to write paths in
N( R R R) R, ( R R R R) R, ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c C@ s d S( N( ( R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt finish s c C@ s | | j | j | j | j S( N( R R R) R, ( t klasst diff_tree( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt from_diff_tree s c C@ sJ xC | D]4 } | j | | | | | } | t j k r | Sq Wt j Sd S( N( RP R R ( t differsR t old_patht new_patht old_kindt new_kindt file_differt result( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt
_diff_many s
( R R R
R R R R R t classmethodR t staticmethodR ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s
t DiffKindChangec B@ s8 e Z d Z d Z d Z e d Z d Z RS( s Special differ for file kind changes.
Represents kind change as deletion + creation. Uses the other differs
to do this.
c C@ s
| | _ d S( N( R ( R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c C@ s d S( N( ( R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c C@ s
| | j S( N( R ( R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c C@ sl d | | f k r t j St j | j | | | | d } | t j k rM | St j | j | | | d | S( s1 Perform comparison
:param file_id: The file_id of the file to compare
:param old_path: Path of the file in the old tree
:param new_path: Path of the file in the new tree
:param old_kind: Old file-kind of the file
:param new_kind: New file-kind of the file
N( R R R R R ( R R R R R R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRP ! s ( R R R
R R R R RP ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s
t
DiffDirectoryc B@ s e Z d Z RS( c C@ sF d | | f k r | j S| d k r, | j S| d k r? | j S| j S( s> Perform comparison between two directories. (dummy)
t directoryN( R N( R N( R R R ( R R R R R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRP 6 s ( R R RP ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR 4 s t DiffSymlinkc B@ s e Z d Z d Z RS( c C@ s d | | f k r | j S| d k r: | j j | } n | d k rO d } n | j S| d k rw | j j | } n | d k r d } n | j S| j | | S( sF Perform comparison between two symlinks
:param file_id: The file_id of the file to compare
:param old_path: Path of the file in the old tree
:param new_path: Path of the file in the new tree
:param old_kind: Old file-kind of the file
:param new_kind: New file-kind of the file
t symlinkN( R R t get_symlink_targetR R t diff_symlink( R R R R R R t
old_targett
new_target( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRP E s c C@ sg | d k r# | j j d | n= | d k rF | j j d | n | j j d | | f | j S( Ns === target is %r
s === target was %r
s === target changed %r => %r
( R R) R# R ( R R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR ^ s ( R R RP R ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR C s t DiffTextc B@ s> e Z d Z d d d e e d Z d Z d d d Z RS( s 1970-01-01 00:00:00 +0000s utf-8R| c C@ sJ t j | | | | | | | _ | | _ | | _ | | _ | | _ d S( N( R R t text_differR R R, R- ( R R R R) R, R R R R- ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR o s c C@ s d | | f k r | j S| } } | d k rG t | j | | } n% | d k re | j } d } n | j S| d k r t | j | | } n% | d k r | j } d } n | j Sd | j | | f }
d | j | | f } | j | | |
| | | S( sG Compare two files in unified diff format
:param file_id: The file_id of the file to compare
:param old_path: Path of the file in the old tree
:param new_path: Path of the file in the new tree
:param old_kind: Old file-kind of the file
:param new_kind: New file-kind of the file
t files %s%s %sN( R R R R t
EPOCH_DATER R R t diff_text( R R R R R R t from_file_idt
to_file_idt old_datet new_datet
from_labelt to_label( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRP y s&
c
C@ s d } y\ | | j | | } | | j | | } | j | | | | | j d | j d | j Wn= t j k
r | j j d | | f j | j d n X| j
S( s Diff the content of given files in two trees
:param from_file_id: The id of the file in the from tree. If None,
the file is not present in the from tree.
:param to_file_id: The id of the file in the to tree. This may refer
to a different file from from_file_id. If None,
the file is not present in the to tree.
:param from_path: The path in the from tree or None if unknown.
:param to_path: The path in the to tree or None if unknown.
c S@ s$ | d k r | j | | Sg Sd S( N( R t get_file_lines( R R RH ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _get_text s R, R- s Binary files %s and %s differ
R ( R R R R) R, R- RC t
BinaryFileR# R R (
R R R R R t from_patht to_pathR t from_textt to_text( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s !N( R R R R0 R R RP R R ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR i s t DiffFromToolc B@ s e Z d d Z e d d Z e d d Z d Z d Z d Z e
d Z d Z d Z
e e d
Z e e d Z d Z d
Z d Z RS( s utf-8c C@ s; t j | | | | | | | _ t j d d | _ d S( NRL s bzr-diff-( R R t command_templatet osutilst mkdtempt _root( R R R R R) R, ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c C@ sG t j | } d | k r1 | j d d g n | | | | | | S( NR s @old_paths @new_path( t cmdlineR` R[ ( R t command_stringR R R) R, R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt from_string s
c @ s f d } | S( Nc @ sE g } d k r& | d 7} n j | | j | j | j S( Nt ( R R R R R) ( R t full_command_string( R R R ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s
( ( R R R R ( ( R R R s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt make_from_diff_tree s c C@ s i | d 6| d 6} g | j D] } t | j | ^ q } t j d k r g } xC | D]; } t | t r | j | j d q[ | j | q[ W| S| Sd S( NR R RN RO ( R R t
substituteRW RX t
isinstancet unicodeRZ R ( R R R t my_mapt tt commandt command_encodedt c( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _get_command s (
c C@ s | j | | } y% t j | d t j d | j } Wn> t k
rw } | j t j k rq t j | d qx n X| j
j | j j
| j S( NR7 t cwdi ( R R= R? R> R R@ RA RB RC t ExecutableMissingR) R# R7 t readt wait( R R R R t procRJ ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _execute s c C@ s t | d d d k s% t j r) t Sy, t j | j d t j | j | Wn+ t
k
r } | j t j k r q n Xt
S( Nt abspathR| ( t getattrR R t host_os_dereferences_symlinksR R: R R t pathjoinR R@ RA t EEXISTR\ ( R R RL RJ ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _try_symlink_root s
,
c C@ s' t j d k r d St j p" d Sd S( s8 Returns safe encoding for passing file path to diff toolRN RO t asciiN( RW RX t getfilesystemencoding( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _fenc s c C@ sE | j } y | | j | j | k SWn t k
r@ t SXd S( s8 Return true if `path` may be able to pass to subprocess.N( R R t decodet UnicodeErrorR ( R RH t fenc( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _is_safepath s
c C@ sR | j } | j | d j | d } | j d d } t j | j | | S( s] Replace unsafe character in `relpath` then join `self._root`,
`prefix` and `relpath`.R u ?u _( R R R R R R R ( R RL R R t relpath_tmp( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _safe_filename
s c
C@ sp | rD t | t rD | j | j | } | j | rD | Sn | j | | } | rs | j | | rs | St j | } y t j
| Wn+ t k
r } | j t j
k r q n X| j | | }
z5 t | d } z t j |
| Wd | j XWd |
j Xy | j | } Wn t j k
r?n Xt j | | | f | slt j | n | S( NRM ( R t WorkingTreeR t id2pathR R R R t dirnameR: t makedirsR@ RA R t get_filet opent pumpfileRV R RC R t utimet
make_readonly(
R R R RL R t
force_tempt allow_writet full_patht
parent_dirRJ t sourcet targetR ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _write_file s8
c C@ sL | j | | j d | | } | j | | j d | | d | } | | f S( Nt oldt newR ( R! R R ( R R R R R t allow_write_newt
old_disk_patht
new_disk_path( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt _prepare_files7 s c C@ sZ y t j | j Wn? t k
rU } | j t j k rV t d | j | f qV n Xd S( Ns9 The temporary directory "%s" was not cleanly removed: %s.( R t rmtreeR R@ RA RB R ( R RJ ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR @ s c C@ sH | | f d k r t j S| j | | | \ } } | j | | d S( NR ( s files file( R R R' R ( R R R R R R R% R& ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRP H s
c C@ s | j j | } | j j | } | j | | | d t d t \ } } | j | | } t j | d | j t | d } z | j
SWd | j Xd S( s Use this tool to edit a file.
A temporary copy will be edited, and the new contents will be
returned.
:param file_id: The id of the file to edit.
:return: The new contents of the file.
R$ R R t rbN( R R R R' R\ R R= t callR R R RV ( R R R R t old_abs_patht new_abs_pathR t new_file( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt edit_fileO s N( R R R R R R R R R R R R R R R R! R' R RP R. ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s$
" R c B@ sh e Z d Z e j e j g Z d d d d Z e d Z
d d Z d Z d Z
d Z RS( s Provides textual representations of the difference between two trees.
A DiffTree examines two trees and where a file-id has altered
between them, generates a textual representation of the difference.
DiffTree uses a sequence of DiffPath objects which are each
given the opportunity to handle a given altered fileid. The list
of DiffPath objects can be extended globally by appending to
DiffTree.diff_factories, or for a specific diff operation by
supplying the extra_factories option to the appropriate method.
s utf-8c @ s | d k r- t | | | | d d t } n | _ | _ | _ | _ g _ | d k r j j f d | D n j j f d j D j j | t
j g d S( s Constructor
:param old_tree: Tree to show as old in the comparison
:param new_tree: Tree to show as new in the comparison
:param to_file: File to write comparision to
:param path_encoding: Character encoding to write paths in
:param diff_text: DiffPath-type object to use as a last resort for
diffing text files.
:param extra_factories: Factories of DiffPaths to try before any other
DiffPathsR| c 3@ s | ] } | Vq d S( N( ( t .0t f( R ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pys <genexpr> s c 3@ s | ] } | Vq d S( N( ( R/ R0 ( R ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pys <genexpr> s N( R R R0 R R R) R, R R[ t diff_factoriesR R ( R R R R) R, R t extra_factories( ( R s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR x s ##c
@ s | d k r$ t j | | g }
n g }
| rT | j d d f d } n t } t | | | | | | | d | } | | | | | | |
S( s Factory for producing a DiffTree.
Designed to accept options used by show_diff_trees.
:param old_tree: The tree to show as old in the comparison
:param new_tree: The tree to show as new in the comparison
:param to_file: File to write comparisons to
:param path_encoding: Character encoding to use for writing paths
:param external_diff_options: If supplied, use the installed diff
binary to perform file comparison, using supplied options.
:param old_label: Prefix to use for old file labels
:param new_label: Prefix to use for new file labels
:param using: Commandline to use to invoke an external diff tool
c @ s t | | | | | d S( s} :param path_encoding: not used but required
to match the signature of internal_diff.
N( Ru ( t olabt olinest nlabt nlinesR) R, R- ( t opts( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt diff_file s R- N( R R R R` R0 R (
R R R R) R, R R R R R- R2 R8 R ( ( R7 s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c C@ s: z | j | | SWd x | j D] } | j q! WXd S( s Write tree diff to self.to_file
:param specific_files: the specific files to compare (recursive)
:param extra_trees: extra trees to use for mapping paths to file_ids
N( t
_show_diffR R ( R R R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR s c @ sx j j j d | d | d t } d } d } f d } x,t | d | D]\ } } } }
} } }
} | d k sX |
d k r qX n | \ } } | | d } | | d } |
d d k o |
d } |
d d k o |
d } | d | d f | d | d f k } g } | j t | d | d | r_d d
j | f } n d } | | f t t f k r j
j d |
d | f | } n | | f t t f k r j
j d
|
d | f | } nN | r j
j d |
d | | | f n! j
j d |
d | | f | ra j | | | |
d |
d d } n | rX d } qX qX W| S( NR R t require_versionedi c S@ s/ | d \ } } | } | d k r+ | } n | S( Ni ( R ( t changeR R RH ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt changes_key s
c @ s# | d k r | j j d Sd S( NR ( R R R, ( RH ( R ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt get_encoded_path s t keyi s (properties changed: %s)s , R| s === removed %s '%s'
s === added %s '%s'
s === renamed %s '%s' => '%s'%s
s === modified %s '%s'%s
( NN( NN(
R t iter_changesR R\ t sortedR R[ R t joinR R) R# t _diff( R R R t iteratort has_changesR< R= R t pathst changed_contentt versionedt parentt namet kindt
executablet oldpatht newpatht oldpath_encodedt newpath_encodedt old_presentt new_presentt renamedt properties_changedt prop_str( ( R s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR9 sR . ( !
c C@ s y | j j | } Wn# t j t j f k
r; d } n Xy | j j | } Wn# t j t j f k
rw d } n X| j | | | | | d S( s Perform a diff of a single file
:param file_id: file-id of the file
:param old_path: The path of the file in the old tree
:param new_path: The path of the file in the new tree
N( R RJ RC t NoSuchIdt
NoSuchFileR R RB ( R R R R R R ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRP s
c C@ sa t j | j | | | | | } | t j k r] | } | d k rK | } n t j | n d S( N( R R R R R RC t NoDiffFound( R R R R R R R t
error_path( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyRB s N( R R R
R R R R1 R R R R R R9 RP RB ( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyR g s
$ = t default(* t
__future__R R
R: Ra t stringRW t bzrlib.lazy_importR t globalst bzrlib.registryR t bzrlib.traceR R R R t TemplateR R R R R R0 R\ RK Ru R R R R R t objectR R R R R R R t format_registryt register( ( ( s/ /usr/lib/python2.7/dist-packages/bzrlib/diff.pyt <module> sL
- % v ' *#&M
Copyright © 2017 || Recoded By Mr.Bumblebee