git/git-p4.py, branch v2.21.4

Merge branch 'ld/git-p4-shelve-update-fix'

2019-02-05T22:26:10Z

"git p4" failed to update a shelved change when there were moved files, which has been corrected. * ld/git-p4-shelve-update-fix: git-p4: handle update of moved/copied files when updating a shelve git-p4: add failing test for shelved CL update involving move/copy

git-p4: handle update of moved/copied files when updating a shelve

2019-01-18T17:43:40Z

Perforce requires a complete list of files being operated on. If git is updating an existing shelved changelist, then any files which are moved or copied were not being added to this list. Signed-off-by: Luke Diamand Acked-by: Andrey Mazo Signed-off-by: Junio C Hamano

git-p4: fix problem when p4 login is not necessary

2019-01-07T22:23:22Z

In a perforce setup where login is not required, communication fails because p4_check_access does not understand the response from the p4 client. Fixed by detecting and ignoring the "info" response. Signed-off-by: Peter Osterlund Acked-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: fully support unshelving changelists

2018-10-16T04:28:49Z

The previous git-p4 unshelve support would check for changes in Perforce to the files being unshelved since the original shelve, and would complain if any were found. This was to ensure that the user wouldn't end up with both the shelved change delta, and some deltas from other changes in their git commit. e.g. given fileA: the quick brown fox change1: s/the/The/ <- p4 shelve this change change2: s/fox/Fox/ <- p4 submit this change git p4 unshelve 1 <- FAIL This change teaches the P4Unshelve class to always create a parent commit which matches the P4 tree (for the files being unshelved) at the point prior to the P4 shelve being created (which is reported in the p4 description for a shelved changelist). That then means git-p4 can always create a git commit matching the P4 shelve that was originally created, without any extra deltas. The user might still need to use the --origin option though - there is no way for git-p4 to work out the versions of all of the other *unchanged* files in the shelve, since this information is not recorded by Perforce. Additionally this fixes handling of shelved 'move' operations. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved

2018-10-16T04:28:49Z

The branch detection code looks for branches under refs/remotes/p4/... and can end up getting confused if there are unshelved changes in there as well. This happens in the function p4BranchesInGit(). Instead, put the unshelved changes into refs/remotes/p4-unshelved/. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: do not fail in verbose mode for missing 'fileSize' key

2018-10-12T13:38:29Z

If deleting or moving a file, sometimes P4 doesn't report the file size. The code handles this just fine but some logging crashes. Stop this happening. There was some earlier discussion on the list about this: https://public-inbox.org/git/xmqq1sqpp1vv.fsf@gitster.mtv.corp.google.com/ Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: add the `p4-pre-submit` hook

2018-08-01T20:37:18Z

The `p4-pre-submit` hook is executed before git-p4 submits code. If the hook exits with non-zero value, submit process not start. Signed-off-by: Chen Bin Reviewed-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: python3: fix octal constants

2018-06-19T16:34:32Z

See PEP3127. Works fine with python2 as well. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: python3: use print() function

2018-06-19T16:34:32Z

Replace calls to print ... with the function form, print(...), to allow use with python3 as well as python2.x. Converted using 2to3 (and some hand-editing). Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: python3: basestring workaround

2018-06-19T16:34:32Z

In Python3, basestring no longer exists, so use this workaround. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano