importers/git-importer
3
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the import of breeze and other packages #13

Merged
Ghost merged 2 commits from add_export into main 2022-11-03 15:19:07 +01:00
Conversation 5 Commits 2 Files Changed 11 +10195 -51
Ghost commented 2022-11-03 10:39:10 +01:00
First-time contributor
Copy Link
No description provided.
Ghost added 2 commits 2022-11-03 10:39:10 +01:00 
This happens in packages that change their devel project over time. Then
the commit in the devel project no longer has the parent in the devel branch
but is based on factory
Ghost commented 2022-11-03 10:46:23 +01:00
Author
First-time contributor
Copy Link

Old importer:
image

New importer:
image

Note that the red line is Factory in the 2nd picture while it's devel branch in the 1st picture.

Old importer: ![image](/attachments/6d3871eb-567c-4b74-84a7-9697919809a9) New importer: ![image](/attachments/b262942f-90f7-4268-884b-46a96586d701) Note that the red line is Factory in the 2nd picture while it's devel branch in the 1st picture.
image.png
302 KiB
image.png
192 KiB
aplanas reviewed 2022-11-03 10:47:10 +01:00
lib/git_exporter.py Outdated
@ -98,0 +129,4 @@
self.git.repo.references[f"refs/heads/{flat.branch}"].set_target(
flat.parent1.git_commit
)
self.git.checkout(flat.branch)
aplanas commented 2022-11-03 10:47:10 +01:00
Owner
Copy Link

I do not understand this as a rebase. IIUC this is setting "refs/heads/{devel,factory}" reference to the parent1 commit, and checking out later this reference.

Whatever I am missing, maybe is a good idea to make this action as a verb in the Git class, and no access the repo directly.

I do not understand this as a rebase. IIUC this is setting "refs/heads/{devel,factory}" reference to the parent1 commit, and checking out later this reference. Whatever I am missing, maybe is a good idea to make this action as a verb in the Git class, and no access the repo directly.
Ghost commented 2022-11-03 10:49:05 +01:00
Author
First-time contributor
Copy Link

OK, it's not a rebase - but I miss a word for it - it's changing where devel points to.

OK, it's not a rebase - but I miss a word for it - it's changing where devel points to.
aplanas commented 2022-11-03 10:51:01 +01:00
Owner
Copy Link

Idontknow... maybe checkout?

https://gitea.opensuse.org/importers/git-importer/src/branch/main/lib/git.py#L55

Idontknow... maybe checkout? https://gitea.opensuse.org/importers/git-importer/src/branch/main/lib/git.py#L55
Ghost commented 2022-11-03 12:00:17 +01:00
Author
First-time contributor
Copy Link

I settled for reset

I settled for reset
Ghost marked this conversation as resolved
aplanas commented 2022-11-03 10:54:51 +01:00
Owner
Copy Link

Note that the red line is Factory in the 2nd picture while it's devel branch in the 1st picture.

In the second image the green line is the devel project? What is the 3rd line? For example I see an update to 5.8.1 for luca_b that I am not able to see it in the first image

> Note that the red line is Factory in the 2nd picture while it's devel branch in the 1st picture. In the second image the green line is the devel project? What is the 3rd line? For example I see an update to 5.8.1 for luca_b that I am not able to see it in the first image
Ghost commented 2022-11-03 10:58:40 +01:00
Author
First-time contributor
Copy Link

The problem starts with using "the" in front of "devel project" - because green is KDE:Frameworks5 (the devel project now) and purple is KDE:Frameworks5:LTS (the devel project between august and october 2016)

The problem starts with using "the" in front of "devel project" - because green is KDE:Frameworks5 (the devel project now) and purple is KDE:Frameworks5:LTS (the devel project between august and october 2016)
aplanas commented 2022-11-03 10:59:50 +01:00
Owner
Copy Link

The problem starts with using "the" in front of "devel project" - because green is KDE:Frameworks5 (the devel project now) and purple is KDE:Frameworks5:LTS (the devel project between august and october 2016)

Ohhhhh super cool ...

> The problem starts with using "the" in front of "devel project" - because green is KDE:Frameworks5 (the devel project now) and purple is KDE:Frameworks5:LTS (the devel project between august and october 2016) Ohhhhh super cool ...
Ghost force-pushed add_export from 8bb7f25e92 to 417ecd5dc4 2022-11-03 12:00:04 +01:00 Compare
Ghost added 2 commits 2022-11-03 15:11:26 +01:00 
This happens in packages that change their devel project over time. Then
the commit in the devel project no longer has the parent in the devel branch
but is based on factory
Ghost force-pushed add_export from 48e3aef05d to ed4b7367eb 2022-11-03 15:12:13 +01:00 Compare
Ghost commented 2022-11-03 15:12:30 +01:00
Author
First-time contributor
Copy Link

rebased

rebased
aplanas approved these changes 2022-11-03 15:14:30 +01:00
Ghost merged commit 6b26f8ff96 into main 2022-11-03 15:19:07 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
aplanas
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: importers/git-importer#13
No description provided.
Delete Branch "add_export"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?