GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — p4python/PythonMergeData.cpp at master · iVerb/p4python

Expand file tree

/

PythonMergeData.cpp

Copy path
More file actions
More file actions

Latest commit

 

History

History
History
143 lines (114 loc) · 4.43 KB
/

PythonMergeData.cpp

Copy path

File metadata and controls

143 lines (114 loc) · 4.43 KB
Raw
Copy raw file
Download raw file
Open symbols panel
Edit and raw actions
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
/*******************************************************************************
Copyright (c) 2007-2008, 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/r13.1/p4-python/PythonMergeData.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 "PythonMergeData.h"
#include <iostream>
using namespace std;
PythonMergeData::PythonMergeData( ClientUser *ui, ClientMerge *m, StrPtr &hint )
{
this->debug = 0;
this->ui = ui;
this->merger = m;
this->hint = hint;
// Extract (forcibly) the paths from the RPC buffer.
StrPtr *t;
if( ( t = ui->varList->GetVar( "baseName" ) ) ) base = t->Text();
if( ( t = ui->varList->GetVar( "yourName" ) ) ) yours = t->Text();
if( ( t = ui->varList->GetVar( "theirName" ) ) ) theirs = t->Text();
}
PyObject * PythonMergeData::GetYourName() const
{
return CreatePythonString( yours.Text() );
}
PyObject * PythonMergeData::GetTheirName() const
{
return CreatePythonString( theirs.Text() );
}
PyObject * PythonMergeData::GetBaseName() const
{
return CreatePythonString( base.Text() );
}
PyObject * PythonMergeData::GetYourPath() const
{
return CreatePythonString( merger->GetYourFile()->Name() );
}
PyObject * PythonMergeData::GetTheirPath() const
{
if( merger->GetTheirFile() )
return CreatePythonString( merger->GetTheirFile()->Name() );
else
Py_RETURN_NONE;
}
PyObject * PythonMergeData::GetBasePath() const
{
if( merger->GetBaseFile() )
return CreatePythonString( merger->GetBaseFile()->Name() );
else
Py_RETURN_NONE;
}
PyObject * PythonMergeData::GetResultPath() const
{
if( merger->GetResultFile() )
return CreatePythonString( merger->GetResultFile()->Name() );
else
Py_RETURN_NONE;
}
PyObject * PythonMergeData::GetMergeHint() const
{
return CreatePythonString( hint.Text() );
}
PyObject * PythonMergeData::RunMergeTool()
{
Error e;
ui->Merge( merger->GetBaseFile(), merger->GetTheirFile(),
merger->GetYourFile(), merger->GetResultFile(), &e );
if( e.Test() )
Py_RETURN_FALSE;
Py_RETURN_TRUE;
}
StrBuf PythonMergeData::GetString() const
{
StrBuf result = "P4MergeData\n";
if( yours.Length() ) result << "\tyourName: " << yours << "\n";
if( theirs.Length() ) result << "\ttheirName: " << theirs << "\n";
if( base.Length() ) result << "\tbaseName: " << base << "\n";
// be defensive, only add the additional information if it exists
if( merger->GetYourFile() )
result << "\tyourFile: " << merger->GetYourFile()->Name() << "\n";
if( merger->GetTheirFile() )
result << "\ttheirFile: " << merger->GetTheirFile()->Name() << "\n";
if( merger->GetBaseFile() )
result << "\tbaseFile: " << merger->GetBaseFile()->Name() << "\n";
if( merger->GetResultFile() )
result << "\tresultFile: " << merger->GetResultFile()->Name() << "\n";
return result;
}
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.