* [PATCHv2 0/2] git-p4: handle moved files when updating a P4 shelve
@ 2019-01-14 23:55 Luke Diamand
2019-01-14 23:55 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
0 siblings, 1 reply; 4+ messages in thread
From: Luke Diamand @ 2019-01-14 23:55 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Andrew Oakley, Romain Merland, SZEDER Gábor,
Vitor Antunes, Andrey Mazo, Luke Diamand
Updated as per comments from Junio, Eric.
https://public-inbox.org/git/20190113135815.11286-1-luke@diamand.org/
Luke Diamand (2):
git-p4: add failing test for shelved CL update involving move
git-p4: handle update of moved files when updating a shelve
git-p4.py | 1 +
t/t9807-git-p4-submit.sh | 51 +++++++++++++++++++++++++++++++++++++---
2 files changed, 49 insertions(+), 3 deletions(-)
--
2.20.1.100.g9ee79a14a8
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move
2019-01-14 23:55 [PATCHv2 0/2] git-p4: handle moved files when updating a P4 shelve Luke Diamand
@ 2019-01-14 23:55 ` Luke Diamand
2019-01-14 23:55 ` [PATCHv2 2/2] git-p4: handle update of moved files when updating a shelve Luke Diamand
2019-01-16 23:40 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Mazo, Andrey
0 siblings, 2 replies; 4+ messages in thread
From: Luke Diamand @ 2019-01-14 23:55 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Andrew Oakley, Romain Merland, SZEDER Gábor,
Vitor Antunes, Andrey Mazo, Luke Diamand
Updating a shelved P4 changelist where one or more files have
been moved does not work. Add a test for this.
The problem is that P4 requires a complete list of the files being
changed, and move/rename only includes the _source_ in the case of
updating a shelved changelist. This results in errors from Perforce
such as:
//depot/src - needs tofile //depot/dst
Submit aborted -- fix problems then use 'p4 submit -c 1234'
Signed-off-by: Luke Diamand <luke@diamand.org>
---
t/t9807-git-p4-submit.sh | 51 +++++++++++++++++++++++++++++++++++++---
1 file changed, 48 insertions(+), 3 deletions(-)
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 2325599ee6..c390af56ad 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -500,6 +500,10 @@ test_expect_success 'submit --shelve' '
)
'
+last_shelve() {
+ p4 -G changes -s shelved -m 1 //depot/... | marshal_dump change
+}
+
make_shelved_cl() {
test_commit "$1" >/dev/null &&
git p4 submit --origin HEAD^ --shelve >/dev/null &&
@@ -533,12 +537,53 @@ test_expect_success 'submit --update-shelve' '
) &&
(
cd "$cli" &&
- change=$(p4 -G changes -s shelved -m 1 //depot/... | \
- marshal_dump change) &&
+ change=$(last_shelve) &&
p4 unshelve -c $change -s $change &&
grep -q updated-line shelf.t &&
p4 describe -S $change | grep added-file.t &&
- test_path_is_missing shelved-change-1.t
+ test_path_is_missing shelved-change-1.t &&
+ p4 revert ...
+ )
+'
+
+test_expect_failure 'update a shelve involving a moved file' '
+ test_when_finished cleanup_git &&
+ (
+ cd "$cli" &&
+ : >file_to_move &&
+ p4 add file_to_move &&
+ p4 submit -d "change1" &&
+ p4 edit file_to_move &&
+ echo change >>file_to_move &&
+ p4 submit -d "change2" &&
+ p4 opened
+ ) &&
+ git p4 clone --dest="$git" //depot &&
+ (
+ cd "$git" &&
+ git config git-p4.skipSubmitEdit true &&
+ mkdir moved &&
+ git mv file_to_move moved/ &&
+ git commit -m "rename a file" &&
+ git p4 submit -M --shelve --origin HEAD^ &&
+ : >new_file &&
+ git add new_file &&
+ git commit --amend &&
+ git show --stat HEAD &&
+ change=$(last_shelve) &&
+ git p4 submit -M --update-shelve $change --commit HEAD
+ ) &&
+ (
+ cd "$cli" &&
+ change=$(last_shelve) &&
+ echo change=$change &&
+ p4 unshelve -s $change &&
+ p4 submit -d "Testing update-shelve" &&
+ test_path_is_file moved/file_to_move &&
+ test_path_is_missing file_to_move &&
+ test_path_is_file new_file &&
+ echo "unshelved and submitted change $change" &&
+ p4 changes moved/file_to_move | grep "Testing update-shelve"
)
'
--
2.20.1.100.g9ee79a14a8
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCHv2 2/2] git-p4: handle update of moved files when updating a shelve
2019-01-14 23:55 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
@ 2019-01-14 23:55 ` Luke Diamand
2019-01-16 23:40 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Mazo, Andrey
1 sibling, 0 replies; 4+ messages in thread
From: Luke Diamand @ 2019-01-14 23:55 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Andrew Oakley, Romain Merland, SZEDER Gábor,
Vitor Antunes, Andrey Mazo, Luke Diamand
Perforce requires a complete list of files being operated on. If
git is updating an existing shelved changelist, then any files
which are moved were not being added to this list.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
git-p4.py | 1 +
t/t9807-git-p4-submit.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 1998c3e141..20c5ce9903 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1875,6 +1875,7 @@ def applyCommit(self, id):
editedFiles.add(dest)
elif modifier == "R":
src, dest = diff['src'], diff['dst']
+ all_files.append(dest)
if self.p4HasMoveCommand:
p4_edit(src) # src must be open before move
p4_move(src, dest) # opens for (move/delete, move/add)
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index c390af56ad..c4ddd28f41 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -546,7 +546,7 @@ test_expect_success 'submit --update-shelve' '
)
'
-test_expect_failure 'update a shelve involving a moved file' '
+test_expect_success 'update a shelve involving a moved file' '
test_when_finished cleanup_git &&
(
cd "$cli" &&
--
2.20.1.100.g9ee79a14a8
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move
2019-01-14 23:55 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
2019-01-14 23:55 ` [PATCHv2 2/2] git-p4: handle update of moved files when updating a shelve Luke Diamand
@ 2019-01-16 23:40 ` Mazo, Andrey
1 sibling, 0 replies; 4+ messages in thread
From: Mazo, Andrey @ 2019-01-16 23:40 UTC (permalink / raw)
To: luke@diamand.org
Cc: Mazo, Andrey, aoakley@roku.com, git@vger.kernel.org,
gitster@pobox.com, merlorom@yahoo.fr, szeder.dev@gmail.com,
vitor.hda@gmail.com
>
> Updating a shelved P4 changelist where one or more files have
> been moved does not work. Add a test for this.
>
> The problem is that P4 requires a complete list of the files being
> changed, and move/rename only includes the _source_ in the case of
> updating a shelved changelist. This results in errors from Perforce
> such as:
>
> //depot/src - needs tofile //depot/dst
> Submit aborted -- fix problems then use 'p4 submit -c 1234'
>
Shouldn't a similar test case and a fix be added for the "copy" case too?
The code looks very similar to the "move" case, so will probably fail in a similar way, right?
For the "move" test case and the fix, please, feel free to add my
Acked-by: Andrey Mazo <amazo@checkvideo.com>
(if it's of any use)
Thank you,
Andrey
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-16 23:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 23:55 [PATCHv2 0/2] git-p4: handle moved files when updating a P4 shelve Luke Diamand
2019-01-14 23:55 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Luke Diamand
2019-01-14 23:55 ` [PATCHv2 2/2] git-p4: handle update of moved files when updating a shelve Luke Diamand
2019-01-16 23:40 ` [PATCHv2 1/2] git-p4: add failing test for shelved CL update involving move Mazo, Andrey
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).