Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial support for conflicts #94

Closed
wants to merge 10 commits into from
Closed

Initial support for conflicts #94

wants to merge 10 commits into from

Conversation

GZGavinZhao
Copy link
Contributor

  • dag: add neighbors_outgoing/incoming and scc
  • moss: initial support for conflicts

@GZGavinZhao GZGavinZhao added the type: feature A new functionality to implement. label Dec 4, 2023
@GZGavinZhao GZGavinZhao self-assigned this Dec 4, 2023
@GZGavinZhao GZGavinZhao force-pushed the conflicts branch 2 times, most recently from ad36a4f to 1c20048 Compare December 11, 2023 03:12
tarkah
tarkah reviewed Dec 11, 2023
View reviewed changes
crates/moss/src/db/meta/mod.rs
.iter()
.flat_map(|(id, meta)| meta.conflicts.iter().map(move |conflict| (id, conflict)))
.collect::<Vec<_>>();
println!("conflicts: {conflicts:?}");
Copy link
Collaborator

Choose a reason for hiding this comment

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

Reminder to remove this println

crates/moss/src/package/meta.rs Outdated Show resolved Hide resolved
crates/moss/src/package/meta.rs Outdated Show resolved Hide resolved
@GZGavinZhao GZGavinZhao force-pushed the conflicts branch 3 times, most recently from 8213806 to 66a72e5 Compare December 13, 2023 17:25
@GZGavinZhao
Copy link
Contributor Author

I found a problem with this algorithm, gonna fix it later this week.

@GZGavinZhao
dag: add neighbors_outgoing/incoming and scc
ba64e7d 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
moss: initial support for conflicts
d2df817 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
moss: update db implementation to load and store conflicts
1096fd4 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
Add test case for conflicts
f6dfe15 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
Cleanup a pattern match
114fc07 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
Update test data now boulder has proper support
2ee098a 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
Fix provides detection when conflicts are present
24ec6c1 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
I'm an idiot
dfc9e76 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
Add basic tests for conflicts
645f5b0 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao
Cleanup an unneeded variable
953419f 
Signed-off-by: Gavin Zhao <git@gzgz.dev>
@GZGavinZhao GZGavinZhao mentioned this pull request Mar 12, 2024
Closed
@GZGavinZhao
Copy link
Contributor Author

@ikeycode @ermo @tarkah I want to at least make the conflicts field recognized/stored in moss before it's too late. We can work on how to best detect/report the conflicts in a separate PR. I'll try to rebase and split up this PR in the next few days.

@GZGavinZhao GZGavinZhao mentioned this pull request May 25, 2024
Merged
@GZGavinZhao
Copy link
Contributor Author

See #248.

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

@tarkah tarkah tarkah left review comments

@ikeycode ikeycode Awaiting requested review from ikeycode ikeycode will be requested when the pull request is marked ready for review ikeycode is a code owner

@ermo ermo Awaiting requested review from ermo ermo will be requested when the pull request is marked ready for review ermo is a code owner

Assignees

@GZGavinZhao GZGavinZhao

Labels
type: feature A new functionality to implement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GZGavinZhao @tarkah