git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Pete Wyckoff <pw@padd.com>
Cc: git@vger.kernel.org, Luke Diamand <luke@diamand.org>,
	Chris Li <git@chrisli.org>,
	Stefano Lattarini <stefano.lattarini@gmail.com>
Subject: Re: [PATCH 2/6] git-p4: handle utf16 filetype properly
Date: Sun, 16 Oct 2011 11:08:33 -0700	[thread overview]
Message-ID: <7vaa90reqm.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20111016144435.GE22144@arf.padd.com> (Pete Wyckoff's message of "Sun, 16 Oct 2011 10:44:35 -0400")

Pete Wyckoff <pw@padd.com> writes:

> +build_smush() {
> +	cat >k_smush.py <<-\EOF &&
> +	import re, sys
> +	sys.stdout.write(re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$', r'$\1$', sys.stdin.read()))
> +	EOF
> +	cat >ko_smush.py <<-\EOF
> +	import re, sys
> +	sys.stdout.write(re.sub(r'(?i)\$(Id|Header):[^$]*\$', r'$\1$', sys.stdin.read()))
> +	EOF
> +}
> +
> +test_expect_success 'keyword file test' '
> +	build_smush &&
> +	test_when_finished rm -f k_smush.py ko_smush.py &&
> +	test_when_finished cleanup_git &&
> +	"$GITP4" clone --dest="$git" //depot@all &&
> +	(
> +		cd "$git" &&
> +
> +		# text, ensure unexpanded
> +		python "$TRASH_DIRECTORY/k_smush.py" <"$cli/k-text-k" >cli-k-text-k-smush &&
> +		test_cmp cli-k-text-k-smush k-text-k &&
> +		python "$TRASH_DIRECTORY/ko_smush.py" <"$cli/k-text-ko" >cli-k-text-ko-smush &&
> +		test_cmp cli-k-text-ko-smush k-text-ko &&
> +
> +		# utf16, even though p4 expands keywords, git-p4 does not
> +		# try to undo that
> +		test_cmp "$cli/k-utf16-k" k-utf16-k &&
> +		test_cmp "$cli/k-utf16-ko" k-utf16-ko
> +	)
> +'

Shouldn't this pay attention to PYTHON_PATH in any way?

  parent reply	other threads:[~2011-10-16 18:08 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-16 14:42 [PATCH v3 0/6] git-p4 tests, filetypes, shell metacharacters Pete Wyckoff
2011-10-16 14:43 ` [PATCH 1/6] git-p4 tests: refactor and cleanup Pete Wyckoff
2011-10-16 22:48   ` Pete Wyckoff
2011-10-16 14:44 ` [PATCH 2/6] git-p4: handle utf16 filetype properly Pete Wyckoff
2011-10-16 14:59   ` Stefano Lattarini
2011-10-16 15:22     ` Pete Wyckoff
2011-10-16 18:08   ` Junio C Hamano [this message]
2011-10-16 22:47     ` Pete Wyckoff
2011-10-16 14:45 ` [PATCH 3/6] git-p4: recognize all p4 filetypes Pete Wyckoff
2011-10-16 14:45 ` [PATCH 4/6] git-p4: stop ignoring apple filetype Pete Wyckoff
2011-10-16 14:46 ` [PATCH 5/6] git-p4: keyword flattening fixes Pete Wyckoff
2011-10-16 14:47 ` [PATCH 6/6] git-p4: handle files with shell metacharacters Pete Wyckoff
  -- strict thread matches above, loose matches on Subject: below --
2011-10-15 15:53 [PATCH v2 0/6] git-p4 tests, filetypes, " Pete Wyckoff
2011-10-15 15:56 ` [PATCH 2/6] git-p4: handle utf16 filetype properly Pete Wyckoff
2011-10-16  9:52   ` Stefano Lattarini
2011-10-16 14:38     ` Pete Wyckoff

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vaa90reqm.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@chrisli.org \
    --cc=git@vger.kernel.org \
    --cc=luke@diamand.org \
    --cc=pw@padd.com \
    --cc=stefano.lattarini@gmail.com \
    /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.
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 NNTP newsgroup(s).