030: Gitweb importing does not recognise multiple parent IDs for a commit

Notice: this is a static mirror for historical purposes.

View Issue Details [ Jump to Notes ] [ Related Changesets ]

[ Issue History ] [ Print ]

Project

Category

View Status

Date Submitted

Last Update

030

Source Integration

Gitweb

public

2009-04-22 20:42

2009-05-01 07:22

Reporter

David Hicks

Assigned To

John Reese

Priority

normal

Severity

major

Reproducibility

always

Status

resolved

Resolution

fixed

Product Version

Target Version

0.14

Fixed in Version

0.14

Summary

030: Gitweb importing does not recognise multiple parent IDs for a commit

Description

From SourceGitweb.php:

            if( preg_match( '#<tr><td>parent</td><td class="sha1"><a [^<>]*>([a-f0-9]*)</a></td>#', $t_gitweb_data, $t_matches ) ) {
                $t_commit['parent'] = $t_matches[1];
            }

Only the first parent ID is being read. In the case of merges, there are two parent IDs and it is required that the second one also be followed to find all the changesets that were merged.

Currently only the first parent is followed (which is usually the previous commit in the branch). The second parent (usually the last commit in the branch that has just been merged) is not followed.

The database format currently only stores one commit parent per changeset. This really needs to be changed so that a changeset can have an arbitrary number of parents attached (octopus merging in git, for example).

Tags

No tags attached.

Attached Files

Relationships

Notes
(021) John Reese (administrator) 2009-05-01 07:22	Fix committed to master branch at 2009-05-01 14:12:22.

Related Changesets
Source Integration: master 30507623 Timestamp: 2009-05-01 14:12:22 Author: John Reese Committer: John Reese [ Details ] [ Diff ]	Fix 030: Gitweb integration did not properly parse multiple parent commits.
	mod - SourceGitweb/SourceGitweb.php	[ Diff ] [ File ]

Issue History
Date Modified	Username	Field	Change
2009-02-28 09:39		Changeset attached	master 6bdeaedd =>
2009-04-22 20:42	David Hicks	New Issue
2009-05-01 06:41	John Reese	Assigned To	=> John Reese
2009-05-01 06:41	John Reese	Status	new => assigned
2009-05-01 06:41	John Reese	Target Version	=> 0.16
2009-05-01 07:22	John Reese	Note Added: 021
2009-05-01 07:22	John Reese	Status	assigned => resolved
2009-05-01 07:22	John Reese	Fixed in Version	=> 0.16
2009-05-01 07:22	John Reese	Resolution	open => fixed
2009-05-01 07:22	John Reese	Changeset attached	master 30507623 =>

Time: 0.1391 seconds.
memory usage: 8,328 KB

hosted with