403Webshell
Server IP : 217.160.0.244  /  Your IP : 216.73.217.138
Web Server : Apache
System : Linux infong-eu155 4.4.400-icpu-108 #2 SMP Wed Feb 11 11:51:01 UTC 2026 x86_64
User : u100174116 ( 6746176)
PHP Version : 8.5.10
Disable Function : NONE
MySQL : OFF  |  cURL : ON  |  WGET : ON  |  Perl : ON  |  Python : OFF  |  Sudo : OFF  |  Pkexec : OFF
Directory :  /lib/python3/dist-packages/breezy/__pycache__/

Upload File :
current_dir [ Writeable ] document_root [ Writeable ]

 

Command :


[ Back ]     

Current File : /lib/python3/dist-packages/breezy/__pycache__/conflicts.cpython-313.pyc
�

p��g�-����SSKrSSKrSSKJr \"\"5S5 SSKJrJrJrJrJ	r	J
r
 "SS\R5r\	R\\4"5r\R!SSS	5 \R!S
S
S5 \R!SS
S5 \R!SSS5 S
\l"SS\R$5r"SS\R5rSSjrSr"SS5r"SS5rg)�N�)�lazy_importzX

from breezy import (
    workingtree,
    )
from breezy.i18n import gettext, ngettext
)�commands�errors�option�osutils�registry�tracec�P�\rSrSrSrS\R"SSS9/rSS/rSS	jr	S
r
g)
�
cmd_conflicts�&a>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 brz resolve when you have fixed a problem.
    �	directory�textz(List paths of files with text conflicts.��help�resolvezconflict-typesc�J�[RRU5SnUR5HmnU(a<URS:waMUR
R
URS-5 MFUR
R
[U5S-5 Mo g)Nrz
text conflict�
)	�workingtree�WorkingTree�open_containing�	conflicts�
typestring�outf�write�path�str)�selfrr�wt�conflicts     �2/usr/lib/python3/dist-packages/breezy/conflicts.py�run�cmd_conflicts.run:ss��
�
$�
$�
4�
4�Y�
?��
B������H���&�&�/�9���	�	����
�
�� 4�5��	�	����H�
�� 4�5�
'��N)F�.)�__name__�
__module__�__qualname__�__firstlineno__�__doc__r�Option�
takes_options�	_see_alsor"�__static_attributes__r%r$r!rr&s6���G�	��
�
�f�#M�N��M��,�-�I�6r$r�autoz2Detect whether conflict has been resolved by user.�donezMarks the conflict as resolved.z	take-this�	take_thisz@Resolve the conflict preserving the version in the working tree.z
take-other�
take_otherz<Resolve the conflict taking the merged version into account.c�(^�\rSrSrU4SjrSrU=r$)�ResolveActionOption�Yc�.>�[TU]SSS[S9 g)N�actionzHow to resolve the conflict.T)�value_switchesr	)�super�__init__�resolve_action_registry)r�	__class__s �r!r;�ResolveActionOption.__init__Zs!���
����*��,�		�	
r$r%)r'r(r)r*r;r/�
__classcell__)r=s@r!r5r5Ys
���
�
r$r5c�f�\rSrSrSrS/rS/rS\R"SSS9\	"5/r
S	/rS
SjrSr
g
)�cmd_resolve�ca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 "brz resolve" to automatically mark
    text conflicts as fixed, "brz resolve FILE" to mark a specific conflict as
    resolved, or "brz resolve --all" to mark all conflicts as resolved.
    �resolvedzfile*r�allz#Resolve all conflicts in this tree.rrNc���U(aSU(a[R"[S55eUcSn[RRU5SnUcSnO,[RR
X5upQUcUcSnOSn[XQUS9upgUS:Xa�Uc�US:�a|[R"[SSXg-
5Xg-
5 [R"[S	55 UR5H"n[R"[U55 M$ g
[R"[S55 g[R"[SS
Xg-
5RXg-
U55 g)Nz.If --all is specified, no FILE may be providedr&rr1r0)r8z%d conflict auto-resolved.z%d conflicts auto-resolved.zRemaining conflicts:rzAll conflicts resolved.z${0} conflict resolved, {1} remainingz%{0} conflicts resolved, {1} remaining)r�CommandError�gettextrrr�open_containing_pathsrr
�note�ngettextrr�format)	r�	file_listrDr8r�tree�before�afterr s	         r!r"�cmd_resolve.runxsM�����)�)��L�M���� ��	��*�*�:�:�9�E�a�H�D��~����)�5�5�K�K���O�D��~��$�#�F�#�F����?�
���V��	� 1��q�y��
�
��4�5����
�N�
��
�
�7�#9�:�;� $��� 0�H��J�J�s�8�}�-�!1���
�
�7�#<�=�>���J�J��:�;��N���&����/�
r$r%)NFNN)r'r(r)r*r+�aliases�
takes_argsrr,r5r-r.r"r/r%r$r!rArAcsF��
�G��l�G���J���
�
�e�"G�H����M�
�
�I�.r$rAc���SnUR5 UR5n[U5nUc/nUn	OURXX#5up�U	H&n
U
R	X@5 U
RU5 M( [U5nURU5 SSS5 UcWnWU4$![a URU
5 Mvf=f![Ra NIf=f!,(df   NS=f)apResolve 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)�lock_tree_writer�len�select_conflicts�do�cleanup�NotImplementedError�append�
set_conflictsr�UnsupportedOperation)rM�paths�
ignore_misses�	recursiver8�nb_conflicts_after�tree_conflicts�nb_conflicts_before�
new_conflicts�
to_processr s           r!rr�s�����	
�	�	�	����)��!�.�1���=��M�'�J�(6�(G�(G��]�)�%�M�#�H�
/����F�)�� � ��&�#�	�!$�]�!3�����}�-�%
 �*�!�0��� 2�2�2��'�
/��$�$�X�.�
/��
�*�*�	��	��'
 �	�sM�=C!�"B%�3C!�8C�%C�C!�C�C!�C�C!�C�C!�!
C/c�0�Sn[R"US-U5 Sn[
R"US-5 Sn[
R"US-5 SnU(d[R"U5eg![a)nUR[R:waeSnAN�SnAff=f![a)nUR[R:waeSnAN�SnAff=f![a)nUR[R:waeSnAN�SnAff=f)zqRestore a conflicted file to the state it was in before merging.

Only text restoration is supported at present.
Fz.THISTNz.BASEz.OTHER)	r�rename�OSError�errno�ENOENT�os�unlinkr�
NotConflicted)�filename�
conflicted�es   r!�restorerp�s���
�J�����x�'�)�8�4��
��
�	�	�(�W�$�%��
��
�	�	�(�X�%�&��
���"�"�8�,�,������7�7�e�l�l�"��#�������7�7�e�l�l�"��#�������7�7�e�l�l�"��#���sE�A6�B,�C"�6
B)�B$�$B)�,
C�6C�C�"
D�,D�Dc�h�\rSrSrSrSSjrSrSrSrSr	S	r
S
rSrSr
S
rSrSSjrSrg)�ConflictList��zDList of conflicts.

Typically obtained from WorkingTree.conflicts()
Nc�P�[RU5 Uc/UlgXlg�N)�objectr;�_ConflictList__list)rrs  r!r;�ConflictList.__init__�s ����������D�K�#�Kr$c�2�[UR5S:H$)Nr�rUrw�rs r!�is_empty�ConflictList.is_empty�s���4�;�;��1�$�$r$c�,�[UR5$rurzr{s r!�__len__�ConflictList.__len__�s���4�;�;��r$c�,�[UR5$ru)�iterrwr{s r!�__iter__�ConflictList.__iter__s���D�K�K� � r$c� �URU$ru)rw)r�keys  r!�__getitem__�ConflictList.__getitem__s���{�{�3��r$c�8�URRU5$ru)rwrZ�rr s  r!rZ�ConflictList.appends���{�{�!�!�(�+�+r$c�0�[U5[U5:H$ru)�list�r�
other_lists  r!�__eq__�ConflictList.__eq__
s���D�z�T�*�-�-�-r$c��X:X+$rur%r�s  r!�__ne__�ConflictList.__ne__
s���'�'r$c�8�SRUR5$)NzConflictList({!r}))rKrwr{s r!�__repr__�ConflictList.__repr__s��#�*�*�4�;�;�7�7r$c#�8# �UHn[U5v� M g7f)z,Generate strings for the provided conflicts.N)rr�s  r!�
to_strings�ConflictList.to_stringss����H��h�-���s�c�^�UH'nUR(dMURU5 M) g)z;Remove the THIS, BASE and OTHER files for listed conflicts.N)�	has_filesrX)rrMr s   r!�remove_files�ConflictList.remove_filess&���H��%�%�����T�"�r$c���[U5n[5n[5n[5nUH�n	Sn
U	RU;aSn
URU	R5 U(aB[R
"XYR5(aSn
URU	R5 U
(aUR
U	5 M�UR
U	5 M� USLa�UVs/sHo�U;dM
UPM snHln[RRURU55(d[SRU55 MR[SRU55 Mn Xx4$s snf)zrSelect the conflicts associated with paths in a tree.

:return: a pair of ConflictLists: (not_selected, selected)
FTz{} does not existz{} is not conflicted)�setrrr�addr�
is_inside_anyrZrj�exists�abspath�printrK)
rrMr]r^�recurse�path_set�selected_pathsrc�selected_conflictsr �selected�prs
             r!rV�ConflictList.select_conflictss!��
�u�:�����$��
�)�^���H��H��}�}��(����"�"�8�=�=�1���(�(��=�=�A�A�#�H�"�&�&�x�}�}�5��"�)�)�(�3��$�$�X�.����$�$)�E�E�q�n�-D��E�E���w�w�~�~�d�l�l�4�&8�9�9��-�4�4�T�:�;��0�7�7��=�>�	F�
�0�0��Fs�	E(�,E()�__listru)FF)r'r(r)r*r+r;r|rr�r�rZr�r�r�r�r�rVr/r%r$r!rrrr�sC���
$�%� �!� �,�.�(�8� �
#�1r$rrc�B�\rSrSr%Sr\\S'SrSrSr	Sr
SrS	rg
)�Conflicti@zBase class for conflicts.rc��Xlgru�r)rrs  r!r;�Conflict.__init__Es���	r$c�,�[UR5e)z>The names of the files generated to help resolve the conflict.)rY�associated_filenamesr{s r!r��Conflict.associated_filenamesHs��!�$�";�";�<�<r$c���UR5H)n[R"URU55 M+ g![a*nUR
[
R:waeSnAM]SnAff=fru)r�r�
delete_anyr�rgrhri)rrM�fnameros    r!rX�Conflict.cleanupLs[���.�.�0�E�
��"�"�4�<�<��#6�7�1���
��7�7�e�l�l�*��+��
�s�%?�
A3�	A.�.A3c�,�[UR5e)z�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.
)rYrW)rr8rMs   r!rW�Conflict.doTs��"�$�'�'�*�*r$c�,�[UR5e)z-Return a string description of this conflict.)rY�describer{s r!r��Conflict.describe]s��!�$�-�-�0�0r$r�N)
r'r(r)r*r+r�__annotations__r;r�rXrWr�r/r%r$r!r�r�@s#��#��O��=��+�1r$r�)NFFr1)rhrjr�globals�rrrrr	r
�Commandr�Registryrr<�register�default_key�RegistryOptionr5rArrprrr�r%r$r!�<module>r�s��(
�	�$���I��	�A�@�6�H�$�$�6�>#�+�+�C��H�5�7��� � �
�F�H��� � ���1R�S�� � ���F��
� � ���B��
'-��#�
�&�/�/�
�C�(�"�"�C�L&3�R-�8O1�O1�d1�1r$

Youez - 2016 - github.com/yon3zu
LinuXploit