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

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

git-p4: python3: remove backticks

2018-06-19T16:34:32Z

Backticks around a variable are a deprecated alias for repr(). This has been removed in python3, so just use the string representation instead, which is equivalent. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: python3: replace dict.has_key(k) with "k in dict"

2018-06-19T16:34:31Z

Python3 does not have the dict.has_key() function, so replace all such calls with "k in dict". This will still work with python2.6 and python2.7. Converted using 2to3 (plus some hand-editing) Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: python3: replace <> with !=

2018-06-19T16:34:31Z

The <> string inequality operator (which doesn't seem to be even documented) no longer exists in python3. Replace with !=. This still works with python2. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

Merge branch 'ld/git-p4-updates'

2018-06-18T17:18:41Z

"git p4" updates. * ld/git-p4-updates: git-p4: auto-size the block git-p4: narrow the scope of exceptions caught when parsing an int git-p4: raise exceptions from p4CmdList based on error from p4 server git-p4: better error reporting when p4 fails git-p4: add option to disable syncing of p4/master with p4 git-p4: disable-rebase: allow setting this via configuration git-p4: add options --commit and --disable-rebase

git-p4: auto-size the block

2018-06-12T21:46:09Z

git-p4 originally would fetch changes in one query. On large repos this could fail because of the limits that Perforce imposes on the number of items returned and the number of queries in the database. To fix this, git-p4 learned to query changes in blocks of 512 changes, However, this can be very slow - if you have a few million changes, with each chunk taking about a second, it can be an hour or so. Although it's possible to tune this value manually with the "--changes-block-size" option, it's far from obvious to ordinary users that this is what needs doing. This change alters the block size dynamically by looking for the specific error messages returned from the Perforce server, and reducing the block size if the error is seen, either to the limit reported by the server, or to half the current block size. That means we can start out with a very large block size, and then let it automatically drop down to a value that works without error, while still failing correctly if some other error occurs. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: narrow the scope of exceptions caught when parsing an int

2018-06-12T21:46:09Z

The current code traps all exceptions around some code which parses an integer, and then talks to Perforce. That can result in errors from Perforce being ignored. Change the code to only catch the integer conversion exceptions. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano