| Disable Functions: Path : /usr/lib64/python2.7/site-packages/hgext/ |
| Current File : //usr/lib64/python2.7/site-packages/hgext/transplant.pyc |
�
Hq�Qc @ 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 d d l m Z m
Z
m Z m Z m Z m Z d d l 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 d0 d e d1 � e d2 � f g
e d3 � � d4 � � Z! d5 � Z" d6 � Z# d7 � Z$ e" e# g Z% d S(8 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 _N( t short( t
bundlerepot hgt merget match( t patcht revlogt scmutilt utilt errort cmdutil( t revsett
templatekwt TransplantErrorc B s e Z RS( ( t __name__t
__module__( ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR s t internalt transplantentryc B s e Z d � Z RS( c C s | | _ | | _ d S( N( t lnodet rnode( t selfR R ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt __init__ s ( R R R ( ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR 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 ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR % 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( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR 0 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# R t hexR R t writet closeR ( R t fpR* t tt lt r( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR0 8 s
$!
c C s | j j | � p g S( N( R t get( R R ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR6 D s c C s8 | j j | g � } | j t | | � � t | _ d S( N( R R& R' R t TrueR ( R R R R* ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt setG s c C s; | j j | j � } | r7 | | j | � =t | _ n d S( N( R R6 R t indexR7 R ( R t
transplantR* ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt removeL s N( R R t NoneR R R0 R6 R8 R; ( ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR $ s t transplanterc B s� e Z d � Z d � Z i d � Z d � Z e e d d � Z d � Z d � Z
d � Z d � Z d � Z
e d
� Z d � Z d � Z d
� Z RS( c C s[ | | _ | j d � | _ t j | j � | _ t | j d d | j �| _ d | _ d S( NR: R R ( t uiR R R R R R< t editor( R R> t repo( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR S 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 ancestorsR7 R R6 R R; R ( R R@ t nodet parentt parentrevRD t reachableR3 t lnoderev( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt applied[ s" c C s� t | � } | j j � \ } } g } t j | j | � }
t |
_ d } } }
z| j � } | j
� } | j d � }
x�| D]�} | | } d | t | � f } | j
| | | � r� | j j t d � | � q� n | j j | � } | j d � p | j d � s�| d | k r8| j | � | } q� n | r�| | k rf| j | j � d | �n t j | | d t t d � | j j � \ } } g } q�n t } | | k r�t } t | | � s�| j | d | g �q�n t } | d t j k r�| j d
� s>| j j t d � | t | � f � t } q�| j | d
� } | | k r�t j t d � t | � t | � f � � q�n
| d } | r�d } nm t j d
d � \ } } t! j" | d � } t j# | | | d |
�} x | D] } | j$ | � q�W| j% � | | =| s'| 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 | � f � n5 | r| j j) t d � t | � t | � f � n Wd | rt! j* | � n Xq� q� W|
j% � | rl| j | j � d | �t j | | d t t d � n Wd | j+ | | � | j, j$ � |
r�|
j- � n | j- � | j- � 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 headsi����i RG s skipping merge changeset %s:%s
s %s is not a parent of %st prefixs hg-transplant-R+ t optsR s %s merged at %s
s %s transplanted to %s
N(. t sortedt dirstatet parentsR t diffoptsR> R7 t gitR< t wlockt lockt transactionR RK t warnR RC R6 R' t pullt peerR t updateR RB R t nullidt notet lookupR t Abortt tempfilet mkstempR t fdopent diffR0 R1 t applyoneR R t statust unlinkt
saveseriesR t release( R R@ t sourcet revmapt mergesRP t revst p1t p2t pullsRT RW RV t trRD RF t revstrRS t domerget skipmergeRG t patchfilet fdR2 t gent chunkt n( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt applyq s�
"
$
c
C sc | j j t d � | � | d | d | d } } } t j d d � \ } } t j | d � }
|
j d � |
j d | � |
j d
| � |
j | d � |
j � z� t j
d | t j | � t j | � f d
i | d d 6t j
| � d 6d t j d t d � d | j j �| j t | � � d d !\ } } } Wd t j | � X| | | f S( s0 arbitrarily rewrite changeset before applying its
filtering %s
i i i RO 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 failedt outN( R> Rf R Ra Rb R Rc R0 R1 R t systemt
shellquoteR R/ R` t foutt parselogt fileRg ( R RL RF RC Ru t usert datet msgRv t
headerfileR2 ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyRL � 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 d | | |
f � | r� | r� t j t d � � � n | r�y; t
� } t j | j | | d | d d �t
| � } Wq�t k
r�} t j j | j d
� } t j j | � rvt j | � n | j j � } | } | j | | |
| | d | �| j j t | � d � t t d
� � � q�Xn 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 | � � 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
s1 fix up the merge and run hg transplant --continuet t extraR R? s skipping emptied changeset %s
N($ RL R R/ R> Rf R R R^ R R` R8 R R< R* t ExceptionR R R R! Rg RR Rn RM R0 t strR RS t
setparentsR t alwayst roott exactt commitR? RY R ( R R@ RF t clRu R RM RL t manifestR� t timet timezoneR� t messageR� R� t instt
seriespathRn Ro t mRy ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyRe � sN
$ " c
C s t j j t j j | j d � � rn | j | | | � \ } } | j j t d � t | � t | � 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 changesetst journals %s transplanted as %s
R� N( R R R! R t recoverR> Rf R R R R0 t
readseriesRC RD Rg Rz (
R R@ Rj RP Ry RF R� t nodesRl Rk ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt resume* 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 |
� t | � f � � q� q� t } n i | d 6} | j
� } z� | j j � \ }
} |
|
k r?t j t d � t
j |
� � � n | r\| j |
| d � n | j | | | d | d | j �} | s�t j t d
� � � n | s�| j j | | � n | j � | | f SWd | j � Xd S( s/ commit working directory using journal metadatai s transplant log file is corrupti RG s %s is not a parent of %sR� s' working dir not at transplant parent %sR� R? s
commit failedN( t readlogR R R` R t lenR6 R_ R R7 RV RR RS R R/ R� R� R? R R8 t unlogRi ( R R@ Rj RP RF R� R� R� RS R RG R� RV Rn Ro Ry ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR� < s>
"
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� Rl t curR) ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR� d 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 RQ R0 R R/ R1 ( R Rk Rl R� RD R� ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyRh p 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$ R7 R R` R R ( R R2 RS R� RF t inmsgR� R� R) ( ( s6 /usr/lib64/python2.7/site-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 R0 R R/ t rstripR1 ( R R� R� R� Rn Ro R R2 ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyRM � s !c C s | j | j d � � S( NR� ( R� R ( R ( ( s6 /usr/lib64/python2.7/site-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! Rg ( R t absdst( ( s6 /usr/lib64/python2.7/site-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� ( RK R RC RS R R] R R6 R7 ( RF R� t cnode( R@ R� R Rj ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt matchfn� s ( ( R R@ Rj R� R� ( ( R@ R� R Rj s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt transplantfilter� s N( R R R RK Rz RL R R< Re R� R� R� Rh R� RM R� R� R� ( ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR= R s j 3 ( c C s6 y | j j | � d k SWn t j k
r1 t SXd S( N( RC RD R< R
t RevlogErrorR ( R@ RF ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyRB � s c C s� d � } t j | | | � } g } g } xJ| D]B} | j | | � d } x� | s| j t d � � } | d k r� | | � d } qQ | d k r� | j j | � d }
x* t j | |
| � D] } | j
| � q� Wd } qQ | d
k rQ | j
t d � � d } qQ qQ W| d k r+| j | � q1 | d k rG| j | � q1 | d k rWPq1 | d
k r1 d } d } Pq1 q1 W| j � | | f S( s# interactively transplant changesetsc S s | j t d � � d S( Ns� y: transplant this changeset
n: skip this changeset
m: merge at this changeset
p: show patch
c: commit selected changesets
q: cancel transplant
?: show this help
( R0 R ( R> ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt
browsehelp� s s apply changeset? [ynmpcq?]:t ?t pi t yRy R� t ct qs no such option
N( R� Ry R� R� R� ( ( (
R t show_changesett showR< t promptR RC RS R Rd R0 R' R1 ( R> R@ R� RP R� t displayerR Rl RF t actionRG Rx ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt
browserevs� s@
R: t sRj 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 REVRG s) parent to choose when transplanting merget et edits invoke editor on commit messagesRM s% append transplant info to log messageR� t continues7 continue last transplant session after fixing conflictsRL s! filter changesets through commandt CMDsC hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]...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 d � r� t j | _ n | j j � \ } } t
| � d k r� | t j k r� t j
t d � � � n | j d
� s�| t j k r5t j
t d � � � n | j � d \ }
} } }
|
si| si| si|
r�t j
t d
� � � q�n | j d � } | rt j | | | j | � � } t | j | j d d � � } t j | | | d | d t �\ � } } n* | � t � j | j d d � � } d } z�| j d
� rU| j | � | � d S| j | � | � � | j d � r�t � f d � t j � | j d � � D� � � � � f d � } n � } t � j | j d d � � } i } | r(x� t j � | � D] } � j | � | t | � <qWn� | j d � s>| r�� | k rb| � | d | �} n | � | | d | �} | j d � r�| } n( t | � | | � \ } } | j | � x' | D] } | | � j! j" | � <q�Wn x$ | D] } | | � j! j" | � <q�W| j# | � | | | � Wd | r8| � n Xd 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 changsets 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`.
c s s) x" | D] } | | � r | Vq q Wd S( N( ( R@ t csetsR RF ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt incwalk2 s
c s s� | s | j � } n g } x* | D]" } | j | j j | | � � q" Wx5 | j j | | � d D] } | | � rb | Vqb qb 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( RN R' RC t ancestort nodesbetween( R@ t destRN R RE t headRF ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt transplantwalk7 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 --mergeRj s8 no source URL, branch revision or revision list provideds --all requires a branch revisions* --all is incompatible with a revision list( R6 R R` R ( RP Rm ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt checkoptsD s - RM R: RL R� i s no revision checked outR� s outstanding uncommitted mergesi s outstanding local changesRj R� t onlyheadst forceNR� c 3 s | ] } � j | � Vq d S( N( R_ ( t .0R5 ( Rj ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pys <genexpr>| s c s � | � o | � k S( N( ( t x( R� t tf( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt <lambda>~ s R R� R ( ( ( ($ R R� R6 t configR= R t commitforceeditorR? RR RS R� R R] R` R Rf R R[ t
expandpathR# R_ R t getremotechangesR7 R< R� R� R8 R t revranget intR� t extendRC RD Rz ( R> R@ Rm RP R� R� R� t tpRn Ro R� R� R5 t dt
sourcerepoR[ RN R� t cleanupfnR� Rl Rk t alltransplantst newmerges( ( R� Rj R� s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyR: � sx C
! "
c C sT | r t j | | | � } n | } g | D]% } | | j � j d � r+ | ^ q+ S( s` ``transplanted([set])``
Transplanted changesets in set, or all transplanted changesets.
R� ( R t getsetR� R6 ( R@ t subsetR� R� R5 ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt revsettransplanted� s c K s. | j � j d � } | r* t j | � p- d S( sT :transplanted: String. The node identifier of the transplanted
changeset if any.R� R� ( R� R6 R R/ ( R@ t ctxt argsRy ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt kwtransplanted� s c C s t t j d <t t j d <d S( Nt transplanted( R� R t symbolsR� R
t keywords( R> ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt extsetup� s
(& t __doc__t mercurial.i18nR R Ra t mercurial.nodeR t mercurialR R R R R R R R R
R R R
R` R t cmdtablet commandt
testedwitht objectR R R= RB R� R< R R: R� R� R� t
i18nfunctions( ( ( s6 /usr/lib64/python2.7/site-packages/hgext/transplant.pyt <module> sD "..� m + �