GeezerVison is showing github.com — p4python/PythonMergeData.h at master · perforce/p4python

Expand file tree

PythonMergeData.h

Copy path

More file actions

Latest commit

History

72 lines (62 loc) · 2.41 KB

PythonMergeData.h

Copy path

File metadata and controls

72 lines (62 loc) · 2.41 KB

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

* PythonMergeData

* 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.

* $Id: //depot/main/p4-python/PythonMergeData.h#4 $

* Build instructions:

* Use Distutils - see accompanying setup.py

* python setup.py install

#ifndef PYTHON_MERGE_DATA_H

#define PYTHON_MERGE_DATA_H

class PythonMergeData

{

public:

PythonMergeData( ClientUser *ui, ClientMerge *m, StrPtr &hint );

void SetDebug( int d ) { debug = d; }

PyObject * GetYourName() const;

PyObject * GetTheirName() const;

PyObject * GetBaseName() const;

PyObject * GetYourPath() const;

PyObject * GetTheirPath() const;

PyObject * GetBasePath() const;

PyObject * GetResultPath() const;

PyObject * GetMergeHint() const;

PyObject * RunMergeTool();

StrBuf GetString() const;

private:

int debug;

ClientUser * ui;

StrBuf hint;

ClientMerge * merger;

StrBuf yours;

StrBuf theirs;

StrBuf base;

};

#endif