On Wednesday 10 September 2008 08:29:56 dhruva wrote:
> Hi,
> Incorporated the style tip, sure makes it look cleaner.
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index 2216cac..3e72e43 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -16,6 +16,9 @@ from sets import Set;
>
> verbose = False
>
> +# Handling of RCS keyowrds. To ensure backward compatibility, the default
> +# is to strip keywords. Default behavior is controlled here
> +kwstrip = True
>
> def p4_build_cmd(cmd):
> """Build a suitable p4 command line.
> @@ -975,7 +978,9 @@ class P4Sync(Command):
> sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
> continue
>
> - if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
> + if not kwstrip:
> + pass
> + elif stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
> text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text)
> elif stat['type'] in ('text+k', 'ktext', 'kxtext',
> 'unicode+k', 'binary+k'): text =
> re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r
>'$\1$', text) @@ -1850,6 +1855,16 @@ def main():
> (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
> global verbose
> verbose = cmd.verbose
> +
> + global kwstrip
> + kwval = gitConfig("git-p4.kwstrip")
> + if len(kwval) > 0:
> + kwval = kwval.lower();
> + if "false" == kwval:
> + kwstrip = False
> + elif "true" == kwval:
> + kwstrip = True
I have another style nitpick, sorry :). Please use "kwval == "false" instead
of the other way around.
Otherwise your patch looks good to me, I think it's a very good option to add.
Please resend with commit message so that Junio can include it.
Simon
Attachment:
signature.asc
Description: This is a digitally signed message part.
