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

Merge branch 'ao/p4-has-branch-prefix-fix' into maint

2016-07-11T17:44:16Z

A bug, which caused "git p4" while running under verbose mode to report paths that are omitted due to branch prefix incorrectly, has been fixed; the command said "Ignoring file outside of prefix" for paths that are _inside_. * ao/p4-has-branch-prefix-fix: git-p4: correct hasBranchPrefix verbose output

git-p4: correct hasBranchPrefix verbose output

2016-06-22T16:45:15Z

The logic here was inverted, you got a message saying the file is ignored for each file that is not ignored. Signed-off-by: Andrew Oakley Acked-by: Lars Schneider Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-lfs'

2016-05-10T20:40:29Z

Recent update to Git LFS broke "git p4" by changing the output from its "lfs pointer" subcommand. * ls/p4-lfs: git-p4: fix Git LFS pointer parsing travis-ci: express Linux/OS X dependency versions more clearly travis-ci: update Git-LFS and P4 to the latest version

git-p4: fix Git LFS pointer parsing

2016-04-28T17:03:13Z

Git LFS 1.2.0 removed a preamble from the output of the 'git lfs pointer' command [1] which broke the parsing of this output. Adjust the parser to support the old and the new format. Please note that this patch slightly changes the second return parameter from a list of LF terminated strings to a single string that contains a number of LF characters. [1] https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43 Signed-off-by: Lars Schneider Helped-by: Sebastian Schuberth Helped-by: Ben Woosley Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano

git-p4: add P4 jobs to git commit message

2016-04-19T20:41:00Z

When migrating from Perforce to git the information about P4 jobs associated with P4 changelists is lost. Having these jobs listed on messages of related git commits enables smooth migration for projects that take advantage of e.g. JIRA integration (which uses jobs on Perforce side and parses commit messages on git side). The jobs are added to the message in the same format as is expected when migrating in the reverse direction. Signed-off-by: Jan Durovec Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-map-user'

2016-04-06T18:39:05Z

"git p4" now allows P4 author names to be mapped to Git author names. * ls/p4-map-user: git-p4: map a P4 user to Git author name and email address

git-p4: map a P4 user to Git author name and email address

2016-03-15T18:45:13Z

Map a P4 user to a specific name and email address in Git with the "git-p4.mapUser" config. The config value must be a string adhering to the format "p4user = First Lastname ". Signed-off-by: Lars Schneider Reviewed-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4.py: add support for filetype change

2016-01-13T17:06:54Z

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 Acked-by: Luke Diamand Signed-off-by: Junio C Hamano

Merge branch 'sh/p4-multi-depot'

2015-12-28T21:58:58Z

"git p4" when interacting with multiple depots at the same time used to incorrectly drop changes. * sh/p4-multi-depot: git-p4: reduce number of server queries for fetches git-p4: support multiple depot paths in p4 submit git-p4: failing test case for skipping changes with multiple depots

git-p4: reduce number of server queries for fetches

2015-12-21T19:26:55Z

When fetching changes from a depot using a full client spec, there is no need to perform as many queries as there are top-level paths in the client spec. Instead we query all changes in chronological order, also getting rid of the need to sort the results and remove duplicates. Signed-off-by: Sam Hocevar Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano