/******************************************************************************* Copyright (c) 1997-2006, Perforce Software, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTR IBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PERFORCE SOFTWARE, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ /******************************************************************************* * Name : p4mergedata.h * * Author : Tony Smith <tony@perforce.com> or <tony@smee.org> * * Description : Class for holding merge data * ******************************************************************************/ class P4MergeData { public: P4MergeData( ClientUser *ui, ClientMerge *m, StrPtr &hint ); void SetDebug( int d ) { debug = d; } VALUE GetYourName(); VALUE GetTheirName(); VALUE GetBaseName(); VALUE GetYourPath(); VALUE GetTheirPath(); VALUE GetBasePath(); VALUE GetResultPath(); VALUE GetMergeHint(); VALUE RunMergeTool(); // Wrap as Ruby object of class pClass VALUE Wrap( VALUE pClass ); // Ruby garbage collection void GCMark(); private: int debug; ClientUser * ui; StrBuf hint; ClientMerge * merger; StrBuf yours; StrBuf theirs; StrBuf base; };
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 5791 | Tony Smith |
Add experimental support for passing a block to P4#run_resolve. The block is passed a P4::MergeData object encapsulating the context of each merge performed. The block should evaluate to a string indicating the desired result of the merge: 'ay', 'at', 'am', 's', etc. The P4::MergeData object contains information about the files involved in the merge and can invoke an external merge tool. This is still experimental at this stage so the interface may change as it evolves. |