/* * PythonActionMergeData.cpp * * Copyright (c) 2012, 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 CONTRIBUTORS "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/r17.1/p4-python/PythonActionMergeData.cpp#1 $ */ #include <Python.h> #include <bytesobject.h> #include "undefdups.h" #include "python2to3.h" #include <clientapi.h> #include <i18napi.h> #include <strtable.h> #include <enviro.h> #include <hostenv.h> #include <spec.h> #include <debug.h> #include <iostream> #include "PythonActionMergeData.h" PythonActionMergeData::PythonActionMergeData( ClientUser *ui, ClientResolveA *m, StrPtr &hint, PyObject * info) { this->debug = 0; this->ui = ui; this->merger = m; this->hint = hint; Py_INCREF(info); this->mergeInfo = info; } PythonActionMergeData::~PythonActionMergeData() { if( mergeInfo ) { Py_DECREF(mergeInfo); mergeInfo = 0; } } PyObject * PythonActionMergeData::GetMergeInfo() const { Py_INCREF(mergeInfo); return mergeInfo; } PyObject * PythonActionMergeData::GetMergeAction() const { StrBuf buffer; merger->GetMergeAction().Fmt( &buffer, EF_PLAIN ); return CreatePythonString( buffer.Text() ); } PyObject * PythonActionMergeData::GetYoursAction() const { StrBuf buffer; merger->GetYoursAction().Fmt( &buffer, EF_PLAIN ); return CreatePythonString( buffer.Text() ); } PyObject * PythonActionMergeData::GetTheirAction() const { StrBuf buffer; merger->GetTheirAction().Fmt( &buffer, EF_PLAIN ); return CreatePythonString( buffer.Text() ); } PyObject * PythonActionMergeData::GetType() const { StrBuf buffer; merger->GetType().Fmt( &buffer, EF_PLAIN ); return CreatePythonString( buffer.Text() ); } PyObject * PythonActionMergeData::GetMergeHint() const { return CreatePythonString( hint.Text() ); } StrBuf PythonActionMergeData::GetString() const { StrBuf result = "P4ActionMergeData\n"; StrBuf buffer; merger->GetMergeAction().Fmt(&buffer, EF_INDENT); result << "\tmergeAction: " << buffer << "\n"; buffer.Clear(); merger->GetTheirAction().Fmt(&buffer, EF_INDENT); result << "\ttheirAction: " << buffer << "\n"; buffer.Clear(); merger->GetYoursAction().Fmt(&buffer, EF_INDENT); result << "\tyoursAction: " << buffer << "\n"; buffer.Clear(); merger->GetType().Fmt(&buffer, EF_INDENT); result << "\ttype: " << buffer << "\n"; buffer.Clear(); result << "\thint: " << hint << "\n"; return result; }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#8 | 26129 | Paul Allen | Move p4python to Main branch | ||
#7 | 23584 | Sven Erik Knop | Updated P4Python to 2017.2 in sync with the internal development version. | ||
#6 | 22483 | Sven Erik Knop | Updated to 2017.1 | ||
#5 | 21667 | Sven Erik Knop |
Update OpenSource version of P4Python to 2016.2 This source drop is virtually identical to the internal release. The source is also available from pypi as a tar ball, here for completeness and to encourage anyone who wants to extend or fix P4Python. |
||
#4 | 20225 | Sven Erik Knop | Updated P4Python to released version of 2016.1 | ||
#3 | 16835 | Sven Erik Knop |
Updated P4Python to the 2015.2 release. This update contains a lot of whitespace changes as well to get the internal and public codebase in line. New features include: Updated spec map to match 2015.2 server Native C++ interface for P4.clone and P4.init. This change requires P4API 2015.2 Minor signature changes to add kargs for every command |
||
#2 | 16137 | Sven Erik Knop | Updated P4Python to 2015.1 | ||
#1 | 10082 | Matt Attaway |
Initial add of P4Python source. 2014.1.898721 |