mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ls/p4-keep-empty-commits'
"git p4" used to import Perforce CLs that touch only paths outside the client spec as empty commits. It has been corrected to ignore them instead, with a new configuration git-p4.keepEmptyCommits as a backward compatibility knob. * ls/p4-keep-empty-commits: git-p4: add option to keep empty commits
This commit is contained in:
commit
a899d500c6
|
@ -549,6 +549,10 @@ git-p4.largeFilePush::
|
||||||
Boolean variable which defines if large files are automatically
|
Boolean variable which defines if large files are automatically
|
||||||
pushed to a server.
|
pushed to a server.
|
||||||
|
|
||||||
|
git-p4.keepEmptyCommits::
|
||||||
|
A changelist that contains only excluded files will be imported
|
||||||
|
as an empty commit if this boolean option is set to true.
|
||||||
|
|
||||||
Submit variables
|
Submit variables
|
||||||
~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~
|
||||||
git-p4.detectRenames::
|
git-p4.detectRenames::
|
||||||
|
|
44
git-p4.py
44
git-p4.py
|
@ -2556,12 +2556,6 @@ def streamP4Files(self, files):
|
||||||
filesToDelete = []
|
filesToDelete = []
|
||||||
|
|
||||||
for f in files:
|
for f in files:
|
||||||
# if using a client spec, only add the files that have
|
|
||||||
# a path in the client
|
|
||||||
if self.clientSpecDirs:
|
|
||||||
if self.clientSpecDirs.map_in_client(f['path']) == "":
|
|
||||||
continue
|
|
||||||
|
|
||||||
filesForCommit.append(f)
|
filesForCommit.append(f)
|
||||||
if f['action'] in self.delete_actions:
|
if f['action'] in self.delete_actions:
|
||||||
filesToDelete.append(f)
|
filesToDelete.append(f)
|
||||||
|
@ -2632,25 +2626,41 @@ def streamTag(self, gitStream, labelName, labelDetails, commit, epoch):
|
||||||
gitStream.write(description)
|
gitStream.write(description)
|
||||||
gitStream.write("\n")
|
gitStream.write("\n")
|
||||||
|
|
||||||
|
def inClientSpec(self, path):
|
||||||
|
if not self.clientSpecDirs:
|
||||||
|
return True
|
||||||
|
inClientSpec = self.clientSpecDirs.map_in_client(path)
|
||||||
|
if not inClientSpec and self.verbose:
|
||||||
|
print('Ignoring file outside of client spec: {0}'.format(path))
|
||||||
|
return inClientSpec
|
||||||
|
|
||||||
|
def hasBranchPrefix(self, path):
|
||||||
|
if not self.branchPrefixes:
|
||||||
|
return True
|
||||||
|
hasPrefix = [p for p in self.branchPrefixes
|
||||||
|
if p4PathStartsWith(path, p)]
|
||||||
|
if hasPrefix and self.verbose:
|
||||||
|
print('Ignoring file outside of prefix: {0}'.format(path))
|
||||||
|
return hasPrefix
|
||||||
|
|
||||||
def commit(self, details, files, branch, parent = ""):
|
def commit(self, details, files, branch, parent = ""):
|
||||||
epoch = details["time"]
|
epoch = details["time"]
|
||||||
author = details["user"]
|
author = details["user"]
|
||||||
|
|
||||||
if self.verbose:
|
if self.verbose:
|
||||||
print "commit into %s" % branch
|
print('commit into {0}'.format(branch))
|
||||||
|
|
||||||
# start with reading files; if that fails, we should not
|
|
||||||
# create a commit.
|
|
||||||
new_files = []
|
|
||||||
for f in files:
|
|
||||||
if [p for p in self.branchPrefixes if p4PathStartsWith(f['path'], p)]:
|
|
||||||
new_files.append (f)
|
|
||||||
else:
|
|
||||||
sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path'])
|
|
||||||
|
|
||||||
if self.clientSpecDirs:
|
if self.clientSpecDirs:
|
||||||
self.clientSpecDirs.update_client_spec_path_cache(files)
|
self.clientSpecDirs.update_client_spec_path_cache(files)
|
||||||
|
|
||||||
|
files = [f for f in files
|
||||||
|
if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])]
|
||||||
|
|
||||||
|
if not files and not gitConfigBool('git-p4.keepEmptyCommits'):
|
||||||
|
print('Ignoring revision {0} as it would produce an empty commit.'
|
||||||
|
.format(details['change']))
|
||||||
|
return
|
||||||
|
|
||||||
self.gitStream.write("commit %s\n" % branch)
|
self.gitStream.write("commit %s\n" % branch)
|
||||||
self.gitStream.write("mark :%s\n" % details["change"])
|
self.gitStream.write("mark :%s\n" % details["change"])
|
||||||
self.committedChanges.add(int(details["change"]))
|
self.committedChanges.add(int(details["change"]))
|
||||||
|
@ -2674,7 +2684,7 @@ def commit(self, details, files, branch, parent = ""):
|
||||||
print "parent %s" % parent
|
print "parent %s" % parent
|
||||||
self.gitStream.write("from %s\n" % parent)
|
self.gitStream.write("from %s\n" % parent)
|
||||||
|
|
||||||
self.streamP4Files(new_files)
|
self.streamP4Files(files)
|
||||||
self.gitStream.write("\n")
|
self.gitStream.write("\n")
|
||||||
|
|
||||||
change = int(details["change"])
|
change = int(details["change"])
|
||||||
|
|
134
t/t9826-git-p4-keep-empty-commits.sh
Executable file
134
t/t9826-git-p4-keep-empty-commits.sh
Executable file
|
@ -0,0 +1,134 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
test_description='Clone repositories and keep empty commits'
|
||||||
|
|
||||||
|
. ./lib-git-p4.sh
|
||||||
|
|
||||||
|
test_expect_success 'start p4d' '
|
||||||
|
start_p4d
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'Create a repo' '
|
||||||
|
client_view "//depot/... //client/..." &&
|
||||||
|
(
|
||||||
|
cd "$cli" &&
|
||||||
|
|
||||||
|
mkdir -p subdir &&
|
||||||
|
|
||||||
|
>subdir/file1.txt &&
|
||||||
|
p4 add subdir/file1.txt &&
|
||||||
|
p4 submit -d "Add file 1" &&
|
||||||
|
|
||||||
|
>file2.txt &&
|
||||||
|
p4 add file2.txt &&
|
||||||
|
p4 submit -d "Add file 2" &&
|
||||||
|
|
||||||
|
>subdir/file3.txt &&
|
||||||
|
p4 add subdir/file3.txt &&
|
||||||
|
p4 submit -d "Add file 3" &&
|
||||||
|
|
||||||
|
>file4.txt &&
|
||||||
|
p4 add file4.txt &&
|
||||||
|
p4 submit -d "Add file 4" &&
|
||||||
|
|
||||||
|
p4 delete subdir/file3.txt &&
|
||||||
|
p4 submit -d "Remove file 3" &&
|
||||||
|
|
||||||
|
p4 delete file4.txt &&
|
||||||
|
p4 submit -d "Remove file 4"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'Clone repo root path with all history' '
|
||||||
|
client_view "//depot/... //client/..." &&
|
||||||
|
test_when_finished cleanup_git &&
|
||||||
|
(
|
||||||
|
cd "$git" &&
|
||||||
|
git init . &&
|
||||||
|
git p4 clone --use-client-spec --destination="$git" //depot@all &&
|
||||||
|
cat >expect <<-\EOF &&
|
||||||
|
Remove file 4
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 6]
|
||||||
|
|
||||||
|
Remove file 3
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 5]
|
||||||
|
|
||||||
|
Add file 4
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 4]
|
||||||
|
|
||||||
|
Add file 3
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 3]
|
||||||
|
|
||||||
|
Add file 2
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 2]
|
||||||
|
|
||||||
|
Add file 1
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 1]
|
||||||
|
|
||||||
|
EOF
|
||||||
|
git log --format=%B >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'Clone repo subdir with all history but keep empty commits' '
|
||||||
|
client_view "//depot/subdir/... //client/subdir/..." &&
|
||||||
|
test_when_finished cleanup_git &&
|
||||||
|
(
|
||||||
|
cd "$git" &&
|
||||||
|
git init . &&
|
||||||
|
git config git-p4.keepEmptyCommits true &&
|
||||||
|
git p4 clone --use-client-spec --destination="$git" //depot@all &&
|
||||||
|
cat >expect <<-\EOF &&
|
||||||
|
Remove file 4
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 6]
|
||||||
|
|
||||||
|
Remove file 3
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 5]
|
||||||
|
|
||||||
|
Add file 4
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 4]
|
||||||
|
|
||||||
|
Add file 3
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 3]
|
||||||
|
|
||||||
|
Add file 2
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 2]
|
||||||
|
|
||||||
|
Add file 1
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 1]
|
||||||
|
|
||||||
|
EOF
|
||||||
|
git log --format=%B >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'Clone repo subdir with all history' '
|
||||||
|
client_view "//depot/subdir/... //client/subdir/..." &&
|
||||||
|
test_when_finished cleanup_git &&
|
||||||
|
(
|
||||||
|
cd "$git" &&
|
||||||
|
git init . &&
|
||||||
|
git p4 clone --use-client-spec --destination="$git" --verbose //depot@all &&
|
||||||
|
cat >expect <<-\EOF &&
|
||||||
|
Remove file 3
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 5]
|
||||||
|
|
||||||
|
Add file 3
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 3]
|
||||||
|
|
||||||
|
Add file 1
|
||||||
|
[git-p4: depot-paths = "//depot/": change = 1]
|
||||||
|
|
||||||
|
EOF
|
||||||
|
git log --format=%B >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'kill p4d' '
|
||||||
|
kill_p4d
|
||||||
|
'
|
||||||
|
|
||||||
|
test_done
|
Loading…
Reference in a new issue