mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
git-p4: avoid syncing duplicate changes
When a particular changeset affects multiple depot paths, it will appear multiple times in the output of "p4 changes". Filter out the duplicates to avoid the extra empty commits that this otherwise would create. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2d602e9179
commit
b4b0ba06f8
@ -442,13 +442,14 @@ def p4ChangesForPaths(depotPaths, changeRange):
|
||||
output = p4_read_pipe_lines("changes " + ' '.join (["%s...%s" % (p, changeRange)
|
||||
for p in depotPaths]))
|
||||
|
||||
changes = []
|
||||
changes = {}
|
||||
for line in output:
|
||||
changeNum = line.split(" ")[1]
|
||||
changes.append(int(changeNum))
|
||||
changeNum = int(line.split(" ")[1])
|
||||
changes[changeNum] = True
|
||||
|
||||
changes.sort()
|
||||
return changes
|
||||
changelist = changes.keys()
|
||||
changelist.sort()
|
||||
return changelist
|
||||
|
||||
class Command:
|
||||
def __init__(self):
|
||||
|
Loading…
Reference in New Issue
Block a user