Re: [PATCH v1] git-p4: fix git-p4.pathEncoding for removed files

From: Luke Diamand <luke@diamand.org>
Date: Dec 20, 2016, 11:01 UTC
Message-ID: <CAE5ih7-=bD_ZoL5pFYfD2Qvy-XE24V_cgge0XoAvuoTK02EDfg@mail.gmail.com>
In-Reply-To: <xmqq37hjobf6.fsf@gitster.mtv.corp.google.com>

On 19 December 2016 at 21:29, Junio C Hamano <gitster@pobox.com> wrote:

Show 25 quoted lines

> larsxschneider@gmail.com writes:
>
>> From: Lars Schneider <larsxschneider@gmail.com>
>>
>> In a9e38359e3 we taught git-p4 a way to re-encode path names from what
>> was used in Perforce to UTF-8. This path re-encoding worked properly for
>> "added" paths. "Removed" paths were not re-encoded and therefore
>> different from the "added" paths. Consequently, these files were not
>> removed in a git-p4 cloned Git repository because the path names did not
>> match.
>>
>> Fix this by moving the re-encoding to a place that affects "added" and
>> "removed" paths. Add a test to demonstrate the issue.
>>
>> Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
>> ---
>
> Thanks.
>
> The above description makes me wonder what happens to "modified"
> paths, but presumably they are handled in a separate codepath?  Or
> does this also cover not just "removed" but also paths with any
> change?
>
> Luke, does this look good?

I'm not totally sure. In the previous version the conversion happened in streamOneP4File(). There is a counterpart to this, streamOneP4Deletion() which would seem like the callpoint that needs to know about this.

The change puts the logic into stripRepoPath() instead, which is indeed called from both of those functions (good), but also from splitFilesIntoBranches(), but only if self.useClientSpec is set. That function only gets used if we're doing the automatic branch detection logic, so it's possible that this code might now be broken and we wouldn't know.

Lars, what do you think? Other than the above, the change looks good, so it may all be fine.

(As an aside, this is the heart of the code that's going to need some careful rework if/when we ever move to Python3).

Luke