-=[ Mr. Bumblebee ]=-
_Indonesia_
๓
๒๊Oc @@ sข d Z d d l m Z d d l m Z m Z d d l j Z d d Z
d d e d d e j d Z
e d Z e d Z d
Z d d d Z d Z d S(
sI Display what revisions are missing in 'other' from 'this' and vice versa.i ( t absolute_import( t logt symbol_versioningNc
c@ sฮ | j t j } d } | d k r- i } n x | D] } t | d k ra | \ } } d } n | \ } } } | j | } | r | j | }
n d }
t j | | | d |
d | j | Vq4 Wd S( Ni i t deltat tags(
t
revision_treet
_mod_revisiont
NULL_REVISIONt Nonet lent get_revisiont get_revision_deltaR t LogRevisiont get( t revisionst revision_sourcet verboset rev_tag_dictt last_treet last_rev_idt revt revnot rev_idt merge_depthR ( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt iter_log_revisions s
t allc
C@ sน t j | r= t j d t d d | d k r= | } q= n | d k rR t } n | j zK | j z/ t | | d | d | d | d | d | SWd | j XWd | j Xd S(
sg Find revisions from each side that have not been merged.
:param local_branch: Compare the history of local_branch
:param remote_branch: versus the history of remote_branch, and determine
mainline revisions which have not been merged.
:param restrict: ('all', 'local', 'remote') If 'all', we will return the
unique revisions from both sides. If 'local', we will return None
for the remote revisions, similarly if 'remote' we will return None for
the local revisions.
:param include_merged: Show mainline revisions only if False,
all revisions otherwise.
:param backward: Show oldest versions first when True, newest versions
first when False.
:param local_revid_range: Revision-id range for filtering local_branch
revisions (lower bound, upper bound)
:param remote_revid_range: Revision-id range for filtering remote_branch
revisions (lower bound, upper bound)
:param include_merges: Deprecated historical alias for include_merged
:return: A list of [(revno, revision_id)] for the mainline revisions on
each side.
sA include_merges was deprecated in 2.5. Use include_merged instead.t
stackleveli t restrictt include_mergedt backwardt local_revid_ranget remote_revid_rangeN( R t deprecated_passedt warnt DeprecationWarningR t Falset lock_readt _find_unmergedt unlock( t local_brancht
remote_branchR R R R R t include_merges( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt
find_unmerged3 s&
c
C@ sฎ | d k r d S| s g Sg } | } | } xh | | k r | j | g } | j | } | sf Pn | j t | | f | d } | d 8} q/ W| sช | j n | S( s Enumerate the mainline revisions for these revisions.
:param ancestry: A set of revisions that we care about
:param graph: A Graph which lets us find the parents for a revision
:param tip_revno: The revision number for the tip revision
:param tip: The tip of mainline
:param backward: Show oldest versions first when True, newest versions
first when False.
:return: [(revno, revision_id)] for all revisions in ancestry that
are left-hand parents from tip, or None if ancestry is None.
i i N( R t get_parent_mapR
t appendt strt reverse(
t ancestryt grapht tip_revnot tipR t mainlinet curt cur_revnot
parent_mapt parents( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt _enumerate_mainlinee s$
c C@ sะ | d k r d S| s g S| j } g | D]3 \ } } } }
| | k r- d | | | |
f ^ q- } | s~ t j | } n g } xE | D]= \ } }
} } } | j d j t t | |
| f q W| S( s, Enumerate the revisions for the ancestry.
:param branch: The branch we care about
:param ancestry: A set of revisions that we care about
:param graph: A Graph which lets us find the parents for a revision
:param tip_revno: The revision number for the tip revision
:param tip: The tip of the ancsetry
:param backward: Show oldest versions first when True, newest versions
first when False.
:return: [(revno, revision_id)] for all revisions in ancestry that
are parents from tip, or None if ancestry is None.
i t .N( R t iter_merge_sorted_revisionsR t reverse_by_depthR, t joint mapR- ( t branchR/ R0 R1 R2 R t merge_sorted_revisionst revidt nt dt et revlinet seqR R R t end_of_merge( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt _enumerate_with_merges s ' ,c C@ sT | d k s | d k r | Sg | D]- } | j | d | d | d r# | ^ q# S( Ni i ( R t
is_between( R0 t revst revid_rangeR ( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt _filter_revsญ s
c C@ sz | j \ } } | j \ } }
| | k rF | |
k rF g g f S| j j | j } | d k r
d } | j |
| g }
nd | d k rฏ d }
| j | |
g } n: | d k rั t d | f n | j | |
\ } }
| r(t | | | | | | } t | |
| | |
| } n0 t | | | | | } t |
| | |
| } t | | | t | | | f S( sS See find_unmerged.
The branches should already be locked before entering.
t remotet localR s6 param restrict not one of "all", "local", "remote": %rN(
t last_revision_infot
repositoryt get_graphR t find_unique_ancestorst
ValueErrort find_differenceRG R8 RK ( R' R( R R R R R t local_revnot local_revision_idt remote_revnot remote_revision_idR0 t local_extrat remote_extrat localst remotes( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyR% ด s>
c C@ s1 g | D] } | | | f ^ q } | j | S( N( t sort( R t history_mapt r( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt sorted_revisionsแ s #
( t __doc__t
__future__R t bzrlibR R t bzrlib.revisiont revisionR R R R# t DEPRECATED_PARAMETERR* t TrueR8 RG RK R% R_ ( ( ( s2 /usr/lib/python2.7/dist-packages/bzrlib/missing.pyt <module> s / & " +
Copyright © 2017 || Recoded By Mr.Bumblebee