development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sw/git-p4-unshelve-branched-files'

Browse source 
"git p4" update.

* sw/git-p4-unshelve-branched-files:
  git-p4: allow unshelving of branched files
This commit is contained in:
Junio C Hamano 2019-06-17 10:15:18 -07:00
parent a3e6b426b9 0108f47eb3
commit e7ef93ba7a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-p4.py
View file

@ -1309,7 +1309,7 @@ def processContent(self, git_mode, relPath, contents):
class Command: class Command:
delete_actions = ( "delete", "move/delete", "purge" ) delete_actions = ( "delete", "move/delete", "purge" )
add_actions = ( "add", "move/add" ) add_actions = ( "add", "branch", "move/add" )
def __init__(self): def __init__(self):
self.usage = "usage: %prog [options]" self.usage = "usage: %prog [options]"

8
t/t9832-unshelve.sh
View file

@ -22,7 +22,10 @@ test_expect_success 'init depot' '
: >file_to_move && : >file_to_move &&
p4 add file_to_delete && p4 add file_to_delete &&
p4 add file_to_move && p4 add file_to_move &&
p4 submit -d "add files to delete" p4 submit -d "add files to delete" &&
echo file_to_integrate >file_to_integrate &&
p4 add file_to_integrate &&
p4 submit -d "add file to integrate"
) )
' '
@ -40,6 +43,7 @@ test_expect_success 'create shelved changelist' '
p4 delete file_to_delete && p4 delete file_to_delete &&
p4 edit file_to_move && p4 edit file_to_move &&
p4 move file_to_move moved_file && p4 move file_to_move moved_file &&
p4 integrate file_to_integrate integrated_file &&
p4 opened && p4 opened &&
p4 shelve -i <<EOF p4 shelve -i <<EOF
Change: new Change: new
@ -53,6 +57,7 @@ Files:
//depot/file_to_delete //depot/file_to_delete
//depot/file_to_move //depot/file_to_move
//depot/moved_file //depot/moved_file
//depot/integrated_file
EOF EOF
) && ) &&
@ -65,6 +70,7 @@ EOF
test_path_is_file file2 && test_path_is_file file2 &&
test_cmp file1 "$cli"/file1 && test_cmp file1 "$cli"/file1 &&
test_cmp file2 "$cli"/file2 && test_cmp file2 "$cli"/file2 &&
test_cmp file_to_integrate "$cli"/integrated_file &&
test_path_is_missing file_to_delete && test_path_is_missing file_to_delete &&
test_path_is_missing file_to_move && test_path_is_missing file_to_move &&
test_path_is_file moved_file test_path_is_file moved_file