Search with path #153
Merged
Search with path #153
Conversation
This file contains hidden or 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
- Added 'path' case to SearchKind enum. - Updated the label and description for 'path'. - Refactored logic in SearchTokensHandler to accommodate the new 'path' case in filter methods. - Simplified case handling in multiple switch statements by using 'default'.
- Introduced a private helper method `gitLog` to simplify the creation of GitLog instances, reducing duplication in the code. - Updated existing methods to utilize the new `gitLog` method for improved readability and maintainability.
There was a problem hiding this comment.
Pull Request Overview
This PR adds path-based commit search, refactors log construction, and enhances the search UI.
- Introduces a new
pathsearch kind with labels and help text. - Updates
SearchTokensHandlerto handlepathtokens in filtering. - Refactors
LogStoreandGitLogto support passing file/directory paths and consolidatesGitLoginstantiation. - Adds tooltips in the
FolderViewsearch token picker.
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| GitClient/Views/Folder/FolderView.swift | Added .help(kind.help) tooltip to each search token picker item |
| GitClient/Models/SearchTokensHandler.swift | Extended token-filtering logic to include the new path kind |
| GitClient/Models/SearchKind.swift | Appended path case and corresponding label, shortLabel, and help text |
| GitClient/Models/Observables/LogStore.swift | Added paths property, introduced gitLog helper, wired path tokens |
| GitClient/Models/Commands/GitLog.swift | Moved --topo-order, added path arguments in the command builder |
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.
This pull request introduces enhancements to the
GitClientmodule, focusing on improving search functionality and code organization. Key changes include adding support for searching commits by file or directory paths, refactoringGitLogto streamline argument handling, and simplifying the creation ofGitLoginstances inLogStore.Search Functionality Enhancements:
SearchKindcase (path) to enable searching commits that modify specific file or directory paths. UpdatedSearchKindwith labels and descriptions for the new search type. ([[1]](https://github.com/maoyama/Tempo/pull/153/files#diff-e2f1ffd385455ac9df914b5a077d257bdd4c9d0f9372541e625d70da74465f07L11-R11),[[2]](https://github.com/maoyama/Tempo/pull/153/files#diff-e2f1ffd385455ac9df914b5a077d257bdd4c9d0f9372541e625d70da74465f07R27-R28),[[3]](https://github.com/maoyama/Tempo/pull/153/files#diff-e2f1ffd385455ac9df914b5a077d257bdd4c9d0f9372541e625d70da74465f07R46-R47),[[4]](https://github.com/maoyama/Tempo/pull/153/files#diff-e2f1ffd385455ac9df914b5a077d257bdd4c9d0f9372541e625d70da74465f07R65-R66))SearchTokensHandlerto include the newpathsearch kind in token filtering logic. ([GitClient/Models/SearchTokensHandler.swiftL31-R76](https://github.com/maoyama/Tempo/pull/153/files#diff-f7bec91803b611b449f7c79471b9dadde937cf2beebc3b84d5f8b9988c1dd4abL31-R76))Code Refactoring and Simplification:
GitLogarguments: Added apathsproperty toGitLogand adjusted argument handling to support path-based filtering. Moved the--topo-orderargument to ensure proper ordering. ([[1]](https://github.com/maoyama/Tempo/pull/153/files#diff-37eff570e1f5e2291c5bd8370430f624c8ea799690b6965d120eb76bc4253fccR26-R27),[[2]](https://github.com/maoyama/Tempo/pull/153/files#diff-37eff570e1f5e2291c5bd8370430f624c8ea799690b6965d120eb76bc4253fccL57-R62),[[3]](https://github.com/maoyama/Tempo/pull/153/files#diff-37eff570e1f5e2291c5bd8370430f624c8ea799690b6965d120eb76bc4253fccR76))LogStorelogic: Created a helper methodgitLogfor constructingGitLoginstances, reducing redundancy in multiple places whereGitLogwas instantiated. ([[1]](https://github.com/maoyama/Tempo/pull/153/files#diff-83d76bf6bb027587384a3aaad45adfe25c0b97840e863834478b4f9c90442522R54-R67),[[2]](https://github.com/maoyama/Tempo/pull/153/files#diff-83d76bf6bb027587384a3aaad45adfe25c0b97840e863834478b4f9c90442522L72-R90),[[3]](https://github.com/maoyama/Tempo/pull/153/files#diff-83d76bf6bb027587384a3aaad45adfe25c0b97840e863834478b4f9c90442522L89-R99),[[4]](https://github.com/maoyama/Tempo/pull/153/files#diff-83d76bf6bb027587384a3aaad45adfe25c0b97840e863834478b4f9c90442522L114-R123),[[5]](https://github.com/maoyama/Tempo/pull/153/files#diff-83d76bf6bb027587384a3aaad45adfe25c0b97840e863834478b4f9c90442522L170-R165),[[6]](https://github.com/maoyama/Tempo/pull/153/files#diff-83d76bf6bb027587384a3aaad45adfe25c0b97840e863834478b4f9c90442522L190-R179))UI Improvements:
FolderViewto display tooltips (help) for search token kinds, providing additional context for users. ([GitClient/Views/Folder/FolderView.swiftL94-R96](https://github.com/maoyama/Tempo/pull/153/files#diff-7c23e0932cd90b6072f70acc6ed6eb514b0ad4ec63a1dfc83d738cd241f9392eL94-R96))