[Resent in plain-text. Apologies for dupe content to Pete and Luke.]
On Tue, Feb 21, 2012 at 04:18, Pete Wyckoff <pw@xxxxxxxx> wrote:
> luke@xxxxxxxxxxx wrote on Tue, 14 Feb 2012 22:33 +0000:
> > diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> > +#
> > +# Given a type base and modifier, return a regexp matching
> > +# the keywords that can be expanded in the file
> > +#
> > +def p4_keywords_regexp_for_type(base, type_mods):
> > + if base in ("text", "unicode", "binary"):
> > + if "ko" in type_mods:
> > + return r'\$(Id|Header)[^$]*\$'
> > + elif "k" in type_mods:
> > + return
> > r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision)[^$]*\$'
>
> Still no ":"? Won't that match too much?
> Fix the colon thing at least, then happy to add my Acked-By.
No, that would be an incorrect change. The colon is added by P4 when
it expands the keyword pattern, but it is *not* part of the pattern
required by P4 to trigger a keyword expansion.
http://kb.perforce.com/article/54/using-rcs-keywords
-Eric
--
Eric Scouten :: software developer, photographer :: Poulsbo, WA (near Seattle)
http://ericscouten.com :: click for Flickr, Facebook, Twitter, LinkedIn links
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html