From: David Aguilar <davvid@gmail.com>
Date: Sat, 20 Apr 2013 10:50:53 GMT
Subject: Re: is git-p4 compatible with p4/linux?
Message-ID: <CAJDDKr4gLWev=N-yMw3j0norzVxBp99ie_EYAbNcUvWcL-_70w@mail.gmail.com>
In-Reply-To: <20130419000947.GB9048@padd.com>

On Thu, Apr 18, 2013 at 5:09 PM, Pete Wyckoff <pw@padd.com> wrote:
>> 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 == "symlink":
>>         git_mode = "120000"
>>         # p4 print on a symlink contains "target\n"; remove the newline
>>         data = ''.join(contents)
>>         contents = [data[:-1]]

This line could be made more robust by changing it to:

    contents = [data.rstrip('\n')]

That way it only strips off newlines if they exist, which essentially
papers over these rogue depot files.
Alternatively, it could use rstrip() with no arguments to cast a wider
net and catch all whitespace.
-- 
David