Skip to content

Support handling cases where multiple integration records found for t… #35

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
437569 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support handling cases where multiple integration records found for t… #35

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
18 changes: 14 additions & 4 deletions P4Transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,19 +1262,29 @@ def getChange(self, changeNum):
fpaths = ['{}#{}'.format(x.depotFile, x.rev) for x in filesToLog.values()]
filelogs = []
if fpaths:
processedRevs = {}
# Get 2 filelogs per rev - saves time
filelogs = self.p4.run_filelog('-i', '-m2', *fpaths)
if len(filelogs) < 1000:
self.logger.debug('filelogs: %s' % filelogs)
else:
self.logger.debug('filelogs count: %d' % len(filelogs))
# Create a dictionary to track the highest revision per depotFile
max_revs = {}
# First pass: find the filelog from the maximum revision for each depotFile
for flog in filelogs:
depot_file = flog.depotFile
current_rev = flog.revisions[0].rev
if depot_file not in max_revs or current_rev > max_revs[depot_file]:
max_revs[depot_file] = current_rev
# Second pass: filter the filelogs to keep only those with the max revision per depotFile
filtered_logs = [
flog for flog in filelogs
if flog.revisions[0].rev == max_revs[flog.depotFile]
]

for flog in filtered_logs:
if flog.depotFile in filesToLog:
chRev = filesToLog[flog.depotFile]
if chRev.depotFile in processedRevs: # Only process once
continue
processedRevs[chRev.depotFile] = 1
revision = flog.revisions[0]
if len(revision.integrations) > 0:
if not self.options.historical_start_change or revision.change >= self.options.historical_start_change:
Expand Down