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.

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

Add support for commit hashes along with branches #213

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

darrelladjei
Copy link

This PR allows commit hashes to be supported for the branch arg when using a remote repo url.

Checklist

  • Run npm run test
  • Run npm run lint

Copy link

stackblitz bot commented Dec 21, 2024

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

Copy link
Contributor

coderabbitai bot commented Dec 21, 2024

📝 Walkthrough

Walkthrough

The pull request modifies the execGitShallowClone function in the Git command module to provide more flexible repository cloning capabilities. The primary change involves renaming the branch parameter to branchOrCommit and adjusting the cloning logic to support both branch names and commit hashes. Instead of conditionally including the branch in the clone command, the function now performs a shallow clone and then uses a separate checkout command to switch to the specified branch or commit if provided.

Changes

File Change Summary
src/core/file/gitCommand.ts - Renamed branch parameter to branchOrCommit
- Simplified clone command to always perform shallow clone
- Added separate checkout command for branch/commit after cloning
tests/core/file/gitCommand.test.ts - Updated existing test cases for execGitShallowClone
- Added new test scenarios for commit hash and branch checkout
- Improved error handling test cases

Sequence Diagram

sequenceDiagram
    participant User
    participant GitCommand
    participant Git
    User->>GitCommand: execGitShallowClone(url, directory, branchOrCommit)
    GitCommand->>Git: git clone --depth 1 url directory
    alt branchOrCommit specified
        GitCommand->>Git: git -C directory checkout branchOrCommit
    end
Loading

Possibly related PRs

Suggested reviewers

  • yamadashy

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (2)
src/core/file/gitCommand.ts (1)

29-32: Consider enhancing error handling with specific error types

The function could benefit from more specific error handling to distinguish between different failure scenarios (network issues, authentication failures, invalid refs, etc.).

Consider wrapping errors with more context:

  export const execGitShallowClone = async (
    url: string,
    directory: string,
    branchOrCommit?: string,
    deps = {
      execAsync,
    },
  ) => {
    try {
      await deps.execAsync(`git clone --depth 1 ${url} ${directory}`);
      if (branchOrCommit) {
        await deps.execAsync(`git -C ${directory} checkout ${branchOrCommit}`);
      }
+   } catch (error) {
+     if (error.message.includes('Authentication failed')) {
+       throw new Error(`Git authentication failed for repository: ${url}`);
+     } else if (error.message.includes('not found')) {
+       throw new Error(`Git reference not found: ${branchOrCommit}`);
+     }
+     throw error;
    }
  };
tests/core/file/gitCommand.test.ts (1)

91-108: Consider adding security-focused test cases

While the error handling for invalid commits is well tested, consider adding test cases for potential security issues.

Add tests for command injection scenarios:

test('should safely handle special characters in branch names', async () => {
  const mockExecAsync = vi.fn().mockResolvedValue({ stdout: '', stderr: '' });
  const url = 'https://github.com/user/repo.git';
  const directory = '/tmp/repo';
  const maliciousBranch = 'master; rm -rf /';

  await execGitShallowClone(url, directory, maliciousBranch, { execAsync: mockExecAsync });
  
  // Verify the command is properly escaped
  expect(mockExecAsync).toHaveBeenCalledWith(expect.not.stringContaining(';'));
});
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b263c87 and f51231c.

📒 Files selected for processing (2)
  • src/core/file/gitCommand.ts (1 hunks)
  • tests/core/file/gitCommand.test.ts (2 hunks)
🔇 Additional comments (2)
tests/core/file/gitCommand.test.ts (2)

43-53: LGTM! Test cases properly verify the new branch functionality

The test cases effectively verify the separation of clone and checkout commands for branch-based operations.


55-65: LGTM! Good coverage for commit hash functionality

The test cases properly verify that commit hashes are handled correctly in the checkout phase.

src/core/file/gitCommand.ts Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant