Skip to content

Add libcart#752

Closed
someone2639 wants to merge 11 commits intoHackerN64:develop/2.4.0from
someone2639:libcart
Closed

Add libcart#752
someone2639 wants to merge 11 commits intoHackerN64:develop/2.4.0from
someone2639:libcart

Conversation

@someone2639
Copy link
Collaborator

No description provided.

someone2639 added 2 commits January 20, 2024 16:35
subrepo:
  subdir:   "src/libcart"
  merged:   "948358b8"
upstream:
  origin:   "https://github.com/devwizard64/libcart"
  branch:   "main"
  commit:   "948358b8"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
subrepo:
  subdir:   "src/libcart"
  merged:   "948358b8"
upstream:
  origin:   "https://github.com/devwizard64/libcart"
  branch:   "main"
  commit:   "948358b8"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@someone2639 someone2639 added enhancement New feature or request do not merge Do not merge (yet) labels Jan 20, 2024
someone2639 added 8 commits January 20, 2024 17:11
subrepo:
  subdir:   "src/libcart"
  merged:   "948358b8"
upstream:
  origin:   "https://github.com/devwizard64/libcart"
  branch:   "main"
  commit:   "948358b8"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
subrepo:
  subdir:   "src/libcart"
  merged:   "948358b8"
upstream:
  origin:   "https://github.com/devwizard64/libcart"
  branch:   "main"
  commit:   "948358b8"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
subrepo:
  subdir:   "src/libcart"
  merged:   "948358b8"
upstream:
  origin:   "https://github.com/devwizard64/libcart"
  branch:   "main"
  commit:   "948358b8"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@someone2639 someone2639 marked this pull request as ready for review January 20, 2024 22:23
@someone2639 someone2639 requested a review from gheskett as a code owner January 20, 2024 22:23
Comment on lines +1 to +12
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
;
[subrepo]
remote = https://github.com/devwizard64/libcart
branch = main
commit = 948358b8320f49e75b4a9e3b4e792ccaec866e0b
parent = 543d7add024fea312a8991b29a029a0ac0ed7bef
method = merge
cmdver = 0.4.6
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the advantage of subrepos over submodules exactly, and is it necessary here? Seems like subrepos aren't an actual part of git, so I'm hesitant to use this unless submodules/subtrees are no good here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

submodules are an extra command for the end user which is Bad™ (think changing the required baserom name bad)

maintaining the subrepo is on the contributors with zero work for the end user

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is? Cloning a repo with a submodule doesn't also clone the submodule?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an end user would have to either run git clone --recursive or git submodule init --update after a clone to grab those submodules

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welp...that sucks. What about with subtrees?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those work but i found them harder to maintain (s2dex text engine used to be a subtree here but i just made it part of the main repo eventually)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, whatever then. Could you update the libpl PR to use subrepos then since it sounds like submodules are bad

@someone2639 someone2639 mentioned this pull request Jan 31, 2024
Copy link
Collaborator

@gheskett gheskett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libcart should really be a submodule, with an option to pull it down from within the makefile automatically. Idk what the issue is on libcart's front that requires code modification, but it sounds like whatever it is should be fixed over there afaict.

Also please get this out of src and move it to somewhere like lib because that just makes more sense.

@gheskett gheskett added this to the 2.2 milestone Feb 3, 2024
@gheskett gheskett modified the milestones: 2.2, 2.3 Mar 2, 2024
@gheskett gheskett changed the base branch from develop/2.2.0 to develop/2.3.0 March 2, 2024 13:44
@gheskett gheskett modified the milestones: 2.3, 2.4 Jul 4, 2024
@gheskett gheskett changed the base branch from develop/2.3.0 to develop/2.4.0 July 4, 2024 07:10
@arthurtilly
Copy link
Collaborator

What is status on this?

@someone2639
Copy link
Collaborator Author

lol (iirc the verdict was to redo it as a submodule rather than a subtree)

@arthurtilly
Copy link
Collaborator

Alright I suppose we should close this for now then

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not merge Do not merge (yet) enhancement New feature or request

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants