# [PATCH v2] git-p4.py: add support for filetype change 4 messages from 2016-01-04 to 2016-01-05. Participants: Romain Picard, Junio C Hamano, Luke Diamand. Thread: https://gitlist.dev/t/41114 ## Romain Picard, 2016-01-04 10:52 Subject: [PATCH v2] git-p4.py: add support for filetype change Message-ID: <1451904764-338-1-git-send-email-romain.picard@oakbits.com> URL: https://gitlist.dev/e/1451904764-338-1-git-send-email-romain.picard%40oakbits.com ``` After changing the type of a file in the git repository, it is not possible to "git p4 publish" the commit to perforce. This is due to the fact that the git "T" status is not handled in git-p4.py. This can typically occur when replacing an existing file with a symbolic link. The "T" modifier is now supported in git-p4.py. When a file type has changed, inform perforce with the "p4 edit -f auto" command. Signed-off-by: Romain Picard --- git-p4.py | 9 +++-- t/t9827-git-p4-change-filetype.sh | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100755 t/t9827-git-p4-change-filetype.sh diff --git a/git-p4.py b/git-p4.py index a7ec118..b7a3494 100755 --- a/git-p4.py +++ b/git-p4.py @@ -240,8 +240,8 @@ def p4_add(f): def p4_delete(f): p4_system(["delete", wildcard_encode(f)]) -def p4_edit(f): - p4_system(["edit", wildcard_encode(f)]) +def p4_edit(f, *options): + p4_system(["edit"] + list(options) + [wildcard_encode(f)]) def p4_revert(f): p4_system(["revert", wildcard_encode(f)]) @@ -1344,6 +1344,7 @@ class P4Submit(Command, P4UserMap): diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id)) filesToAdd = set() + filesToChangeType = set() filesToDelete = set() editedFiles = set() pureRenameCopy = set() @@ -1404,6 +1405,8 @@ class P4Submit(Command, P4UserMap): os.unlink(dest) filesToDelete.add(src) editedFiles.add(dest) + elif modifier == "T": + filesToChangeType.add(path) else: die("unknown modifier %s for %s" % (modifier, path)) @@ -1463,6 +1466,8 @@ class P4Submit(Command, P4UserMap): # system(applyPatchCmd) + for f in filesToChangeType: + p4_edit(f, "-t", "auto") for f in filesToAdd: p4_add(f) for f in filesToDelete: diff --git a/t/t9827-git-p4-change-filetype.sh b/t/t9827-git-p4-change-filetype.sh new file mode 100755 index 0000000..b0a9f62 --- /dev/null +++ b/t/t9827-git-p4-change-filetype.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# +# Copyright (c) 2016 Romain Picard +# + +test_description='git p4 support for file type change' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'create files' ' + ( + cd "$cli" && + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && + cat >file1 <<-EOF && + This is a first file. + EOF + cat >file2 <<-EOF && + This is a second file whose type will change. + EOF + p4 add file1 file2 && + p4 submit -d "add files" + ) +' + +test_expect_success 'change file to symbolic link' ' + git p4 clone --dest="$git" //depot@all && + test_when_finished cleanup_git && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + + rm file2 && + ln -s file1 file2 && + git add file2 && + git commit -m "symlink file1 to file2" && + git p4 submit && + p4 filelog -m 1 //depot/file2 >filelog && + grep "(symlink)" filelog + ) +' + +test_expect_success 'change symbolic link to file' ' + git p4 clone --dest="$git" //depot@all && + test_when_finished cleanup_git && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + + rm file2 && + cat >file2 <<-EOF && + This is another content for the second file. + EOF + git add file2 && + git commit -m "re-write file2" && + git p4 submit && + p4 filelog -m 1 //depot/file2 >filelog && + grep "(text)" filelog + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done -- 2.6.4 ``` ## Junio C Hamano, 2016-01-04 21:55 Subject: Re: [PATCH v2] git-p4.py: add support for filetype change Message-ID: URL: https://gitlist.dev/e/xmqqtwmtm2m3.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1451904764-338-1-git-send-email-romain.picard@oakbits.com> ``` Romain Picard writes: > diff --git a/t/t9827-git-p4-change-filetype.sh b/t/t9827-git-p4-change-filetype.sh > new file mode 100755 > index 0000000..b0a9f62 > --- /dev/null > +++ b/t/t9827-git-p4-change-filetype.sh > @@ -0,0 +1,69 @@ > +#!/bin/sh > +# > +# Copyright (c) 2016 Romain Picard > +# > + > +test_description='git p4 support for file type change' > + > +. ./lib-git-p4.sh > + > +test_expect_success 'start p4d' ' > + start_p4d > +' > + > +test_expect_success 'create files' ' > + ( > + cd "$cli" && > + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && > + cat >file1 <<-EOF && > + This is a first file. > + EOF > + cat >file2 <<-EOF && > + This is a second file whose type will change. > + EOF Micronit. It would be nicer to the readers to make it clear that there is no funny substitution to be worried about by quoting the end marker of these here document, i.e. cat >dest <<-\EOF && text without any funny substitution business EOF > + p4 add file1 file2 && > + p4 submit -d "add files" > + ) > +' > + > +test_expect_success 'change file to symbolic link' ' This needs a SYMLINKS prerequisite so that it is skipped on systems that lack support for symbolic links, i.e. test_expect_success SYMLINKS 'change file to symbolic link' ' The same for the next one. Thanks. ``` ## Luke Diamand, 2016-01-04 22:16 Subject: Re: [PATCH v2] git-p4.py: add support for filetype change Message-ID: URL: https://gitlist.dev/e/CAE5ih78Jb9u8FKNd5hoWkWVFsZJBa2_dqaQ1G1SKtjm8Ec4J6Q%40mail.gmail.com In-Reply-To: <1451904764-338-1-git-send-email-romain.picard@oakbits.com> ``` On 4 January 2016 at 10:52, Romain Picard wrote: > After changing the type of a file in the git repository, it is not possible to > "git p4 publish" the commit to perforce. This is due to the fact that the git > "T" status is not handled in git-p4.py. This can typically occur when replacing > an existing file with a symbolic link. > > The "T" modifier is now supported in git-p4.py. When a file type has changed, > inform perforce with the "p4 edit -f auto" command. Looks good to me, thanks for adding the test. I think the test needs to say what the terms of the copyright are (GPL, etc) but other than that it looks good. Thanks Luke > > Signed-off-by: Romain Picard > --- > git-p4.py | 9 +++-- > t/t9827-git-p4-change-filetype.sh | 69 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 76 insertions(+), 2 deletions(-) > create mode 100755 t/t9827-git-p4-change-filetype.sh > > diff --git a/git-p4.py b/git-p4.py > index a7ec118..b7a3494 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -240,8 +240,8 @@ def p4_add(f): > def p4_delete(f): > p4_system(["delete", wildcard_encode(f)]) > > -def p4_edit(f): > - p4_system(["edit", wildcard_encode(f)]) > +def p4_edit(f, *options): > + p4_system(["edit"] + list(options) + [wildcard_encode(f)]) > > def p4_revert(f): > p4_system(["revert", wildcard_encode(f)]) > @@ -1344,6 +1344,7 @@ class P4Submit(Command, P4UserMap): > > diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id)) > filesToAdd = set() > + filesToChangeType = set() > filesToDelete = set() > editedFiles = set() > pureRenameCopy = set() > @@ -1404,6 +1405,8 @@ class P4Submit(Command, P4UserMap): > os.unlink(dest) > filesToDelete.add(src) > editedFiles.add(dest) > + elif modifier == "T": > + filesToChangeType.add(path) > else: > die("unknown modifier %s for %s" % (modifier, path)) > > @@ -1463,6 +1466,8 @@ class P4Submit(Command, P4UserMap): > # > system(applyPatchCmd) > > + for f in filesToChangeType: > + p4_edit(f, "-t", "auto") > for f in filesToAdd: > p4_add(f) > for f in filesToDelete: > diff --git a/t/t9827-git-p4-change-filetype.sh b/t/t9827-git-p4-change-filetype.sh > new file mode 100755 > index 0000000..b0a9f62 > --- /dev/null > +++ b/t/t9827-git-p4-change-filetype.sh > @@ -0,0 +1,69 @@ > +#!/bin/sh > +# > +# Copyright (c) 2016 Romain Picard > +# > + > +test_description='git p4 support for file type change' > + > +. ./lib-git-p4.sh > + > +test_expect_success 'start p4d' ' > + start_p4d > +' > + > +test_expect_success 'create files' ' > + ( > + cd "$cli" && > + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && > + cat >file1 <<-EOF && > + This is a first file. > + EOF > + cat >file2 <<-EOF && > + This is a second file whose type will change. > + EOF > + p4 add file1 file2 && > + p4 submit -d "add files" > + ) > +' > + > +test_expect_success 'change file to symbolic link' ' > + git p4 clone --dest="$git" //depot@all && > + test_when_finished cleanup_git && > + ( > + cd "$git" && > + git config git-p4.skipSubmitEdit true && > + > + rm file2 && > + ln -s file1 file2 && > + git add file2 && > + git commit -m "symlink file1 to file2" && > + git p4 submit && > + p4 filelog -m 1 //depot/file2 >filelog && > + grep "(symlink)" filelog > + ) > +' > + > +test_expect_success 'change symbolic link to file' ' > + git p4 clone --dest="$git" //depot@all && > + test_when_finished cleanup_git && > + ( > + cd "$git" && > + git config git-p4.skipSubmitEdit true && > + > + rm file2 && > + cat >file2 <<-EOF && > + This is another content for the second file. > + EOF > + git add file2 && > + git commit -m "re-write file2" && > + git p4 submit && > + p4 filelog -m 1 //depot/file2 >filelog && > + grep "(text)" filelog > + ) > +' > + > +test_expect_success 'kill p4d' ' > + kill_p4d > +' > + > +test_done > -- > 2.6.4 > ``` ## Romain Picard, 2016-01-05 13:08 Subject: Re: [PATCH v2] git-p4.py: add support for filetype change Message-ID: <011e31179a6b263636562de374102fd7@oakbits.com> URL: https://gitlist.dev/e/011e31179a6b263636562de374102fd7%40oakbits.com In-Reply-To: ``` Le 04.01.2016 23:16, Luke Diamand a écrit : > On 4 January 2016 at 10:52, Romain Picard > wrote: >> After changing the type of a file in the git repository, it is not >> possible to >> "git p4 publish" the commit to perforce. This is due to the fact that >> the git >> "T" status is not handled in git-p4.py. This can typically occur when >> replacing >> an existing file with a symbolic link. >> >> The "T" modifier is now supported in git-p4.py. When a file type has >> changed, >> inform perforce with the "p4 edit -f auto" command. > > Looks good to me, thanks for adding the test. I think the test needs > to say what the terms of the copyright are (GPL, etc) but other than > that it looks good. I copy/pasted the copyright present in "t/README" and other tests. Tell me if you want an explicit reference to a license. However since many existing tests do not have any copyright I can just remove it. > > Thanks > Luke > >> >> Signed-off-by: Romain Picard >> --- >> git-p4.py | 9 +++-- >> t/t9827-git-p4-change-filetype.sh | 69 >> +++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 76 insertions(+), 2 deletions(-) >> create mode 100755 t/t9827-git-p4-change-filetype.sh >> >> diff --git a/git-p4.py b/git-p4.py >> index a7ec118..b7a3494 100755 >> --- a/git-p4.py >> +++ b/git-p4.py >> @@ -240,8 +240,8 @@ def p4_add(f): >> def p4_delete(f): >> p4_system(["delete", wildcard_encode(f)]) >> >> -def p4_edit(f): >> - p4_system(["edit", wildcard_encode(f)]) >> +def p4_edit(f, *options): >> + p4_system(["edit"] + list(options) + [wildcard_encode(f)]) >> >> def p4_revert(f): >> p4_system(["revert", wildcard_encode(f)]) >> @@ -1344,6 +1344,7 @@ class P4Submit(Command, P4UserMap): >> >> diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % >> (self.diffOpts, id, id)) >> filesToAdd = set() >> + filesToChangeType = set() >> filesToDelete = set() >> editedFiles = set() >> pureRenameCopy = set() >> @@ -1404,6 +1405,8 @@ class P4Submit(Command, P4UserMap): >> os.unlink(dest) >> filesToDelete.add(src) >> editedFiles.add(dest) >> + elif modifier == "T": >> + filesToChangeType.add(path) >> else: >> die("unknown modifier %s for %s" % (modifier, path)) >> >> @@ -1463,6 +1466,8 @@ class P4Submit(Command, P4UserMap): >> # >> system(applyPatchCmd) >> >> + for f in filesToChangeType: >> + p4_edit(f, "-t", "auto") >> for f in filesToAdd: >> p4_add(f) >> for f in filesToDelete: >> diff --git a/t/t9827-git-p4-change-filetype.sh >> b/t/t9827-git-p4-change-filetype.sh >> new file mode 100755 >> index 0000000..b0a9f62 >> --- /dev/null >> +++ b/t/t9827-git-p4-change-filetype.sh >> @@ -0,0 +1,69 @@ >> +#!/bin/sh >> +# >> +# Copyright (c) 2016 Romain Picard >> +# >> + >> +test_description='git p4 support for file type change' >> + >> +. ./lib-git-p4.sh >> + >> +test_expect_success 'start p4d' ' >> + start_p4d >> +' >> + >> +test_expect_success 'create files' ' >> + ( >> + cd "$cli" && >> + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client >> -i && >> + cat >file1 <<-EOF && >> + This is a first file. >> + EOF >> + cat >file2 <<-EOF && >> + This is a second file whose type will change. >> + EOF >> + p4 add file1 file2 && >> + p4 submit -d "add files" >> + ) >> +' >> + >> +test_expect_success 'change file to symbolic link' ' >> + git p4 clone --dest="$git" //depot@all && >> + test_when_finished cleanup_git && >> + ( >> + cd "$git" && >> + git config git-p4.skipSubmitEdit true && >> + >> + rm file2 && >> + ln -s file1 file2 && >> + git add file2 && >> + git commit -m "symlink file1 to file2" && >> + git p4 submit && >> + p4 filelog -m 1 //depot/file2 >filelog && >> + grep "(symlink)" filelog >> + ) >> +' >> + >> +test_expect_success 'change symbolic link to file' ' >> + git p4 clone --dest="$git" //depot@all && >> + test_when_finished cleanup_git && >> + ( >> + cd "$git" && >> + git config git-p4.skipSubmitEdit true && >> + >> + rm file2 && >> + cat >file2 <<-EOF && >> + This is another content for the second file. >> + EOF >> + git add file2 && >> + git commit -m "re-write file2" && >> + git p4 submit && >> + p4 filelog -m 1 //depot/file2 >filelog && >> + grep "(text)" filelog >> + ) >> +' >> + >> +test_expect_success 'kill p4d' ' >> + kill_p4d >> +' >> + >> +test_done >> -- >> 2.6.4 >> ```