Re: [PATCHv1 0/3] git-p4: fixing import with labels when commit is not transferred

[Holl, Marcus]

Hi Luke,

>Marcus - if you're able to take a look at this and see if it
>fixes your problem that would be very useful.


Fix works for me.

Thanks a lot for fixing this issue.

Best regards,
Marcus

On 27/08/15 09:18, "Luke Diamand"  wrote:

>Marcus Holl discovered that git-p4 fails to import labels sometimes.
>
>http://permalink.gmane.org/gmane.comp.version-control.git/273034
>
>It turns out there are at least two related problems.
>
>The first is that if git-p4 tries to import a P4 tag which references
>a commit that we don't know about at all (e.g. because the P4
>changelist was created before the point at which the repo was
>cloned) then when it tries to find the commit, the git rev-list
>command fails, and git-p4 terminates.
>
>This can be fixed by detecting the problem and ignoring that label.
>
>The second problem is that git-p4 can end up trying to find out
>about a commit which is still in the git fast-import stream and not
>yet processed. This is fixed by using fast-import "marks" to reference
>these commits, which avoids having to query for commits which don't
>yet exist. The normal path is used for commits that have not been
>imported during this run of the program (and so won't have marks).
>
>A test case is added to demonstrate the problem.
>
>Marcus - if you're able to take a look at this and see if it
>fixes your problem that would be very useful.
>
>Thanks,
>Luke
>
>Luke Diamand (3):
>  git-p4: failing test for ignoring invalid p4 labels
>  git-p4: do not terminate creating tag for unknown commit
>  git-p4: fix P4 label import for unprocessed commits
>
> git-p4.py  | 25 +++
> t/t9811-git-p4-label-import.sh | 45
>++
> 2 files changed, 62 insertions(+), 8 deletions(-)
>
>-- 
>2.5.0.rc0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[git-p4] import with labels fails when commit is not transferred

[Holl, Marcus]

Hi,

I have an issue with the git p4 tooling regarding import of labels.

My git version is 2.4.5

I try to transform a perforce repository. My command line is:
git p4 clone --verbose --detect-branches --import-local --import-labels 
--destination DESTINATION //depot@all


The relevant parts in the gitconfig is:
[git-p4]
branchUser = USERNAME


For that user there is a branch mapping defined with a lot of entries like:
//depot/trunk/... //depot/branches/ipro-status-8-2--branch/...
//depot/trunk/... //depot/branches/9-0-preview/...
//depot/trunk/... //depot/branches/release-8-0-0-branch/...
//depot/trunk/... //depot/branches/release-8-1-0-branch/...
//depot/trunk/... //depot/branches/release-8-2-0-branch/...
//depot/trunk/... //depot/branches/release-8-3-0-branch/...
//depot/trunk/... //depot/branches/release-8-4-branch/...
//depot/trunk/... //depot/branches/release-8-5-branch/...
...


The import fails with the log output that can be found at the bottom of this 
mail.

git log -all -grep \[git-p4:.*change\ =\ 69035\] reports nothing. The commit 
is not contained in the git repository.

p4 describe for changelist 69035 returns a reasonable result. This change 
contains one file located at a path in the perforce folder structure that comes 
without corresponding entry in the perforce branch mapping. 

According to the given branch mapping it looks reasonable to me that the change 
is omitted in the git repository. But in my opinion the import should not fail 
in such a case.

A reasonable behavior would be to blacklist the label (add it to 
git-p4.ignoredP4Labels) and to continue with the next label.

Attached is a proposal for a fix that needs to be carefully reviews since I'm 
not that experienced with python.

Other proposals for resolving this issue are highly appreciated.

Thanks a lot and best regards,
Marcus Holl


Log output:

Reading pipe: ['git', 'rev-list', '--max-count=1', '--reverse', 
':/\\[git-p4:.*change = 69035\\]']
fatal: ambiguous argument ':/\[git-p4:.*change = 69035\]': unknown revision or 
path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git command [revision...] -- [file...]'
ied with change: 69078, original Date: 2010-04-22T09:07:24.00Z\n', 
'Update': '2013/11/02 07:40:31', 'Label': 'release-8-1-0-976', 'Access': 
'2015/06/26 14:50:15', 'Owner': 'svn_p4_converter', 'Options': 'unlocked 
noautoreload'}
p4 label release-8-1-0-976 mapped to git commit 
82a11809928b86a7bde03cf486428de52ab3380f
writing tag release-9-0-0-179 for commit 
fb8370cd04806686c567ad720d065436f2334b4a
labelDetails= {'code': 'stat', 'Description': 'Created or modified with change: 
96984, original Date: 2011-12-22T16:01:25.681427Z\n', 'Update': '2013/11/02 
15:15:50', 'Label': 'release-9-0-0-179', 'Access': '2015/06/26 14:50:16', 
'Owner': 'build', 'Options': 'unlocked noautoreload'}
p4 label release-9-0-0-179 mapped to git commit 
fb8370cd04806686c567ad720d065436f2334b4a
Traceback (most recent call last):
  File /usr/lib/git/git-p4, line 3297, in module
main()
  File /usr/lib/git/git-p4, line 3291, in main
if not cmd.run(args):
  File /usr/lib/git/git-p4, line 3165, in run
if not P4Sync.run(self, depotPaths):
  File /usr/lib/git/git-p4, line 3045, in run
self.importP4Labels(self.gitStream, missingP4Labels)
  File /usr/lib/git/git-p4, line 2421, in importP4Labels
--reverse, :/\[git-p4:.*change = %d\] % changelist])
  File /usr/lib/git/git-p4, line 138, in read_pipe
die('Command failed: %s' % str(c))
  File /usr/lib/git/git-p4, line 106, in die
raise Exception(msg)
Exception: Command failed: ['git', 'rev-list', '--max-count=1', '--reverse', 
':/\\[git-p4:.*change = 69035\\]']


0001-git-p4-Do-not-fail-on-not-found-commit-when-importin.patch
Description: 0001-git-p4-Do-not-fail-on-not-found-commit-when-importin.patch