File: //usr/lib/python2.7/dist-packages/hgext/transplant.pyc
Xc @@ s d Z d d l m Z d d l Z d d l Z d d l m Z d d l m Z m Z m
Z
m Z m Z m
Z
m Z m Z m Z m Z m Z m Z m Z m Z d e
j f d YZ i Z e j e Z d Z d e f d
YZ d e f d YZ d
e f d YZ d Z d Z! e d d d d e d e d f d d g e d e d f d d e" 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 d& d' e# e d( f d d) e" e d* f d+ d, e" e d- f d d. d e d/ e d0 f g
e d1 d2 Z$ d3 Z% e j& Z& e& d4 d5 Z' e j( Z( e( d6 d7 Z) d8 Z* e' e) g Z+ d S(9 sV command to transplant changesets from another branch
This extension allows you to transplant changes to another parent revision,
possibly in another repository. The transplant is done using 'diff' patches.
Transplanted patches are recorded in .hg/transplant/transplants, as a
map from a changeset hash to its hash in the source repository.
i ( t absolute_importN( t _( t
bundlerepot cmdutilt errort exchanget hgt matcht merget nodet patcht registrart revlogt revsett scmutilt utilt TransplantErrorc B@ s e Z RS( ( t __name__t
__module__( ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR & s s ships-with-hg-coret transplantentryc B@ s e Z d Z RS( c C@ s | | _ | | _ d S( N( t lnodet rnode( t selfR R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt __init__2 s ( R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR 1 s t transplantsc B@ sG e Z d d d d Z d Z d Z d Z d Z d Z RS( c C@ sY | | _ | | _ | | _ | s9 t j | j | _ n i | _ t | _ | j d S( N( t patht transplantfilet openerR R t Falset dirtyt read( R R R R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR 7 s c C@ s t j j | j | j } | j r t j j | r xr | j j | j j D]R } t t j
| j d \ } } | j j
| g } | j t | | qR Wn d S( Nt :( t osR t joinR t existsR R t
splitlinest mapR t bint splitR t
setdefaultt appendR ( R t abspatht lineR R t list( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR B s "!c C@ s | j r | j r t j j | j s: t j | j n | j | j d } xe | j j D]T } xK | D]C } t t
j | j | j
f \ } } | j | d | d ql Wq_ W| j n t | _ d S( Nt wR s
( R R R R t isdirt mkdirR R t
itervaluesR$ t nodemodt hexR R t writet closeR ( R t fpR+ t tt lt r( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR2 J s
$!
c C@ s | j j | p g S( N( R t get( R R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR8 V s c C@ s8 | j j | g } | j t | | t | _ d S( N( R R' R( R t TrueR ( R R R R+ ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt setY s c C@ s; | j j | j } | r7 | | j | =t | _ n d S( N( R R8 R t indexR9 R ( R t
transplantR+ ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt remove^ s N( R R t NoneR R R2 R8 R: R= ( ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR 6 s t transplanterc B@ s e Z d Z d Z d d Z d Z e e d d Z d Z d Z
d Z d Z d Z
d
Z e d Z d Z d
Z d Z RS( c @ sm | | _ j d | _ t j | j | _ t | j d d | j | _ f d } | | _ d S( NR< R R c @ s) t j d d } t j d | S( NR< t editform( R t
mergeeditformR> t getcommiteditor( R@ ( t optst repo( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyRB k s ( t uiR! R R R R RB ( R RE RD RC RB ( ( RC RD s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR e s c C@ s t | | r$ | j j | } n t | | rv | j j | } | j j | g | d t } | | k rv t Sn x} | j j | D]i } t | | j s | j j | t S| j j | j } | | j j | g | d t k r t Sq Wt S( sm returns True if a node is already an ancestor of parent
or is parent or has already been transplantedt inclusive(
t hasnodet changelogt revt ancestorsR9 R R8 R R= R ( R RD R t parentt parentrevRI t reachableR5 t lnoderev( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt appliedp s" c
C@ s | d k r i } n t | } | j j \ } } g } t j | j | }
t |
_ d } } z,| j } | j
d } x| D]}
| |
} d |
t j | f } | j
| | | r | j j t d | q n | j j | } | j d p| j d s| d | k r@| j | | } q n | r| | k rqt j | | j d | n t j | | d t t | j j \ } } g } qn t } | | k rt } t | | st j | | j d | g qn t } | d t j k r| j d
sR| j j t d |
t j | f t } q| j | d
} | | k rt j t d t j | t j | f qn
| d } | rd } nm t j! d
d \ } } t" j# | d } t j$ | | | d |
} x | D] } | j% | q
W| j& | |
=| sA| r z yL | j' | | | j j( | | d | d | j d d | j d } Wn t) k
r| j& n X| r| r| j j* t d | t j | f n; | r$| j j* t d t j | t j | f n Wd | r>t" j+ | n Xq q W| j& | rt j | | j d | t j | | d t t n Wd | j, | | | j- j% | r| j. n | r| j. n Xd S( s: apply the revisions in revmap one by one in revision orderR< s %s:%ss% skipping already applied revision %s
t filtert logi t headsii RK s skipping merge changeset %s:%s
s %s is not a parent of %st prefixs hg-transplant-R, RC R s %s merged at %s
s %s transplanted to %s
N(/ R> t sortedt dirstatet parentsR
t difffeatureoptsRE R9 t gitt lockt transactionR0 t shortRO t warnR RH R8 R( R t pullt peerR t updateR RG R t nullidt notet lookupR t Abortt tempfilet mkstempR t fdopent diffR2 R3 t applyoneR R t statust unlinkt
saveseriesR t release( R RD t sourcet revmapt mergesRC t revst p1t p2t pullst diffoptsRY t trRI R t revstrRV t domerget skipmergeRK t patchfilet fdR4 t gent chunkt n( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt apply s
%
!
c C@ sZ | j j t d | | d | d | d } } } t j d d \ } } t j | d }
|
j d |
j d | |
j d
| |
j | d |
j z | j j d | t
j | t
j | f d
i | d d 6t j
| d 6d t j d t d | j t | d d !\ } } } Wd t j | X| | | f S( s0 arbitrarily rewrite changeset before applying its
filtering %s
i i i RS s hg-transplant-R, s # HG changeset patch
s
# User %s
s
# Date %d %d
s
s %s %s %st environt HGUSERt
HGREVISIONt onerrt errprefixs
filter failedN( RE Ri R Rd Re R Rf R2 R3 t systemR t
shellquoteR0 R1 R Rc t parselogt fileRj ( R RP R RH Ry t usert datet msgRz t
headerfileR4 ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyRP s$
)c
C@ s | d \ } } \ }
} } }
d |
| f } i | d 6} | rf | j | | | | \ } } }
n | r |
d t j | 7}
n | j j t d t j | | j j d | | |
f | r | r t j t d n | ry; t
} t j | j | | d | d d t
| } Wqt k
r} t j j | j d
} t j j | ryt j | n | j j } | } | j | | |
| | d | | j j t | d t t d
qXn d } | r)| j j \ } } | j | | t j | j d } n t j | j d | } | j |
| | d | d | d | j! } | s| j j" t d t j | d S| s| j# j
| | n | S( s> apply the patch in patchfile to the repository as a transplanti s %d %dt transplant_sources
(transplanted from %s)s applying %s
s %s %s
%s
s" can only omit patchfile if mergingt filest eolmodet seriesR s
s= fix up the working directory and run hg transplant --continuet t extraR t editors skipping emptied changeset %s
N($ RP R0 R1 RE Ri R R[ Ra R Rc R: R
R> R+ t ExceptionR R R! R" Rj RU Rq RQ R2 t strR RV t
setparentsR t alwayst roott exactt commitRB R\ R ( R RD R t clRy R RQ RP t manifestR t timet timezoneR t messageR R t instt
seriespathRq Rr t mR} ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyRh sP
$# " c C@ s" t j j t j j | j d S( Nt journal( R R R" R! ( R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt canresumeA s c
C@ sG t j j t j j | j d r | j | | | \ } } | rz | j j t d t j | t j | f q | j j t d t j | f n t j j | j d } t j j | s | j
j d S| j \ } } i } x$ | D] } | | | j
j | <q Wt j | | j | | | | | d S( s7 recover last transaction and apply remaining changesetsR s %s transplanted as %s
s %s skipped due to empty diff
R N( R R R" R! t recoverRE Ri R R0 R[ R R2 t
readseriesRH RI Rj R~ (
R RD Rm RC R} R R t nodesRo Rn ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt resumeD s$ $
c C@ s | j \ } } } } } t } | sA | sA | sA | d rY t j t d n | d }
t | d k r | j d r | j | d }
|
| k r t j t d t j |
t j | f q q t
} n i | d 6} z | j j \ } }
| |
k r9t j t d t j
|
n | rV| j | | d n | j d \ } } } } | s| s| s| s| r| j | | | d | d
| j } | st j t d n | s| j j | | qn d } | j | | f SWd Xd S(
s/ commit working directory using journal metadatai s transplant log file is corrupti RK s %s is not a parent of %sR s- working directory not at transplant parent %si R R s
commit failedN( t readlogR R Rc R t lenR8 Rb R0 R[ R9 RU RV R1 R Ri R RB R R: R> t unlog( R RD Rm RC R R R R RV R RK R Rq Rr t modifiedt addedt removedt deletedR} ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR [ sB
c C@ sp g } g } | } xQ | j j d j D]7 } | j d rL | } q+ n | j t j | q+ W| | f S( NR s # Merges( R R R# t
startswithR( R R% ( R R Ro t curR* ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR s c C@ s | s
d St j j | j s2 t j | j n | j d d } x2 t | D]$ } | j t j | | d qQ W| r | j d x+ | D] } | j t j | d q Wn | j d S( NR R, s
s # Merges
(
R R R- R. R RT R2 R0 R1 R3 ( R Rn Ro R RI R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyRk s "
!c C@ sN g } g } t j } t } d } d } x | j j D] } | rV | j | q: | j d rr | d } q: | j d r | d } q: | j d r t j | d } q: | j d r | j t j | d q: | j d s: t } | j | q: q: Wd | | f k r2t
j t d n | | | d
j
| | f S( Ns # User i s # Date s
# Node ID i
s # Parent i s # s, filter corrupted changeset (no user or date)s
( R R` R R> R R# R( R R% R9 R Rc R R! ( R R4 RV R R t inmsgR R R* ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR s.
c C@ s t j j | j s( t j | j n | j d d } | j d | | j d | | j d t j | | j d t j | d | r | j d t j | d n | j | j d | j d S( s, journal changelog metadata for later recoverR R, s
# User %s
s
# Date %s
s
# Node ID %s
s # Parent s
N(
R R R- R. R R2 R0 R1 t rstripR3 ( R R R R Rq Rr R R4 ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyRQ s !c C@ s | j | j d S( NR ( R R ( R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR s c C@ s> t j j | j d } t j j | r: t j | n d S( s remove changelog journalR N( R R R! R" Rj ( R t absdst( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR s c @ s f d } | S( Nc @ s j | r t S j j | d t j k r< t S j j | d } | j d } | r j | r t St S( Ni i R ( RO R RH RV R R` R R8 R9 ( R R t cnode( RD R R Rm ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt matchfn s ( ( R RD Rm R R ( ( RD R R Rm s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt transplantfilter s N( R R R RO R> R~ RP R Rh R R R R Rk R RQ R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR? d s l 4 - c C@ s6 y | j j | d k SWn t j k
r1 t SXd S( N( RH RI R> R t RevlogErrorR ( RD R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyRG s c C@ s t j | | | } g } g } t d } xQ| D]I} | j | | d } x | sd | j | } | d k r x8 | j | d D]# \ }
} | j d |
| f q Wd } qT | d k rT | j j | d } x* t
j | | | D] }
| j |
q Wd } qT qT W| d k r5| j | q4 | d k rQ| j | q4 | d
k raPq4 | d k r4 d
} d } Pq4 q4 W| j
| | f S( s# interactively transplant changesetss apply changeset? [ynmpcq?]:$$ &yes, transplant this changeset$$ &no, skip this changeset$$ &merge at this changeset$$ show &patch$$ &commit selected changesets$$ &quit and cancel transplant$$ &? (show this help)s ynmpcq?t ?i s %s: %s
t pi t yR t ct qN( ( ( R t show_changesetR t showR> t promptchoicet extractchoicesR2 RH RV R
Rg R( R3 ( RE RD R RC t displayerR Ro t promptR t actionR R5 RK R| ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt
browserevs s<
R< t sRm R s transplant changesets from REPOt REPOt bt branchs! use this source changeset as headt REVt at alls0 pull all changesets up to the --branch revisionsR t prunes
skip over REVR R s merge at REVRK s) parent to choose when transplanting merget et edits invoke editor on commit messagesRQ s% append transplant info to log messageR t continues7 continue last transplant session after fixing conflictsRP s! filter changesets through commandt CMDsC hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]...c O@ s* | j t | | | | SWd QXd S( s transplant changesets from another branch
Selected changesets will be applied on top of the current working
directory with the log of the original changeset. The changesets
are copied and will thus appear twice in the history with different
identities.
Consider using the graft command if everything is inside the same
repository - it will use merges and will usually give a better result.
Use the rebase extension if the changesets are unpublished and you want
to move them instead of copying them.
If --log is specified, log messages will have a comment appended
of the form::
(transplanted from CHANGESETHASH)
You can rewrite the changelog message with the --filter option.
Its argument will be invoked with the current changelog message as
$1 and the patch as $2.
--source/-s specifies another repository to use for selecting changesets,
just as if it temporarily had been pulled.
If --branch/-b is specified, these revisions will be used as
heads when deciding which changesets to transplant, just as if only
these revisions had been pulled.
If --all/-a is specified, all the revisions up to the heads specified
with --branch will be transplanted.
Example:
- transplant all changes up to REV on top of your current revision::
hg transplant --branch REV --all
You can optionally mark selected transplanted changesets as merge
changesets. You will not be prompted to transplant any ancestors
of a merged transplant, and you can merge descendants of them
normally instead of transplanting them.
Merge changesets may be transplanted directly by specifying the
proper parent changeset by calling :hg:`transplant --parent`.
If no merges or revisions are provided, :hg:`transplant` will
start an interactive changeset browser.
If a changeset application fails, you can fix the merge by hand
and then resume where you left off by calling :hg:`transplant
--continue/-c`.
N( t wlockt
_dotransplant( RE RD Rp RC ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR< s C
c @ s t j d } t j d } d } | | | | j d s\ | j d d | d <n | j d s | j d d | d <n t | | | } | j j \ } } t | d k r | t j k r t
j t d n | j d r| j
st
j t d
qn t j | | t j k rNt
j t d n | j d \ }
} } }
|
s| s| s|
rt
j t d
n | j d } | rlt j | | | j | } t | j | j d d } t | } x? | D]7 } y | j | j | Wqt
j k
r4qXqWt j | | | d t | d t \ } } n* | t j | j d d } d } z| j d r| j | | d S| j | | | j d r)t f d t j! | j d D f d } n } t j | j d d } i } | rx t j! | D] } j | | t" | <qlWn | j d s| rN | k r| | d | } n | | | d | } | j d r| } n( t# | | | \ } } | j$ | x' | D] } | | j% j& | <q+Wn x$ | D] } | | j% j& | <qUW| j' | | | | Wd | r| n Xd S( Nc s@ s) x" | D] } | | r | Vq q Wd S( N( ( RD t csetsR R ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt incwalkW s
c s@ s | s | j } n g } | | } x. | D]& } | j | j | | j q, Wx5 | j j | | d D] } | | rp | Vqp qp Wd S( s Yield all nodes that are ancestors of a head but not ancestors
of dest.
If no heads are specified, the heads of repo will be used.i N( RR R( t ancestorR RH t nodesbetween( RD t destRR R RJ t ctxt headR ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt transplantwalk\ s
$ c S@ s | j d rX | j d s< | j d s< | j d rT t j t d n d S| j d p | p | j d p | j d s t j t d n | j d r | j d s t j t d n | r t j t d q n d S(
NR R R R s; --continue is incompatible with --branch, --all and --mergeRm s9 no source URL, branch revision, or revision list provideds --all requires a branch revisions* --all is incompatible with a revision list( R8 R Rc R ( RC Rp ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt checkoptsj s - RQ R< RP i s no revision checked outR s no transplant to continues outstanding uncommitted mergesi s outstanding local changesRm R t onlyheadst forceR c 3@ s | ] } j | Vq d S( N( Rb ( t .0R7 ( Rm ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pys <genexpr> s c @ s | o | k S( N( ( t x( R t tf( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt <lambda> s R R R ( ( ( (( R R R8 t configR? RU RV R R R` R Rc R R R t checkunfinishedRi R R^ t
expandpathR$ Rb R: t addt RepoErrorR t getremotechangesRT R9 R> R R R t revranget intR t extendRH RI R~ ( RE RD Rp RC R R R t tpRq Rr R R R7 t dt
sourcerepoR^ RR t targetR t cleanupfnR Ro Rn t alltransplantst newmerges( ( R Rm R s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyR V s
!
! "
s transplanted([set])c C@ s] | r t j | | | } n | } t j g | D]% } | | j j d r1 | ^ q1 S( sD Transplanted changesets in set, or all transplanted changesets.
R ( R
t getsett basesetR R8 ( RD t subsetR R R7 ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt revsettransplanted s
t transplantedc K@ s. | j j d } | r* t j | p- d S( sE String. The node identifier of the transplanted
changeset if any.R R ( R R8 R0 R1 ( RD R t argsR} ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt kwtransplanted s c C@ s/ t j j d t t t d t d g d S( Ns transplant/journals transplant in progresss6 use 'hg transplant --continue' or 'hg update' to abort( R t unfinishedstatesR( R9 R R ( RE ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt extsetup s (, t __doc__t
__future__R R Rd t mercurial.i18nR t mercurialR R R R R R R R R0 R
R R R
R R Rc R t cmdtablet commandt
testedwitht objectR R R? RG R R> R R< R t revsetpredicateR t templatekeywordR R t
i18nfunctions( ( ( s4 /usr/lib/python2.7/dist-packages/hgext/transplant.pyt <module> sH ^. ( 8 u