Skip to content

Actual update from wrong fork for binary+l fix #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
willKman718 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Actual update from wrong fork for binary+l fix #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 60 additions & 3 deletions P4Transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,17 @@ def logOnce(logger, *args):
alreadyLogged[msg] = 1
logger.debug(msg)

## COLORS FOR EYE BALLS
RED = "\033[1;31m"
GREEN = "\033[1;32m"
YELLOW = "\033[1;33m"
BLUE = "\033[1;34m"
MAGENTA = "\033[1;35m"
CYAN = "\033[1;36m"
WHITE = "\033[1;37m"
# Reset code (in case you need to reset the color back to default)
RESET = "\033[0;0m"


P4.Revision.__repr__ = logrepr
P4.Integration.__repr__ = logrepr
Expand Down Expand Up @@ -435,7 +446,7 @@ def stop_file_exists(filepath):
def controlled_sleep(minutes):
start_time = time.time()
end_time = start_time + (minutes * 60)

while time.time() < end_time:
if stop_file_exists(STOP_FILE_PATH):
# Log or print that we detected the stop file and are breaking out of sleep
Expand Down Expand Up @@ -823,6 +834,7 @@ def listsEqual(self, srclist, targlist, filesToIgnore):
return (False, "Replication failure: src/target content differences found\nsrc:%s\ntarg:%s" % (
"\n ".join([str(r) for r in diffs]),
"\n ".join([str(targlookup[r.localFile]) for r in diffs])))
self.logger.info(f"{GREEN}Replication success: source and target changelists match!{RESET}")
return (True, "")


Expand Down Expand Up @@ -1039,13 +1051,20 @@ def createClientWorkspace(self, isSource, matchingStreams=None):
self.depotmap = self.localmap.reverse()

def p4cmd(self, *args, **kwargs):
"Execute p4 cmd while logging arguments and results"
"""Execute p4 cmd while logging arguments and results"""
self.logger.debug(self.p4id, args)
output = self.p4.run(args, **kwargs)
self.logger.debug(self.p4id, output)
self.checkWarnings()

# If our condition is met, prepend our code to the output
if "can't change +l type with reopen" in str(output):
return str(output)

return output



def disconnect(self):
if self.p4:
self.p4.disconnect()
Expand Down Expand Up @@ -1565,7 +1584,37 @@ def fixFileTypes(self, fileRevs, openedFiles):
if localFile and len(localFile) > 0 and localFile in revDict:
chRev = revDict[localFile]
if chRev.type != ofile['type']:
self.p4cmd('reopen', '-t', chRev.type, ofile['depotFile'])
if chRev.type == 'binary+l':
# Handle the special case for binary+l
self.handleBinaryLType(ofile, chRev)
else:
# For other types, just reopen
self.logger.debug(RED + "fixFileTypes attempting file type change for binary+l" + RESET)
self.p4cmd('reopen', '-t', chRev.type, ofile['depotFile'])

def handleBinaryLType(self, ofile, chRev):
self.logger.debug(YELLOW + "handleBinaryLTypes attempting file type change for binary+l" + RESET)
result = self.p4cmd('reopen', '-t', chRev.type, ofile['depotFile'])

# If there's an error specifically suggesting revert -k for the file, then perform the steps
if "can't change +l type with reopen; use revert -k and then edit -t to change type." in result:
self.logger.warning(f"{RED}Issue identified with file {ofile['depotFile']} suggesting to use 'revert -k' and type change.{RESET}")
edit_result = self.p4cmd('revert', '-k', ofile['depotFile'])
edit_result = self.p4cmd('add', '-t', chRev.type, ofile['depotFile'])
edit_result = self.p4cmd('edit', '-t', chRev.type, ofile['depotFile'])

# # Handle the situation where file is already opened for add
# if "can't edit (already opened for add)" in edit_result:
# self.logger.warning(f"{RED}File {ofile['depotFile']} is opened for add. Reverting and adding with correct type.{RESET}")
# self.p4cmd('revert', ofile['depotFile'])
# self.p4cmd('add', '-t', chRev.type, ofile['depotFile'])
# else:
# # If the file isn't on the client, sync it first
# if "file(s) not on client." in edit_result:
# self.logger.info(f"{RED}Syncing {ofile['depotFile']} before type change{RESET}")
# self.p4cmd('sync', ofile['depotFile'])
# self.p4cmd('edit', '-t', chRev.type, ofile['depotFile'])


def replicateChange(self, fileRevs, specialMoveRevs, srcFileLogs, change, sourcePort):
"""This is the heart of it all. Replicate all changes according to their description"""
Expand Down Expand Up @@ -1624,6 +1673,7 @@ def replicateChange(self, fileRevs, specialMoveRevs, srcFileLogs, change, source
for w in self.p4.warnings:
mf = re_translation.search(w)
if mf:
self.logger.debug("We're in the MF")
self.p4cmd("reopen", "-tbinary", mf.group(1))
self.filesToIgnore.append(mf.group(1))
result = self.p4cmd("submit", "-c", chgNo) # May cause another exception
Expand All @@ -1642,6 +1692,10 @@ def replicateChange(self, fileRevs, specialMoveRevs, srcFileLogs, change, source
self.validateSubmittedChange(newChangeId, fileRevs)
return newChangeId





def replicateFirstChange(self, sourcePort):
"""Replicate first change when historical start specified"""

Expand Down Expand Up @@ -1789,6 +1843,7 @@ def removeKeywords(self, opened):
for openFile in opened:
if self.hasKeyword(openFile["type"]):
fileType = self.removeKeyword(openFile["type"])
self.logger.debug("removeKeywords attempt reopen")
self.p4cmd('reopen', '-t', fileType, openFile["depotFile"])
self.logger.debug("targ: Changed type from {} to {} for {}".
format(openFile["type"], fileType, openFile["depotFile"]))
Expand Down Expand Up @@ -2230,6 +2285,7 @@ def initChangeMapFile(self):
fh.write("sourceP4Port,sourceChangeNo,targetChangeNo\n")
output = self.p4cmd('reconcile', fpath)[0]
if output['action'] == 'add':
self.logger.debug("initChangeMapFile attempt reopen")
self.p4cmd('reopen', '-t', 'text+CS32', fpath)
chg = self.p4.fetch_change()
fpath = os.path.join(self.root, self.options.change_map_file)
Expand All @@ -2239,6 +2295,7 @@ def initChangeMapFile(self):
if not m:
raise P4TException("Failed to create changelist")
chgno = m.group(1)
self.logger.debug("2initChangeMapFile attempt reopen")
self.p4cmd('reopen', '-c', chgno, fpath)[0]

def updateChangeMap(self, sourceP4Port, sourceChangeNo, targetChangeNo):
Expand Down