-=[ Mr. Bumblebee ]=-
_Indonesia_
8Oc @@ s d d l m Z d d l Z d d l m Z e e d d d l m Z m Z m Z d6 Z
d e j f d
YZ e j
Z e j d d d e j d
d d e j d d d d e _ d e j f d YZ d e j f d YZ d e e d 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 d' e f d( YZ d) e f d* YZ! d+ e f d, YZ" d- e f d. YZ# d/ e f d0 YZ$ d1 e f d2 YZ% d3 e f d4 YZ& i a' d5 Z( e( e e e e e! e" e# e$ e% e&
d S(7 i ( t absolute_importN( t lazy_imports
import errno
from bzrlib import (
cleanup,
errors,
osutils,
rio,
trace,
transform,
workingtree,
)
from bzrlib.i18n import gettext, ngettext
( t commandst optiont registrys .THISs .BASEs .OTHERt
cmd_conflictsc B@ sD e Z d Z d e j d d d g Z d d g Z e d d Z RS( s> List files with conflicts.
Merge will do its best to combine the changes in two branches, but there
are some kinds of problems only a human can fix. When it encounters those,
it will mark a conflict. A conflict means that you need to fix something,
before you can commit.
Conflicts normally are listed as short, human-readable messages. If --text
is supplied, the pathnames of files with text conflicts are listed,
instead. (This is useful for editing all files with text conflicts.)
Use bzr resolve when you have fixed a problem.
t directoryt textt helps( List paths of files with text conflicts.t resolves conflict-typesu .c C@ s t j j | d } xc | j D]U } | r^ | j d k rD q# n | j j | j d q# | j j t | d q# Wd S( Ni s
text conflicts
( t workingtreet WorkingTreet open_containingt conflictst
typestringt outft writet patht unicode( t selfR R t wtt conflict( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt runF s ( t __name__t
__module__t __doc__R t Optiont
takes_optionst _see_alsot FalseR ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR 1 s
t dones Marks the conflict as resolved.s take-thist take_thiss@ Resolve the conflict preserving the version in the working tree.s
take-othert
take_others< Resolve the conflict taking the merged version into account.t ResolveActionOptionc B@ s e Z d Z RS( c C@ s) t t | j d d d t d t d S( Nt actions How to resolve the conflict.t value_switchesR ( t superR! t __init__t Truet resolve_action_registry( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR% ` s ( R R R% ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR! ^ s t cmd_resolvec B@ s_ e Z d Z d g Z d g Z d e j d d d e g Z d g Z d e d d d Z RS(
s Mark a conflict as resolved.
Merge will do its best to combine the changes in two branches, but there
are some kinds of problems only a human can fix. When it encounters those,
it will mark a conflict. A conflict means that you need to fix something,
before you can commit.
Once you have fixed a problem, use "bzr resolve" to automatically mark
text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
resolved, or "bzr resolve --all" to mark all conflicts as resolved.
t resolveds file*R t allR s# Resolve all conflicts in this tree.R
c C@ s | rg | r$ t j t d n | d k r9 d } n t j j | d } | d k r d } q nT t j j | | \ } } | d k r | d k r d } q n | d k r d } n | d k rw| d k r| j \ } } t | d k rZt
j t d d t | t | t
j t d x! | D] } t
j t
| q9Wd St
j t d
d SqnH t | | d | \ } }
t
j t d d
| |
j | |
|
d S( Ns. If --all is specified, no FILE may be providedu .i R t autos %d conflict auto-resolved.s %d conflicts auto-resolved.s Remaining conflicts:i s All conflicts resolved.R" s$ {0} conflict resolved, {1} remainings% {0} conflicts resolved, {1} remaining( t errorst BzrCommandErrort gettextt NoneR
R R t open_containing_pathst auto_resolvet lent tracet notet ngettextR R t format( R t file_listR* R" R t treet un_resolvedR) R t beforet after( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR { sB
N(
R R R t aliasest
takes_argsR R R! R R R/ R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR( g s c C@ s | j d } z | j } t | } | d k rI t } | } n | j | | | | \ } } xP | D]H }
y! |
j | | |
j | Wqn t k
r | j |
qn Xqn Wy t | } | j
| Wn t j k
r n XWd | j
X| d k r| } n | | f S( s Resolve some or all of the conflicts in a working tree.
:param paths: If None, resolve all conflicts. Otherwise, select only
specified conflicts.
:param recursive: If True, then elements of paths which are directories
have all their children resolved, etc. When invoked as part of
recursive commands like revert, this should be True. For commands
or applications wishing finer-grained control, like the resolve
command, this should be False.
:param ignore_misses: If False, warnings will be printed if the supplied
paths do not have conflicts.
:param action: How the conflict should be resolved,
N( t lock_tree_writeR/ R
R2 t ConflictListt select_conflictst _dot cleanupt NotImplementedErrort appendt
set_conflictsR, t UnsupportedOperationt unlock( R8 t pathst
ignore_missest recursiveR" t nb_conflicts_aftert tree_conflictst nb_conflicts_beforet
new_conflictst
to_processR ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s2
c C@ s t } y t j | d | t } Wn+ t k
rQ } | j t j k rR qR n Xy t j | d t } Wn+ t k
r } | j t j k r q n Xy t j | d t } Wn+ t k
r } | j t j k r q n X| s t j
| n d S( sy Restore a conflicted file to the state it was in before merging.
Only text restoration is supported at present.
s .THISs .BASEs .OTHERN( R t osutilst renameR& t OSErrort errnot ENOENTt ost unlinkR, t
NotConflicted( t filenamet
conflictedt e( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt restore s*
R? c B@ s e Z d Z d d Z d Z d Z d Z d Z d Z d Z
d Z d Z e
d
Z d Z d Z d
Z e e d Z RS( s List of conflicts.
Typically obtained from WorkingTree.conflicts()
Can be instantiated from stanzas or from Conflict subclasses.
c C@ s2 t j | | d k r% g | _ n | | _ d S( N( t objectR% R/ t _ConflictList__list( R R
( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR% s
c C@ s t | j d k S( Ni ( R2 R] ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt is_empty s c C@ s
t | j S( N( R2 R] ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __len__ s c C@ s
t | j S( N( t iterR] ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __iter__
s c C@ s | j | S( N( R] ( R t key( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __getitem__
s c C@ s | j j | S( N( R] RD ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRD s c C@ s t | t | k S( N( t list( R t
other_list( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __eq__ s c C@ s | | k S( N( ( R Re ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __ne__ s c C@ s d | j S( Ns ConflictList(%r)( R] ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __repr__ s c C@ s: t } x* | D]" } | j t j | j q W| S( s6 Produce a new ConflictList from an iterable of stanzas( R? RD t Conflictt factoryt as_dict( t stanzasR
t stanza( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt from_stanzas s
c c@ s x | D] } | j Vq Wd S( s Generator of stanzasN( t as_stanza( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt
to_stanzas$ s
c c@ s x | D] } t | Vq Wd S( s+ Generate strings for the provided conflictsN( R ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt
to_strings) s
c C@ s1 x* | D]" } | j s q n | j | q Wd S( s: Remove the THIS, BASE and OTHER files for listed conflictsN( t has_filesRB ( R R8 R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt remove_files. s
c C@ s t | } i } t } t } t } x6 | D]. }
| j |
} | d k r4 |
| | <q4 q4 Wx,| D]$} t }
x d D]} } t | | d } | d k r q n | | k r t }
| j | n | r t j | | r t }
| j | q q q Wxj d D]b } t | | d } | d k r2qn y | | } Wn t
k
rVqn Xt }
| j | qW|
r| j | qm | j | qm W| t k rx` g | D] } | | k r| ^ qD]6 }
t j
j | j |
sd |
GHqd |
GHqWn | | f S(
s Select the conflicts associated with paths in a tree.
File-ids are also used for this.
:return: a pair of ConflictLists: (not_selected, selected)
R t
conflict_patht file_idt conflict_file_ids %s does not exists %s is not conflictedN( s paths
conflict_path( s file_ids conflict_file_id( t setR? t path2idR/ R t getattrR& t addRP t
is_inside_anyt KeyErrorRD RU R t existst abspath( R R8 RH RI t recurset path_sett idst selected_pathsRN t selected_conflictsR Ru R t selectedRb t cpatht cfile_idt p( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR@ 5 sR
, N( R R R R/ R% R^ R_ Ra Rc RD Rf Rg Rh t staticmethodRn Rp Rq Rs R R@ ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR? s Ri c B@ s e Z d Z e Z d d Z d Z d Z d Z d Z
d Z d Z d Z
d Z e d
Z e d Z d Z d
Z d Z d Z d Z d Z d Z RS( s$ Base class for all types of conflictc C@ s% | | _ t j | d t | _ d S( Nt warn( R RP t safe_file_idR Ru ( R R Ru ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR% q s c C@ sP t j d | j d | j } | j d k rL | j d | j j d n | S( Nt typeR Ru t utf8( t riot StanzaR R Ru R/ Rz t decode( R t s( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRo w s c C@ s t | | j | j g S( N( R R Ru ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt _cmp_list~ s c C@ s5 t | d d d k r d St | j | j S( NR i( Ry R/ t cmpR ( R t other( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __cmp__ s c C@ s t t | | j | j f S( N( t hashR R Ru ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __hash__ s c C@ s | j | d k S( Ni ( R ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRf s c C@ s | j | S( N( Rf ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRg s c C@ s | j | j S( N( R6 t __dict__( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt __unicode__ s c C@ s* t | j } | j j | d <| j | S( Nt class( t dictR t __class__R t rformat( R t rdict( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRh s c K@ s t | | S( N( t ctype( R t kwargs( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRj s c C@ sX | j d k r | j | j f St | d d d k rG | j | j f Sd | j f Sd S( NRt ( R R/ R Ry Rt ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt sort_key s
c C@ sM t | d | d } | d k r? t | j j d | n | | d S( s Apply the specified action to the conflict.
:param action: The method name to call.
:param tree: The tree passed as a parameter to the method.
s action_%st .N( Ry R/ RC R R ( R R" R8 t meth( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRA s c C@ s t | j d S( s> The names of the files generated to help resolve the conflict.N( RC t associated_filenames( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ sc x\ | j D]N } y t j | j | Wq
t k
rZ } | j t j k r[ q[ q
Xq
Wd S( N( R RP t
delete_anyR~ RR RS RT ( R R8 t fnameRZ ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRB s c C@ s d S( s5 Mark the conflict as solved once it has been handled.N( ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt action_done s c C@ s t | j d S( N( RC t action_take_this( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ s t | j d S( N( RC t action_take_other( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c O@ sH t j | } t j | j } | j | j | j | | | d S( N( t transformt
TreeTransformRB t OperationWithCleanupst _resolvet add_cleanupt finalizet
run_simple( R R8 t argsR t ttt op( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt _resolve_with_cleanups s N( R R R R Rr R/ R% Ro R R R Rf Rg R Rh R Rj R RA R RB R R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRi k s( t PathConflictc B@ sn e Z d Z d Z d Z d Z d d d Z d Z d Z d Z
d Z d Z d
Z
d Z RS(
s- A conflict was encountered merging file pathss
path conflicts+ Path conflict: %(path)s / %(conflict_path)ss3 %(class)s(%(path)r, %(conflict_path)r, %(file_id)r)c C@ s t j | | | | | _ d S( N( Ri R% Rt ( R R Rt Ru ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR% s c C@ s8 t j | } | j d k r4 | j d | j n | S( NRt ( Ri Ro Rt R/ Rz ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRo s c C@ s g S( N( ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ sT d } | d k rV | j d k r% d S| j d k r | j } | j j d } q nc | d k r | j d k ru d S| j d k r | j } | j j d } q n t d | f | d k r | j | } t j | | | j | j | | | j
| | n | j | } | j | } | j
t j | | | | j d S( s Resolve the conflict.
:param tt: The TreeTransform where the conflict is resolved.
:param file_id: The retained file id.
:param path: The retained path.
:param winner: 'this' or 'other' indicates which side is the winner.
t thiss <deleted>Ni R is bad winner: %r( R/ R Rt t _treet get_parent_idst AssertionErrort trans_id_tree_pathR t create_from_treet _revision_treet version_filet trans_id_file_idt get_tree_parentt adjust_pathRP t basenamet apply( R R Ru R t winnert path_to_createt revidt tidt
parent_tid( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s. c C@ s | j j j | S( N( t brancht
repositoryt
revision_tree( R R8 R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR
s c C@ s g } xH | j | j f D]4 } | d k r1 q n | d k r | j | q q Wd } x\ | j D]N } | j | | } x3 | D]+ } | j | } | d k r | | f Sq Wqd Wd S( Ns <deleted>( NN( R Rt R/ RD R R Rx ( R R8 t possible_pathsR Ru R t revtree( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt _infer_file_id s
c C@ so | j d k r1 | j | | j | j d d n: | j | \ } } | j | j | g d | d t d S( NR R t old_treet backups( Ru R/ R R R t revertt id2pathR ( R R8 R Ru ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR % s
c C@ so | j d k r1 | j | | j | j d d n: | j | \ } } | j | j | g d | d t d S( NR R R R ( Ru R/ R Rt R R R R ( R R8 R Ru ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR 0 s
N( R R R R R6 R R/ R% Ro R R R R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s ' t ContentsConflictc B@ sD e Z d Z e Z d Z d Z d Z d Z d Z d Z
RS( sA The files are of different types (or both binary), or not presents contents conflicts Contents conflict in %(path)sc C@ s g d D] } | j | ^ q S( Ns .BASEs .OTHER( s .BASEs .OTHER( R ( R t suffix( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR F s c C@ s y% | j | j | j d | Wn t j k
r; n Xy | j j | j } Wn t j k
rq d } n X| j | } | d k r | j
| } | j t j
| j | | | j n d S( s" Resolve the conflict.
:param tt: The TreeTransform where the conflict is resolved.
:param suffix_to_remove: Either 'THIS' or 'OTHER'
The resolution is symmetric: when taking THIS, OTHER is deleted and
item.THIS is renamed into item and vice-versa.
R N( t delete_contentsR R R, t
NoSuchFileR R Ru t NoSuchIdR/ R R RP R R ( R R t suffix_to_removet this_patht this_tidR ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR I s
c C@ s | j | d d S( Nt OTHER( R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR n s c C@ s | j | d d S( Nt THIS( R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR q s ( R R R R& Rr R R6 R R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR = s % t TextConflictc B@ sJ e Z d Z e Z d Z d Z d Z d Z d Z d Z
d Z RS( sB The merge algorithm could not resolve all differences encountered.s
text conflicts Text conflict in %(path)ss %(class)s(%(path)r, %(file_id)r)c C@ s g t D] } | j | ^ q S( N( t CONFLICT_SUFFIXESR ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ s | j | j } | j | } | j d | } | j | } | j | } | j t j | j | | | j t j | | | | j | | j | j | | j
d S( s Resolve the conflict by copying one of .THIS or .OTHER into file.
:param tt: The TreeTransform where the conflict is resolved.
:param winner_suffix: Either 'THIS' or 'OTHER'
The resolution is symmetric, when taking THIS, item.THIS is renamed
into item and vice-versa. This takes one of the files as a whole
ignoring every difference that could have been merged cleanly.
R N( R Ru R R R R RP R t unversion_fileR R ( R R t
winner_suffixt item_tidt item_parent_tidt winner_patht
winner_tidt winner_parent_tid( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s
c C@ s | j | d d S( NR ( R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ s | j | d d S( NR ( R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s ( R R R R& Rr R R6 R R R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR w s t HandledConflictc B@ s; e Z d Z d Z d d Z d Z d Z d Z RS( sb A path problem that has been provisionally resolved.
This is intended to be a base class.
s, %(class)s(%(action)r, %(path)r, %(file_id)r)c C@ s t j | | | | | _ d S( N( Ri R% R" ( R R" R Ru ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR% s c C@ s t j | | j g S( N( Ri R R" ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ s& t j | } | j d | j | S( NR" ( Ri Ro Rz R" ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRo s c C@ s g S( N( ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s N( R R R R R/ R% R Ro R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s t HandledPathConflictc B@ s5 e Z d Z d Z d d d Z d Z d Z RS( sh A provisionally-resolved path problem involving two paths.
This is intended to be a base class.
sU %(class)s(%(action)r, %(path)r, %(conflict_path)r, %(file_id)r, %(conflict_file_id)r)c C@ s; t j | | | | | | _ t j | d t | _ d S( NR ( R R% Rt RP R R Rv ( R R" R Rt Ru Rv ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR% s c C@ s t j | | j | j g S( N( R R Rt Rv ( R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ sT t j | } | j d | j | j d k rP | j d | j j d n | S( NRt Rv R ( R Ro Rz Rt Rv R/ R ( R R ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyRo s
N( R R R R R/ R% R Ro ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s t DuplicateIDc B@ s e Z d Z d Z d Z RS( s Two files want the same file_id.s duplicate ids> Conflict adding id to %(conflict_path)s. %(action)s %(path)s.( R R R R R6 ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s t DuplicateEntryc B@ s, e Z d Z d Z d Z d Z d Z RS( s1 Two directory entries want to have the same name.t duplicates= Conflict adding file %(conflict_path)s. %(action)s %(path)s.c C@ s9 | j | j g d t d t | j | j | j d S( Nt forcet
keep_files( t removeRt R& R t
rename_oneR ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ s# | j | j g d t d t d S( NR R ( R R R& R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s ( R R R R R6 R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s
t
ParentLoopc B@ s, e Z d Z d Z d Z d Z d Z RS( s An attempt to create an infinitely-looping directory structure.
This is rare, but can be produced like so:
tree A:
mv foo bar
tree B:
mv bar foo
merge A and B
s parent loops< Conflict moving %(path)s into %(conflict_path)s. %(action)s.c C@ s d S( N( ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s c C@ s t j | } z | j | j } | j | } | j | j } | j | } | j t j | j | | | j t j | j
| | | j Wd | j Xd S( N(
R R R Ru R Rv R RP R R Rt R R ( R R8 R t p_tidR t cp_tidt cparent_tid( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s
( R R R R R6 R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s
t UnversionedParentc B@ s, e Z d Z d Z d Z d Z d Z RS( s An attempt to version a file whose parent directory is not versioned.
Typically, the result of a merge where one tree unversioned the directory
and the other added a versioned file to it.
s unversioned parentsT Conflict because %(path)s is not versioned, but has versioned children. %(action)s.c C@ s d S( N( ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR # s c C@ s d S( N( ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR & s ( R R R R R6 R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR s
t
MissingParentc B@ s, e Z d Z d Z d Z d Z d Z RS( s An attempt to add files to a directory that is not present.
Typically, the result of a merge where THIS deleted the directory and
the OTHER added a file to it.
See also: DeletingParent (same situation, THIS and OTHER reversed)
s missing parents/ Conflict adding files to %(path)s. %(action)s.c C@ s# | j | j g d t d t d S( NR R ( R R R& R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR 5 s c C@ s d S( N( ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR 8 s ( R R R R R6 R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR * s
t DeletingParentc B@ s, e Z d Z d Z d Z d Z d Z RS( s An attempt to add files to a directory that is not present.
Typically, the result of a merge where one OTHER deleted the directory and
the THIS added a file to it.
s deleting parentsE Conflict: can't delete %(path)s because it is not empty. %(action)s.c C@ s d S( N( ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR K s c C@ s# | j | j g d t d t d S( NR R ( R R R& R ( R R8 ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR O s ( R R R R R6 R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR = s
t NonDirectoryParentc B@ s, e Z d Z d Z d Z d Z d Z RS( s An attempt to add files to a directory that is not a directory or
an attempt to change the kind of a directory with files.
s non-directory parentsH Conflict: %(path)s is not a directory, but has files in it. %(action)s.c C@ sh | j j d rU | j t d } | j | j g d t d t | j | n t | j d S( Ns .newR R ( R t endswithR2 R R& R Rz RC R ( R R8 Rt ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR _ s
c C@ sk | j j d rX | j t d } | j | g d t d t | j | j | n t | j d S( Ns .newR R ( R R R2 R R& R R RC R ( R R8 Rt ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR h s
( R R R R R6 R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyR S s
c G@ s" x | D] } | t | j <q Wd S( s7 Register a Conflict subclass for serialization purposesN( R R ( t conflict_typest
conflict_type( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt register_typesu s
( s .THISs .BASEs .OTHER() t
__future__R RU t bzrlib.lazy_importR t globalst bzrlibR R R R t CommandR t RegistryR' t registert default_keyt RegistryOptionR! R( R/ R R R[ R\ R? Ri R R R R R R R R R R R R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/bzrlib/conflicts.pyt <module> sR
F + vdn:/ "
Copyright © 2017 || Recoded By Mr.Bumblebee