3 _Af @sRddlmZddlZddlZddlmZddlmZejdZ GdddeZ dS))print_functionN)Command) GitCommandz"^\s*Change-Id: I([0-9a-f]{40})\s*$c@sTeZdZdZdZdZdZddZddZd d Z d d Z d dZ ddZ ddZ dS) CherryPickTzCherry-pick a change.z %prog z '%prog' cherry-picks a change from one branch to another. The change id will be updated, and a reference to the old change id will be added. cCsdS)N)selfprrE/home/qytech/356xLinux510-101server/.repo/repo/subcmds/cherry_pick.py_Options&szCherryPick._OptionscCst|dkr|jdS)N)lenUsage)roptargsrrr ValidateOptions)s zCherryPick.ValidateOptionsc Csh|d}tddd|gddd}|jdkrDt|jtjdtjd|jj}tddd |gdd }|jdkrtd tjdtjd|j|j}tdd |gddd}|j}t|jtjdt|jtjd|dkr<|j ||}tdd d ddgdddd}|j j ||j j |jdkrdtdtjdtjdn(tdt|j |tjdttjddS)Nrz rev-parsez--verifyT)capture_stdoutcapture_stderr)filer zcat-filecommit)rz,error: Failed to retrieve old commit messagez cherry-pickz--amendz-F-) provide_stdinrrz&error: Failed to update commit messagezvNOTE: When committing (please see above) and editing the commit message, please remove the old Change-Id-line and add:)rWaitprintstderrsysexitstdoutstrip _StripHeader _Reformatstdinwriteclose _GetReference) rrr referencersha1old_msgstatusnew_msgrrr Execute-sF           zCherryPick.ExecutecCs tj|S)N) CHANGE_ID_REmatch)rlinerrr _IsChangeId]szCherryPick._IsChangeIdcCsd|S)Nz(cherry picked from commit %s)r)rr%rrr r#`szCherryPick._GetReferencecCs$|j}dj||jdddS)N r ) splitlinesjoinindex)rZ commit_msglinesrrr rcszCherryPick._StripHeaderc Csxg}x$|jD]}|j|s|j|qWy|djdkrF|jdWntk r\YnX|j|j|dj|S)Nr r/r.)r0r-appendr IndexErrorr#r1)rr&r%r(r,rrr rgs zCherryPick._ReformatN)__name__ __module__ __qualname__common helpSummary helpUsagehelpDescriptionr rr)r-r#rrrrrr rs0r) __future__rrercommandr git_commandrcompiler*rrrrr s