From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Pete Wyckoff <pw@padd.com>, Eric Scouten <eric@scouten.com>,
Junio C Hamano <gitster@pobox.com>,
Luke Diamand <luke@diamand.org>
Subject: [PATCHv4] git-p4: RCS keyword handling
Date: Wed, 22 Feb 2012 10:15:40 +0000 [thread overview]
Message-ID: <1329905741-2092-1-git-send-email-luke@diamand.org> (raw)
Updated patch incorporating comments from Pete and Junio to
handle RCS keyword expansion in git-p4.
Note: The current patch fails to to handle the case where a user
adds an expanded RCS keyword in *git* (e.g. via cut-n-paste).
I'll try to address that separately. There's a failing test case
for this.
This version:
- uses "p4 fstat" to get the filetype
- uses Junio's suggested regexp to match $Keyword:$
- uses the sets of added/deleted files rather than parsing diff output
- various other small fixes spotted by Pete
- adds additional test cases
Luke Diamand (1):
git-p4: add initial support for RCS keywords
Documentation/git-p4.txt | 5 +
contrib/fast-import/git-p4 | 118 ++++++++++++--
t/t9810-git-p4-rcs.sh | 388 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 501 insertions(+), 10 deletions(-)
create mode 100755 t/t9810-git-p4-rcs.sh
--
1.7.9.259.ga92e
next reply other threads:[~2012-02-22 10:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 10:15 Luke Diamand [this message]
2012-02-22 10:15 ` [PATCHv4] git-p4: add initial support for RCS keywords Luke Diamand
2012-02-22 12:53 ` Pete Wyckoff
2012-02-22 19:29 ` Junio C Hamano
2012-02-22 22:44 ` Luke Diamand
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=1329905741-2092-1-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=eric@scouten.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pw@padd.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).