delta/git.git/git-p4.py, branch sb/string-list-split-appends

git-p4: fix Git LFS pointer parsing

2016-04-28T17:03:13+00:00

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.py: add support for filetype change

2016-01-13T17:06:54+00:00

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:58+00:00

"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:55+00:00

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

git-p4: support multiple depot paths in p4 submit

2015-12-21T19:26:36+00:00

When submitting from a repository that was cloned using a client spec,
use the full list of paths when ruling out files that are outside the
view.  This fixes a bug where only files pertaining to the first path
would be included in the p4 submit.

Signed-off-by: Sam Hocevar 
Signed-off-by: Luke Diamand 
Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-keep-empty-commits'

2015-12-15T16:02:19+00:00

"git p4" used to import Perforce CLs that touch only paths outside
the client spec as empty commits.  It has been corrected to ignore
them instead, with a new configuration git-p4.keepEmptyCommits as a
backward compatibility knob.

* ls/p4-keep-empty-commits:
  git-p4: add option to keep empty commits

git-p4: add option to keep empty commits

2015-12-10T18:45:02+00:00

A changelist that contains only excluded files due to a client spec was
imported as an empty commit. Fix that issue by ignoring these commits.
Add option "git-p4.keepEmptyCommits" to make the previous behavior
available.

Signed-off-by: Lars Schneider 
Helped-by: Pete Harlan
Acked-by: Luke Diamand 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2015-12-01T22:32:38+00:00

* maint:
  http: treat config options sslCAPath and sslCAInfo as paths
  Documentation/diff: give --word-diff-regex=. example
  filter-branch: deal with object name vs. pathname ambiguity in tree-filter
  check-ignore: correct documentation about output
  git-p4: clean up after p4 submit failure
  git-p4: work with a detached head
  git-p4: add option to system() to return subshell status
  git-p4: add failing test for submit from detached head
  remote-http(s): support SOCKS proxies
  t5813: avoid creating urls that break on cygwin
  Escape Git's exec path in contrib/rerere-train.sh script
  allow hooks to ignore their standard input stream
  rebase-i-exec: Allow space in SHELL_PATH
  Documentation: make environment variable formatting more consistent

Merge branch 'eg/p4-submit-catch-failure' into maint

2015-12-01T22:24:21+00:00

Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.

* eg/p4-submit-catch-failure:
  git-p4: clean up after p4 submit failure

Merge branch 'ld/p4-detached-head' into maint

2015-12-01T22:21:29+00:00

Make git-p4 work on a detached head.

* ld/p4-detached-head:
  git-p4: work with a detached head
  git-p4: add option to system() to return subshell status
  git-p4: add failing test for submit from detached head