P4python: get diff2 database

I want to get the output of the following command (where p4 is the standard perforce client):

p4 diff2 //depot/...#1 //depot/...#2

      

In the terminal, it produces something like this:

==== //depot/bin/build.sh#1 (xtext) - //depot/bin/build.sh#2 (xtext) ==== content
1a2
> #added something 2
9c10
< fi---
> fi
==== //depot/bin/README#1 - <none> ===
==== //depot/bin/status_ok#1 - <none> ===

      

Suppose I have the following script in python:

from P4 import P4
p4 = P4()
p4.port = "1818"
p4.host = "localhost"
p4.user = "psih"
p4.client = "build_verificator_ws2"
p4.connect()
changes = p4.run_diff2("//depot/...#1", "//depot/...#2")
print changes
p4.disconnect()

      

After executing the python script, I get something like this:

[{'status': 'content', 'depotFile2': '//depot/bin/build.sh', 'rev': '1', 'rev2': '2', 'type': 'xtext', 'depotFile': '//depot/bin/build.sh', 'type2': 'xtext'}, {'status': 'left only', 'type': 'text', 'rev': '1', 'depotFile': '//depot/bin/README'}, {'status': 'left only', 'type': 'text', 'rev': '1', 'depotFile': '//depot/bin/status_ok'}]

      

List of files in the depot with revisions, but no differences.

Any suggestions?

+3


source to share


1 answer


The answer is to use the answer without tags:



changes = p4.run_diff2("//depot/...#1", "//depot/...#2", tagged=False)

      

+2


source







All Articles