From mboxrd@z Thu Jan 1 00:00:00 1970 From: larsxschneider@gmail.com Subject: [PATCH v2] git-p4: add "--path-encoding" option Date: Mon, 31 Aug 2015 22:43:53 +0200 Message-ID: <1441053833-63790-2-git-send-email-larsxschneider@gmail.com> References: <1441053833-63790-1-git-send-email-larsxschneider@gmail.com> Cc: luke@diamand.org, gitster@pobox.com, tboegi@web.de, Lars Schneider To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Aug 31 22:44:09 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZWVvy-0004Ti-Kj for gcvg-git-2@plane.gmane.org; Mon, 31 Aug 2015 22:44:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752985AbbHaUoA (ORCPT ); Mon, 31 Aug 2015 16:44:00 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:34041 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752972AbbHaUn7 (ORCPT ); Mon, 31 Aug 2015 16:43:59 -0400 Received: by wicjd9 with SMTP id jd9so11985414wic.1 for ; Mon, 31 Aug 2015 13:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CEz6dYJ+t2xgRjZvN4EGIqq4GsthxmhIVpnirdOOXAA=; b=qtyQ5usQrtf9SmGib82BmhfFmQj9cMg6t8oG2kPF8VNBNyszjMboPnTBcyFwNVchYx XGgzPoeEJB7EB1ukZgwkhKmVEm48cwBNT7Oyiw7Vybzvn3TVnCKAdxP5vvxgzxio4eZV 03ZkG84jIhKYwsImpZGDWCi+gzBYIPZRye6xPA+BqMcRYaLbCyUh2lUGKxc2Cif74G6n 9sXF8IEf4B0fijElzFATsrR4jbeYKGZdI4DC0r1Fd+Ix5A8kP6LMcnCfT2P/TFMmZ2SA M1AzMi0+mlTq/vpoZh++6dtcWZEhAjPOVuJLt2Qp4aYBc4tmX6LWLYFfilVsMJIRgy7s fpzw== X-Received: by 10.194.250.40 with SMTP id yz8mr32159921wjc.37.1441053838619; Mon, 31 Aug 2015 13:43:58 -0700 (PDT) Received: from slxBook3.ads.autodesk.com (adsknateur.autodesk.com. [132.188.32.100]) by smtp.gmail.com with ESMTPSA id cj1sm441615wib.14.2015.08.31.13.43.57 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Aug 2015 13:43:58 -0700 (PDT) X-Mailer: git-send-email 1.9.5 (Apple Git-50.3) In-Reply-To: <1441053833-63790-1-git-send-email-larsxschneider@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 5 +++++ git-p4.py | 6 ++++++ t/t9821-git-p4-path-encoding.sh | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100755 t/t9821-git-p4-path-encoding.sh diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 82aa5d6..14bb79c 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -252,6 +252,11 @@ Git repository: Use a client spec to find the list of interesting files in p4. See the "CLIENT SPEC" section below. +--path-encoding :: + The encoding to use when reading p4 client paths. With this option + non ASCII paths are properly stored in Git. For example, the encoding + 'cp1252' is often used on Windows systems. + -/ :: Exclude selected depot paths when cloning or syncing. diff --git a/git-p4.py b/git-p4.py index 073f87b..2b3bfc4 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1981,6 +1981,8 @@ class P4Sync(Command, P4UserMap): optparse.make_option("--silent", dest="silent", action="store_true"), optparse.make_option("--detect-labels", dest="detectLabels", action="store_true"), optparse.make_option("--import-labels", dest="importLabels", action="store_true"), + optparse.make_option("--path-encoding", dest="pathEncoding", type="string", + help="Encoding to use for paths"), optparse.make_option("--import-local", dest="importIntoRemotes", action="store_false", help="Import into refs/heads/ , not refs/remotes"), optparse.make_option("--max-changes", dest="maxChanges", @@ -2025,6 +2027,7 @@ class P4Sync(Command, P4UserMap): self.clientSpecDirs = None self.tempBranches = [] self.tempBranchLocation = "git-p4-tmp" + self.pathEncoding = None if gitConfig("git-p4.syncFromOrigin") == "false": self.syncWithOrigin = False @@ -2213,6 +2216,9 @@ class P4Sync(Command, P4UserMap): text = regexp.sub(r'$\1$', text) contents = [ text ] + if self.pathEncoding: + relPath = relPath.decode(self.pathEncoding).encode('utf8', 'replace') + self.gitStream.write("M %s inline %s\n" % (git_mode, relPath)) # total length... diff --git a/t/t9821-git-p4-path-encoding.sh b/t/t9821-git-p4-path-encoding.sh new file mode 100755 index 0000000..bb85074 --- /dev/null +++ b/t/t9821-git-p4-path-encoding.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +test_description='Clone repositories with non ASCII paths' + +. ./lib-git-p4.sh + +UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt" + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'Create a repo containing iso8859-1 encoded paths' ' + cd "$cli" && + + ISO8859="$(printf "$UTF8_ESCAPED" | iconv -f utf-8 -t iso8859-1)" && + >"$ISO8859" && + p4 add "$ISO8859" && + p4 submit -d "test commit" +' + +test_expect_success 'Clone repo containing iso8859-1 encoded paths' ' + git p4 clone --destination="$git" --path-encoding=iso8859-1 //depot && + test_when_finished cleanup_git && + ( + cd "$git" && + printf "\"$UTF8_ESCAPED\"" >expect && + # I wonder why Git prints "ls-files" output UTF-8 escaped. + # This behavior is consistent on Linux and OS X. + printf $(git ls-files) >actual && + test_cmp expect actual + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done -- 2.5.1.1.g9071995.dirty