Commit aa83f7a2 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'ld/p4-compare-dir-vs-symlink' into maint

"git p4" misbehaved when swapping a directory and a symbolic link.

* ld/p4-compare-dir-vs-symlink:
  git-p4: avoid crash adding symlinked directory
parents af04b117 df8a9e86
......@@ -25,6 +25,7 @@
import zipfile
import zlib
import ctypes
import errno
try:
from subprocess import CalledProcessError
......@@ -1543,7 +1544,7 @@ def edit_template(self, template_file):
if response == 'n':
return False
def get_diff_description(self, editedFiles, filesToAdd):
def get_diff_description(self, editedFiles, filesToAdd, symlinks):
# diff
if os.environ.has_key("P4DIFF"):
del(os.environ["P4DIFF"])
......@@ -1558,10 +1559,17 @@ def get_diff_description(self, editedFiles, filesToAdd):
newdiff += "==== new file ====\n"
newdiff += "--- /dev/null\n"
newdiff += "+++ %s\n" % newFile
f = open(newFile, "r")
for line in f.readlines():
newdiff += "+" + line
f.close()
is_link = os.path.islink(newFile)
expect_link = newFile in symlinks
if is_link and expect_link:
newdiff += "+%s\n" % os.readlink(newFile)
else:
f = open(newFile, "r")
for line in f.readlines():
newdiff += "+" + line
f.close()
return (diff + newdiff).replace('\r\n', '\n')
......@@ -1579,6 +1587,7 @@ def applyCommit(self, id):
filesToDelete = set()
editedFiles = set()
pureRenameCopy = set()
symlinks = set()
filesToChangeExecBit = {}
for line in diff:
......@@ -1595,6 +1604,11 @@ def applyCommit(self, id):
filesToChangeExecBit[path] = diff['dst_mode']
if path in filesToDelete:
filesToDelete.remove(path)
dst_mode = int(diff['dst_mode'], 8)
if dst_mode == 0120000:
symlinks.add(path)
elif modifier == "D":
filesToDelete.add(path)
if path in filesToAdd:
......@@ -1732,7 +1746,7 @@ def applyCommit(self, id):
separatorLine = "######## everything below this line is just the diff #######\n"
if not self.prepare_p4_only:
submitTemplate += separatorLine
submitTemplate += self.get_diff_description(editedFiles, filesToAdd)
submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
(handle, fileName) = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+b")
......
#!/bin/sh
test_description='git p4 symlinked directories'
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
start_p4d
'
test_expect_success 'symlinked directory' '
(
cd "$cli" &&
: >first_file.t &&
p4 add first_file.t &&
p4 submit -d "first change"
) &&
git p4 clone --dest "$git" //depot &&
(
cd "$git" &&
mkdir -p some/sub/directory &&
mkdir -p other/subdir2 &&
: > other/subdir2/file.t &&
(cd some/sub/directory && ln -s ../../../other/subdir2 .) &&
git add some other &&
git commit -m "symlinks" &&
git config git-p4.skipSubmitEdit true &&
git p4 submit -v
) &&
(
cd "$cli" &&
p4 sync &&
test -L some/sub/directory/subdir2
test_path_is_file some/sub/directory/subdir2/file.t
)
'
test_expect_success 'kill p4d' '
kill_p4d
'
test_done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment