Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/github/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,10 @@ impl SyncGitHub {
// Remove the current team from the collection of unseen GitHub teams
unseen_github_teams.remove(&github_team.name);

diffs.push(self.diff_team(github_team)?);
let diff_team = self.diff_team(github_team)?;
if !diff_team.noop() {
diffs.push(diff_team);
}
}
}
}
Expand Down Expand Up @@ -222,7 +225,10 @@ impl SyncGitHub {
fn diff_repos(&self) -> anyhow::Result<Vec<RepoDiff>> {
let mut diffs = Vec::new();
for repo in &self.repos {
diffs.push(self.diff_repo(repo)?);
let repo_diff = self.diff_repo(repo)?;
if !repo_diff.noop() {
diffs.push(repo_diff);
}
}
Ok(diffs)
}
Expand Down Expand Up @@ -588,6 +594,13 @@ impl RepoDiff {
RepoDiff::Update(u) => u.apply(sync),
}
}

fn noop(&self) -> bool {
match self {
RepoDiff::Create(_c) => false,
RepoDiff::Update(u) => u.noop(),
}
}
}

impl std::fmt::Display for RepoDiff {
Expand Down Expand Up @@ -944,6 +957,13 @@ impl TeamDiff {

Ok(())
}

fn noop(&self) -> bool {
match self {
TeamDiff::Create(_) | TeamDiff::Delete(_) => false,
TeamDiff::Edit(e) => e.noop(),
}
}
}

impl std::fmt::Display for TeamDiff {
Expand Down
43 changes: 3 additions & 40 deletions src/github/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,7 @@ fn team_dont_add_member_if_invitation_is_pending() {
gh.add_invitation("admins-gh", "jan");

let team_diff = model.diff_teams(gh);
insta::assert_debug_snapshot!(team_diff, @r###"
[
Edit(
EditTeamDiff {
org: "rust-lang",
name: "admins-gh",
name_diff: None,
description_diff: None,
privacy_diff: None,
member_diffs: [
(
"mark",
Noop,
),
(
"jan",
Noop,
),
],
},
),
]
"###);
insta::assert_debug_snapshot!(team_diff, @"[]");
}

#[test]
Expand Down Expand Up @@ -172,23 +150,8 @@ fn team_delete() {
model.get_team("admins").remove_gh_team("users-gh");

let team_diff = model.diff_teams(gh);
insta::assert_debug_snapshot!(team_diff, @r###"
insta::assert_debug_snapshot!(team_diff, @r#"
[
Edit(
EditTeamDiff {
org: "rust-lang",
name: "admins-gh",
name_diff: None,
description_diff: None,
privacy_diff: None,
member_diffs: [
(
"mark",
Noop,
),
],
},
),
Delete(
DeleteTeamDiff {
org: "rust-lang",
Expand All @@ -197,7 +160,7 @@ fn team_delete() {
},
),
]
"###);
"#);
}

#[test]
Expand Down
Loading