Synchronize dependencies with another package and link to vendor directory #48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he map The rewrite map is built recursively scanning the root package dependencies. If two packages in the tree imported the same dependency with different hash the last one to be processed would overwrite the first one. Include a flag in `buildRewriteMapping` to signal when the root package dependencies are being process and allow them to overwrite the map (adding an overwrite flag in `addRewriteForDep`) but don't allow the inverse (transitive dependencies overwriting direct ones). This change has as a side effect that in a scenario where transitive dependencies with different versions were overwriting each other that won't be allowed now, changing in fact the rewrite map, but that would happen only in the already problematic scenario of dependencies with mismatched versions.
(This patch changes the current API.) The previous behavior of `gx-go link` linked packages to the global workspace in `$GOPATH/gx/ipfs/` and affected any packages that would depend on it. Use the Go vendor directory to link packages locally. That implies an explicit parent-dependency relationship where a dependency package is now linked to the vendor directory of a particular parent package (instead of linking it to any package that might depended on that dependency specific hash). Using the vendor directory allows the import paths to remain the same (Go will look in that directory before looking in the `$GOPATH` where the global Gx workspace is located).
Add `--sync` flag that in the case a dependency of the parent package has a version mismatch with a dependency of the linked package it will replace the second with the first. (Most of the implementation logic for this feature had to be added to the `post-install` hook which also has a new `--sync` flag.)
schomatis
changed the title
|
(Each commit should be looked at separately.) |
schomatis
commented
Aug 27, 2018
| } | ||
|
|
||
| dvcsimport := GxDvcsImport(&pkg) | ||
| target := filepath.Join(srcdir, dvcsimport) | ||
| target := filepath.Join(gxSrcDir, dvcsImport) | ||
|
|
||
| uwcmd := exec.Command("gx-go", "uw") |
There was a problem hiding this comment.
If --sync was used during the link process we may need to un-write with --fix.
The --fix could be added in the unlink for all cases as a general precautionary measure (at the cost of more processing time when it may not be needed, but to simplify the code as much as possible and do not add any sync detection logic).
Stebalien
reviewed
Aug 28, 2018
| @@ -53,21 +53,47 @@ unlinked QmVGtdTZdTFaLsaj2RwdVG8jcjNNcp1DE914DKZ2kHmXHw /home/user/go/src/github | |||
| Name: "a,all", | |||
| Usage: "Remove all existing symlinks and reinstate the gx packages. Use with -r.", | |||
| }, | |||
| cli.StringFlag{ | |||
There was a problem hiding this comment.
I wouldn't add this flag. Instead, we could add a top-level -C flag (like git) but we can probably do that later.
|
|
||
| if parentPackagePath == "" { | ||
| var err error | ||
| parentPackagePath, err = os.Getwd() |
There was a problem hiding this comment.
Should probably use gxutil.GetPackageRoot()
There was a problem hiding this comment.
(Fixed in the new PR.)
|
Closing in favor of #51. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Built on top of #47 (should be merged first).
Closes #46.