From: Junio C Hamano <gitster@pobox.com>
To: larsxschneider@gmail.com
Cc: git@vger.kernel.org, luke@diamand.org
Subject: Re: [PATCH v1] git-p4: fix git-p4.pathEncoding for removed files
Date: Mon, 19 Dec 2016 13:29:17 -0800 [thread overview]
Message-ID: <xmqq37hjobf6.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20161218175153.92336-1-larsxschneider@gmail.com> (larsxschneider@gmail.com's message of "Sun, 18 Dec 2016 18:51:53 +0100")
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?
> Notes:
> Base Commit: d1271bddd4 (v2.11.0)
> Diff on Web: https://github.com/git/git/compare/d1271bddd4...larsxschneider:05a82caa69
> Checkout: git fetch https://github.com/larsxschneider/git git-p4/fix-path-encoding-v1 && git checkout 05a82caa69
>
> git-p4.py | 19 +++++++++----------
> t/t9822-git-p4-path-encoding.sh | 16 ++++++++++++++++
> 2 files changed, 25 insertions(+), 10 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index fd5ca52462..8f311cb4e8 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -2366,6 +2366,15 @@ class P4Sync(Command, P4UserMap):
> break
>
> path = wildcard_decode(path)
> + try:
> + path.decode('ascii')
> + except:
> + encoding = 'utf8'
> + if gitConfig('git-p4.pathEncoding'):
> + encoding = gitConfig('git-p4.pathEncoding')
> + path = path.decode(encoding, 'replace').encode('utf8', 'replace')
> + if self.verbose:
> + print 'Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, path)
> return path
>
> def splitFilesIntoBranches(self, commit):
> @@ -2495,16 +2504,6 @@ class P4Sync(Command, P4UserMap):
> text = regexp.sub(r'$\1$', text)
> contents = [ text ]
>
> - try:
> - relPath.decode('ascii')
> - except:
> - encoding = 'utf8'
> - if gitConfig('git-p4.pathEncoding'):
> - encoding = gitConfig('git-p4.pathEncoding')
> - relPath = relPath.decode(encoding, 'replace').encode('utf8', 'replace')
> - if self.verbose:
> - print 'Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, relPath)
> -
> if self.largeFileSystem:
> (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
>
> diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
> index 7b83e696a9..c78477c19b 100755
> --- a/t/t9822-git-p4-path-encoding.sh
> +++ b/t/t9822-git-p4-path-encoding.sh
> @@ -51,6 +51,22 @@ test_expect_success 'Clone repo containing iso8859-1 encoded paths with git-p4.p
> )
> '
>
> +test_expect_success 'Delete iso8859-1 encoded paths and clone' '
> + (
> + cd "$cli" &&
> + ISO8859="$(printf "$ISO8859_ESCAPED")" &&
> + p4 delete "$ISO8859" &&
> + p4 submit -d "remove file"
> + ) &&
> + git p4 clone --destination="$git" //depot@all &&
> + test_when_finished cleanup_git &&
> + (
> + cd "$git" &&
> + git -c core.quotepath=false ls-files >actual &&
> + test_must_be_empty actual
> + )
> +'
> +
> test_expect_success 'kill p4d' '
> kill_p4d
> '
next prev parent reply other threads:[~2016-12-19 21:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-18 17:51 [PATCH v1] git-p4: fix git-p4.pathEncoding for removed files larsxschneider
2016-12-19 21:29 ` Junio C Hamano [this message]
2016-12-20 11:01 ` Luke Diamand
2016-12-22 21:23 ` Junio C Hamano
2017-02-09 15:06 ` [PATCH v2] " Lars Schneider
2017-02-09 23:39 ` Junio C Hamano
2017-02-10 22:05 ` Luke Diamand
2017-02-10 22:32 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq37hjobf6.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=luke@diamand.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).