undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: accommodate new move/delete type in p4

Browse Source 
562d53f (git-p4: Fix sync errors due to new server version, 2010-01-21)
taught git-p4 sync to recognize the new move/delete type, but this type
can also show up in an initial clone and labels output.

Instead of replicating the support in three places, hoist the definition
somewhere global.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-By: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff 2011-02-19 08:17:57 -05:00 committed by Junio C Hamano
parent 1494fcbb75
commit 56c093451c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/fast-import/git-p4
View File

@ -834,6 +834,8 @@ class P4Submit(Command):
return True
class P4Sync(Command):
delete_actions = ( "delete", "move/delete", "purge" )
def __init__(self):
Command.__init__(self)
self.options = [
@ -1038,10 +1040,10 @@ class P4Sync(Command):
if includeFile:
filesForCommit.append(f)
if f['action'] not in ('delete', 'move/delete', 'purge'):
filesToRead.append(f)
else:
if f['action'] in self.delete_actions:
filesToDelete.append(f)
else:
filesToRead.append(f)
# deleted files...
for f in filesToDelete:
@ -1127,7 +1129,7 @@ class P4Sync(Command):
cleanedFiles = {}
for info in files:
if info["action"] in ("delete", "purge"):
if info["action"] in self.delete_actions:
continue
cleanedFiles[info["depotFile"]] = info["rev"]
@ -1453,7 +1455,7 @@ class P4Sync(Command):
if change > newestRevision:
newestRevision = change
if info["action"] in ("delete", "purge"):
if info["action"] in self.delete_actions:
# don't increase the file cnt, otherwise details["depotFile123"] will have gaps!
#fileCnt = fileCnt + 1
continue