ó é˜*Nc@sødZddlZddlZddlZddlZddlZddlmZd„Zd„Zd„Z d„Z ddd„Z d ej fd „ƒYZ d e fd „ƒYZdS( sø Advanced merge tools for git rerere, sloppy commits and parametrization. Wizard requires infrastructure for reusing merge resolutions across many repositories, due to the number of user installs and highly repetitive conflict resolution process. This environment results in a number of unique challenges: 1. Users are commonly very sloppy with their text editors and will frequently change the line-ending style of their file. Because Git respects newline choice when core.autocrlf is off, a file that flips newline style will result in a full merge conflict. 2. We version user configuration files, which means that there will always be a set of changes between upstream and ours. Since Git refuses to automatically merge changes that are too close to each other, these frequently result in spurious merge commits. Furthermore, both of these make it difficult to reuse rerere resolutions across installations. Thus, an advanced Wizard merge has the following properties: 1. Wizard will perform a full scan of all files that were different between common and ours, filter out those that are binary (using as close to the Git heuristic as possible) and then check among common, ours and theirs if the newlines match. The newline style of theirs always takes precedence. 2. Wizard will genericize the ours copy so that it matches common and theirs, and reparametrize it once the merge is finished. Consumers of this function should be careful to appropriately reparametrize if there are conflicts (we can't do it any earlier, because we want clean rerere postimages). Usage of this functionality is primarily through the :func:`merge` function; see that function more usage information. While the ``git`` and ``newline`` functions published by this module are public, use of these functions outside of this module is discouraged. i’’’’N(tshellc GsAtjd„|DƒŒ}tjdd|dddt|Œ}|S(sL Convenience wrapper for ``git commit-tree``. Writes an empty log. css|]}d|gVqdS(s-pN((t.0tp((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pys 8stgits commit-treetinputttlog(t itertoolstchainRtevaltTrue(ttreetparentst parent_argstcommit((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pytgit_commit_tree4scCs‚tjddd||ƒjƒjdƒ}g}xK|D]C}|jƒ\}}}|dkr7|dkr7|j|ƒq7q7W|S(sf Returns a list of files that are text and are different between commits ``a`` and ``b``. Rtdiffs --numstats t-(RR tstriptsplittappend(tatbtlinestfilestlinetaddedtdeletedtname((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyt git_diff_text=s* cCs t|dƒ}|jƒ|jS(s Determines the newline style of ``filename``. This will be a string if only one newline style was find, or a tuple of newline types found. tU(topentreadtnewlines(tfilenametf((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyt get_newlineKs cCs;t|dƒjƒjd|ƒ}t|dƒj|ƒdS(sa Replaces the detected newline style of ``filename`` with ``dest_nl`` type newlines. Rs twbN(RR treplacetwrite(R"tdest_nltcontents((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pytconvert_newlineUs!cCs0|dkrd„}n|dkr0d„}ntjdddƒ}t||ƒ}i}tjddd|ƒx†|D]~}yt|ƒ}Wntk r£qwnXt|tƒsė|dk rŅt j d|ƒnt j d |ƒd }n|||scSstS(N(tFalse(((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyR,„sRs rev-parsetHEADtresets--hardsFCanonical version (theirs) of %s has mixed newline style, forced to \ns?Canonical version (theirs) of %s had no newline style, using \ns s %s^{tree}s3Our file %s had no newlines, ignoring newline styles1Converting our file %s (3) from %s to %s newlinestadds write-trees%Merge wrote virtual tree for ours: %ss4Merge trivially succeeds for %s, ignoring line checks6Common file %s had no newlines, ignoring newline styles4Converting common file %s (1) from %s to %s newliness'Merge wrote virtual tree for common: %stmerges"Merge failed with these message: s Resolved conflicts automaticallyRs-as-msResolution tree is %sN(R+RR RtcallR$tIOErrort isinstancetstrtloggingtwarningtdebugtKeyErrort CallErrortinfotreprR*Rtstderrt MergeError(t common_idt theirs_idtprepare_configtresolve_conflictstours_idtours_theirs_diffttheirs_newlinestfiletnlt theirs_treet theirs_nltours_nlt ours_treet common_nlt common_treetcommon_virtual_idtours_virtual_idttheirs_virtual_idtet result_tree((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyR1]s’#             "    "     tErrorcBseZdZRS(sBase error class for merge(t__name__t __module__t__doc__(((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyRSčsR>cBseZdZRS(s(Merge terminated with a conflict, oh no!(RTRURV(((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyR>ģs(RVR6RttempfiletostwizardRRRR$R*R+R1RSR>(((s:/afs/athena.mit.edu/contrib/scripts/wizard/wizard/merge.pyt*s        ‰