-=[ Mr. Bumblebee ]=-
_Indonesia_
\,Tc @ sj d d l Z d d l m Z m Z m Z m Z d d l m 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 Z d d l Z d d l Z d d l Z d d l Z e j Z e j Z d Z d e f d YZ d Z d Z d
Z d Z d Z d
Z d Z! e" d Z# d Z$ d Z% e" e& e" d Z' d S( iN( t nullidt nullrevt hext bin( t _( t obsoletec C s. | j d } | d | d } d j | S( Nt ii( t splitt join( t datat bits( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt
_droponode s t
mergestatec B s 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 d Z d
Z d Z d Z d Z d Z d Z d Z d Z d d Z RS( s2 track 3-way merge state of individual files
it is stored on disk when needed. Two file are used, one with an old
format, one with a new format. Both contains similar data, but the new
format can store new kind of field.
Current new format is a list of arbitrary record of the form:
[type][length][content]
Type is a single character, length is a 4 bytes integer, content is an
arbitrary suites of bytes of length `length`.
Type should be a letter. Capital letter are mandatory record, Mercurial
should abort if they are unknown. lower case record can be safely ignored.
Currently known record:
L: the node of the "local" part of the merge (hexified version)
O: the node of the "other" part of the merge (hexified version)
F: a file to be merged entry
s merge/states merge/state2c C s | | _ t | _ | j d S( N( t _repot Falset _dirtyt _read( t selft repo( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt __init__3 s c C s_ i | _ d | _ d | _ | r6 | | _ | | _ n t j | j j d t t | _
d S( Nt merge( t _statet Nonet _localt _othert shutilt rmtreeR
R t TrueR R ( R t nodet other( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt reset8 s c C s i | _ d | _ d | _ | j } x | D] \ } } | d k rX t | | _ q. | d k rv t | | _ q. | d k r | j d } | d | j | d <q. | j s. t j t
d | q. q. Wt | _ d S( s Analyse each record content to restore a serialized state from disk
This function process "record" entry produced by the de-serialization
of on disk file.
t Lt Ot FR i i s" unsupported merge state record: %sN(
R R R R t _readrecordsR R t islowert utilt AbortR R R ( R t recordst rtypet recordR
( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR B s c C sK | j } | j } t } x^ | D]V } | d d k rN | j | q( | d d k r( | j d t | d f q( q( Wx | D] } | | k r | j d
j d } | j d | j f xm t
| D]_ \ } } | d d k r | d j d } | j d d | d d j
| f | | <q q W| Sq W| Sd
S( s Read merge state from disk and return a list of record (TYPE, data)
We read data from both v1 and v2 files and decide which one to use.
V1 has been used by version prior to 2.9.1 and contains less data than
v2. We read both versions and check if no data in v2 contradicts
v1. If there is not contradiction we can safely assume that both v1
and v2 were written at the same time and use the extract data in v2. If
there is contradiction we ignore v2 content as we assume an old version
of Mercurial has overwritten the mergestate file and left an old v2
file around.
returns list of record [(TYPE, data), ...]i R R! i iR R it N( t _readrecordsv1t _readrecordsv2t sett addR R
R t parentst appendR t enumerateR t insertR ( R t v1recordst v2recordst oldv2t rect mctxt idxt rR
( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR" Y s&
$
$c C s g } y} | j j | j } xW t | D]I \ } } | d k r] | j d | d f q+ | j d | d f q+ W| j Wn+ t k
r } | j t j k r q n X| S( s read on disk merge state for version 1 file
returns list of record [(TYPE, data), ...]
Note: the "F" data from this file are one entry short
(no "other file node" entry)
i R iR! ( R
t openert statepathv1R0 R/ t closet IOErrort errnot ENOENT( R R& t ft it lt err( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR* s
c
C s g } y | j j | j } | j } d } t | } xz | | k r | | } | d 7} t d | | | d ! d } | d 7} | | | | !} | | 7} | j | | f q? W| j Wn+ t k
r } | j t j
k r q n X| S( sh read on disk merge state for version 2 file
returns list of record [(TYPE, data), ...]
i i s >Ii ( R
R9 t statepathv2t readt lent _unpackR/ R; R< R= R> (
R R& R? R t offt endR' t lengthR( RB ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR+ s&
c C sL t | j pK t | j pK | j j j | j pK | j j j | j S( s Whether mergestate is active.
Returns True if there appears to be mergestate. This is a rough proxy
for "is a merge in progress."
( t boolR R R
R9 t existsR: RC ( R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt active s c C s | j r g } | j d t | j f | j d t | j f x@ | j j D]/ \ } } | j d d j | g | f qW W| j | t | _ n d S( s* Write current state on disk (if necessary)R R R! R N(
R R/ R R R R t iteritemsR t
_writerecordsR ( R R& t dt v( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt commit s '
c C s | j | | j | d S( s, Write current state on disk (both v1 and v2)N( t _writerecordsv1t _writerecordsv2( R R& ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyRN s
c C s | j j | j d } t | } | j } | d d k sF t | j t | j d x: | D]2 \ } } | d k rg | j d t | qg qg W| j
d S( s/ Write current state on disk in a version 1 filet wi R s
R! s %s
N( R
R9 R: t itert nextt AssertionErrort writeR R R R; ( R R& R? t irecordst lrecordsR' R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyRR s c C s | j j | j d } x^ | D]V \ } } t | d k sC t d t | } | j t | | t | | q W| j d S( s/ Write current state on disk in a version 2 fileRT i s >sI%isN( R
R9 RC RE RW RX t _packR; ( R R& R? t keyR t format( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyRS s &c C s t j | j j } | j j j d | | j d | | j | j t | j | j t | j | j
g | j | <t | _
d S( s/ add a new (potentially?) conflicting file the merge state
fcl: file context for local,
fco: file context for remote,
fca: file context for ancestors,
fd: file path of the resulting merge.
note: also write the local version to the `.hg/merge` directory.
s merge/t uN( R$ t sha1t patht hexdigestR
R9 RX R R t filenodet flagsR R R ( R t fclt fcot fcat fdt hash( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR- s c C s
| | j k S( N( R ( R t dfile( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt __contains__ s c C s | j | d S( Ni ( R ( R Ri ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt __getitem__ s c C s t t | j S( N( RU t sortedR ( R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt __iter__ s c C s
| j j S( N( R t keys( R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt files s c C s | | j | d <t | _ d S( Ni ( R R R ( R Ri t state( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt mark s c c s< x5 | j j D]$ \ } } | d d k r | Vq q Wd S( s% Obtain the paths of unresolved files.i R^ N( R t items( R R? t entry( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt
unresolved s c C s | | d k r d S| j | } | \ } } } } } }
} } | j | j }
| | } |
|
} | j j | d | } | j } | j } d | | | k rd | | | k r| j t k r | j j j t d | q| | k r| } qn | j j
d | } | j j | | j | | j
t j | j | j | | | | d | } | d k r| j | =t | _ n | s| j | d n | S(
s) rerun merge process for file path `dfile`R8 i t fileidt xRA s# warning: cannot merge flags for %s
s merge/t labelsN( R R
R t filectxRc R R t uit warnR R9 t wwriteRD R; t filemergeR R R R Rq ( R Ri t wctxRw t
stateentryRp Rh t lfilet afilet anodet ofilet onodeRc t octxt fcdRe Rf t flot flaR? R8 ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt resolve s6
(
!
N( t __name__t
__module__t __doc__R: RC R R R R R" R* R+ RL RQ RN RR RS R- Rj Rk Rm Ro Rq Rt R ( ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR s,
* c C ss | j j | or t j j | j | or | j j j | or | j j | | j k or | | j
| | S( N( t dirstatet _ignoret osR` t isfilet wjoint wopenert auditt checkt normalizet cmp( R R} R6 R? ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt _checkunknownfile, s
c C s t } xU | D]M } | | k r
t | | | | r
t } | j j j t d | q
q
W| r| t j t d n d S( s< check for collisions between unknown files and files in mctxs %s: untracked file differs
sL untracked files in working directory differ from files in requested revisionN( R R R R
Ry Rz R R$ R% ( R R} R6 t errorR? ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt
_checkunknown3 s
!$c C s g } g } } | r | } n x9 | j D]+ } | | k r, | j | d d f q, q, W| s x< | j D]+ } | | k rn | j | d d f qn qn Wn | | f S( s
Forget removed files
If we're jumping between revisions (as opposed to merging), and if
neither the working directory nor the target rev has the file,
then we need to remove it from the dirstate, to prevent the
dirstate from listing the file when it is no longer in the
manifest.
If we're merging, and the other revision has removed a file
that is not present in the working directory, we need to mark it
as removed.
s forget deleteds forget removedN( t deletedR/ R t removed( R} R6 t branchmerget ractionst factionst xactionsR? ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt _forgetremoved? s
c C s t | } | rMx9 d D]1 } x( | | D] \ } } } | j | q* Wq Wx( | d D] \ } } } | j | qY WxA | d D]5 \ } } } | \ } } | j | | j | q Wx4 | d D]( \ } } } | \ } } | j | q WxV | d D]G \ } } } | \ }
} } } }
| r9| j |
n | j | q Wn i } x_ t | D]Q } t j | } | | k rt j t d
| | | f n | | | <q`Wd S( Nt aR? t gt cdt dcR8 t dmt dgt ms( case-folding collision between %s and %s( R R? R R R ( R, R- t discardRl R$ t normcaseR% R ( R t wmft actionst pmmfR R? t argst msgt f2Rc t f1t fat movet anct foldmapt fold( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt _checkcollision] s4
c ) C s t d d j D } i i }
} g t | j | | g d d D] } | j ^ qO | r t j | | | | }
|
\ }
} } } x7 | j D]) \ } } | d j | | f d f q Wx: | j D]) \ } } | d j | | f d f q Wn | j j
t d | j j d
t
| t
| t
| f | j j d | | | f | j | j | j } } } t |
j } | j | j d | k r xC t | j D]/ } | j | j r| d c d
7<PqqWn g } t j | | } | j | } t j | | } x| j D]\ } \ } } | rx| \ } } n( | j | d1 } } | d1 k rqQn | r| \ } }! n | j | } }! | r| | rqQn | rx| rx| }" | j | t }# |# t k r&|
j | | }" n | j |" }$ d | |! |$ k }% | |# k r~|! |$ k r~| d j | d2 d f q | |# k r| |$ k r| | k r| d j | |! f d f qu| d j | |! f d f q |% r| |# k r| d j | |! f d f q |% rF| |# k rF| d j | | f d f q | d j | | | |" t | j f d f qQ| | k rqQ| r| | k r| | }& | d j |& | | f d | f qQ| r | |
k r |
| }& | d j | | |& |& t | j f d |& f qQ| r| | k r| | | k r~| ra| d j | d1 d f q| d j | d1 d f q | d d k r| d j | d1 d! f q | d j | d1 d" f qQ| r | | k r | | }& | d# j |& | |! f d$ | f qQ| r| |
k r|
| }& |& | k ri| d j | |& | |& t | j f d% |& f q | d j | |& | |& t | j f d& |& f qQ| rz| | k rz| r| r| d j | |! f d' f q t | | | | }' | r7| r7|' r7| d j | | | | t | j f d( f q | rZ|' rZ| j | d) f q | d j | |! f d' f qQ| rQ| | | k rQt | | | | }' | r|' r| j | d) f q | r| d j | | j | f d* f q | d+ j | | j | f d, f qQqQWxU t | D]G \ } }( |( d) k rf| j j t d- | q1t s1t! |( q1W| rt" j# t d. n t" j$ | j% s| r| s| j d/ t d0 t rt& | | d1 qt& | | | n | S(3 s
Merge p1 and p2 with ancestor pa and generate merge action list
branchmerge and force are as passed in to update
partial = function to filter file lists
acceptremote = accept the incoming changes without prompting
c s s | ] } | g f Vq d S( N( ( t .0R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pys <genexpr> s s a f g cd dc r dm dg m dr e rd kR\ c S s
| j S( N( t rev( Rv ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt <lambda> s t drs divergent renamest rds rename and deletes resolving manifests
s) branchmerge: %s, force: %s, partial: %s
s% ancestor: %s, local: %s, remote: %s
s .hgsubstatet +RA t kt keept es update permissionsR s remote is newerR s versions differR s$ remote directory rename - move from s local copied/moved from R8 s
remote deleteR s prompt changed/deletedi R R? s remote deleteds
other deletedR s" local directory rename - get from s remote copied from s remote moved from s remote createds# remote differs from untracked localt uds remote recreatingR s prompt deleted/changeds %s: untracked file differs
sL untracked files in working directory differ from files in requested revisiont missingt branchN( (' t dictR Rl R. t manifestt copiest mergecopiesRM R/ Ry t noteR t debugRJ R, t valuest updatet substatet subt dirtyt dicthelperst difft flagsdiffR t getR Rc R R R R R Rz RW R$ R% t checkcaseR` R () R R} t p2t paR t forcet partialt acceptremotet followcopiesR t copyt movewithdirRv t rett diverget renamedeletet oft flt m1t m2t mat copiedt st abortst fdiffR t diff12R? t n12t fl12t n1t n2t fl1t fl2R R R t nolR t differentR ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt
manifestmerge~ s
9!$ # & %
%
%%
%
c c s, | j j } t j } | j } | j j } d } x | D] \ } } } | j j d | | f | r | j j t d | n | | y | | | d t
Wn6 t k
r }
| j j t d | |
j
f n X| d k r | | f Vd } n | d 7} q7 W| d k r(| | f Vn d S( sS apply removes to the working directory
yields tuples for progress updates
i s
%s: %s -> r
s removing %s
t
ignoremissings update failed to remove %s: %s!
id i N( Ry t verboseR$ t
unlinkpathR R R R R R R t OSErrorRz t strerror( R R R t unlinkR R R@ R? R R t inst( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt batchremove. s*
c
c s | j j } | j } | j } d } x | D] \ } } } | j j d | | f | rw | j j t d | n | | | | j | d | d k r | | f Vd } n | d 7} q+ W| d k r | | f Vn d S( su apply gets to the working directory
mctx is the context to get from
yields tuples for progress updates
i s
%s: %s -> g
s getting %s
id i N( Ry R Rx R{ R R R R (
R R6 R R t fctxR{ R@ R? R R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt batchgetI s c )
C sO d* \ } } } } t | }
|
j | j j | j g } x$ | j D] \ } }
|
j qS Wx | d D] \ } } } | \ } } } } } | d k r qx n | j j d | | f | | } | | } | | } | | k r | | } n | j | d t } |
j
| | | | | | k rx | rx | j | qx qx W| j j
} t d } t d } | j j } x` | D]X } t j j | j | r| j j d | | | t j | j | qqWt d | j D } g | d
D] } | d d k r
| ^ q
rHt j | | | | | n d } t j | j d t | f | d
}! x= |! D]5 \ }" }# | |" 7} | | | d |# d
| d | qzWt | d
} t j | j d t | | f | d }! x= |! D]5 \ }" }# | |" 7} | | | d |# d
| d | qWt | d } g | d D] } | d d k rF| ^ qFrt j | | | | | n x^ | d D]R \ } } } | j j d | | f | d 7} | | | d | d
| d | qWx^ | d D]R \ } } } | j j d | | f | d 7} | | | d | d
| d | qWx5 | d D]) \ } } } | j j d | | f qQWx| d D]\ } } } | j j d | | f | d 7} | | | d | d
| d | | \ } } } } } | d k r$t j | | | | j | | qn | | |
j | | d | }$ |$ d+ k rk|$ d k rk| d 7} q|$ d+ k r| d 7} q| d 7} qWx | d D] \ } } } | j j d | | f | d 7} | | | d | d
| d | | \ }% }& | j j t d |% | f | | | j! | | j |% j" |& t j | j |% | d 7} qWx | d D] \ } } } | j j d | | f | d 7} | | | d | d
| d | | \ }% }& | j j t d |% | f | j! | | j |% j" |& | d 7} qvWx | d D] \ } } } | j j d | | f | d 7} | | | d | d
| d | | \ }' | j j# t d! | x" |' D] }( | j j# d" |( qWq/Wx | d# D] \ } } } | j j d$ | | f | d 7} | | | d | d
| d | | \ }' | j j# t d% | x" |' D] }( | j j# d" |( qTWqWx | d& D] \ } } } | j j d' | | f | d 7} | | | d | d
| d | | \ }& | | t j$ | j | d( |& k d) |& k | d 7} qW|
j% | | d+ d
| d | | | | | f S(, s apply the merge action list to the working directory
wctx is the working copy context
mctx is the context to be merged into the working copy
Return a tuple of counts (updated, merged, removed, unresolved) that
describes how many files were affected by the update.
i R s .hgsubstates! preserving %s for resolve of %s
Ru t updatingRo s removing %s
c s s- | ]# \ } } | d k r t | Vq d S( R N( RE ( R R RA ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pys <genexpr> s R8 gMbP?t itemt totalt unitR R? s
%s: %s -> f
i R s
%s: %s -> a
R s
%s: %s -> k
s
%s: %s -> m
Rw R s %s: %s -> dm
s moving %s to %s
R s %s: %s -> dg
s getting %s to %s
R s %s: %s -> dr
s< note: possible conflict - %s was renamed multiple times to:
s %s
R s %s: %s -> rd
s9 note: possible conflict - %s was deleted and renamed to:
R s
%s: %s -> e
RA Rv ( i i i i N(& R R t p1R Rr t sortRy R Rx R R- R/ R R R t progressR R` t lexistsR R$ R t sumt subrepot submerget workerR RE R t ancestorR R R R{ R Rz t setflagsRQ () R R R} R6 t overwriteRw t updatedt mergedR Rt t mst movesR RA R? R R R R R R R Rd Re t actxRf R t _updatingt _filesR t
numupdatesR t zt progR@ R R8 t f0Rc R t nf( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt applyupdates` s
"
- %
#(
#-
#
#
"
"
(
c s& t | d k r= t | | | | d | | | | | } n| j j t d | | t d j d | D f i }
x| D] } | j j t d | t | | | | | | | | | } x t | j D] \ } x D] }
|
\ } } } | j j d | | | f | |
k rh|
| } | | k rX| | j
|
q||
g | | <q i |
g | 6|
| <q Wq Wq W| j j t d t d | j D } xt |
j D]\ } } t | d k r\| j d \ } t
j f d
d D r\| j j d | | f | | j
d qq\n d | k r| j j d
| | d j
| d d qn d | k r
| d d t
j f d | d d D r
| j j d | | d j
qq
n | j j t d | xT t | j D]@ \ } x1 D]) \ } } } | j j d | | f qJWq7W| j d \ } | j j t d | | f | | j
d qqW| j j t d xq | d D]e \ } } } | j j t d | d r9| d j
| d d f q| d j
| d d f qW| d 2xi | d D]] \ } } } | \ } | j j t d | d d k rj| d j
| | f d f qjqjW| d 2| j d k r"t | | | \ } } | d j | | d j | n | S( sD Calculate the actions needed to merge mctx into wctx using ancestorsi i s5 note: merging %s and %s using bids from ancestors %s
s and c s s | ] } t | Vq d S( N( t str( R R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pys <genexpr> s s"
calculating bids for ancestor %s
s %s: %s -> %s
s
auction for merging merge bids
c s s | ] } | g f Vq d S( N( ( R R ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pys <genexpr>) s c 3 s | ] } | d k Vq d S( i N( ( R R ( RA ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pys <genexpr>/ s s %s: consensus for %s
R s %s: picking 'keep' action
R c 3 s | ] } | k Vq d S( N( ( R R ( t ga0( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pys <genexpr>; s s %s: picking 'get' action
s% %s: multiple bids for merge action:
s %s -> %s
s( %s: ambiguous merge - picked %s action
s end of auction
R s^ local changed %s which remote deleted
use (c)hanged version or (d)elete?$$ &Changed $$ &DeleteR8 s
prompt deleteR s prompt keepR sf remote changed %s which local deleted
use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deleteds prompt recreatingR? N( RE R Ry t statusR R R Rl Rr R R/ R Rn R$ t allRz t promptchoiceR R R t extend( R R} R6 t ancestorsR R R R R R t fbidsR R R R? R R RO t bidst _fRc R R ( ( R RA s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt calculateupdates s *
# ' "
$c
C s% xD | d D]8 \ } } } | r3 | j j | q | j j | q Wx+ | d D] \ } } } | j j | qR Wx4 | d D]( \ } } } | s | j j | q q Wx+ | d D] \ } } } | j j | q Wx | d D] \ } } } q WxD | d D]8 \ } } } | r+| j j | q| j j | qWx | d D] \ } } } | \ } } } } }
| r| j j | | | k r | r| j j | n | | k r| j j | | q| j j | | q qJ| | k r| j j | n | rJ| j j | qJqJWx | d D] \ } } } | \ } } | | j k r[q+n | r| j j | | j j | | j j | | q+| j j | | j j | q+Wxc | d D]W \ } } } | \ } } | r
| j j | | j j | | q| j j | qWd
S( s$ record merge actions to the dirstateR8 R? R R R R R R R N( R t removet dropR- t normallookupt otherparentt normalR R (
R R R R? R R R R R R R R t flag( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt
recordupdatesh s^ c !
C s | } | j } zT| d" }
|
j } | d } d" g }
| rT | | g }
n | d" k rXy | j |
j } WnW t j k
r |
j d k r | j d } q t j t
d |
j n X| j rX| j rXt j
| | j } | rUg | D] } | D] } | ^ qq} | j d | d } | g }
qUqXn | ob| } | | } |
d d" k r| j j d d d k r| j j | j | j } g t | pt g D] } | | ^ q}
q| j | d | g }
n | j | j t | t | f \ } } } } | rlt | d
k rlt j t
d n | r|
| g k rt j t
d nU |
| g k r| r| j | j k rt j t
d
d t
d qn | r1|
j s
|
j r1t j t
d d t
d n xt |
j D]7 } |
j | j rAt j t
d | qAqAWn]| s| | k r| j d d t d | d d | j d d | d d d d d$ S|
| g | g f k r|
j d t } | s| d" k rt j | | j g } | | j | k rL| g }
q| rt
d } | d" k ryt
d } n t
d } t j | d | qt
d } t
d } t j | d | q| g }
qn t! } | r|
g }
ni |
| g k r|
j" g }
nH | r2|
j d t r2n+ |
d r]| j j# d d t r]t } n t$ | |
| |
| | | | | } | s| t | d f \ } } } } n | s| j d d t d | d | | j% j& d | j' n t( | | |
| | d! | } | se| j) | | t* | | | t j+ | j, d | se| j- j. | j qen Wd" | j/ X| s| j d d | d | d | d# n | S(% s
Perform a merge between the working directory and the given node
node = the node to update to, or None if unspecified
branchmerge = whether to merge between branches
force = whether to force branch merging or file overwriting
partial = a function to filter file lists (dirstate not updated)
mergeancestor = whether it is merging with an ancestor. If true,
we should accept the incoming changes for any prompts that occur.
If false, merging with an ancestor (fast-forward) is only allowed
between different named branches. This flag is used by rebase extension
as a temporary fix and should be avoided in general.
The table below shows all the behaviors of the update command
given the -c and -C or no options, whether the working directory
is dirty, whether a revision is specified, and the relationship of
the parent rev to the target rev (linear, on the same named
branch, or on another named branch).
This logic is tested by test-update-branches.t.
-c -C dirty rev | linear same cross
n n n n | ok (1) x
n n n y | ok ok ok
n n y n | merge (2) (2)
n n y y | merge (3) (3)
n y * * | --- discard ---
y n y * | --- (4) ---
y n n * | --- ok ---
y y * * | --- (5) ---
x = can't happen
* = don't-care
1 = abort: not a linear update (merge or update --check to force update)
2 = abort: uncommitted changes (commit and merge, or update --clean to
discard changes)
3 = abort: uncommitted changes (commit or update --clean to discard changes)
4 = abort: uncommitted changes (checked in commands.py)
5 = incompatible options (checked in commands.py)
Return the same tuple as applyupdates().
i t defaultt tips branch %s not founds max(%ln)R t preferancestort *Rz i s outstanding uncommitted mergess7 merging with a working directory ancestor has no effects nothing to merget hints# use 'hg update' or check 'hg heads's uncommitted changess use 'hg status' to list changess) uncommitted changes in subrepository '%s't preupdatet throwt parent1t parent2R) R R R s6 commit and merge, or update --clean to discard changess+ commit or update --clean to discard changess not a linear updates' merge or update --check to force updateR t updatestateRw Ni ( i i i i (0 t wlockR R. t branchtipR R t RepoLookupErrort lookupR$ R% R R t childrent successorssetsR t revsRy t configt changelogt commonancestorsheadsRl R R R RE Ro R R R R t hookR t
foregroundR R t
configboolR t vfsRX R R t
setparentsR' R R R t setbrancht release(! R R R R R R t
mergeancestorRw R R2 t wct plR t past
successorsR t nR R t cahsR t fp1t fp2t xp1t xp2R R R= R R, R R t stats( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyR s -
#&
!/6 " ! &(( t structR R R R R t i18nR t mercurialR R R$ R| R R R R R= R R t packR[ t unpackRF R t objectR R R R R R R R R R R R' R R ( ( ( s3 /usr/lib/python2.7/dist-packages/mercurial/merge.pyt <module> s, "T$ ! c Q
Copyright © 2017 || Recoded By Mr.Bumblebee