From: "Mazo, Andrey" <amazo@checkvideo.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Cc: "Mazo, Andrey" <amazo@checkvideo.com>,
"Luke Diamand" <luke@diamand.org>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"George Vanburgh" <gvanburgh@bloomberg.net>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Miguel Torroja" <miguel.torroja@gmail.com>,
"Romain Merland" <merlorom@yahoo.fr>,
"Vitor Antunes" <vitor.hda@gmail.com>,
"Andrew Oakley" <aoakley@roku.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Andrey Mazo" <ahippo@yandex.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [RFC PATCH v2 0/2] git-p4: inexact labels and load changelist description from file
Date: Tue, 2 Apr 2019 00:13:37 +0000 [thread overview]
Message-ID: <cover.1554162242.git.amazo@checkvideo.com> (raw)
In-Reply-To: <cover.1554141338.git.amazo@checkvideo.com>
This patch series introduces two experimental features to git-p4,
unrelated to each other.
1. The first patch adds support for "inexact" label detection.
The feature lets git-p4 find a git commit for a Perforce label
even if there is no git commit with exact same changelist number as in Perforce.
It is particularly useful when splitting a large Perforce depot
into multiple git repositories
or when importing just a subset of a depot into git.
2. The second patch adds support for loading changelist description from a file.
(`p4 -G describe` equivalent)
The original use case is to be able to migrate a Perforce depot,
which database got a little bit corrupted, into git.
This patch series should be applied on top of
"[PATCH v3 0/8] git-p4: a few assorted fixes for branches, excludes" [1]
This is the second iteration of the patch series.
Changes since the v1 [1]:
* Dropped "alien" branch feature;
* Added "inexact" label feature by suggestion from Luke;
* Added minimal documentation;
* Changed "damaged"-oriented narrative to more generic one.
(renamed "git-p4.damagedChangelists" to "git-p4.changelistDescriptionFile",
functions and variables correspondingly)
Range-diff vs v1:
1: b02df749b9 < -: ---------- git-p4: introduce alien branch mappings
-: ---------- > 1: 54ef897fcf git-p4: inexact label detection
2: bb3e14a389 ! 2: 83b0034538 git-p4: support loading changelist descriptions from files
[1] https://public-inbox.org/git/cover.1554141338.git.amazo@checkvideo.com/
Andrey Mazo (2):
git-p4: inexact label detection
git-p4: support loading changelist descriptions from files
Documentation/git-p4.txt | 41 +++++++++++++++++++++++
git-p4.py | 72 ++++++++++++++++++++++++++++++++++++----
2 files changed, 106 insertions(+), 7 deletions(-)
base-commit: 8104ec994ea3849a968b4667d072fedd1e688642
prerequisite-patch-id: 23e039fec7a1f5c51c98326a14d788adb1ecb5ba
prerequisite-patch-id: 9840851ffca6f00126c9c91da5a8828c7d0dcaed
prerequisite-patch-id: 32a738b41fb3dccfbbfb4d382a9748e36dcdfa8b
prerequisite-patch-id: 10661f77392f4131d2375976c77a7cd231fdf9ab
prerequisite-patch-id: a55360c904eba1b9e9c934405d3141eb96c5ad30
prerequisite-patch-id: 46357586199c02d956d53d782a12f1ee0c991302
prerequisite-patch-id: c683e7d6017580df9385a1544af409ca615d770c
prerequisite-patch-id: 411dcb5e95aff036e0cb3e850ea75f2424b260a6
--
2.19.2
next prev parent reply other threads:[~2019-04-02 0:13 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 17:34 [PATCH 0/5] git-p4: a few assorted fixes for branches, excludes Mazo, Andrey
2019-03-04 17:34 ` [PATCH 1/5] git-p4: detect/prevent infinite loop in gitCommitByP4Change() Mazo, Andrey
2019-03-04 17:34 ` [PATCH 2/5] git-p4: match branches case insensitively if configured Mazo, Andrey
2019-03-04 17:34 ` [PATCH 3/5] git-p4: don't groom exclude path list on every commit Mazo, Andrey
2019-03-04 17:34 ` [PATCH 4/5] git-p4: add failing test for "don't exclude other files with same prefix" Mazo, Andrey
2019-03-04 17:34 ` [PATCH 5/5] git-p4: don't exclude other files with same prefix Mazo, Andrey
2019-03-21 22:32 ` [PATCH v2 0/7] git-p4: a few assorted fixes for branches, excludes Mazo, Andrey
2019-03-21 22:32 ` [PATCH v2 1/7] git-p4: detect/prevent infinite loop in gitCommitByP4Change() Mazo, Andrey
2019-03-21 22:32 ` [PATCH v2 2/7] git-p4: match branches case insensitively if configured Mazo, Andrey
2019-03-23 9:15 ` Luke Diamand
2019-03-25 17:20 ` Mazo, Andrey
2019-03-21 22:32 ` [PATCH v2 3/7] git-p4: don't groom exclude path list on every commit Mazo, Andrey
2019-03-21 22:33 ` [PATCH v2 4/7] git-p4: add failing test for "don't exclude other files with same prefix" Mazo, Andrey
2019-03-21 22:33 ` [PATCH v2 5/7] git-p4: don't exclude other files with same prefix Mazo, Andrey
2019-03-21 22:33 ` [PATCH v2 6/7] git-p4: add failing test for "git-p4: respect excluded paths when detecting branches" Mazo, Andrey
2019-03-21 22:33 ` [PATCH v2 7/7] git-p4: respect excluded paths when detecting branches Mazo, Andrey
2019-03-22 19:54 ` [RFC PATCH 0/2] git-p4: "alien" branches and load changelist info from file Mazo, Andrey
2019-03-22 19:54 ` [RFC PATCH 1/2] git-p4: introduce alien branch mappings Mazo, Andrey
2019-03-23 9:08 ` Luke Diamand
2019-03-26 18:43 ` Mazo, Andrey
2019-03-27 23:08 ` [RFC PATCH 1/1] git-p4: inexact label detection Mazo, Andrey
2019-03-22 19:54 ` [RFC PATCH 2/2] git-p4: support loading changelist descriptions from files Mazo, Andrey
2019-03-23 8:44 ` Luke Diamand
2019-03-25 17:46 ` [RFC PATCH 2/2] git-p4: support loading changelist descriptions Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 0/8] git-p4: a few assorted fixes for branches, excludes Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 1/8] git-p4: detect/prevent infinite loop in gitCommitByP4Change() Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 2/8] git-p4: add failing test for "git-p4: match branches case insensitively if configured" Mazo, Andrey
2019-04-02 12:05 ` SZEDER Gábor
2019-04-02 17:13 ` Mazo, Andrey
2019-04-03 7:10 ` Junio C Hamano
2019-04-01 18:02 ` [PATCH v3 3/8] git-p4: match branches case insensitively if configured Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 4/8] git-p4: don't groom exclude path list on every commit Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 5/8] git-p4: add failing test for "don't exclude other files with same prefix" Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 6/8] git-p4: don't exclude other files with same prefix Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 7/8] git-p4: add failing test for "git-p4: respect excluded paths when detecting branches" Mazo, Andrey
2019-04-01 18:02 ` [PATCH v3 8/8] git-p4: respect excluded paths when detecting branches Mazo, Andrey
2019-04-01 19:54 ` [PATCH v3 0/8] git-p4: a few assorted fixes for branches, excludes Mazo, Andrey
2019-04-02 0:13 ` Mazo, Andrey [this message]
2019-04-02 0:13 ` [RFC PATCH v2 1/2] git-p4: inexact label detection Mazo, Andrey
2019-04-02 0:13 ` [RFC PATCH v2 2/2] git-p4: support loading changelist descriptions from files Mazo, Andrey
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=cover.1554162242.git.amazo@checkvideo.com \
--to=amazo@checkvideo.com \
--cc=ahippo@yandex.com \
--cc=aoakley@roku.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gvanburgh@bloomberg.net \
--cc=larsxschneider@gmail.com \
--cc=luke@diamand.org \
--cc=merlorom@yahoo.fr \
--cc=miguel.torroja@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.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).