delta/git.git/git-p4.py, branch fc/mergetools-vimdiff3

git p4: fix an error message when "p4 where" fails

2014-01-22T16:06:19+00:00

When "p4 where" fails, for whatever reason, the error message tries to
show an undefined variable.  This minor bug applies only when using a
client spec, and was introduced recently in 9d57c4a (git p4: implement
view spec wildcards with "p4 where", 2013-08-30).

Signed-off-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

git p4: handle files with wildcards when doing RCS scrubbing

2014-01-22T16:06:19+00:00

Commit 9d7d446 (git p4: submit files with wildcards, 2012-04-29)
fixed problems with handling files that had p4 wildcard
characters, like "@" and "*".  But it missed one case, that of
RCS keyword scrubbing, which uses "p4 fstat" to extract type
information.  Fix it by calling wildcard_encode() on the raw
filename.

Signed-off-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

git p4 test: do not pollute /tmp

2014-01-22T16:06:19+00:00

Generating the submit template for p4 uses tempfile.mkstemp(),
which by default puts files in /tmp.  For a test that fails,
possibly on purpose, this is not cleaned up.  Run with TMPDIR
pointing into the trash directory so the temp files go away
with the test results.

To do this required some other minor changes.  First, the editor
is launched using system(editor + " " + template_file), using
shell expansion to build the command string.  This doesn't work
if editor has a space in it.  And is generally unwise as it's
easy to fool the shell into doing extra work.  Exec the args
directly, without shell expansion.

Second, without shell expansion, the trick of "P4EDITOR=:" used
in the tests doesn't work.  Use a real command, true, as the
non-interactive editor for testing.

Signed-off-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

git p4: work around p4 bug that causes empty symlinks

2014-01-22T16:05:04+00:00

Damien Gérard highlights an interesting problem.  Some p4
repositories end up with symlinks that have an empty target.  It
is not possible to create this with current p4, but they do
indeed exist.

The effect in git p4 is that "p4 print" on the symlink returns an
empty string, confusing the curret symlink-handling code.

Such broken repositories cause problems in p4 as well, even with
no git involved.  In p4, syncing to a change that includes a
bogus symlink causes errors:

    //depot/empty-symlink - updating /home/me/p4/empty-symlink
    rename: /home/me/p4/empty-symlink: No such file or directory

and leaves no symlink.

In git, replicate the p4 behavior by ignoring these bad symlinks.
If, in a later p4 revision, the symlink happens to point to
something non-null, the symlink will be replaced properly.

Add a big test for all this too.

This happens to be a regression introduced by 1292df1 (git-p4:
Fix occasional truncation of symlink contents., 2013-08-08) and
appeared first in 1.8.5.  But it shows up only in p4 repositories
of dubious character, so can wait for a proper release.

Tested-by: Damien Gérard 
Signed-off-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

Merge branch 'cl/p4-use-diff-tree'

2013-12-12T22:18:20+00:00

* cl/p4-use-diff-tree:
  git p4: Use git diff-tree instead of format-patch

git p4: Use git diff-tree instead of format-patch

2013-11-22T23:30:51+00:00

The output of git format-patch can vary with user preferences. In
particular setting diff.noprefix will break the "git apply" that
is done as part of "git p4 submit".

Acked-by: Pete Wyckoff 
Signed-off-by: Crestez Dan Leonard 
Signed-off-by: Junio C Hamano

Merge branch 'ks/p4-view-spec'

2013-09-18T18:44:50+00:00

* ks/p4-view-spec:
  git p4: implement view spec wildcards with "p4 where"
  git p4 test: sanitize P4CHARSET

git p4: implement view spec wildcards with "p4 where"

2013-09-03T21:19:20+00:00

"git p4" does not support many of the view wildcards, such as * and
%%n.  It only knows the common ... mapping, and exclusions.

Redo the entire wildcard code around the idea of directly querying
the p4 server for the mapping.  For each commit, invoke "p4 where"
with committed file paths as args and use the client mapping to
decide where the file goes in git.

This simplifies a lot of code, and adds support for all wildcards
supported by p4.  Downside is that there is probably a 20%-ish
slowdown with this approach.

[pw: redo code and tests]

Signed-off-by: Kazuki Saitoh 
Signed-off-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

git-p4: Fix occasional truncation of symlink contents.

2013-08-12T17:10:46+00:00

Symlink contents in p4 print sometimes have a trailing
new line character, but sometimes it doesn't. git-p4
should only remove the last character if that character
is '\n'.

Signed-off-by: Alex Juncu 
Signed-off-by: Alex Badea 
Acked-by: Pete Wyckoff 
Signed-off-by: Junio C Hamano

many small typofixes

2013-07-29T19:32:25+00:00

Signed-off-by: Ondřej Bílka 
Reviewed-by: Marc Branchaud 
Signed-off-by: Junio C Hamano