Re: [PATCH 7/8] git-p4: decode p4 wildcard characters
- From
Tor Arvid Lund <torarvid@gmail.com>
- Date
- Feb 8, 2011, 09:09 UTC
- Message-ID
- <AANLkTi=Gah9yeYYnHPZ2Z6-OZQ2-CU5Kub=o5SqWAXht@mail.gmail.com>
- In-Reply-To
- <20110205225237.GH30963@arf.padd.com>
On Sat, Feb 5, 2011 at 11:52 PM, Pete Wyckoff <pw@padd.com> wrote:
Show 31 quoted lines
> There are four wildcard characters in p4. Files with these
> characters can be added to p4 repos using the "-f" option.
> They are stored in %xx notation, and when checked out, p4
> converts them back to normal.
>
> This patch does the same thing when importing into git,
> converting the four special characters. Without this change,
> the files appear with literal %xx in their names.
>
> Signed-off-by: Pete Wyckoff <pw@padd.com>
> ---
> contrib/fast-import/git-p4 | 13 +++++++++++++
> t/t9800-git-p4.sh | 22 ++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 0 deletions(-)
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index 04e6c3d..5b08cd6 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -884,6 +884,18 @@ class P4Sync(Command):
> if gitConfig("git-p4.syncFromOrigin") == "false":
> self.syncWithOrigin = False
>
> + # The p4 wildcards are not allowed in filenames. It complains
> + # if you try to add them, but you can override with "-f", in
> + # which case it translates them into %xx encoding. Search for
> + # and fix just these four characters. Do % last so it does
> + # not inadvertantly create new %-escapes.
> + def wildcard_decode(self, path):
> + path = path.replace("%23", "#") \
> + .replace("%2A", "*") \This probably works fine on UNIX platforms, but the asterisk '*' character is not allowed in windows filenames. I don't really know what perforce does in that scenario. Does it make the most sense to just keep the %2A in the filename if we are running on windows (??)
-- Tor Arvid
Show 56 quoted lines
> + .replace("%40", "@") \
> + .replace("%25", "%")
> + return path
> +
> def extractFilesFromCommit(self, commit):
> self.cloneExclude = [re.sub(r"\.\.\.$", "", path)
> for path in self.cloneExclude]
> @@ -962,6 +974,7 @@ class P4Sync(Command):
> return
>
> relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
> + relPath = self.wildcard_decode(relPath)
> if verbose:
> sys.stderr.write("%s\n" % relPath)
>
> diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
> index 41e57bb..72c38af 100755
> --- a/t/t9800-git-p4.sh
> +++ b/t/t9800-git-p4.sh
> @@ -65,6 +65,28 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
> test_must_fail grep -q Traceback errs
> '
>
> +test_expect_success 'add p4 files with wildcards in the names' '
> + cd "$cli" &&
> + echo file-wild-hash >file-wild#hash &&
> + echo file-wild-star >file-wild\*star &&
> + echo file-wild-at >file-wild@at &&
> + echo file-wild-percent >file-wild%percent &&
> + p4 add -f file-wild* &&
> + p4 submit -d "file wildcards" &&
> + cd "$TRASH_DIRECTORY"
> +'
> +
> +test_expect_success 'wildcard files git-p4 clone' '
> + "$GITP4" clone --dest="$git" //depot &&
> + cd "$git" &&
> + test -f file-wild#hash &&
> + test -f file-wild\*star &&
> + test -f file-wild@at &&
> + test -f file-wild%percent &&
> + cd "$TRASH_DIRECTORY" &&
> + rm -rf "$git" && mkdir "$git"
> +'
> +
> test_expect_success 'shutdown' '
> pid=`pgrep -f p4d` &&
> test -n "$pid" &&
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>