mergiraf/mergiraf
mergiraf/mergiraf
9
212
Fork 45
Code Issues 50 Pull requests 6 Releases 19 Activity Actions

perf: reduce the number of calls to git-check-attr #602

Merged
wetneb merged 2 commits from perf_git-check-attr into main 2025-10-02 10:51:36 +02:00
Conversation 2 Commits 2 Files changed 1 +43 -18
wetneb commented 2025-09-30 19:14:52 +02:00
Owner
Copy link

Follow-up to #599.

Follow-up to #599.
perf: reduce the number of calls to git-check-attr
All checks were successful
/ test (pull_request) Successful in 42s
Details
39daeca522
mathstuf approved these changes 2025-09-30 22:08:04 +02:00
ada4a reviewed 2025-10-01 12:52:38 +02:00
ada4a left a comment
Owner
Copy link

Looking good:) Just a couple of nits

Looking good:) Just a couple of nits
src/git.rs
@ -108,4 +113,3 @@
.current_dir(repo_dir)
.output()
.ok()
.filter(|output| output.status.success())?;
ada4a commented 2025-10-01 12:32:03 +02:00
Owner
Copy link

I think the question mark would still work here?

I think the question mark would still work here?
wetneb commented 2025-10-02 09:13:28 +02:00
Author
Owner
Copy link

The return type of the function is now HashMap<…>.

the ? operator can only be used in a function that returns Result or Option (or another type that implements FromResidual)

The return type of the function is now `HashMap<…>`. > the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
👍 1
ada4a commented 2025-10-02 10:43:59 +02:00
Owner
Copy link

🤦‍♀️ of course

🤦‍♀️ of course
ada4a marked this conversation as resolved
src/git.rs Outdated
@ -1,6 +1,7 @@
use core::str;
use itertools::Itertools as _;
use itertools::Itertools;
ada4a commented 2025-10-01 12:38:23 +02:00
Owner
Copy link

I don't think this change is necessary? We're not naming the trait in the code

I don't think this change is necessary? We're not naming the trait in the code
ada4a marked this conversation as resolved
src/git.rs Outdated
@ -100,3 +101,2 @@
file_name: &Path,
attr: &str,
) -> Option<String> {
attrs: &[&'a str],
ada4a commented 2025-10-01 12:30:48 +02:00
Owner
Copy link

We know that 'a is actually 'static here, so I'd say let's write that to avoid complicating the function signature. We could always change that back if need arises

We know that `'a` is actually `'static` here, so I'd say let's write that to avoid complicating the function signature. We could always change that back if need arises
ada4a marked this conversation as resolved
src/git.rs
@ -126,2 +141,3 @@
let attributes = read_attributes_for_file(repo_dir, file_name, attr_names);
read_attr("mergiraf.language").or_else(|| read_attr("linguist-language"))
attr_names
ada4a commented 2025-10-01 12:47:11 +02:00
Owner
Copy link

With this change, it imo becomes less intuitive that what we're doing is looking for the value of mergiraf.language first, and linguist-language second. Could you please add a small note explaining that?

With this change, it imo becomes less intuitive that what we're doing is looking for the value of `mergiraf.language` first, and `linguist-language` second. Could you please add a small note explaining that?
ada4a marked this conversation as resolved
Review feedback
All checks were successful
/ test (pull_request) Successful in 43s
Details
df7c48e5fa
ada4a approved these changes 2025-10-02 10:45:03 +02:00
wetneb merged commit 4dcc2dbf92 into main 2025-10-02 10:51:36 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
mathstuf
ada4a
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind
Bad merge
Examples where the merging algorithm doesn't work as well as it should

  
Kind
Bug
Something is not working

  
Kind
Documentation
Documentation changes

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
New language

  
Kind
Security
This is security issue

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind
Bad merge
Kind
Bug
Kind
Documentation
Kind
Enhancement
Kind
Feature
Kind
New language
Kind
Security
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 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: mergiraf/mergiraf#602
No description provided.
Delete branch "perf_git-check-attr"

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?