From: Pete Wyckoff <pw@padd•com>
To: Alexander Tomlinson <alex@aivor•com>
Cc: "git@vger•kernel.org" <git@vger•kernel.org>
Subject: Re: is git-p4 compatible with p4/linux?
Date: Thu, 18 Apr 2013 20:09:47 -0400 [thread overview]
Message-ID: <20130419000947.GB9048@padd.com> (raw)
In-Reply-To: <7BF81DF9-941D-400B-8304-6DA5F5C82D4F@aivor.com>
alex@aivor•com wrote on Tue, 16 Apr 2013 23:31 -0500:
> git-p4.py (1.8.2.1.418.gaec3f77) has at least two behaviors that
> seem to be incompatible with the version of p4 that I recently
> downloaded from perforce.com (P4/LINUX26X86_64/2013.1/610569).
>
> TLDR: Is git-p4 written for an old version of p4 CLI with different
> behavior? Or for a windows or mac release of p4? Or am I missing
> something?
I had not done any testing beyond p4 12.2 (linux). But running
the unit tests through 13.1 just now, they all pass.
$ p4 -V
Perforce - The Fast Software Configuration Management System.
Copyright 1995-2013 Perforce Software. All rights reserved.
This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)
See 'p4 help legal' for full OpenSSL license information
Version of OpenSSL Libraries: OpenSSL 1.0.1c 10 May 2012
Rev. P4/LINUX26X86_64/2013.1/610569 (2013/03/19).
I'm using python 2.7.3.
> First issue
> -----------
>
> git-p4 assumes the output of 'p4 print' adds a newline to the
> target. To work around this, git-p4.py strips the last char from
> symlinks as shown in the following snippet:
>
> if type_base =3D=3D "symlink":
> git_mode =3D "120000"
> # p4 print on a symlink contains "target\n"; remove the newline
> data =3D ''.join(contents)
> contents =3D [data[:-1]]
>
> But my 'p4 print' does not output the newline:
>
> $ ls -l pcre
> lrwxrwxrwx 1 user group 12 Apr 16 10:27 pcre -> ../libs/pcre
>
> $ p4 print -q pcre | od -t x1a
> 0000000 2e 2e 2f 6c 69 62 73 2f 70 63 72 65
> . . / l i b s / p c r e
> 0000014
>
> If I use 'git p4 clone' the above file shows up in git as a
> symlink to '../libs/pcr'. I had another symlink whose target had
> a strlen of 1 and the 'git p4 clone' failed b/c after stripping
> the last char the result was an empty string.
There wasn't an explict test for symlinks, but I threw
one together quickly and it seems to work. Can you show
a bit more information about anything that potentially might
be odd with your install?
arf-git-test$ ls -l symlink
lrwxrwxrwx 1 pw pw 14 Apr 18 20:02 symlink -> symlink-target
$ p4 fstat symlink
... depotFile //depot/symlink
... clientFile /run/shm/trash directory.t9802-git-p4-filetype/cli/symlink
... isMapped
... headAction add
... headType symlink
... headTime 1366329740
... headRev 1
... headChange 6
... headModTime 1366329740
... haveRev 1
$ p4 print -q symlink | od -t x1a
0000000 73 79 6d 6c 69 6e 6b 2d 74 61 72 67 65 74 0a
s y m l i n k - t a r g e t nl
0000017
No idea why I get an "nl" but you do not. If you run _without_
the "| od ...", then the shell prompt ends up on the same line
as the output? Any interesting shell or shell settings?
> Second issue
> ------------
>
> git-p4 uses 'p4 print -q -o o FILE' to print a file to stdout.
> At least that is how I interpret this snippet:
>
> text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
>
> However, p4/Linux prints to stdout by default and '-o -' will save
> the output in a file named '-'.
>
> My git and p4 versions:
>
> $ git --version
> git version 1.8.2.1.418.gaec3f77
>
> $ p4 -V
> Perforce - The Fast Software Configuration Management System.
> Copyright 1995-2013 Perforce Software. All rights reserved.
> This product includes software developed by the OpenSSL Project
> for use in the OpenSSL Toolkit (http://www.openssl.org/)
> See 'p4 help legal' for full OpenSSL license information
> Version of OpenSSL Libraries: OpenSSL 1.0.1c 10 May 2012
> Rev. P4/LINUX26X86_64/2013.1/610569 (2013/03/19).
This code only happens on utf16 files. But running it by hand,
I cannot reproduce the different behavior:
$ p4 print -q //depot/f-ascii
three
line
text
$ p4 print -o - -q //depot/f-ascii
three
line
$ ls ./-
ls: cannot access ./-: No such file or directory
I'm again confused. Any hints you can give would be helpful.
-- Pete
next prev parent reply other threads:[~2013-04-19 0:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-17 4:31 is git-p4 compatible with p4/linux? Alexander Tomlinson
2013-04-17 4:37 ` Alexander Tomlinson
2013-04-19 0:09 ` Pete Wyckoff [this message]
2013-04-19 1:34 ` Alexander Tomlinson
2013-04-19 11:55 ` Pete Wyckoff
2013-04-19 15:20 ` Alex Tomlinson
2013-04-20 10:50 ` David Aguilar
2013-04-20 13:22 ` Pete Wyckoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130419000947.GB9048@padd.com \
--to=pw@padd$(echo .)com \
--cc=alex@aivor$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox