git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Pete Wyckoff <pw@padd.com>, Vitor Antunes <vitor.hda@gmail.com>,
	Luke Diamand <luke@diamand.org>
Subject: [PATCHv1] git-p4: label import, tag export
Date: Tue,  3 Apr 2012 08:38:33 +0100	[thread overview]
Message-ID: <1333438715-14902-1-git-send-email-luke@diamand.org> (raw)

This is an updated version of my earlier RFC/patch for importing
p4 labels into git, incorporating comments from Pete Wyckoff,
and git export support.

It operates by getting the sets of git tags and p4 labels, finding
out what is missing, and creating tags/labels as necessary. This
is in contrast to the existing detect-labels code which looks
for p4 labels associated with the changelist being imported and
which therefore misses tags on older changelists.

Git tag export is done during the sync phase because that's when
the commit/changelist mapping is first known.

There is also a small fix to t9800 for a problem I found while
testing this.

Luke Diamand (2):
  git-p4: fix t9800 editor check
  git-p4: import/export of labels to/from p4

 Documentation/git-p4.txt       |   39 ++++++-
 contrib/fast-import/git-p4     |  249 ++++++++++++++++++++++++++++++++++------
 t/t9800-git-p4-basic.sh        |    4 +-
 t/t9811-git-p4-label-import.sh |  145 +++++++++++++++++++++++
 4 files changed, 400 insertions(+), 37 deletions(-)
 create mode 100755 t/t9811-git-p4-label-import.sh

-- 
1.7.10.rc0.158.gd9e55

             reply	other threads:[~2012-04-03  7:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-03  7:38 Luke Diamand [this message]
2012-04-03  7:38 ` [PATCHv1 1/2] git-p4: fix t9800 editor check Luke Diamand
2012-04-03  7:38 ` [PATCHv1 2/2] git-p4: import/export of labels to/from p4 Luke Diamand
2012-04-03 22:52   ` Vitor Antunes
2012-04-05  6:54     ` 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=1333438715-14902-1-git-send-email-luke@diamand.org \
    --to=luke@diamand.org \
    --cc=git@vger.kernel.org \
    --cc=pw@padd.com \
    --cc=vitor.hda@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).