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/PythonActionMergeData.h at master · perforce/p4python

Expand file tree

/

PythonActionMergeData.h

Copy path
More file actions
More file actions

Latest commit

 

History

History
History
59 lines (51 loc) · 2.17 KB
/

PythonActionMergeData.h

Copy path

File metadata and controls

59 lines (51 loc) · 2.17 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
/*
* PythonActionMergeData.h. Action resolve data.
*
* 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/main/p4-python/PythonActionMergeData.h#2 $
*/
#ifndef PYTHONACTIONMERGEDATA_H_
#define PYTHONACTIONMERGEDATA_H_
class PythonActionMergeData
{
public:
PythonActionMergeData(ClientUser *ui, ClientResolveA *m, StrPtr &hint, PyObject *info);
~PythonActionMergeData();
void SetDebug( int d ) { debug = d; }
PyObject * GetMergeAction() const;
PyObject * GetYoursAction() const;
PyObject * GetTheirAction() const;
PyObject * GetType() const;
PyObject * GetMergeInfo() const;
PyObject * GetMergeHint() const;
StrBuf GetString() const;
private:
int debug;
ClientUser * ui;
StrBuf hint;
ClientResolveA * merger;
PyObject * mergeInfo;
};
#endif /* PYTHONACTIONMERGEDATA_H_ */
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.