diff --git a/.editorconfig b/.editorconfig
index 56725e7b..22c741b9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -100,7 +100,7 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
-dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
# use accessibility modifiers
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12792cf6..d4117364 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,25 +19,14 @@ jobs:
os: macos-latest
runtime: osx-arm64
- name : Linux
- os: ubuntu-latest
+ os: ubuntu-20.04
runtime: linux-x64
- container: ubuntu:20.04
- name : Linux (arm64)
- os: ubuntu-latest
+ os: ubuntu-20.04
runtime: linux-arm64
- container: ubuntu:20.04
name: Build ${{ matrix.name }}
runs-on: ${{ matrix.os }}
- container: ${{ matrix.container || '' }}
steps:
- - name: Install common CLI tools
- if: ${{ startsWith(matrix.runtime, 'linux-') }}
- run: |
- export DEBIAN_FRONTEND=noninteractive
- ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
- apt-get update
- apt-get install -y sudo
- sudo apt-get install -y curl wget git unzip zip libicu66 tzdata clang
- name: Checkout sources
uses: actions/checkout@v4
- name: Setup .NET
@@ -58,7 +47,7 @@ jobs:
if: ${{ matrix.runtime == 'linux-arm64' }}
run: |
sudo apt-get update
- sudo apt-get install -y llvm gcc-aarch64-linux-gnu
+ sudo apt-get install clang llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
- name: Build
run: dotnet build -c Release
- name: Publish
diff --git a/.github/workflows/localization-check.yml b/.github/workflows/localization-check.yml
index 8dcd61c8..cc5201ab 100644
--- a/.github/workflows/localization-check.yml
+++ b/.github/workflows/localization-check.yml
@@ -4,6 +4,7 @@ on:
branches: [ develop ]
paths:
- 'src/Resources/Locales/**'
+ - 'README.md'
workflow_dispatch:
workflow_call:
@@ -31,8 +32,8 @@ jobs:
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
if [ -n "$(git status --porcelain)" ]; then
- git add TRANSLATION.md src/Resources/Locales/*.axaml
- git commit -m 'doc: Update translation status and sort locale files'
+ git add README.md TRANSLATION.md
+ git commit -m 'doc: Update translation status and missing keys'
git push
else
echo "No changes to commit"
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 2dfc97fd..074c9544 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -9,10 +9,10 @@ on:
jobs:
windows:
name: Package Windows
- runs-on: windows-2019
+ runs-on: ubuntu-latest
strategy:
matrix:
- runtime: [ win-x64, win-arm64 ]
+ runtime: [win-x64, win-arm64]
steps:
- name: Checkout sources
uses: actions/checkout@v4
@@ -22,7 +22,6 @@ jobs:
name: sourcegit.${{ matrix.runtime }}
path: build/SourceGit
- name: Package
- shell: bash
env:
VERSION: ${{ inputs.version }}
RUNTIME: ${{ matrix.runtime }}
@@ -70,7 +69,6 @@ jobs:
linux:
name: Package Linux
runs-on: ubuntu-latest
- container: ubuntu:20.04
strategy:
matrix:
runtime: [linux-x64, linux-arm64]
@@ -79,10 +77,9 @@ jobs:
uses: actions/checkout@v4
- name: Download package dependencies
run: |
- export DEBIAN_FRONTEND=noninteractive
- ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
- apt-get update
- apt-get install -y curl wget git dpkg-dev fakeroot tzdata zip unzip desktop-file-utils rpm libfuse2 file build-essential binutils
+ sudo add-apt-repository universe
+ sudo apt-get update
+ sudo apt-get install desktop-file-utils rpm libfuse2
- name: Download build
uses: actions/download-artifact@v4
with:
@@ -92,7 +89,6 @@ jobs:
env:
VERSION: ${{ inputs.version }}
RUNTIME: ${{ matrix.runtime }}
- APPIMAGE_EXTRACT_AND_RUN: 1
run: |
mkdir build/SourceGit
tar -xf "build/sourcegit.${{ matrix.runtime }}.tar" -C build/SourceGit
diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
new file mode 100644
index 00000000..9e465fe7
--- /dev/null
+++ b/.github/workflows/publish-packages.yml
@@ -0,0 +1,39 @@
+name: Publish to Buildkite
+on:
+ workflow_call:
+ secrets:
+ BUILDKITE_TOKEN:
+ required: true
+jobs:
+ publish:
+ name: Publish to Buildkite
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ runtime: [linux-x64, linux-arm64]
+ steps:
+ - name: Download package artifacts
+ uses: actions/download-artifact@v4
+ with:
+ name: package.${{ matrix.runtime }}
+ path: packages
+
+ - name: Publish DEB package
+ env:
+ BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
+ run: |
+ FILE=$(echo packages/*.deb)
+ curl -X POST https://api.buildkite.com/v2/packages/organizations/sourcegit/registries/sourcegit-deb/packages \
+ -H "Authorization: Bearer $BUILDKITE_TOKEN" \
+ -F "file=@$FILE" \
+ --fail
+
+ - name: Publish RPM package
+ env:
+ BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
+ run: |
+ FILE=$(echo packages/*.rpm)
+ curl -X POST https://api.buildkite.com/v2/packages/organizations/sourcegit/registries/sourcegit-rpm/packages \
+ -H "Authorization: Bearer $BUILDKITE_TOKEN" \
+ -F "file=@$FILE" \
+ --fail
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e61e608b..223fe75f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,6 +24,12 @@ jobs:
uses: ./.github/workflows/package.yml
with:
version: ${{ needs.version.outputs.version }}
+ publish-packages:
+ needs: [package, version]
+ name: Publish Packages
+ uses: ./.github/workflows/publish-packages.yml
+ secrets:
+ BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
release:
needs: [package, version]
name: Release
@@ -38,7 +44,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAG: ${{ github.ref_name }}
VERSION: ${{ needs.version.outputs.version }}
- run: gh release create "$TAG" -t "$VERSION" --notes-from-tag
+ run: gh release create "$TAG" -t "Release $VERSION" --notes-from-tag
- name: Download artifacts
uses: actions/download-artifact@v4
with:
diff --git a/.gitignore b/.gitignore
index e686a534..0c66b11e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,5 +37,3 @@ build/*.deb
build/*.rpm
build/*.AppImage
SourceGit.app/
-build.command
-src/Properties/launchSettings.json
diff --git a/LICENSE b/LICENSE
index 442ce085..dceab2d8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2025 sourcegit
+Copyright (c) 2024 sourcegit
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index f9ba3072..7e4db671 100644
--- a/README.md
+++ b/README.md
@@ -11,16 +11,16 @@
* Supports Windows/macOS/Linux
* Opensource/Free
* Fast
-* Deutsch/English/Español/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil)
+* Deutsch/English/Español/Français/Italiano/Português/Русский/简体中文/繁體中文
* Built-in light/dark themes
* Customize theme
* Visual commit graph
* Supports SSH access with each remote
* GIT commands with GUI
* Clone/Fetch/Pull/Push...
- * Merge/Rebase/Reset/Revert/Cherry-pick...
- * Amend/Reword/Squash
- * Interactive rebase
+ * Merge/Rebase/Reset/Revert/Amend/Cherry-pick...
+ * Amend/Reword
+ * Interactive rebase (Basic)
* Branches
* Remotes
* Tags
@@ -35,14 +35,11 @@
* Revision Diffs
* Branch Diff
* Image Diff - Side-By-Side/Swipe/Blend
-* Git command logs
* Search commits
* GitFlow
* Git LFS
-* Bisect
* Issue Link
* Workspace
-* Custom Action
* Using AI to generate commit message (C# port of [anjerodev/commitollama](https://github.com/anjerodev/commitollama))
> [!WARNING]
@@ -50,25 +47,24 @@
## Translation Status
-You can find the current translation status in [TRANSLATION.md](https://github.com/sourcegit-scm/sourcegit/blob/develop/TRANSLATION.md)
+[](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md) [](TRANSLATION.md)
## How to Use
-**To use this tool, you need to install Git(>=2.25.1) first.**
+**To use this tool, you need to install Git(>=2.23.0) first.**
-You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [GitHub Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
+You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [Github Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationData}/SourceGit"`, which is platform-dependent, to store user settings, downloaded avatars and crash logs.
| OS | PATH |
|---------|-----------------------------------------------------|
-| Windows | `%APPDATA%\SourceGit` |
+| Windows | `C:\Users\USER_NAME\AppData\Roaming\SourceGit` |
| Linux | `${HOME}/.config/SourceGit` or `${HOME}/.sourcegit` |
| macOS | `${HOME}/Library/Application Support/SourceGit` |
> [!TIP]
-> * You can open this data storage directory from the main menu `Open Data Storage Directory`.
-> * You can create a `data` folder next to the `SourceGit` executable to force this app to store data (user settings, downloaded avatars and crash logs) into it (Portable-Mode). Only works on Windows.
+> You can open this data storage directory from the main menu.
For **Windows** users:
@@ -79,12 +75,13 @@ For **Windows** users:
```
> [!NOTE]
> `winget` will install this software as a commandline tool. You need run `SourceGit` from console or `Win+R` at the first time. Then you can add it to the taskbar.
-* You can install the latest stable by `scoop` with follow commands:
+* You can install the latest stable by `scoope` with follow commands:
```shell
scoop bucket add extras
scoop install sourcegit
```
* Pre-built binaries can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest)
+* You can run `dotnet publish -c Release -r win-x64 -p:EnablePortable=true -o $YOUR_PUBLISH_DIR .\src\SourceGit.csproj` to build a portable version.
For **macOS** users:
@@ -93,7 +90,7 @@ For **macOS** users:
brew tap ybeapps/homebrew-sourcegit
brew install --cask --no-quarantine sourcegit
```
-* If you want to install `SourceGit.app` from GitHub Release manually, you need run following command to make sure it works:
+* If you want to install `SourceGit.app` from Github Release manually, you need run following command to make sure it works:
```shell
sudo xattr -cr /Applications/SourceGit.app
```
@@ -102,45 +99,49 @@ For **macOS** users:
For **Linux** users:
-* Thanks [@aikawayataro](https://github.com/aikawayataro) for providing `rpm` and `deb` repositories, hosted on [Codeberg](https://codeberg.org/yataro/-/packages).
-
- `deb` how to:
+* For Debian/Ubuntu based distributions, you can add the `sourcegit` repository by following:
+ You may need to install curl and/or gpg first, if you're on a very minimal host:
```shell
- curl https://codeberg.org/api/packages/yataro/debian/repository.key | sudo tee /etc/apt/keyrings/sourcegit.asc
- echo "deb [signed-by=/etc/apt/keyrings/sourcegit.asc, arch=amd64,arm64] https://codeberg.org/api/packages/yataro/debian generic main" | sudo tee /etc/apt/sources.list.d/sourcegit.list
- sudo apt update
- sudo apt install sourcegit
+ apt update && apt install curl gpg -y
```
-
- `rpm` how to:
+ Install the registry signing key:
```shell
- curl https://codeberg.org/api/packages/yataro/rpm.repo | sed -e 's/gpgcheck=1/gpgcheck=0/' > sourcegit.repo
-
- # Fedora 41 and newer
- sudo dnf config-manager addrepo --from-repofile=./sourcegit.repo
- # Fedora 40 and earlier
- sudo dnf config-manager --add-repo ./sourcegit.repo
-
- sudo dnf install sourcegit
+ curl -fsSL "https://packages.buildkite.com/sourcegit/sourcegit-deb/gpgkey" | gpg --dearmor -o /etc/apt/keyrings/sourcegit_sourcegit-deb-archive-keyring.gpg
```
-
- If your distribution isn't using `dnf`, please refer to the documentation of your distribution on how to add an `rpm` repository.
-* `AppImage` files can be found on [AppImage hub](https://appimage.github.io/SourceGit/), `xdg-open` (`xdg-utils`) must be installed to support open native file manager.
-* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your Linux.
+ Configure the source:
+ ```shell
+ echo -e "deb [signed-by=/etc/apt/keyrings/sourcegit_sourcegit-deb-archive-keyring.gpg] https://packages.buildkite.com/sourcegit/sourcegit-deb/any/ any main\ndeb-src [signed-by=/etc/apt/keyrings/sourcegit_sourcegit-deb-archive-keyring.gpg] https://packages.buildkite.com/sourcegit/sourcegit-deb/any/ any main" > /etc/apt/sources.list.d/buildkite-sourcegit-sourcegit-deb.list
+ ```
+ Update your local repository and install the package:
+ ```shell
+ apt update && apt install sourcegit
+ ```
+* For RHEL/Fedora based distributions, you can add the `sourcegit` repository by following:
+ Configure the source:
+ ```shell
+ sudo sh -c 'echo -e "[sourcegit-rpm]\nname=sourcegit-rpm\nbaseurl=https://packages.buildkite.com/sourcegit/sourcegit-rpm/rpm_any/rpm_any/\$basearch\nenabled=1\nrepo_gpgcheck=1\ngpgcheck=0\ngpgkey=https://packages.buildkite.com/sourcegit/sourcegit-rpm/gpgkey\npriority=1"' > /etc/yum.repos.d/sourcegit-rpm.repo
+ ```
+ Install the package with this command:
+ ```shell
+ sudo dnf install -y sourcegit
+ ```
+* `Appimage` files can be found on [AppimageHub](https://appimage.github.io/SourceGit/)
+* `xdg-open` must be installed to support open native file manager.
+* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your linux.
* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI.
-* If you can NOT type accented characters, such as `ê`, `ó`, try to set the environment variable `AVALONIA_IM_MODULE` to `none`.
+* If you can NOT type accented characters, such as `ê`, `ó`, try to set the environment variable `AVALONIA_IM_MODULE` to `none`.
## OpenAI
-This software supports using OpenAI or other AI service that has an OpenAI compatible HTTP API to generate commit message. You need configurate the service in `Preference` window.
+This software supports using OpenAI or other AI service that has an OpenAI comaptible HTTP API to generate commit message. You need configurate the service in `Preference` window.
For `OpenAI`:
-* `Server` must be `https://api.openai.com/v1`
+* `Server` must be `https://api.openai.com/v1/chat/completions`
For other AI service:
-* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1`. For example, when using `Ollama`, it should be `http://localhost:11434/v1` instead of `http://localhost:11434/api/generate`
+* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1/chat/completions`. For example, when using `Ollama`, it should be `http://localhost:11434/v1/chat/completions` instead of `http://localhost:11434/api/generate`
* The `API Key` is optional that depends on the service
## External Tools
@@ -189,19 +190,6 @@ This app supports open repository in external tools listed in the table below.
Everyone is welcome to submit a PR. Please make sure your PR is based on the latest `develop` branch and the target branch of PR is `develop`.
-In short, here are the commands to get started once [.NET tools are installed](https://dotnet.microsoft.com/en-us/download):
-
-```sh
-dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org
-dotnet restore
-dotnet build
-dotnet run --project src/SourceGit.csproj
-```
-
Thanks to all the people who contribute.
[](https://github.com/sourcegit-scm/sourcegit/graphs/contributors)
-
-## Third-Party Components
-
-For detailed license information, see [THIRD-PARTY-LICENSES.md](THIRD-PARTY-LICENSES.md).
diff --git a/SourceGit.sln b/SourceGit.sln
index 624322f8..88730204 100644
--- a/SourceGit.sln
+++ b/SourceGit.sln
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
.github\workflows\package.yml = .github\workflows\package.yml
.github\workflows\release.yml = .github\workflows\release.yml
.github\workflows\localization-check.yml = .github\workflows\localization-check.yml
+ .github\workflows\publish-packages.yml = .github\workflows\publish-packages.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49A7C2D6-558C-4FAA-8F5D-EEE81497AED7}"
@@ -60,8 +61,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DEBIAN", "DEBIAN", "{F101849D-BDB7-40D4-A516-751150C3CCFC}"
ProjectSection(SolutionItems) = preProject
build\resources\deb\DEBIAN\control = build\resources\deb\DEBIAN\control
- build\resources\deb\DEBIAN\preinst = build\resources\deb\DEBIAN\preinst
- build\resources\deb\DEBIAN\prerm = build\resources\deb\DEBIAN\prerm
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpm", "rpm", "{9BA0B044-0CC9-46F8-B551-204F149BF45D}"
diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
deleted file mode 100644
index 2338263c..00000000
--- a/THIRD-PARTY-LICENSES.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Third-Party Licenses
-
-This project incorporates components from the following third parties:
-
-## Packages
-
-### AvaloniaUI
-
-- **Source**: https://github.com/AvaloniaUI/Avalonia
-- **Version**: 11.2.5
-- **License**: MIT License
-- **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
-
-### AvaloniaEdit
-
-- **Source**: https://github.com/AvaloniaUI/AvaloniaEdit
-- **Version**: 11.2.0
-- **License**: MIT License
-- **License Link**: https://github.com/AvaloniaUI/AvaloniaEdit/blob/master/LICENSE
-
-### LiveChartsCore.SkiaSharpView.Avalonia
-
-- **Source**: https://github.com/beto-rodriguez/LiveCharts2
-- **Version**: 2.0.0-rc5.4
-- **License**: MIT License
-- **License Link**: https://github.com/beto-rodriguez/LiveCharts2/blob/master/LICENSE
-
-### TextMateSharp
-
-- **Source**: https://github.com/danipen/TextMateSharp
-- **Version**: 1.0.66
-- **License**: MIT License
-- **License Link**: https://github.com/danipen/TextMateSharp/blob/master/LICENSE.md
-
-### OpenAI .NET SDK
-
-- **Source**: https://github.com/openai/openai-dotnet
-- **Version**: 2.2.0-beta2
-- **License**: MIT License
-- **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
-
-### Azure.AI.OpenAI
-
-- **Source**: https://github.com/Azure/azure-sdk-for-net
-- **Version**: 2.2.0-beta2
-- **License**: MIT License
-- **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
-
-## Fonts
-
-### JetBrainsMono
-
-- **Source**: https://github.com/JetBrains/JetBrainsMono
-- **Commit**: v2.304
-- **License**: SIL Open Font License, Version 1.1
-- **License Link**: https://github.com/JetBrains/JetBrainsMono/blob/v2.304/OFL.txt
-
-## Grammar Files
-
-### haxe-TmLanguage
-
-- **Source**: https://github.com/vshaxe/haxe-TmLanguage
-- **Commit**: ddad8b4c6d0781ac20be0481174ec1be772c5da5
-- **License**: MIT License
-- **License Link**: https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md
-
-### coc-toml
-
-- **Source**: https://github.com/kkiyama117/coc-toml
-- **Commit**: aac3e0c65955c03314b2733041b19f903b7cc447
-- **License**: MIT License
-- **License Link**: https://github.com/kkiyama117/coc-toml/blob/aac3e0c65955c03314b2733041b19f903b7cc447/LICENSE
-
-### eclipse-buildship
-
-- **Source**: https://github.com/eclipse/buildship
-- **Commit**: 6bb773e7692f913dec27105129ebe388de34e68b
-- **License**: Eclipse Public License 1.0
-- **License Link**: https://github.com/eclipse-buildship/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/README.md
-
-### vscode-jsp-lang
-
-- **Source**: https://github.com/samuel-weinhardt/vscode-jsp-lang
-- **Commit**: 0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355
-- **License**: MIT License
-- **License Link**: https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE
diff --git a/TRANSLATION.md b/TRANSLATION.md
index 051440f0..69962320 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -1,511 +1,167 @@
-# Translation Status
+### de_DE.axaml: 100.00%
-This document shows the translation status of each locale file in the repository.
-
-## Details
-
-### 
-
-### 
-Missing keys in de_DE.axaml
+Missing Keys
+
-- Text.Avatar.Load
-- Text.BranchCM.ResetToSelectedCommit
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.CommitDetail.Changes.Count
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.Diff.Submodule.Deleted
-- Text.GitFlow.FinishWithPush
-- Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Hotkeys.TextEditor.OpenExternalMergeTool
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
-- Text.Pull.RecurseSubmodules
-- Text.Repository.ClearStashes
-- Text.Repository.ShowSubmodulesAsTree
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.Submodule.Deinit
-- Text.Submodule.Status
-- Text.Submodule.Status.Modified
-- Text.Submodule.Status.NotInited
-- Text.Submodule.Status.RevisionChanged
-- Text.Submodule.Status.Unmerged
-- Text.Submodule.URL
-- Text.WorkingCopy.ResetAuthor
-### 
+### es_ES.axaml: 100.00%
-### 
-Missing keys in fr_FR.axaml
+Missing Keys
+
-- Text.Avatar.Load
-- Text.Bisect
-- Text.Bisect.Abort
-- Text.Bisect.Bad
-- Text.Bisect.Detecting
-- Text.Bisect.Good
-- Text.Bisect.Skip
-- Text.Bisect.WaitingForRange
-- Text.BranchCM.ResetToSelectedCommit
-- Text.Checkout.RecurseSubmodules
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.CommitCM.CopyAuthor
-- Text.CommitCM.CopyCommitter
-- Text.CommitCM.CopySubject
-- Text.CommitDetail.Changes.Count
-- Text.CommitMessageTextBox.SubjectCount
-- Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Continue
-- Text.ConfirmEmptyCommit.NoLocalChanges
-- Text.ConfirmEmptyCommit.StageAllThenCommit
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.Diff.Submodule.Deleted
-- Text.GitFlow.FinishWithPush
-- Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Hotkeys.TextEditor.OpenExternalMergeTool
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
-- Text.Preferences.Git.IgnoreCRAtEOLInDiff
-- Text.Pull.RecurseSubmodules
-- Text.Repository.BranchSort
-- Text.Repository.BranchSort.ByCommitterDate
-- Text.Repository.BranchSort.ByName
-- Text.Repository.ClearStashes
-- Text.Repository.Search.ByContent
-- Text.Repository.ShowSubmodulesAsTree
-- Text.Repository.ViewLogs
-- Text.Repository.Visit
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.Submodule.Deinit
-- Text.Submodule.Status
-- Text.Submodule.Status.Modified
-- Text.Submodule.Status.NotInited
-- Text.Submodule.Status.RevisionChanged
-- Text.Submodule.Status.Unmerged
-- Text.Submodule.URL
-- Text.ViewLogs
-- Text.ViewLogs.Clear
-- Text.ViewLogs.CopyLog
-- Text.ViewLogs.Delete
-- Text.WorkingCopy.ConfirmCommitWithFilter
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
-- Text.WorkingCopy.ResetAuthor
-### 
+### fr_FR.axaml: 95.00%
+
-Missing keys in it_IT.axaml
+Missing Keys
-- Text.Avatar.Load
-- Text.BranchCM.ResetToSelectedCommit
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.CommitDetail.Changes.Count
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.Diff.Submodule.Deleted
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
-- Text.Pull.RecurseSubmodules
-- Text.Repository.ClearStashes
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.Submodule.Deinit
-- Text.WorkingCopy.ResetAuthor
-
-
-
-### 
-
-
-Missing keys in ja_JP.axaml
-
-- Text.Avatar.Load
-- Text.Bisect
-- Text.Bisect.Abort
-- Text.Bisect.Bad
-- Text.Bisect.Detecting
-- Text.Bisect.Good
-- Text.Bisect.Skip
-- Text.Bisect.WaitingForRange
-- Text.BranchCM.CompareWithCurrent
-- Text.BranchCM.ResetToSelectedCommit
-- Text.Checkout.RecurseSubmodules
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.CommitCM.CopyAuthor
-- Text.CommitCM.CopyCommitter
-- Text.CommitCM.CopySubject
-- Text.CommitDetail.Changes.Count
-- Text.CommitMessageTextBox.SubjectCount
-- Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Continue
-- Text.ConfirmEmptyCommit.NoLocalChanges
-- Text.ConfirmEmptyCommit.StageAllThenCommit
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.Diff.Submodule.Deleted
-- Text.GitFlow.FinishWithPush
-- Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Hotkeys.TextEditor.OpenExternalMergeTool
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
-- Text.Preferences.Git.IgnoreCRAtEOLInDiff
-- Text.Pull.RecurseSubmodules
-- Text.Repository.BranchSort
-- Text.Repository.BranchSort.ByCommitterDate
-- Text.Repository.BranchSort.ByName
-- Text.Repository.ClearStashes
-- Text.Repository.FilterCommits
-- Text.Repository.Search.ByContent
-- Text.Repository.ShowSubmodulesAsTree
-- Text.Repository.ViewLogs
-- Text.Repository.Visit
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.Submodule.Deinit
-- Text.Submodule.Status
-- Text.Submodule.Status.Modified
-- Text.Submodule.Status.NotInited
-- Text.Submodule.Status.RevisionChanged
-- Text.Submodule.Status.Unmerged
-- Text.Submodule.URL
-- Text.ViewLogs
-- Text.ViewLogs.Clear
-- Text.ViewLogs.CopyLog
-- Text.ViewLogs.Delete
-- Text.WorkingCopy.ConfirmCommitWithFilter
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
-- Text.WorkingCopy.ResetAuthor
-
-
-
-### 
-
-
-Missing keys in pt_BR.axaml
-
-- Text.AIAssistant.Regen
-- Text.AIAssistant.Use
-- Text.ApplyStash
-- Text.ApplyStash.DropAfterApply
-- Text.ApplyStash.RestoreIndex
-- Text.ApplyStash.Stash
-- Text.Avatar.Load
-- Text.Bisect
-- Text.Bisect.Abort
-- Text.Bisect.Bad
-- Text.Bisect.Detecting
-- Text.Bisect.Good
-- Text.Bisect.Skip
-- Text.Bisect.WaitingForRange
-- Text.BranchCM.CustomAction
- Text.BranchCM.MergeMultiBranches
-- Text.BranchCM.ResetToSelectedCommit
-- Text.BranchUpstreamInvalid
-- Text.Checkout.RecurseSubmodules
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.Clone.RecurseSubmodules
-- Text.CommitCM.CopyAuthor
-- Text.CommitCM.CopyCommitter
-- Text.CommitCM.CopySubject
+- Text.CherryPick.AppendSourceToMessage
+- Text.CherryPick.Mainline.Tips
+- Text.CommitCM.CherryPickMultiple
- Text.CommitCM.Merge
- Text.CommitCM.MergeMultiple
-- Text.CommitDetail.Changes.Count
- Text.CommitDetail.Files.Search
-- Text.CommitDetail.Info.Children
-- Text.CommitMessageTextBox.SubjectCount
-- Text.Configure.CustomAction.Scope.Branch
-- Text.Configure.CustomAction.WaitForExit
-- Text.Configure.Git.PreferredMergeMode
-- Text.Configure.IssueTracker.AddSampleGiteeIssue
-- Text.Configure.IssueTracker.AddSampleGiteePullRequest
-- Text.ConfirmEmptyCommit.Continue
-- Text.ConfirmEmptyCommit.NoLocalChanges
-- Text.ConfirmEmptyCommit.StageAllThenCommit
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.CopyFullPath
-- Text.CreateBranch.Name.WarnSpace
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.DeleteRepositoryNode.Path
-- Text.DeleteRepositoryNode.TipForGroup
-- Text.DeleteRepositoryNode.TipForRepository
-- Text.Diff.First
-- Text.Diff.Last
-- Text.Diff.Submodule.Deleted
- Text.Diff.UseBlockNavigation
- Text.Fetch.Force
- Text.FileCM.ResolveUsing
-- Text.GitFlow.FinishWithPush
-- Text.GitFlow.FinishWithSquash
- Text.Hotkeys.Global.Clone
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Hotkeys.TextEditor.OpenExternalMergeTool
- Text.InProgress.CherryPick.Head
- Text.InProgress.Merge.Operating
- Text.InProgress.Rebase.StoppedAt
- Text.InProgress.Revert.Head
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
- Text.Merge.Source
- Text.MergeMultiple
- Text.MergeMultiple.CommitChanges
- Text.MergeMultiple.Strategy
- Text.MergeMultiple.Targets
-- Text.Preferences.AI.Streaming
-- Text.Preferences.Appearance.EditorTabWidth
-- Text.Preferences.General.DateFormat
-- Text.Preferences.General.ShowChildren
-- Text.Preferences.General.ShowTagsInGraph
-- Text.Preferences.Git.IgnoreCRAtEOLInDiff
-- Text.Preferences.Git.SSLVerify
-- Text.Pull.RecurseSubmodules
-- Text.Repository.BranchSort
-- Text.Repository.BranchSort.ByCommitterDate
-- Text.Repository.BranchSort.ByName
-- Text.Repository.ClearStashes
+- Text.Preference.Appearance.FontSize
+- Text.Preference.Appearance.FontSize.Default
+- Text.Preference.Appearance.FontSize.Editor
+- Text.Preference.General.ShowChildren
+- Text.Repository.CustomActions
- Text.Repository.FilterCommits
-- Text.Repository.HistoriesLayout
-- Text.Repository.HistoriesLayout.Horizontal
-- Text.Repository.HistoriesLayout.Vertical
+- Text.Repository.FilterCommits.Default
+- Text.Repository.FilterCommits.Exclude
+- Text.Repository.FilterCommits.Include
- Text.Repository.HistoriesOrder
-- Text.Repository.Notifications.Clear
-- Text.Repository.OnlyHighlightCurrentBranchInHistories
-- Text.Repository.Search.ByContent
-- Text.Repository.ShowSubmodulesAsTree
+- Text.Repository.HistoriesOrder.ByDate
+- Text.Repository.HistoriesOrder.Topo
- Text.Repository.Skip
-- Text.Repository.Tags.OrderByCreatorDate
-- Text.Repository.Tags.OrderByName
-- Text.Repository.Tags.Sort
-- Text.Repository.UseRelativeTimeInHistories
-- Text.Repository.ViewLogs
-- Text.Repository.Visit
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.SetUpstream
-- Text.SetUpstream.Local
-- Text.SetUpstream.Unset
-- Text.SetUpstream.Upstream
+- Text.ScanRepositories
- Text.SHALinkCM.NavigateTo
-- Text.Stash.AutoRestore
-- Text.Stash.AutoRestore.Tip
-- Text.StashCM.SaveAsPatch
-- Text.Submodule.Deinit
-- Text.Submodule.Status
-- Text.Submodule.Status.Modified
-- Text.Submodule.Status.NotInited
-- Text.Submodule.Status.RevisionChanged
-- Text.Submodule.Status.Unmerged
-- Text.Submodule.URL
-- Text.ViewLogs
-- Text.ViewLogs.Clear
-- Text.ViewLogs.CopyLog
-- Text.ViewLogs.Delete
- Text.WorkingCopy.CommitToEdit
-- Text.WorkingCopy.ConfirmCommitWithFilter
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
-- Text.WorkingCopy.ResetAuthor
-- Text.WorkingCopy.SignOff
-### 
+### it_IT.axaml: 95.56%
+
-Missing keys in ru_RU.axaml
+Missing Keys
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
+- Text.BranchCM.MergeMultiBranches
+- Text.CommitCM.Merge
+- Text.CommitCM.MergeMultiple
+- Text.CommitDetail.Files.Search
+- Text.CommitDetail.Info.Children
+- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
+- Text.Configure.OpenAI.Preferred
+- Text.Configure.OpenAI.Preferred.Tip
+- Text.Diff.UseBlockNavigation
+- Text.Fetch.Force
+- Text.FileCM.ResolveUsing
+- Text.InProgress.CherryPick.Head
+- Text.InProgress.Merge.Operating
+- Text.InProgress.Rebase.StoppedAt
+- Text.InProgress.Revert.Head
+- Text.Merge.Source
+- Text.MergeMultiple
+- Text.MergeMultiple.CommitChanges
+- Text.MergeMultiple.Strategy
+- Text.MergeMultiple.Targets
+- Text.Preference.General.ShowChildren
+- Text.Repository.FilterCommits
+- Text.Repository.FilterCommits.Default
+- Text.Repository.FilterCommits.Exclude
+- Text.Repository.FilterCommits.Include
+- Text.Repository.HistoriesOrder
+- Text.Repository.HistoriesOrder.ByDate
+- Text.Repository.HistoriesOrder.Topo
+- Text.Repository.Skip
+- Text.SHALinkCM.CopySHA
+- Text.SHALinkCM.NavigateTo
+- Text.WorkingCopy.CommitToEdit
-### 
+### pt_BR.axaml: 96.81%
+
-Missing keys in ta_IN.axaml
+Missing Keys
-- Text.Avatar.Load
-- Text.Bisect
-- Text.Bisect.Abort
-- Text.Bisect.Bad
-- Text.Bisect.Detecting
-- Text.Bisect.Good
-- Text.Bisect.Skip
-- Text.Bisect.WaitingForRange
-- Text.BranchCM.CompareWithCurrent
-- Text.BranchCM.ResetToSelectedCommit
-- Text.Checkout.RecurseSubmodules
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.CommitCM.CopyAuthor
-- Text.CommitCM.CopyCommitter
-- Text.CommitCM.CopySubject
-- Text.CommitDetail.Changes.Count
-- Text.CommitMessageTextBox.SubjectCount
-- Text.Configure.Git.PreferredMergeMode
-- Text.ConfirmEmptyCommit.Continue
-- Text.ConfirmEmptyCommit.NoLocalChanges
-- Text.ConfirmEmptyCommit.StageAllThenCommit
-- Text.ConfirmEmptyCommit.WithLocalChanges
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.Diff.Submodule.Deleted
-- Text.GitFlow.FinishWithPush
-- Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Hotkeys.TextEditor.OpenExternalMergeTool
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
-- Text.Preferences.Git.IgnoreCRAtEOLInDiff
-- Text.Pull.RecurseSubmodules
-- Text.Repository.BranchSort
-- Text.Repository.BranchSort.ByCommitterDate
-- Text.Repository.BranchSort.ByName
-- Text.Repository.ClearStashes
-- Text.Repository.Search.ByContent
-- Text.Repository.ShowSubmodulesAsTree
-- Text.Repository.ViewLogs
-- Text.Repository.Visit
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.Submodule.Deinit
-- Text.Submodule.Status
-- Text.Submodule.Status.Modified
-- Text.Submodule.Status.NotInited
-- Text.Submodule.Status.RevisionChanged
-- Text.Submodule.Status.Unmerged
-- Text.Submodule.URL
-- Text.UpdateSubmodules.Target
-- Text.ViewLogs
-- Text.ViewLogs.Clear
-- Text.ViewLogs.CopyLog
-- Text.ViewLogs.Delete
-- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
-- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
-- Text.WorkingCopy.Conflicts.UseMine
-- Text.WorkingCopy.Conflicts.UseTheirs
-- Text.WorkingCopy.ResetAuthor
+- Text.BranchCM.MergeMultiBranches
+- Text.CommitCM.Merge
+- Text.CommitCM.MergeMultiple
+- Text.CommitDetail.Files.Search
+- Text.CommitDetail.Info.Children
+- Text.Diff.UseBlockNavigation
+- Text.Fetch.Force
+- Text.FileCM.ResolveUsing
+- Text.Hotkeys.Global.Clone
+- Text.InProgress.CherryPick.Head
+- Text.InProgress.Merge.Operating
+- Text.InProgress.Rebase.StoppedAt
+- Text.InProgress.Revert.Head
+- Text.Merge.Source
+- Text.MergeMultiple
+- Text.MergeMultiple.CommitChanges
+- Text.MergeMultiple.Strategy
+- Text.MergeMultiple.Targets
+- Text.Preference.General.ShowChildren
+- Text.Repository.FilterCommits
+- Text.Repository.Skip
+- Text.SHALinkCM.NavigateTo
+- Text.WorkingCopy.CommitToEdit
-### 
+### ru_RU.axaml: 100.00%
+
-Missing keys in uk_UA.axaml
+Missing Keys
+
-- Text.Avatar.Load
-- Text.Bisect
-- Text.Bisect.Abort
-- Text.Bisect.Bad
-- Text.Bisect.Detecting
-- Text.Bisect.Good
-- Text.Bisect.Skip
-- Text.Bisect.WaitingForRange
-- Text.BranchCM.ResetToSelectedCommit
-- Text.Checkout.RecurseSubmodules
-- Text.Checkout.WithFastForward
-- Text.Checkout.WithFastForward.Upstream
-- Text.CommitCM.CopyAuthor
-- Text.CommitCM.CopyCommitter
-- Text.CommitCM.CopySubject
-- Text.CommitDetail.Changes.Count
-- Text.CommitMessageTextBox.SubjectCount
-- Text.ConfigureWorkspace.Name
-- Text.CreateBranch.OverwriteExisting
-- Text.DeinitSubmodule
-- Text.DeinitSubmodule.Force
-- Text.DeinitSubmodule.Path
-- Text.Diff.Submodule.Deleted
-- Text.GitFlow.FinishWithPush
-- Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
-- Text.Hotkeys.Global.SwitchTab
-- Text.Hotkeys.TextEditor.OpenExternalMergeTool
-- Text.Launcher.Workspaces
-- Text.Launcher.Pages
-- Text.Preferences.Git.IgnoreCRAtEOLInDiff
-- Text.Pull.RecurseSubmodules
-- Text.Repository.BranchSort
-- Text.Repository.BranchSort.ByCommitterDate
-- Text.Repository.BranchSort.ByName
-- Text.Repository.ClearStashes
-- Text.Repository.Search.ByContent
-- Text.Repository.ShowSubmodulesAsTree
-- Text.Repository.ViewLogs
-- Text.Repository.Visit
-- Text.ResetWithoutCheckout
-- Text.ResetWithoutCheckout.MoveTo
-- Text.ResetWithoutCheckout.Target
-- Text.Submodule.Deinit
-- Text.Submodule.Status
-- Text.Submodule.Status.Modified
-- Text.Submodule.Status.NotInited
-- Text.Submodule.Status.RevisionChanged
-- Text.Submodule.Status.Unmerged
-- Text.Submodule.URL
-- Text.ViewLogs
-- Text.ViewLogs.Clear
-- Text.ViewLogs.CopyLog
-- Text.ViewLogs.Delete
-- Text.WorkingCopy.ResetAuthor
-### 
+### zh_CN.axaml: 100.00%
-### 
\ No newline at end of file
+
+
+Missing Keys
+
+
+
+
+
+### zh_TW.axaml: 100.00%
+
+
+
+Missing Keys
+
+
+
+
diff --git a/VERSION b/VERSION
index d3e094ba..b977bf8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.22
\ No newline at end of file
+8.45
\ No newline at end of file
diff --git a/build/README.md b/build/README.md
index 17305edf..b4358a55 100644
--- a/build/README.md
+++ b/build/README.md
@@ -12,4 +12,4 @@
dotnet publish -c Release -r $RUNTIME_IDENTIFIER -o $DESTINATION_FOLDER src/SourceGit.csproj
```
> [!NOTE]
-> Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replace the `$DESTINATION_FOLDER` with the real path that will store the output executable files.
+> Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replece the `$DESTINATION_FOLDER` with the real path that will store the output executable files.
diff --git a/build/resources/deb/DEBIAN/control b/build/resources/deb/DEBIAN/control
index 71786b43..7cfed330 100755
--- a/build/resources/deb/DEBIAN/control
+++ b/build/resources/deb/DEBIAN/control
@@ -1,8 +1,7 @@
Package: sourcegit
-Version: 2025.10
+Version: 8.23
Priority: optional
-Depends: libx11-6, libice6, libsm6, libicu | libicu76 | libicu74 | libicu72 | libicu71 | libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu63 | libicu60 | libicu57 | libicu55 | libicu52, xdg-utils
+Depends: libx11-6, libice6, libsm6
Architecture: amd64
-Installed-Size: 60440
Maintainer: longshuang@msn.cn
Description: Open-source & Free Git GUI Client
diff --git a/build/resources/deb/DEBIAN/preinst b/build/resources/deb/DEBIAN/preinst
deleted file mode 100755
index a93f8090..00000000
--- a/build/resources/deb/DEBIAN/preinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * `install'
-# * `install'
-# * `upgrade'
-# * `abort-upgrade'
-# for details, see http://www.debian.org/doc/debian-policy/
-
-case "$1" in
- install|upgrade)
- # Check if SourceGit is running and stop it
- if pgrep -f '/opt/sourcegit/sourcegit' > /dev/null; then
- echo "Stopping running SourceGit instance..."
- pkill -f '/opt/sourcegit/sourcegit' || true
- # Give the process a moment to terminate
- sleep 1
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/build/resources/deb/DEBIAN/prerm b/build/resources/deb/DEBIAN/prerm
deleted file mode 100755
index c2c9e4f0..00000000
--- a/build/resources/deb/DEBIAN/prerm
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * `remove'
-# * `upgrade'
-# * `failed-upgrade'
-# * `remove' `in-favour'
-# * `deconfigure' `in-favour'
-# `removing'
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
- remove|upgrade|deconfigure)
- if pgrep -f '/opt/sourcegit/sourcegit' > /dev/null; then
- echo "Stopping running SourceGit instance..."
- pkill -f '/opt/sourcegit/sourcegit' || true
- # Give the process a moment to terminate
- sleep 1
- fi
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/build/resources/rpm/SPECS/build.spec b/build/resources/rpm/SPECS/build.spec
index 2a684837..bc10ca48 100644
--- a/build/resources/rpm/SPECS/build.spec
+++ b/build/resources/rpm/SPECS/build.spec
@@ -8,7 +8,6 @@ Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.
Requires: libX11.so.6()(%{__isa_bits}bit)
Requires: libSM.so.6()(%{__isa_bits}bit)
Requires: libicu
-Requires: xdg-utils
%define _build_id_links none
diff --git a/build/scripts/localization-check.js b/build/scripts/localization-check.js
index 8d636b5b..45db82be 100644
--- a/build/scripts/localization-check.js
+++ b/build/scripts/localization-check.js
@@ -6,6 +6,7 @@ const repoRoot = path.join(__dirname, '../../');
const localesDir = path.join(repoRoot, 'src/Resources/Locales');
const enUSFile = path.join(localesDir, 'en_US.axaml');
const outputFile = path.join(repoRoot, 'TRANSLATION.md');
+const readmeFile = path.join(repoRoot, 'README.md');
const parser = new xml2js.Parser();
@@ -14,70 +15,45 @@ async function parseXml(filePath) {
return parser.parseStringPromise(data);
}
-async function filterAndSortTranslations(localeData, enUSKeys, enUSData) {
- const strings = localeData.ResourceDictionary['x:String'];
- // Remove keys that don't exist in English file
- const filtered = strings.filter(item => enUSKeys.has(item.$['x:Key']));
-
- // Sort based on the key order in English file
- const enUSKeysArray = enUSData.ResourceDictionary['x:String'].map(item => item.$['x:Key']);
- filtered.sort((a, b) => {
- const aIndex = enUSKeysArray.indexOf(a.$['x:Key']);
- const bIndex = enUSKeysArray.indexOf(b.$['x:Key']);
- return aIndex - bIndex;
- });
-
- return filtered;
-}
-
async function calculateTranslationRate() {
const enUSData = await parseXml(enUSFile);
const enUSKeys = new Set(enUSData.ResourceDictionary['x:String'].map(item => item.$['x:Key']));
+
+ const translationRates = [];
+ const badges = [];
+
const files = (await fs.readdir(localesDir)).filter(file => file !== 'en_US.axaml' && file.endsWith('.axaml'));
- const lines = [];
-
- lines.push('# Translation Status');
- lines.push('This document shows the translation status of each locale file in the repository.');
- lines.push(`## Details`);
- lines.push(`### `);
+ // Add en_US badge first
+ badges.push(`[](TRANSLATION.md)`);
for (const file of files) {
- const locale = file.replace('.axaml', '').replace('_', '__');
const filePath = path.join(localesDir, file);
const localeData = await parseXml(filePath);
const localeKeys = new Set(localeData.ResourceDictionary['x:String'].map(item => item.$['x:Key']));
+
const missingKeys = [...enUSKeys].filter(key => !localeKeys.has(key));
+ const translationRate = ((enUSKeys.size - missingKeys.length) / enUSKeys.size) * 100;
- // Sort and clean up extra translations
- const sortedAndCleaned = await filterAndSortTranslations(localeData, enUSKeys, enUSData);
- localeData.ResourceDictionary['x:String'] = sortedAndCleaned;
+ translationRates.push(`### ${file}: ${translationRate.toFixed(2)}%\n`);
+ translationRates.push(`\nMissing Keys
\n\n${missingKeys.map(key => `- ${key}`).join('\n')}\n\n `);
- // Save the updated file
- const builder = new xml2js.Builder({
- headless: true,
- renderOpts: { pretty: true, indent: ' ' }
- });
- let xmlStr = builder.buildObject(localeData);
-
- // Add an empty line before the first x:String
- xmlStr = xmlStr.replace(' 0) {
- const progress = ((enUSKeys.size - missingKeys.length) / enUSKeys.size) * 100;
- const badgeColor = progress >= 75 ? 'yellow' : 'red';
-
- lines.push(`### }%25-${badgeColor})`);
- lines.push(`\nMissing keys in ${file}
\n\n${missingKeys.map(key => `- ${key}`).join('\n')}\n\n `)
- } else {
- lines.push(`### `);
- }
+ // Add badges
+ const locale = file.replace('.axaml', '').replace('_', '__');
+ const badgeColor = translationRate === 100 ? 'brightgreen' : translationRate >= 75 ? 'yellow' : 'red';
+ badges.push(`[}%25-${badgeColor})](TRANSLATION.md)`);
}
- const content = lines.join('\n\n');
- console.log(content);
- await fs.writeFile(outputFile, content, 'utf8');
+ console.log(translationRates.join('\n\n'));
+
+ await fs.writeFile(outputFile, translationRates.join('\n\n') + '\n', 'utf8');
+
+ // Update README.md
+ let readmeContent = await fs.readFile(readmeFile, 'utf8');
+ const badgeSection = `## Translation Status\n\n${badges.join(' ')}`;
+ console.log(badgeSection);
+ readmeContent = readmeContent.replace(/## Translation Status\n\n.*\n\n/, badgeSection + '\n\n');
+ await fs.writeFile(readmeFile, readmeContent, 'utf8');
}
calculateTranslationRate().catch(err => console.error(err));
diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 1b4adbdc..5abb058b 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -56,15 +56,8 @@ cp -f SourceGit/* resources/deb/opt/sourcegit
ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
cp -r resources/_common/applications resources/deb/usr/share
cp -r resources/_common/icons resources/deb/usr/share
-# Calculate installed size in KB
-installed_size=$(du -sk resources/deb | cut -f1)
-# Update the control file
-sed -i -e "s/^Version:.*/Version: $VERSION/" \
- -e "s/^Architecture:.*/Architecture: $arch/" \
- -e "s/^Installed-Size:.*/Installed-Size: $installed_size/" \
- resources/deb/DEBIAN/control
-# Build deb package with gzip compression
-dpkg-deb -Zgzip --root-owner-group --build resources/deb "sourcegit_$VERSION-1_$arch.deb"
+sed -i -e "s/^Version:.*/Version: $VERSION/" -e "s/^Architecture:.*/Architecture: $arch/" resources/deb/DEBIAN/control
+dpkg-deb --root-owner-group --build resources/deb "sourcegit_$VERSION-1_$arch.deb"
rpmbuild -bb --target="$target" resources/rpm/SPECS/build.spec --define "_topdir $(pwd)/resources/rpm" --define "_version $VERSION"
mv "resources/rpm/RPMS/$target/sourcegit-$VERSION-1.$target.rpm" ./
diff --git a/build/scripts/package.windows.sh b/build/scripts/package.windows.sh
index c22a9d35..6bd3879b 100755
--- a/build/scripts/package.windows.sh
+++ b/build/scripts/package.windows.sh
@@ -9,8 +9,4 @@ cd build
rm -rf SourceGit/*.pdb
-if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OSTYPE" == "win32" ]]; then
- powershell -Command "Compress-Archive -Path SourceGit -DestinationPath \"sourcegit_$VERSION.$RUNTIME.zip\" -Force"
-else
- zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit
-fi
+zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit
diff --git a/src/App.Commands.cs b/src/App.Commands.cs
index 22e9fb51..18016a1c 100644
--- a/src/App.Commands.cs
+++ b/src/App.Commands.cs
@@ -29,30 +29,20 @@ namespace SourceGit
{
get
{
-#if DISABLE_UPDATE_DETECTION
+ #if DISABLE_UPDATE_DETECTION
return false;
-#else
+ #else
return true;
-#endif
+ #endif
}
}
- public static readonly Command OpenPreferencesCommand = new Command(_ => ShowWindow(new Views.Preferences(), false));
- public static readonly Command OpenHotkeysCommand = new Command(_ => ShowWindow(new Views.Hotkeys(), false));
+ public static readonly Command OpenPreferenceCommand = new Command(_ => OpenDialog(new Views.Preference()));
+ public static readonly Command OpenHotkeysCommand = new Command(_ => OpenDialog(new Views.Hotkeys()));
public static readonly Command OpenAppDataDirCommand = new Command(_ => Native.OS.OpenInFileManager(Native.OS.DataDir));
- public static readonly Command OpenAboutCommand = new Command(_ => ShowWindow(new Views.About(), false));
- public static readonly Command CheckForUpdateCommand = new Command(_ => (Current as App)?.Check4Update(true));
+ public static readonly Command OpenAboutCommand = new Command(_ => OpenDialog(new Views.About()));
+ public static readonly Command CheckForUpdateCommand = new Command(_ => Check4Update(true));
public static readonly Command QuitCommand = new Command(_ => Quit(0));
- public static readonly Command CopyTextBlockCommand = new Command(p =>
- {
- var textBlock = p as TextBlock;
- if (textBlock == null)
- return;
-
- if (textBlock.Inlines is { Count: > 0 } inlines)
- CopyText(inlines.Text);
- else if (!string.IsNullOrEmpty(textBlock.Text))
- CopyText(textBlock.Text);
- });
+ public static readonly Command CopyTextBlockCommand = new Command(p => CopyTextBlock(p as TextBlock));
}
}
diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs
index 9cad0792..70567af5 100644
--- a/src/App.JsonCodeGen.cs
+++ b/src/App.JsonCodeGen.cs
@@ -46,9 +46,11 @@ namespace SourceGit
[JsonSerializable(typeof(Models.ExternalToolPaths))]
[JsonSerializable(typeof(Models.InteractiveRebaseJobCollection))]
[JsonSerializable(typeof(Models.JetBrainsState))]
+ [JsonSerializable(typeof(Models.OpenAIChatRequest))]
+ [JsonSerializable(typeof(Models.OpenAIChatResponse))]
[JsonSerializable(typeof(Models.ThemeOverrides))]
[JsonSerializable(typeof(Models.Version))]
[JsonSerializable(typeof(Models.RepositorySettings))]
- [JsonSerializable(typeof(ViewModels.Preferences))]
+ [JsonSerializable(typeof(ViewModels.Preference))]
internal partial class JsonCodeGen : JsonSerializerContext { }
}
diff --git a/src/App.axaml b/src/App.axaml
index 186022d5..55aacb89 100644
--- a/src/App.axaml
+++ b/src/App.axaml
@@ -16,13 +16,10 @@
-
-
-
@@ -35,10 +32,10 @@
-
+
-
+
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 8e579373..3d1547c9 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -1,13 +1,10 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Net.Http;
using System.Reflection;
using System.Text;
using System.Text.Json;
-using System.Text.RegularExpressions;
-using System.Threading;
using System.Threading.Tasks;
using Avalonia;
@@ -25,7 +22,6 @@ namespace SourceGit
{
public partial class App : Application
{
- #region App Entry Point
[STAThread]
public static void Main(string[] args)
{
@@ -38,14 +34,15 @@ namespace SourceGit
TaskScheduler.UnobservedTaskException += (_, e) =>
{
+ LogException(e.Exception);
e.SetObserved();
};
try
{
- if (TryLaunchAsRebaseTodoEditor(args, out int exitTodo))
+ if (TryLaunchedAsRebaseTodoEditor(args, out int exitTodo))
Environment.Exit(exitTodo);
- else if (TryLaunchAsRebaseMessageEditor(args, out int exitMessage))
+ else if (TryLaunchedAsRebaseMessageEditor(args, out int exitMessage))
Environment.Exit(exitMessage);
else
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
@@ -78,71 +75,38 @@ namespace SourceGit
return builder;
}
- public static void LogException(Exception ex)
+ public override void Initialize()
{
- if (ex == null)
- return;
+ AvaloniaXamlLoader.Load(this);
- var builder = new StringBuilder();
- builder.Append($"Crash::: {ex.GetType().FullName}: {ex.Message}\n\n");
- builder.Append("----------------------------\n");
- builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n");
- builder.Append($"OS: {Environment.OSVersion}\n");
- builder.Append($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n");
- builder.Append($"Source: {ex.Source}\n");
- builder.Append($"Thread Name: {Thread.CurrentThread.Name ?? "Unnamed"}\n");
- builder.Append($"User: {Environment.UserName}\n");
- builder.Append($"App Start Time: {Process.GetCurrentProcess().StartTime}\n");
- builder.Append($"Exception Time: {DateTime.Now}\n");
- builder.Append($"Memory Usage: {Process.GetCurrentProcess().PrivateMemorySize64 / 1024 / 1024} MB\n");
- builder.Append($"---------------------------\n\n");
- builder.Append(ex);
+ var pref = ViewModels.Preference.Instance;
+ pref.PropertyChanged += (_, _) => pref.Save();
- var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
- var file = Path.Combine(Native.OS.DataDir, $"crash_{time}.log");
- File.WriteAllText(file, builder.ToString());
+ SetLocale(pref.Locale);
+ SetTheme(pref.Theme, pref.ThemeOverrides);
+ SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily, pref.OnlyUseMonoFontInEditor);
}
- #endregion
- #region Utility Functions
- public static void ShowWindow(object data, bool showAsDialog)
+ public override void OnFrameworkInitializationCompleted()
{
- var impl = (Views.ChromelessWindow target, bool isDialog) =>
+ if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
- if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
- {
- if (isDialog)
- target.ShowDialog(owner);
- else
- target.Show(owner);
- }
- else
- {
- target.Show();
- }
- };
+ BindingPlugins.DataValidators.RemoveAt(0);
- if (data is Views.ChromelessWindow window)
- {
- impl(window, showAsDialog);
- return;
+ if (TryLaunchedAsCoreEditor(desktop))
+ return;
+
+ if (TryLaunchedAsAskpass(desktop))
+ return;
+
+ TryLaunchedAsNormal(desktop);
}
+ }
- var dataTypeName = data.GetType().FullName;
- if (string.IsNullOrEmpty(dataTypeName) || !dataTypeName.Contains(".ViewModels.", StringComparison.Ordinal))
- return;
-
- var viewTypeName = dataTypeName.Replace(".ViewModels.", ".Views.");
- var viewType = Type.GetType(viewTypeName);
- if (viewType == null || !viewType.IsSubclassOf(typeof(Views.ChromelessWindow)))
- return;
-
- window = Activator.CreateInstance(viewType) as Views.ChromelessWindow;
- if (window != null)
- {
- window.DataContext = data;
- impl(window, showAsDialog);
- }
+ public static void OpenDialog(Window window)
+ {
+ if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
+ window.ShowDialog(owner);
}
public static void RaiseException(string context, string message)
@@ -240,9 +204,6 @@ namespace SourceGit
app._fontsOverrides = null;
}
- defaultFont = app.FixFontFamilyName(defaultFont);
- monospaceFont = app.FixFontFamilyName(monospaceFont);
-
var resDic = new ResourceDictionary();
if (!string.IsNullOrEmpty(defaultFont))
resDic.Add("Fonts.Default", new FontFamily(defaultFont));
@@ -301,7 +262,7 @@ namespace SourceGit
return await clipboard.GetTextAsync();
}
}
- return null;
+ return default;
}
public static string Text(string key, params object[] args)
@@ -323,7 +284,8 @@ namespace SourceGit
icon.Height = 12;
icon.Stretch = Stretch.Uniform;
- if (Current?.FindResource(key) is StreamGeometry geo)
+ var geo = Current?.FindResource(key) as StreamGeometry;
+ if (geo != null)
icon.Data = geo;
return icon;
@@ -337,11 +299,26 @@ namespace SourceGit
return null;
}
- public static ViewModels.Launcher GetLauncher()
+ public static ViewModels.Launcher GetLauncer()
{
return Current is App app ? app._launcher : null;
}
+ public static ViewModels.Repository FindOpenedRepository(string repoPath)
+ {
+ if (Current is App app && app._launcher != null)
+ {
+ foreach (var page in app._launcher.Pages)
+ {
+ var id = page.Node.Id.Replace("\\", "/");
+ if (id == repoPath && page.Data is ViewModels.Repository repo)
+ return repo;
+ }
+ }
+
+ return null;
+ }
+
public static void Quit(int exitCode)
{
if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
@@ -354,68 +331,94 @@ namespace SourceGit
Environment.Exit(exitCode);
}
}
- #endregion
- #region Overrides
- public override void Initialize()
+ private static void CopyTextBlock(TextBlock textBlock)
{
- AvaloniaXamlLoader.Load(this);
+ if (textBlock == null)
+ return;
- var pref = ViewModels.Preferences.Instance;
- pref.PropertyChanged += (_, _) => pref.Save();
-
- SetLocale(pref.Locale);
- SetTheme(pref.Theme, pref.ThemeOverrides);
- SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily, pref.OnlyUseMonoFontInEditor);
+ if (textBlock.Inlines is { Count: > 0 } inlines)
+ CopyText(inlines.Text);
+ else if (!string.IsNullOrEmpty(textBlock.Text))
+ CopyText(textBlock.Text);
}
- public override void OnFrameworkInitializationCompleted()
+ private static void LogException(Exception ex)
{
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+ if (ex == null)
+ return;
+
+ var builder = new StringBuilder();
+ builder.Append($"Crash::: {ex.GetType().FullName}: {ex.Message}\n\n");
+ builder.Append("----------------------------\n");
+ builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n");
+ builder.Append($"OS: {Environment.OSVersion.ToString()}\n");
+ builder.Append($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n");
+ builder.Append($"Source: {ex.Source}\n");
+ builder.Append($"---------------------------\n\n");
+ builder.Append(ex.StackTrace);
+ while (ex.InnerException != null)
{
- BindingPlugins.DataValidators.RemoveAt(0);
+ ex = ex.InnerException;
+ builder.Append($"\n\nInnerException::: {ex.GetType().FullName}: {ex.Message}\n");
+ builder.Append(ex.StackTrace);
+ }
- // Disable tooltip if window is not active.
- ToolTip.ToolTipOpeningEvent.AddClassHandler((c, e) =>
+ var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss");
+ var file = Path.Combine(Native.OS.DataDir, $"crash_{time}.log");
+ File.WriteAllText(file, builder.ToString());
+ }
+
+ private static void Check4Update(bool manually = false)
+ {
+ Task.Run(async () =>
+ {
+ try
{
- var topLevel = TopLevel.GetTopLevel(c);
- if (topLevel is not Window { IsActive: true })
- e.Cancel = true;
- });
+ // Fetch lastest release information.
+ var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };
+ var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
- if (TryLaunchAsCoreEditor(desktop))
- return;
+ // Parse json into Models.Version.
+ var ver = JsonSerializer.Deserialize(data, JsonCodeGen.Default.Version);
+ if (ver == null)
+ return;
- if (TryLaunchAsAskpass(desktop))
- return;
-
- _ipcChannel = new Models.IpcChannel();
- if (!_ipcChannel.IsFirstInstance)
- {
- var arg = desktop.Args is { Length: > 0 } ? desktop.Args[0].Trim() : string.Empty;
- if (!string.IsNullOrEmpty(arg))
+ // Check if already up-to-date.
+ if (!ver.IsNewVersion)
{
- if (arg.StartsWith('"') && arg.EndsWith('"'))
- arg = arg.Substring(1, arg.Length - 2).Trim();
-
- if (arg.Length > 0 && !Path.IsPathFullyQualified(arg))
- arg = Path.GetFullPath(arg);
+ if (manually)
+ ShowSelfUpdateResult(new Models.AlreadyUpToDate());
+ return;
}
- _ipcChannel.SendToFirstInstance(arg);
- Environment.Exit(0);
- }
- else
- {
- _ipcChannel.MessageReceived += TryOpenRepository;
- desktop.Exit += (_, _) => _ipcChannel.Dispose();
- TryLaunchAsNormal(desktop);
- }
- }
- }
- #endregion
+ // Should not check ignored tag if this is called manually.
+ if (!manually)
+ {
+ var pref = ViewModels.Preference.Instance;
+ if (ver.TagName == pref.IgnoreUpdateTag)
+ return;
+ }
- private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode)
+ ShowSelfUpdateResult(ver);
+ }
+ catch (Exception e)
+ {
+ if (manually)
+ ShowSelfUpdateResult(e);
+ }
+ });
+ }
+
+ private static void ShowSelfUpdateResult(object data)
+ {
+ Dispatcher.UIThread.Post(() =>
+ {
+ OpenDialog(new Views.SelfUpdate() { DataContext = new ViewModels.SelfUpdate() { Data = data } });
+ });
+ }
+
+ private static bool TryLaunchedAsRebaseTodoEditor(string[] args, out int exitCode)
{
exitCode = -1;
@@ -468,7 +471,7 @@ namespace SourceGit
return true;
}
- private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCode)
+ private static bool TryLaunchedAsRebaseMessageEditor(string[] args, out int exitCode)
{
exitCode = -1;
@@ -483,42 +486,26 @@ namespace SourceGit
return true;
var gitDir = Path.GetDirectoryName(file)!;
- var origHeadFile = Path.Combine(gitDir, "rebase-merge", "orig-head");
- var ontoFile = Path.Combine(gitDir, "rebase-merge", "onto");
- var doneFile = Path.Combine(gitDir, "rebase-merge", "done");
var jobsFile = Path.Combine(gitDir, "sourcegit_rebase_jobs.json");
- if (!File.Exists(ontoFile) || !File.Exists(origHeadFile) || !File.Exists(doneFile) || !File.Exists(jobsFile))
+ if (!File.Exists(jobsFile))
return true;
- var origHead = File.ReadAllText(origHeadFile).Trim();
- var onto = File.ReadAllText(ontoFile).Trim();
var collection = JsonSerializer.Deserialize(File.ReadAllText(jobsFile), JsonCodeGen.Default.InteractiveRebaseJobCollection);
- if (!collection.Onto.Equals(onto) || !collection.OrigHead.Equals(origHead))
+ var doneFile = Path.Combine(gitDir, "rebase-merge", "done");
+ if (!File.Exists(doneFile))
return true;
- var done = File.ReadAllText(doneFile).Trim().Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- if (done.Length == 0)
+ var done = File.ReadAllText(doneFile).Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+ if (done.Length > collection.Jobs.Count)
return true;
- var current = done[^1].Trim();
- var match = REG_REBASE_TODO().Match(current);
- if (!match.Success)
- return true;
-
- var sha = match.Groups[1].Value;
- foreach (var job in collection.Jobs)
- {
- if (job.SHA.StartsWith(sha))
- {
- File.WriteAllText(file, job.Message);
- break;
- }
- }
+ var job = collection.Jobs[done.Length - 1];
+ File.WriteAllText(file, job.Message);
return true;
}
- private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
+ private bool TryLaunchedAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
{
var args = desktop.Args;
if (args == null || args.Length <= 1 || !args[0].Equals("--core-editor", StringComparison.Ordinal))
@@ -526,18 +513,14 @@ namespace SourceGit
var file = args[1];
if (!File.Exists(file))
- {
desktop.Shutdown(-1);
- return true;
- }
+ else
+ desktop.MainWindow = new Views.StandaloneCommitMessageEditor(file);
- var editor = new Views.StandaloneCommitMessageEditor();
- editor.SetFile(file);
- desktop.MainWindow = editor;
return true;
}
- private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
+ private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
{
var launchAsAskpass = Environment.GetEnvironmentVariable("SOURCEGIT_LAUNCH_AS_ASKPASS");
if (launchAsAskpass is not "TRUE")
@@ -546,158 +529,32 @@ namespace SourceGit
var args = desktop.Args;
if (args?.Length > 0)
{
- var askpass = new Views.Askpass();
- askpass.TxtDescription.Text = args[0];
- desktop.MainWindow = askpass;
+ desktop.MainWindow = new Views.Askpass(args[0]);
return true;
}
return false;
}
- private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
+ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop)
{
- Native.OS.SetupExternalTools();
+ Native.OS.SetupEnternalTools();
Models.AvatarManager.Instance.Start();
string startupRepo = null;
if (desktop.Args != null && desktop.Args.Length == 1 && Directory.Exists(desktop.Args[0]))
startupRepo = desktop.Args[0];
- var pref = ViewModels.Preferences.Instance;
- pref.SetCanModify();
-
_launcher = new ViewModels.Launcher(startupRepo);
desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
- desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
-#if !DISABLE_UPDATE_DETECTION
+ #if !DISABLE_UPDATE_DETECTION
+ var pref = ViewModels.Preference.Instance;
if (pref.ShouldCheck4UpdateOnStartup())
Check4Update();
-#endif
+ #endif
}
- private void TryOpenRepository(string repo)
- {
- if (!string.IsNullOrEmpty(repo) && Directory.Exists(repo))
- {
- var test = new Commands.QueryRepositoryRootPath(repo).ReadToEnd();
- if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
- {
- Dispatcher.UIThread.Invoke(() =>
- {
- var node = ViewModels.Preferences.Instance.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false);
- ViewModels.Welcome.Instance.Refresh();
- _launcher?.OpenRepositoryInTab(node, null);
-
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: Views.Launcher wnd })
- wnd.BringToTop();
- });
-
- return;
- }
- }
-
- Dispatcher.UIThread.Invoke(() =>
- {
- if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: Views.Launcher launcher })
- launcher.BringToTop();
- });
- }
-
- private void Check4Update(bool manually = false)
- {
- Task.Run(async () =>
- {
- try
- {
- // Fetch latest release information.
- var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };
- var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
-
- // Parse JSON into Models.Version.
- var ver = JsonSerializer.Deserialize(data, JsonCodeGen.Default.Version);
- if (ver == null)
- return;
-
- // Check if already up-to-date.
- if (!ver.IsNewVersion)
- {
- if (manually)
- ShowSelfUpdateResult(new Models.AlreadyUpToDate());
- return;
- }
-
- // Should not check ignored tag if this is called manually.
- if (!manually)
- {
- var pref = ViewModels.Preferences.Instance;
- if (ver.TagName == pref.IgnoreUpdateTag)
- return;
- }
-
- ShowSelfUpdateResult(ver);
- }
- catch (Exception e)
- {
- if (manually)
- ShowSelfUpdateResult(new Models.SelfUpdateFailed(e));
- }
- });
- }
-
- private void ShowSelfUpdateResult(object data)
- {
- Dispatcher.UIThread.Post(() =>
- {
- ShowWindow(new ViewModels.SelfUpdate() { Data = data }, true);
- });
- }
-
- private string FixFontFamilyName(string input)
- {
- if (string.IsNullOrEmpty(input))
- return string.Empty;
-
- var parts = input.Split(',');
- var trimmed = new List();
-
- foreach (var part in parts)
- {
- var t = part.Trim();
- if (string.IsNullOrEmpty(t))
- continue;
-
- // Collapse multiple spaces into single space
- var prevChar = '\0';
- var sb = new StringBuilder();
-
- foreach (var c in t)
- {
- if (c == ' ' && prevChar == ' ')
- continue;
- sb.Append(c);
- prevChar = c;
- }
-
- var name = sb.ToString();
- if (name.Contains('#', StringComparison.Ordinal))
- {
- if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
- !name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))
- continue;
- }
-
- trimmed.Add(name);
- }
-
- return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;
- }
-
- [GeneratedRegex(@"^[a-z]+\s+([a-fA-F0-9]{4,40})(\s+.*)?$")]
- private static partial Regex REG_REBASE_TODO();
-
- private Models.IpcChannel _ipcChannel = null;
private ViewModels.Launcher _launcher = null;
private ResourceDictionary _activeLocale = null;
private ResourceDictionary _themeOverrides = null;
diff --git a/src/App.manifest b/src/App.manifest
index 11a2ff11..b3bc3bdf 100644
--- a/src/App.manifest
+++ b/src/App.manifest
@@ -1,7 +1,7 @@
diff --git a/src/Commands/Add.cs b/src/Commands/Add.cs
index 210eb4b2..c3d1d3e6 100644
--- a/src/Commands/Add.cs
+++ b/src/Commands/Add.cs
@@ -1,4 +1,7 @@
-namespace SourceGit.Commands
+using System.Collections.Generic;
+using System.Text;
+
+namespace SourceGit.Commands
{
public class Add : Command
{
@@ -9,18 +12,20 @@
Args = includeUntracked ? "add ." : "add -u .";
}
- public Add(string repo, Models.Change change)
+ public Add(string repo, List changes)
{
WorkingDirectory = repo;
Context = repo;
- Args = $"add -- \"{change.Path}\"";
- }
- public Add(string repo, string pathspecFromFile)
- {
- WorkingDirectory = repo;
- Context = repo;
- Args = $"add --pathspec-from-file=\"{pathspecFromFile}\"";
+ var builder = new StringBuilder();
+ builder.Append("add --");
+ foreach (var c in changes)
+ {
+ builder.Append(" \"");
+ builder.Append(c.Path);
+ builder.Append("\"");
+ }
+ Args = builder.ToString();
}
}
}
diff --git a/src/Commands/Archive.cs b/src/Commands/Archive.cs
index 5e0919f7..d4f6241c 100644
--- a/src/Commands/Archive.cs
+++ b/src/Commands/Archive.cs
@@ -1,12 +1,23 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
{
public class Archive : Command
{
- public Archive(string repo, string revision, string saveTo)
+ public Archive(string repo, string revision, string saveTo, Action outputHandler)
{
WorkingDirectory = repo;
Context = repo;
Args = $"archive --format=zip --verbose --output=\"{saveTo}\" {revision}";
+ TraitErrorAsOutput = true;
+ _outputHandler = outputHandler;
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler;
}
}
diff --git a/src/Commands/AssumeUnchanged.cs b/src/Commands/AssumeUnchanged.cs
index 28f78280..1898122a 100644
--- a/src/Commands/AssumeUnchanged.cs
+++ b/src/Commands/AssumeUnchanged.cs
@@ -1,14 +1,75 @@
-namespace SourceGit.Commands
-{
- public class AssumeUnchanged : Command
- {
- public AssumeUnchanged(string repo, string file, bool bAdd)
- {
- var mode = bAdd ? "--assume-unchanged" : "--no-assume-unchanged";
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
- WorkingDirectory = repo;
- Context = repo;
- Args = $"update-index {mode} -- \"{file}\"";
+namespace SourceGit.Commands
+{
+ public partial class AssumeUnchanged
+ {
+ [GeneratedRegex(@"^(\w)\s+(.+)$")]
+ private static partial Regex REG_PARSE();
+
+ class ViewCommand : Command
+ {
+ public ViewCommand(string repo)
+ {
+ WorkingDirectory = repo;
+ Args = "ls-files -v";
+ RaiseError = false;
+ }
+
+ public List Result()
+ {
+ Exec();
+ return _outs;
+ }
+
+ protected override void OnReadline(string line)
+ {
+ var match = REG_PARSE().Match(line);
+ if (!match.Success)
+ return;
+
+ if (match.Groups[1].Value == "h")
+ {
+ _outs.Add(match.Groups[2].Value);
+ }
+ }
+
+ private readonly List _outs = new List();
}
+
+ class ModCommand : Command
+ {
+ public ModCommand(string repo, string file, bool bAdd)
+ {
+ var mode = bAdd ? "--assume-unchanged" : "--no-assume-unchanged";
+
+ WorkingDirectory = repo;
+ Context = repo;
+ Args = $"update-index {mode} -- \"{file}\"";
+ }
+ }
+
+ public AssumeUnchanged(string repo)
+ {
+ _repo = repo;
+ }
+
+ public List View()
+ {
+ return new ViewCommand(_repo).Result();
+ }
+
+ public void Add(string file)
+ {
+ new ModCommand(_repo, file, true).Exec();
+ }
+
+ public void Remove(string file)
+ {
+ new ModCommand(_repo, file, false).Exec();
+ }
+
+ private readonly string _repo;
}
}
diff --git a/src/Commands/Bisect.cs b/src/Commands/Bisect.cs
deleted file mode 100644
index a3bf1a97..00000000
--- a/src/Commands/Bisect.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace SourceGit.Commands
-{
- public class Bisect : Command
- {
- public Bisect(string repo, string subcmd)
- {
- WorkingDirectory = repo;
- Context = repo;
- RaiseError = false;
- Args = $"bisect {subcmd}";
- }
- }
-}
diff --git a/src/Commands/Blame.cs b/src/Commands/Blame.cs
index 1fc51fa4..de221b07 100644
--- a/src/Commands/Blame.cs
+++ b/src/Commands/Blame.cs
@@ -21,17 +21,10 @@ namespace SourceGit.Commands
public Models.BlameData Result()
{
- var rs = ReadToEnd();
- if (!rs.IsSuccess)
- return _result;
-
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
+ var succ = Exec();
+ if (!succ)
{
- ParseLine(line);
-
- if (_result.IsBinary)
- break;
+ return new Models.BlameData();
}
if (_needUnifyCommitSHA)
@@ -49,9 +42,14 @@ namespace SourceGit.Commands
return _result;
}
- private void ParseLine(string line)
+ protected override void OnReadline(string line)
{
- if (line.Contains('\0', StringComparison.Ordinal))
+ if (_result.IsBinary)
+ return;
+ if (string.IsNullOrEmpty(line))
+ return;
+
+ if (line.IndexOf('\0', StringComparison.Ordinal) >= 0)
{
_result.IsBinary = true;
_result.LineInfos.Clear();
@@ -67,7 +65,7 @@ namespace SourceGit.Commands
var commit = match.Groups[1].Value;
var author = match.Groups[2].Value;
var timestamp = int.Parse(match.Groups[3].Value);
- var when = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString(_dateFormat);
+ var when = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString("yyyy/MM/dd");
var info = new Models.BlameLineInfo()
{
@@ -89,7 +87,6 @@ namespace SourceGit.Commands
private readonly Models.BlameData _result = new Models.BlameData();
private readonly StringBuilder _content = new StringBuilder();
- private readonly string _dateFormat = Models.DateTimeFormat.Active.DateOnly;
private string _lastSHA = string.Empty;
private bool _needUnifyCommitSHA = false;
private int _minSHALen = 64;
diff --git a/src/Commands/Branch.cs b/src/Commands/Branch.cs
index 0d1b1f8f..391aeeb2 100644
--- a/src/Commands/Branch.cs
+++ b/src/Commands/Branch.cs
@@ -1,6 +1,4 @@
-using System.Text;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
{
public static class Branch
{
@@ -13,40 +11,29 @@ namespace SourceGit.Commands
return cmd.ReadToEnd().StdOut.Trim();
}
- public static bool Create(string repo, string name, string basedOn, bool force, Models.ICommandLog log)
+ public static bool Create(string repo, string name, string basedOn)
{
- var builder = new StringBuilder();
- builder.Append("branch ");
- if (force)
- builder.Append("-f ");
- builder.Append(name);
- builder.Append(" ");
- builder.Append(basedOn);
-
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
- cmd.Args = builder.ToString();
- cmd.Log = log;
+ cmd.Args = $"branch {name} {basedOn}";
return cmd.Exec();
}
- public static bool Rename(string repo, string name, string to, Models.ICommandLog log)
+ public static bool Rename(string repo, string name, string to)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.Args = $"branch -M {name} {to}";
- cmd.Log = log;
return cmd.Exec();
}
- public static bool SetUpstream(string repo, string name, string upstream, Models.ICommandLog log)
+ public static bool SetUpstream(string repo, string name, string upstream)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
- cmd.Log = log;
if (string.IsNullOrEmpty(upstream))
cmd.Args = $"branch {name} --unset-upstream";
@@ -56,27 +43,32 @@ namespace SourceGit.Commands
return cmd.Exec();
}
- public static bool DeleteLocal(string repo, string name, Models.ICommandLog log)
+ public static bool DeleteLocal(string repo, string name)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.Args = $"branch -D {name}";
- cmd.Log = log;
return cmd.Exec();
}
- public static bool DeleteRemote(string repo, string remote, string name, Models.ICommandLog log)
+ public static bool DeleteRemote(string repo, string remote, string name)
{
- bool exists = new Remote(repo).HasBranch(remote, name);
- if (exists)
- return new Push(repo, remote, $"refs/heads/{name}", true) { Log = log }.Exec();
-
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
- cmd.Args = $"branch -D -r {remote}/{name}";
- cmd.Log = log;
+
+ bool exists = new Remote(repo).HasBranch(remote, name);
+ if (exists)
+ {
+ cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
+ cmd.Args = $"push {remote} --delete {name}";
+ }
+ else
+ {
+ cmd.Args = $"branch -D -r {remote}/{name}";
+ }
+
return cmd.Exec();
}
}
diff --git a/src/Commands/Checkout.cs b/src/Commands/Checkout.cs
index d2876740..306d62ff 100644
--- a/src/Commands/Checkout.cs
+++ b/src/Commands/Checkout.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Text;
namespace SourceGit.Commands
@@ -11,37 +12,19 @@ namespace SourceGit.Commands
Context = repo;
}
- public bool Branch(string branch, bool force)
+ public bool Branch(string branch, Action onProgress)
{
- var builder = new StringBuilder();
- builder.Append("checkout --progress ");
- if (force)
- builder.Append("--force ");
- builder.Append(branch);
-
- Args = builder.ToString();
+ Args = $"checkout --recurse-submodules --progress {branch}";
+ TraitErrorAsOutput = true;
+ _outputHandler = onProgress;
return Exec();
}
- public bool Branch(string branch, string basedOn, bool force, bool allowOverwrite)
+ public bool Branch(string branch, string basedOn, Action onProgress)
{
- var builder = new StringBuilder();
- builder.Append("checkout --progress ");
- if (force)
- builder.Append("--force ");
- builder.Append(allowOverwrite ? "-B " : "-b ");
- builder.Append(branch);
- builder.Append(" ");
- builder.Append(basedOn);
-
- Args = builder.ToString();
- return Exec();
- }
-
- public bool Commit(string commitId, bool force)
- {
- var option = force ? "--force" : string.Empty;
- Args = $"checkout {option} --detach --progress {commitId}";
+ Args = $"checkout --recurse-submodules --progress -b {branch} {basedOn}";
+ TraitErrorAsOutput = true;
+ _outputHandler = onProgress;
return Exec();
}
@@ -78,5 +61,20 @@ namespace SourceGit.Commands
Args = $"checkout --no-overlay {revision} -- \"{file}\"";
return Exec();
}
+
+ public bool Commit(string commitId, Action onProgress)
+ {
+ Args = $"checkout --detach --progress {commitId}";
+ TraitErrorAsOutput = true;
+ _outputHandler = onProgress;
+ return Exec();
+ }
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private Action _outputHandler;
}
}
diff --git a/src/Commands/Clean.cs b/src/Commands/Clean.cs
index 6ed74999..a10e5873 100644
--- a/src/Commands/Clean.cs
+++ b/src/Commands/Clean.cs
@@ -1,12 +1,31 @@
-namespace SourceGit.Commands
+using System.Collections.Generic;
+using System.Text;
+
+namespace SourceGit.Commands
{
public class Clean : Command
{
- public Clean(string repo)
+ public Clean(string repo, bool includeIgnored)
{
WorkingDirectory = repo;
Context = repo;
- Args = "clean -qfdx";
+ Args = includeIgnored ? "clean -qfdx" : "clean -qfd";
+ }
+
+ public Clean(string repo, List files)
+ {
+ var builder = new StringBuilder();
+ builder.Append("clean -qfd --");
+ foreach (var f in files)
+ {
+ builder.Append(" \"");
+ builder.Append(f);
+ builder.Append("\"");
+ }
+
+ WorkingDirectory = repo;
+ Context = repo;
+ Args = builder.ToString();
}
}
}
diff --git a/src/Commands/Clone.cs b/src/Commands/Clone.cs
index efec264b..683b8846 100644
--- a/src/Commands/Clone.cs
+++ b/src/Commands/Clone.cs
@@ -1,13 +1,18 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
{
public class Clone : Command
{
- public Clone(string ctx, string path, string url, string localName, string sshKey, string extraArgs)
+ private readonly Action _notifyProgress;
+
+ public Clone(string ctx, string path, string url, string localName, string sshKey, string extraArgs, Action ouputHandler)
{
Context = ctx;
WorkingDirectory = path;
+ TraitErrorAsOutput = true;
SSHKey = sshKey;
- Args = "clone --progress --verbose ";
+ Args = "clone --progress --verbose --recurse-submodules ";
if (!string.IsNullOrEmpty(extraArgs))
Args += $"{extraArgs} ";
@@ -16,6 +21,13 @@
if (!string.IsNullOrEmpty(localName))
Args += localName;
+
+ _notifyProgress = ouputHandler;
+ }
+
+ protected override void OnReadline(string line)
+ {
+ _notifyProgress?.Invoke(line);
}
}
}
diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
index 975922fc..3f61de17 100644
--- a/src/Commands/Command.cs
+++ b/src/Commands/Command.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
using System.Text.RegularExpressions;
-using System.Threading;
using Avalonia.Threading;
@@ -11,6 +10,11 @@ namespace SourceGit.Commands
{
public partial class Command
{
+ public class CancelToken
+ {
+ public bool Requested { get; set; } = false;
+ }
+
public class ReadToEndResult
{
public bool IsSuccess { get; set; } = false;
@@ -26,51 +30,82 @@ namespace SourceGit.Commands
}
public string Context { get; set; } = string.Empty;
- public CancellationToken CancellationToken { get; set; } = CancellationToken.None;
+ public CancelToken Cancel { get; set; } = null;
public string WorkingDirectory { get; set; } = null;
public EditorType Editor { get; set; } = EditorType.CoreEditor; // Only used in Exec() mode
public string SSHKey { get; set; } = string.Empty;
public string Args { get; set; } = string.Empty;
public bool RaiseError { get; set; } = true;
- public Models.ICommandLog Log { get; set; } = null;
+ public bool TraitErrorAsOutput { get; set; } = false;
public bool Exec()
{
- Log?.AppendLine($"$ git {Args}\n");
-
var start = CreateGitStartInfo();
var errs = new List();
var proc = new Process() { StartInfo = start };
+ var isCancelled = false;
- proc.OutputDataReceived += (_, e) => HandleOutput(e.Data, errs);
- proc.ErrorDataReceived += (_, e) => HandleOutput(e.Data, errs);
+ proc.OutputDataReceived += (_, e) =>
+ {
+ if (Cancel != null && Cancel.Requested)
+ {
+ isCancelled = true;
+ proc.CancelErrorRead();
+ proc.CancelOutputRead();
+ if (!proc.HasExited)
+ proc.Kill(true);
+ return;
+ }
+
+ if (e.Data != null)
+ OnReadline(e.Data);
+ };
+
+ proc.ErrorDataReceived += (_, e) =>
+ {
+ if (Cancel != null && Cancel.Requested)
+ {
+ isCancelled = true;
+ proc.CancelErrorRead();
+ proc.CancelOutputRead();
+ if (!proc.HasExited)
+ proc.Kill(true);
+ return;
+ }
+
+ if (string.IsNullOrEmpty(e.Data))
+ {
+ errs.Add(string.Empty);
+ return;
+ }
+
+ if (TraitErrorAsOutput)
+ OnReadline(e.Data);
+
+ // Ignore progress messages
+ if (e.Data.StartsWith("remote: Enumerating objects:", StringComparison.Ordinal))
+ return;
+ if (e.Data.StartsWith("remote: Counting objects:", StringComparison.Ordinal))
+ return;
+ if (e.Data.StartsWith("remote: Compressing objects:", StringComparison.Ordinal))
+ return;
+ if (e.Data.StartsWith("Filtering content:", StringComparison.Ordinal))
+ return;
+ if (REG_PROGRESS().IsMatch(e.Data))
+ return;
+
+ errs.Add(e.Data);
+ };
- var dummy = null as Process;
- var dummyProcLock = new object();
try
{
proc.Start();
-
- // It not safe, please only use `CancellationToken` in readonly commands.
- if (CancellationToken.CanBeCanceled)
- {
- dummy = proc;
- CancellationToken.Register(() =>
- {
- lock (dummyProcLock)
- {
- if (dummy is { HasExited: false })
- dummy.Kill();
- }
- });
- }
}
catch (Exception e)
{
if (RaiseError)
Dispatcher.UIThread.Post(() => App.RaiseException(Context, e.Message));
- Log?.AppendLine(string.Empty);
return false;
}
@@ -78,19 +113,10 @@ namespace SourceGit.Commands
proc.BeginErrorReadLine();
proc.WaitForExit();
- if (dummy != null)
- {
- lock (dummyProcLock)
- {
- dummy = null;
- }
- }
-
int exitCode = proc.ExitCode;
proc.Close();
- Log?.AppendLine(string.Empty);
- if (!CancellationToken.IsCancellationRequested && exitCode != 0)
+ if (!isCancelled && exitCode != 0)
{
if (RaiseError)
{
@@ -137,6 +163,11 @@ namespace SourceGit.Commands
return rs;
}
+ protected virtual void OnReadline(string line)
+ {
+ // Implemented by derived class
+ }
+
private ProcessStartInfo CreateGitStartInfo()
{
var start = new ProcessStartInfo();
@@ -161,12 +192,13 @@ namespace SourceGit.Commands
if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
- // Force using en_US.UTF-8 locale
+ // Force using en_US.UTF-8 locale to avoid GCM crash
if (OperatingSystem.IsLinux())
- {
- start.Environment.Add("LANG", "C");
- start.Environment.Add("LC_ALL", "C");
- }
+ start.Environment.Add("LANG", "en_US.UTF-8");
+
+ // Fix macOS `PATH` env
+ if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
+ start.Environment.Add("PATH", Native.OS.CustomPathEnv);
// Force using this app as git editor.
switch (Editor)
@@ -192,28 +224,6 @@ namespace SourceGit.Commands
return start;
}
- private void HandleOutput(string line, List errs)
- {
- line ??= string.Empty;
- Log?.AppendLine(line);
-
- // Lines to hide in error message.
- if (line.Length > 0)
- {
- if (line.StartsWith("remote: Enumerating objects:", StringComparison.Ordinal) ||
- line.StartsWith("remote: Counting objects:", StringComparison.Ordinal) ||
- line.StartsWith("remote: Compressing objects:", StringComparison.Ordinal) ||
- line.StartsWith("Filtering content:", StringComparison.Ordinal) ||
- line.StartsWith("hint:", StringComparison.Ordinal))
- return;
-
- if (REG_PROGRESS().IsMatch(line))
- return;
- }
-
- errs.Add(line);
- }
-
[GeneratedRegex(@"\d+%")]
private static partial Regex REG_PROGRESS();
}
diff --git a/src/Commands/Commit.cs b/src/Commands/Commit.cs
index 1585e7e3..cb086793 100644
--- a/src/Commands/Commit.cs
+++ b/src/Commands/Commit.cs
@@ -4,18 +4,19 @@ namespace SourceGit.Commands
{
public class Commit : Command
{
- public Commit(string repo, string message, bool signOff, bool amend, bool resetAuthor)
+ public Commit(string repo, string message, bool amend, bool signOff)
{
_tmpFile = Path.GetTempFileName();
File.WriteAllText(_tmpFile, message);
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
Args = $"commit --allow-empty --file=\"{_tmpFile}\"";
+ if (amend)
+ Args += " --amend --no-edit";
if (signOff)
Args += " --signoff";
- if (amend)
- Args += resetAuthor ? " --amend --reset-author --no-edit" : " --amend --no-edit";
}
public bool Run()
@@ -34,6 +35,6 @@ namespace SourceGit.Commands
return succ;
}
- private readonly string _tmpFile;
+ private string _tmpFile = string.Empty;
}
}
diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
index c88e087a..c4674c8e 100644
--- a/src/Commands/CompareRevisions.cs
+++ b/src/Commands/CompareRevisions.cs
@@ -6,10 +6,8 @@ namespace SourceGit.Commands
{
public partial class CompareRevisions : Command
{
- [GeneratedRegex(@"^([MADC])\s+(.+)$")]
+ [GeneratedRegex(@"^(\s?[\w\?]{1,4})\s+(.+)$")]
private static partial Regex REG_FORMAT();
- [GeneratedRegex(@"^R[0-9]{0,4}\s+(.+)$")]
- private static partial Regex REG_RENAME_FORMAT();
public CompareRevisions(string repo, string start, string end)
{
@@ -20,44 +18,18 @@ namespace SourceGit.Commands
Args = $"diff --name-status {based} {end}";
}
- public CompareRevisions(string repo, string start, string end, string path)
- {
- WorkingDirectory = repo;
- Context = repo;
-
- var based = string.IsNullOrEmpty(start) ? "-R" : start;
- Args = $"diff --name-status {based} {end} -- \"{path}\"";
- }
-
public List Result()
{
- var rs = ReadToEnd();
- if (!rs.IsSuccess)
- return _changes;
-
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- ParseLine(line);
-
- _changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
+ Exec();
+ _changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
return _changes;
}
- private void ParseLine(string line)
+ protected override void OnReadline(string line)
{
var match = REG_FORMAT().Match(line);
if (!match.Success)
- {
- match = REG_RENAME_FORMAT().Match(line);
- if (match.Success)
- {
- var renamed = new Models.Change() { Path = match.Groups[1].Value };
- renamed.Set(Models.ChangeState.Renamed);
- _changes.Add(renamed);
- }
-
return;
- }
var change = new Models.Change() { Path = match.Groups[2].Value };
var status = match.Groups[1].Value;
@@ -76,6 +48,10 @@ namespace SourceGit.Commands
change.Set(Models.ChangeState.Deleted);
_changes.Add(change);
break;
+ case 'R':
+ change.Set(Models.ChangeState.Renamed);
+ _changes.Add(change);
+ break;
case 'C':
change.Set(Models.ChangeState.Copied);
_changes.Add(change);
diff --git a/src/Commands/Config.cs b/src/Commands/Config.cs
index 49e8fcb7..2fb83325 100644
--- a/src/Commands/Config.cs
+++ b/src/Commands/Config.cs
@@ -29,7 +29,7 @@ namespace SourceGit.Commands
var rs = new Dictionary();
if (output.IsSuccess)
{
- var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var lines = output.StdOut.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
var idx = line.IndexOf('=', StringComparison.Ordinal);
diff --git a/src/Commands/CountLocalChangesWithoutUntracked.cs b/src/Commands/CountLocalChangesWithoutUntracked.cs
index a704f313..afb62840 100644
--- a/src/Commands/CountLocalChangesWithoutUntracked.cs
+++ b/src/Commands/CountLocalChangesWithoutUntracked.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = "--no-optional-locks status -uno --ignore-submodules=all --porcelain";
+ Args = "status -uno --ignore-submodules=dirty --porcelain";
}
public int Result()
@@ -16,7 +16,7 @@ namespace SourceGit.Commands
var rs = ReadToEnd();
if (rs.IsSuccess)
{
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
return lines.Length;
}
diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
index 6af0a3cc..da971e58 100644
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
@@ -28,48 +28,34 @@ namespace SourceGit.Commands
Context = repo;
if (ignoreWhitespace)
- Args = $"diff --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
- else if (Models.DiffOption.IgnoreCRAtEOL)
- Args = $"diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
+ Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --ignore-all-space --unified={unified} {opt}";
else
- Args = $"diff --no-ext-diff --patch --unified={unified} {opt}";
+ Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
}
public Models.DiffResult Result()
{
- var rs = ReadToEnd();
- var start = 0;
- var end = rs.StdOut.IndexOf('\n', start);
- while (end > 0)
- {
- var line = rs.StdOut.Substring(start, end - start);
- ParseLine(line);
+ Exec();
- start = end + 1;
- end = rs.StdOut.IndexOf('\n', start);
- }
-
- if (start < rs.StdOut.Length)
- ParseLine(rs.StdOut.Substring(start));
-
- if (_result.IsBinary || _result.IsLFS || _result.TextDiff.Lines.Count == 0)
+ if (_result.IsBinary || _result.IsLFS)
{
_result.TextDiff = null;
}
else
{
ProcessInlineHighlights();
- _result.TextDiff.MaxLineNumber = Math.Max(_newLine, _oldLine);
+
+ if (_result.TextDiff.Lines.Count == 0)
+ _result.TextDiff = null;
+ else
+ _result.TextDiff.MaxLineNumber = Math.Max(_newLine, _oldLine);
}
return _result;
}
- private void ParseLine(string line)
+ protected override void OnReadline(string line)
{
- if (_result.IsBinary)
- return;
-
if (line.StartsWith("old mode ", StringComparison.Ordinal))
{
_result.OldMode = line.Substring(9);
@@ -82,17 +68,8 @@ namespace SourceGit.Commands
return;
}
- if (line.StartsWith("deleted file mode ", StringComparison.Ordinal))
- {
- _result.OldMode = line.Substring(18);
+ if (_result.IsBinary)
return;
- }
-
- if (line.StartsWith("new file mode ", StringComparison.Ordinal))
- {
- _result.NewMode = line.Substring(14);
- return;
- }
if (_result.IsLFS)
{
@@ -105,7 +82,7 @@ namespace SourceGit.Commands
}
else if (line.StartsWith("-size ", StringComparison.Ordinal))
{
- _result.LFSDiff.Old.Size = long.Parse(line.AsSpan(6));
+ _result.LFSDiff.Old.Size = long.Parse(line.Substring(6));
}
}
else if (ch == '+')
@@ -116,12 +93,12 @@ namespace SourceGit.Commands
}
else if (line.StartsWith("+size ", StringComparison.Ordinal))
{
- _result.LFSDiff.New.Size = long.Parse(line.AsSpan(6));
+ _result.LFSDiff.New.Size = long.Parse(line.Substring(6));
}
}
else if (line.StartsWith(" size ", StringComparison.Ordinal))
{
- _result.LFSDiff.New.Size = _result.LFSDiff.Old.Size = long.Parse(line.AsSpan(6));
+ _result.LFSDiff.New.Size = _result.LFSDiff.Old.Size = long.Parse(line.Substring(6));
}
return;
}
@@ -151,8 +128,7 @@ namespace SourceGit.Commands
_oldLine = int.Parse(match.Groups[1].Value);
_newLine = int.Parse(match.Groups[2].Value);
- _last = new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0);
- _result.TextDiff.Lines.Add(_last);
+ _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
}
}
else
@@ -160,8 +136,7 @@ namespace SourceGit.Commands
if (line.Length == 0)
{
ProcessInlineHighlights();
- _last = new Models.TextDiffLine(Models.TextDiffLineType.Normal, "", _oldLine, _newLine);
- _result.TextDiff.Lines.Add(_last);
+ _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Normal, "", _oldLine, _newLine));
_oldLine++;
_newLine++;
return;
@@ -177,8 +152,7 @@ namespace SourceGit.Commands
return;
}
- _last = new Models.TextDiffLine(Models.TextDiffLineType.Deleted, line.Substring(1), _oldLine, 0);
- _deleted.Add(_last);
+ _deleted.Add(new Models.TextDiffLine(Models.TextDiffLineType.Deleted, line.Substring(1), _oldLine, 0));
_oldLine++;
}
else if (ch == '+')
@@ -190,8 +164,7 @@ namespace SourceGit.Commands
return;
}
- _last = new Models.TextDiffLine(Models.TextDiffLineType.Added, line.Substring(1), 0, _newLine);
- _added.Add(_last);
+ _added.Add(new Models.TextDiffLine(Models.TextDiffLineType.Added, line.Substring(1), 0, _newLine));
_newLine++;
}
else if (ch != '\\')
@@ -202,8 +175,7 @@ namespace SourceGit.Commands
{
_oldLine = int.Parse(match.Groups[1].Value);
_newLine = int.Parse(match.Groups[2].Value);
- _last = new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0);
- _result.TextDiff.Lines.Add(_last);
+ _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
}
else
{
@@ -214,16 +186,11 @@ namespace SourceGit.Commands
return;
}
- _last = new Models.TextDiffLine(Models.TextDiffLineType.Normal, line.Substring(1), _oldLine, _newLine);
- _result.TextDiff.Lines.Add(_last);
+ _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Normal, line.Substring(1), _oldLine, _newLine));
_oldLine++;
_newLine++;
}
}
- else if (line.Equals("\\ No newline at end of file", StringComparison.Ordinal))
- {
- _last.NoNewLineEndOfFile = true;
- }
}
}
@@ -274,7 +241,6 @@ namespace SourceGit.Commands
private readonly Models.DiffResult _result = new Models.DiffResult();
private readonly List _deleted = new List();
private readonly List _added = new List();
- private Models.TextDiffLine _last = null;
private int _oldLine = 0;
private int _newLine = 0;
}
diff --git a/src/Commands/Discard.cs b/src/Commands/Discard.cs
index f36ca6c9..a279bb84 100644
--- a/src/Commands/Discard.cs
+++ b/src/Commands/Discard.cs
@@ -1,95 +1,39 @@
using System;
using System.Collections.Generic;
-using System.IO;
-
-using Avalonia.Threading;
namespace SourceGit.Commands
{
public static class Discard
{
- ///
- /// Discard all local changes (unstaged & staged)
- ///
- ///
- ///
- ///
- public static void All(string repo, bool includeIgnored, Models.ICommandLog log)
+ public static void All(string repo, bool includeIgnored)
{
- var changes = new QueryLocalChanges(repo).Result();
- try
- {
- foreach (var c in changes)
- {
- if (c.WorkTree == Models.ChangeState.Untracked ||
- c.WorkTree == Models.ChangeState.Added ||
- c.Index == Models.ChangeState.Added ||
- c.Index == Models.ChangeState.Renamed)
- {
- var fullPath = Path.Combine(repo, c.Path);
- if (Directory.Exists(fullPath))
- Directory.Delete(fullPath, true);
- else
- File.Delete(fullPath);
- }
- }
- }
- catch (Exception e)
- {
- Dispatcher.UIThread.Invoke(() =>
- {
- App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");
- });
- }
-
- new Reset(repo, "HEAD", "--hard") { Log = log }.Exec();
-
- if (includeIgnored)
- new Clean(repo) { Log = log }.Exec();
+ new Restore(repo).Exec();
+ new Clean(repo, includeIgnored).Exec();
}
- ///
- /// Discard selected changes (only unstaged).
- ///
- ///
- ///
- ///
- public static void Changes(string repo, List changes, Models.ICommandLog log)
+ public static void Changes(string repo, List changes)
{
- var restores = new List();
+ var needClean = new List();
+ var needCheckout = new List();
- try
+ foreach (var c in changes)
{
- foreach (var c in changes)
- {
- if (c.WorkTree == Models.ChangeState.Untracked || c.WorkTree == Models.ChangeState.Added)
- {
- var fullPath = Path.Combine(repo, c.Path);
- if (Directory.Exists(fullPath))
- Directory.Delete(fullPath, true);
- else
- File.Delete(fullPath);
- }
- else
- {
- restores.Add(c.Path);
- }
- }
- }
- catch (Exception e)
- {
- Dispatcher.UIThread.Invoke(() =>
- {
- App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}");
- });
+ if (c.WorkTree == Models.ChangeState.Untracked || c.WorkTree == Models.ChangeState.Added)
+ needClean.Add(c.Path);
+ else
+ needCheckout.Add(c.Path);
}
- if (restores.Count > 0)
+ for (int i = 0; i < needClean.Count; i += 10)
{
- var pathSpecFile = Path.GetTempFileName();
- File.WriteAllLines(pathSpecFile, restores);
- new Restore(repo, pathSpecFile, false) { Log = log }.Exec();
- File.Delete(pathSpecFile);
+ var count = Math.Min(10, needClean.Count - i);
+ new Clean(repo, needClean.GetRange(i, count)).Exec();
+ }
+
+ for (int i = 0; i < needCheckout.Count; i += 10)
+ {
+ var count = Math.Min(10, needCheckout.Count - i);
+ new Restore(repo, needCheckout.GetRange(i, count), "--worktree --recurse-submodules").Exec();
}
}
}
diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs
index e59bc068..4981b2f9 100644
--- a/src/Commands/ExecuteCustomAction.cs
+++ b/src/Commands/ExecuteCustomAction.cs
@@ -8,26 +8,7 @@ namespace SourceGit.Commands
{
public static class ExecuteCustomAction
{
- public static void Run(string repo, string file, string args)
- {
- var start = new ProcessStartInfo();
- start.FileName = file;
- start.Arguments = args;
- start.UseShellExecute = false;
- start.CreateNoWindow = true;
- start.WorkingDirectory = repo;
-
- try
- {
- Process.Start(start);
- }
- catch (Exception e)
- {
- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, e.Message));
- }
- }
-
- public static void RunAndWait(string repo, string file, string args, Models.ICommandLog log)
+ public static void Run(string repo, string file, string args, Action outputHandler)
{
var start = new ProcessStartInfo();
start.FileName = file;
@@ -40,7 +21,13 @@ namespace SourceGit.Commands
start.StandardErrorEncoding = Encoding.UTF8;
start.WorkingDirectory = repo;
- log?.AppendLine($"$ {file} {args}\n");
+ // Force using en_US.UTF-8 locale to avoid GCM crash
+ if (OperatingSystem.IsLinux())
+ start.Environment.Add("LANG", "en_US.UTF-8");
+
+ // Fix macOS `PATH` env
+ if (OperatingSystem.IsMacOS() && !string.IsNullOrEmpty(Native.OS.CustomPathEnv))
+ start.Environment.Add("PATH", Native.OS.CustomPathEnv);
var proc = new Process() { StartInfo = start };
var builder = new StringBuilder();
@@ -48,14 +35,14 @@ namespace SourceGit.Commands
proc.OutputDataReceived += (_, e) =>
{
if (e.Data != null)
- log?.AppendLine(e.Data);
+ outputHandler?.Invoke(e.Data);
};
proc.ErrorDataReceived += (_, e) =>
{
if (e.Data != null)
{
- log?.AppendLine(e.Data);
+ outputHandler?.Invoke(e.Data);
builder.AppendLine(e.Data);
}
};
@@ -66,21 +53,26 @@ namespace SourceGit.Commands
proc.BeginOutputReadLine();
proc.BeginErrorReadLine();
proc.WaitForExit();
-
- var exitCode = proc.ExitCode;
- if (exitCode != 0)
- {
- var errMsg = builder.ToString().Trim();
- if (!string.IsNullOrEmpty(errMsg))
- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, errMsg));
- }
}
catch (Exception e)
{
- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, e.Message));
+ Dispatcher.UIThread.Invoke(() =>
+ {
+ App.RaiseException(repo, e.Message);
+ });
}
+ var exitCode = proc.ExitCode;
proc.Close();
+
+ if (exitCode != 0)
+ {
+ var errMsg = builder.ToString();
+ Dispatcher.UIThread.Invoke(() =>
+ {
+ App.RaiseException(repo, errMsg);
+ });
+ }
}
}
}
diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs
index edf2a6dd..1c3e78cb 100644
--- a/src/Commands/Fetch.cs
+++ b/src/Commands/Fetch.cs
@@ -1,11 +1,15 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
{
public class Fetch : Command
{
- public Fetch(string repo, string remote, bool noTags, bool force)
+ public Fetch(string repo, string remote, bool noTags, bool prune, bool force, Action outputHandler)
{
+ _outputHandler = outputHandler;
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
Args = "fetch --progress --verbose ";
@@ -17,15 +21,27 @@
if (force)
Args += "--force ";
+ if (prune)
+ Args += "--prune ";
+
Args += remote;
}
- public Fetch(string repo, Models.Branch local, Models.Branch remote)
+ public Fetch(string repo, Models.Branch local, Models.Branch remote, Action outputHandler)
{
+ _outputHandler = outputHandler;
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
SSHKey = new Config(repo).Get($"remote.{remote.Remote}.sshkey");
Args = $"fetch --progress --verbose {remote.Remote} {remote.Name}:{local.Name}";
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler;
}
}
diff --git a/src/Commands/FormatPatch.cs b/src/Commands/FormatPatch.cs
index bf850d60..b3ec2e4a 100644
--- a/src/Commands/FormatPatch.cs
+++ b/src/Commands/FormatPatch.cs
@@ -6,7 +6,6 @@
{
WorkingDirectory = repo;
Context = repo;
- Editor = EditorType.None;
Args = $"format-patch {commit} -1 --output=\"{saveTo}\"";
}
}
diff --git a/src/Commands/GC.cs b/src/Commands/GC.cs
index 0b27f487..393b915e 100644
--- a/src/Commands/GC.cs
+++ b/src/Commands/GC.cs
@@ -1,12 +1,23 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
{
public class GC : Command
{
- public GC(string repo)
+ public GC(string repo, Action outputHandler)
{
+ _outputHandler = outputHandler;
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
Args = "gc --prune=now";
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler;
}
}
diff --git a/src/Commands/GenerateCommitMessage.cs b/src/Commands/GenerateCommitMessage.cs
index df61fdd2..e4f25f38 100644
--- a/src/Commands/GenerateCommitMessage.cs
+++ b/src/Commands/GenerateCommitMessage.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
using System.Text;
using System.Threading;
-using Avalonia.Threading;
-
namespace SourceGit.Commands
{
///
@@ -22,78 +20,82 @@ namespace SourceGit.Commands
}
}
- public GenerateCommitMessage(Models.OpenAIService service, string repo, List changes, CancellationToken cancelToken, Action onResponse)
+ public GenerateCommitMessage(Models.OpenAIService service, string repo, List changes, CancellationToken cancelToken, Action onProgress)
{
_service = service;
_repo = repo;
_changes = changes;
_cancelToken = cancelToken;
- _onResponse = onResponse;
+ _onProgress = onProgress;
}
- public void Exec()
+ public string Result()
{
try
{
- _onResponse?.Invoke("Waiting for pre-file analyzing to completed...\n\n");
-
- var responseBuilder = new StringBuilder();
- var summaryBuilder = new StringBuilder();
+ var summarybuilder = new StringBuilder();
+ var bodyBuilder = new StringBuilder();
foreach (var change in _changes)
{
if (_cancelToken.IsCancellationRequested)
- return;
+ return "";
- responseBuilder.Append("- ");
- summaryBuilder.Append("- ");
+ _onProgress?.Invoke($"Analyzing {change.Path}...");
- var rs = new GetDiffContent(_repo, new Models.DiffOption(change, false)).ReadToEnd();
- if (rs.IsSuccess)
- {
- _service.Chat(
- _service.AnalyzeDiffPrompt,
- $"Here is the `git diff` output: {rs.StdOut}",
- _cancelToken,
- update =>
- {
- responseBuilder.Append(update);
- summaryBuilder.Append(update);
+ var summary = GenerateChangeSummary(change);
+ summarybuilder.Append("- ");
+ summarybuilder.Append(summary);
+ summarybuilder.Append("(file: ");
+ summarybuilder.Append(change.Path);
+ summarybuilder.Append(")");
+ summarybuilder.AppendLine();
- _onResponse?.Invoke($"Waiting for pre-file analyzing to completed...\n\n{responseBuilder}");
- });
- }
-
- responseBuilder.Append("\n");
- summaryBuilder.Append("(file: ");
- summaryBuilder.Append(change.Path);
- summaryBuilder.Append(")\n");
+ bodyBuilder.Append("- ");
+ bodyBuilder.Append(summary);
+ bodyBuilder.AppendLine();
}
if (_cancelToken.IsCancellationRequested)
- return;
+ return "";
- var responseBody = responseBuilder.ToString();
- var subjectBuilder = new StringBuilder();
- _service.Chat(
- _service.GenerateSubjectPrompt,
- $"Here are the summaries changes:\n{summaryBuilder}",
- _cancelToken,
- update =>
- {
- subjectBuilder.Append(update);
- _onResponse?.Invoke($"{subjectBuilder}\n\n{responseBody}");
- });
+ _onProgress?.Invoke($"Generating commit message...");
+
+ var body = bodyBuilder.ToString();
+ var subject = GenerateSubject(summarybuilder.ToString());
+ return string.Format("{0}\n\n{1}", subject, body);
}
catch (Exception e)
{
- Dispatcher.UIThread.Post(() => App.RaiseException(_repo, $"Failed to generate commit message: {e}"));
+ App.RaiseException(_repo, $"Failed to generate commit message: {e}");
+ return "";
}
}
+ private string GenerateChangeSummary(Models.Change change)
+ {
+ var rs = new GetDiffContent(_repo, new Models.DiffOption(change, false)).ReadToEnd();
+ var diff = rs.IsSuccess ? rs.StdOut : "unknown change";
+
+ var rsp = _service.Chat(_service.AnalyzeDiffPrompt, $"Here is the `git diff` output: {diff}", _cancelToken);
+ if (rsp != null && rsp.Choices.Count > 0)
+ return rsp.Choices[0].Message.Content;
+
+ return string.Empty;
+ }
+
+ private string GenerateSubject(string summary)
+ {
+ var rsp = _service.Chat(_service.GenerateSubjectPrompt, $"Here are the summaries changes:\n{summary}", _cancelToken);
+ if (rsp != null && rsp.Choices.Count > 0)
+ return rsp.Choices[0].Message.Content;
+
+ return string.Empty;
+ }
+
private Models.OpenAIService _service;
private string _repo;
private List _changes;
private CancellationToken _cancelToken;
- private Action _onResponse;
+ private Action _onProgress;
}
}
diff --git a/src/Commands/GitFlow.cs b/src/Commands/GitFlow.cs
index 1d33fa3a..5e05ed83 100644
--- a/src/Commands/GitFlow.cs
+++ b/src/Commands/GitFlow.cs
@@ -1,12 +1,52 @@
-using System.Text;
+using System;
+using System.Collections.Generic;
+
using Avalonia.Threading;
namespace SourceGit.Commands
{
public static class GitFlow
{
- public static bool Init(string repo, string master, string develop, string feature, string release, string hotfix, string version, Models.ICommandLog log)
+ public class BranchDetectResult
{
+ public bool IsGitFlowBranch { get; set; } = false;
+ public string Type { get; set; } = string.Empty;
+ public string Prefix { get; set; } = string.Empty;
+ }
+
+ public static bool IsEnabled(string repo, List branches)
+ {
+ var localBrancheNames = new HashSet();
+ foreach (var branch in branches)
+ {
+ if (branch.IsLocal)
+ localBrancheNames.Add(branch.Name);
+ }
+
+ var config = new Config(repo).ListAll();
+ if (!config.TryGetValue("gitflow.branch.master", out string master) || !localBrancheNames.Contains(master))
+ return false;
+
+ if (!config.TryGetValue("gitflow.branch.develop", out string develop) || !localBrancheNames.Contains(develop))
+ return false;
+
+ return config.ContainsKey("gitflow.prefix.feature") &&
+ config.ContainsKey("gitflow.prefix.release") &&
+ config.ContainsKey("gitflow.prefix.hotfix");
+ }
+
+ public static bool Init(string repo, List branches, string master, string develop, string feature, string release, string hotfix, string version)
+ {
+ var current = branches.Find(x => x.IsCurrent);
+
+ var masterBranch = branches.Find(x => x.Name == master);
+ if (masterBranch == null && current != null)
+ Branch.Create(repo, master, current.Head);
+
+ var devBranch = branches.Find(x => x.Name == develop);
+ if (devBranch == null && current != null)
+ Branch.Create(repo, develop, current.Head);
+
var config = new Config(repo);
config.Set("gitflow.branch.master", master);
config.Set("gitflow.branch.develop", develop);
@@ -21,72 +61,104 @@ namespace SourceGit.Commands
init.WorkingDirectory = repo;
init.Context = repo;
init.Args = "flow init -d";
- init.Log = log;
return init.Exec();
}
- public static bool Start(string repo, Models.GitFlowBranchType type, string name, Models.ICommandLog log)
+ public static string GetPrefix(string repo, string type)
{
+ return new Config(repo).Get($"gitflow.prefix.{type}");
+ }
+
+ public static BranchDetectResult DetectType(string repo, List branches, string branch)
+ {
+ var rs = new BranchDetectResult();
+ var localBrancheNames = new HashSet();
+ foreach (var b in branches)
+ {
+ if (b.IsLocal)
+ localBrancheNames.Add(b.Name);
+ }
+
+ var config = new Config(repo).ListAll();
+ if (!config.TryGetValue("gitflow.branch.master", out string master) || !localBrancheNames.Contains(master))
+ return rs;
+
+ if (!config.TryGetValue("gitflow.branch.develop", out string develop) || !localBrancheNames.Contains(develop))
+ return rs;
+
+ if (!config.TryGetValue("gitflow.prefix.feature", out var feature) ||
+ !config.TryGetValue("gitflow.prefix.release", out var release) ||
+ !config.TryGetValue("gitflow.prefix.hotfix", out var hotfix))
+ return rs;
+
+ if (branch.StartsWith(feature, StringComparison.Ordinal))
+ {
+ rs.IsGitFlowBranch = true;
+ rs.Type = "feature";
+ rs.Prefix = feature;
+ }
+ else if (branch.StartsWith(release, StringComparison.Ordinal))
+ {
+ rs.IsGitFlowBranch = true;
+ rs.Type = "release";
+ rs.Prefix = release;
+ }
+ else if (branch.StartsWith(hotfix, StringComparison.Ordinal))
+ {
+ rs.IsGitFlowBranch = true;
+ rs.Type = "hotfix";
+ rs.Prefix = hotfix;
+ }
+
+ return rs;
+ }
+
+ public static bool Start(string repo, string type, string name)
+ {
+ if (!SUPPORTED_BRANCH_TYPES.Contains(type))
+ {
+ Dispatcher.UIThread.Post(() =>
+ {
+ App.RaiseException(repo, "Bad branch type!!!");
+ });
+
+ return false;
+ }
+
var start = new Command();
start.WorkingDirectory = repo;
start.Context = repo;
-
- switch (type)
- {
- case Models.GitFlowBranchType.Feature:
- start.Args = $"flow feature start {name}";
- break;
- case Models.GitFlowBranchType.Release:
- start.Args = $"flow release start {name}";
- break;
- case Models.GitFlowBranchType.Hotfix:
- start.Args = $"flow hotfix start {name}";
- break;
- default:
- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!"));
- return false;
- }
-
- start.Log = log;
+ start.Args = $"flow {type} start {name}";
return start.Exec();
}
- public static bool Finish(string repo, Models.GitFlowBranchType type, string name, bool squash, bool push, bool keepBranch, Models.ICommandLog log)
+ public static bool Finish(string repo, string type, string name, bool keepBranch)
{
- var builder = new StringBuilder();
- builder.Append("flow ");
-
- switch (type)
+ if (!SUPPORTED_BRANCH_TYPES.Contains(type))
{
- case Models.GitFlowBranchType.Feature:
- builder.Append("feature");
- break;
- case Models.GitFlowBranchType.Release:
- builder.Append("release");
- break;
- case Models.GitFlowBranchType.Hotfix:
- builder.Append("hotfix");
- break;
- default:
- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!"));
- return false;
+ Dispatcher.UIThread.Post(() =>
+ {
+ App.RaiseException(repo, "Bad branch type!!!");
+ });
+
+ return false;
}
- builder.Append(" finish ");
- if (squash)
- builder.Append("--squash ");
- if (push)
- builder.Append("--push ");
- if (keepBranch)
- builder.Append("-k ");
- builder.Append(name);
-
+ var option = keepBranch ? "-k" : string.Empty;
var finish = new Command();
finish.WorkingDirectory = repo;
finish.Context = repo;
- finish.Args = builder.ToString();
- finish.Log = log;
+ finish.Args = $"flow {type} finish {option} {name}";
return finish.Exec();
}
+
+ private static readonly List SUPPORTED_BRANCH_TYPES = new List()
+ {
+ "feature",
+ "release",
+ "bugfix",
+ "hotfix",
+ "support",
+ };
}
}
diff --git a/src/Commands/GitIgnore.cs b/src/Commands/GitIgnore.cs
index 8b351f5e..e666eba6 100644
--- a/src/Commands/GitIgnore.cs
+++ b/src/Commands/GitIgnore.cs
@@ -8,14 +8,7 @@ namespace SourceGit.Commands
{
var file = Path.Combine(repo, ".gitignore");
if (!File.Exists(file))
- {
File.WriteAllLines(file, [pattern]);
- return;
- }
-
- var org = File.ReadAllText(file);
- if (!org.EndsWith('\n'))
- File.AppendAllLines(file, ["", pattern]);
else
File.AppendAllLines(file, [pattern]);
}
diff --git a/src/Commands/IsBareRepository.cs b/src/Commands/IsBareRepository.cs
deleted file mode 100644
index f92d0888..00000000
--- a/src/Commands/IsBareRepository.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.IO;
-
-namespace SourceGit.Commands
-{
- public class IsBareRepository : Command
- {
- public IsBareRepository(string path)
- {
- WorkingDirectory = path;
- Args = "rev-parse --is-bare-repository";
- }
-
- public bool Result()
- {
- if (!Directory.Exists(Path.Combine(WorkingDirectory, "refs")) ||
- !Directory.Exists(Path.Combine(WorkingDirectory, "objects")) ||
- !File.Exists(Path.Combine(WorkingDirectory, "HEAD")))
- return false;
-
- var rs = ReadToEnd();
- return rs.IsSuccess && rs.StdOut.Trim() == "true";
- }
- }
-}
diff --git a/src/Commands/IsBinary.cs b/src/Commands/IsBinary.cs
index af8f54bb..de59b5a4 100644
--- a/src/Commands/IsBinary.cs
+++ b/src/Commands/IsBinary.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = $"diff {Models.Commit.EmptyTreeSHA1} {commit} --numstat -- \"{path}\"";
+ Args = $"diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 {commit} --numstat -- \"{path}\"";
RaiseError = false;
}
diff --git a/src/Commands/IsCommitSHA.cs b/src/Commands/IsCommitSHA.cs
deleted file mode 100644
index 1b0c50e3..00000000
--- a/src/Commands/IsCommitSHA.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace SourceGit.Commands
-{
- public class IsCommitSHA : Command
- {
- public IsCommitSHA(string repo, string hash)
- {
- WorkingDirectory = repo;
- Args = $"cat-file -t {hash}";
- }
-
- public bool Result()
- {
- var rs = ReadToEnd();
- return rs.IsSuccess && rs.StdOut.Trim().Equals("commit");
- }
- }
-}
diff --git a/src/Commands/IsConflictResolved.cs b/src/Commands/IsConflictResolved.cs
index 9b243451..13bc12ac 100644
--- a/src/Commands/IsConflictResolved.cs
+++ b/src/Commands/IsConflictResolved.cs
@@ -10,10 +10,5 @@
Context = repo;
Args = $"diff -a --ignore-cr-at-eol --check {opt}";
}
-
- public bool Result()
- {
- return ReadToEnd().IsSuccess;
- }
}
}
diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs
index 18d2ba93..c9ab7b41 100644
--- a/src/Commands/LFS.cs
+++ b/src/Commands/LFS.cs
@@ -7,18 +7,26 @@ namespace SourceGit.Commands
{
public partial class LFS
{
- [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
+ [GeneratedRegex(@"^(.+)\s+(\w+)\s+\w+:(\d+)$")]
private static partial Regex REG_LOCK();
- private class SubCmd : Command
+ class SubCmd : Command
{
- public SubCmd(string repo, string args, Models.ICommandLog log)
+ public SubCmd(string repo, string args, Action onProgress)
{
WorkingDirectory = repo;
Context = repo;
Args = args;
- Log = log;
+ TraitErrorAsOutput = true;
+ _outputHandler = onProgress;
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler;
}
public LFS(string repo)
@@ -36,35 +44,35 @@ namespace SourceGit.Commands
return content.Contains("git lfs pre-push");
}
- public bool Install(Models.ICommandLog log)
+ public bool Install()
{
- return new SubCmd(_repo, "lfs install --local", log).Exec();
+ return new SubCmd(_repo, "lfs install --local", null).Exec();
}
- public bool Track(string pattern, bool isFilenameMode, Models.ICommandLog log)
+ public bool Track(string pattern, bool isFilenameMode = false)
{
var opt = isFilenameMode ? "--filename" : "";
- return new SubCmd(_repo, $"lfs track {opt} \"{pattern}\"", log).Exec();
+ return new SubCmd(_repo, $"lfs track {opt} \"{pattern}\"", null).Exec();
}
- public void Fetch(string remote, Models.ICommandLog log)
+ public void Fetch(string remote, Action outputHandler)
{
- new SubCmd(_repo, $"lfs fetch {remote}", log).Exec();
+ new SubCmd(_repo, $"lfs fetch {remote}", outputHandler).Exec();
}
- public void Pull(string remote, Models.ICommandLog log)
+ public void Pull(string remote, Action outputHandler)
{
- new SubCmd(_repo, $"lfs pull {remote}", log).Exec();
+ new SubCmd(_repo, $"lfs pull {remote}", outputHandler).Exec();
}
- public void Push(string remote, Models.ICommandLog log)
+ public void Push(string remote, Action outputHandler)
{
- new SubCmd(_repo, $"lfs push {remote}", log).Exec();
+ new SubCmd(_repo, $"lfs push {remote}", outputHandler).Exec();
}
- public void Prune(Models.ICommandLog log)
+ public void Prune(Action outputHandler)
{
- new SubCmd(_repo, "lfs prune", log).Exec();
+ new SubCmd(_repo, "lfs prune", outputHandler).Exec();
}
public List Locks(string remote)
@@ -74,7 +82,7 @@ namespace SourceGit.Commands
var rs = cmd.ReadToEnd();
if (rs.IsSuccess)
{
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var lines = rs.StdOut.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
var match = REG_LOCK().Match(line);
@@ -93,21 +101,21 @@ namespace SourceGit.Commands
return locks;
}
- public bool Lock(string remote, string file, Models.ICommandLog log)
+ public bool Lock(string remote, string file)
{
- return new SubCmd(_repo, $"lfs lock --remote={remote} \"{file}\"", log).Exec();
+ return new SubCmd(_repo, $"lfs lock --remote={remote} \"{file}\"", null).Exec();
}
- public bool Unlock(string remote, string file, bool force, Models.ICommandLog log)
+ public bool Unlock(string remote, string file, bool force)
{
var opt = force ? "-f" : "";
- return new SubCmd(_repo, $"lfs unlock --remote={remote} {opt} \"{file}\"", log).Exec();
+ return new SubCmd(_repo, $"lfs unlock --remote={remote} {opt} \"{file}\"", null).Exec();
}
- public bool Unlock(string remote, long id, bool force, Models.ICommandLog log)
+ public bool Unlock(string remote, long id, bool force)
{
var opt = force ? "-f" : "";
- return new SubCmd(_repo, $"lfs unlock --remote={remote} {opt} --id={id}", log).Exec();
+ return new SubCmd(_repo, $"lfs unlock --remote={remote} {opt} --id={id}", null).Exec();
}
private readonly string _repo;
diff --git a/src/Commands/Merge.cs b/src/Commands/Merge.cs
index b08377b9..bd1f3653 100644
--- a/src/Commands/Merge.cs
+++ b/src/Commands/Merge.cs
@@ -1,21 +1,26 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Text;
namespace SourceGit.Commands
{
public class Merge : Command
{
- public Merge(string repo, string source, string mode)
+ public Merge(string repo, string source, string mode, Action outputHandler)
{
+ _outputHandler = outputHandler;
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
Args = $"merge --progress {source} {mode}";
}
- public Merge(string repo, List targets, bool autoCommit, string strategy)
+ public Merge(string repo, List targets, bool autoCommit, string strategy, Action outputHandler)
{
+ _outputHandler = outputHandler;
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
var builder = new StringBuilder();
builder.Append("merge --progress ");
@@ -32,5 +37,12 @@ namespace SourceGit.Commands
Args = builder.ToString();
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler = null;
}
}
diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs
index fc6d0d75..d3478d59 100644
--- a/src/Commands/MergeTool.cs
+++ b/src/Commands/MergeTool.cs
@@ -13,18 +13,15 @@ namespace SourceGit.Commands
cmd.Context = repo;
cmd.RaiseError = true;
- // NOTE: If no names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts.
- var fileArg = string.IsNullOrEmpty(file) ? "" : $"\"{file}\"";
-
if (toolType == 0)
{
- cmd.Args = $"mergetool {fileArg}";
+ cmd.Args = $"mergetool \"{file}\"";
return cmd.Exec();
}
if (!File.Exists(toolPath))
{
- Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!"));
+ Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT found external merge tool in '{toolPath}'!"));
return false;
}
@@ -35,7 +32,7 @@ namespace SourceGit.Commands
return false;
}
- cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {fileArg}";
+ cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.Cmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\"";
return cmd.Exec();
}
@@ -54,7 +51,7 @@ namespace SourceGit.Commands
if (!File.Exists(toolPath))
{
- Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!"));
+ Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT found external diff tool in '{toolPath}'!"));
return false;
}
diff --git a/src/Commands/Pull.cs b/src/Commands/Pull.cs
index 698fbfce..732530f5 100644
--- a/src/Commands/Pull.cs
+++ b/src/Commands/Pull.cs
@@ -1,18 +1,33 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
{
public class Pull : Command
{
- public Pull(string repo, string remote, string branch, bool useRebase)
+ public Pull(string repo, string remote, string branch, bool useRebase, bool noTags, bool prune, Action outputHandler)
{
+ _outputHandler = outputHandler;
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
- Args = "pull --verbose --progress ";
+ Args = "pull --verbose --progress --tags ";
if (useRebase)
- Args += "--rebase=true ";
+ Args += "--rebase ";
+ if (noTags)
+ Args += "--no-tags ";
+ if (prune)
+ Args += "--prune ";
Args += $"{remote} {branch}";
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler;
}
}
diff --git a/src/Commands/Push.cs b/src/Commands/Push.cs
index 8a5fe33c..69b859ab 100644
--- a/src/Commands/Push.cs
+++ b/src/Commands/Push.cs
@@ -1,11 +1,16 @@
-namespace SourceGit.Commands
+using System;
+
+namespace SourceGit.Commands
{
public class Push : Command
{
- public Push(string repo, string local, string remote, string remoteBranch, bool withTags, bool checkSubmodules, bool track, bool force)
+ public Push(string repo, string local, string remote, string remoteBranch, bool withTags, bool checkSubmodules, bool track, bool force, Action onProgress)
{
+ _outputHandler = onProgress;
+
WorkingDirectory = repo;
Context = repo;
+ TraitErrorAsOutput = true;
SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
Args = "push --progress --verbose ";
@@ -21,7 +26,7 @@
Args += $"{remote} {local}:{remoteBranch}";
}
- public Push(string repo, string remote, string refname, bool isDelete)
+ public Push(string repo, string remote, string tag, bool isDelete)
{
WorkingDirectory = repo;
Context = repo;
@@ -31,7 +36,14 @@
if (isDelete)
Args += "--delete ";
- Args += $"{remote} {refname}";
+ Args += $"{remote} refs/tags/{tag}";
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private readonly Action _outputHandler = null;
}
}
diff --git a/src/Commands/QueryAssumeUnchangedFiles.cs b/src/Commands/QueryAssumeUnchangedFiles.cs
deleted file mode 100644
index b5c23b0b..00000000
--- a/src/Commands/QueryAssumeUnchangedFiles.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace SourceGit.Commands
-{
- public partial class QueryAssumeUnchangedFiles : Command
- {
- [GeneratedRegex(@"^(\w)\s+(.+)$")]
- private static partial Regex REG_PARSE();
-
- public QueryAssumeUnchangedFiles(string repo)
- {
- WorkingDirectory = repo;
- Args = "ls-files -v";
- RaiseError = false;
- }
-
- public List Result()
- {
- var outs = new List();
- var rs = ReadToEnd();
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- {
- var match = REG_PARSE().Match(line);
- if (!match.Success)
- continue;
-
- if (match.Groups[1].Value == "h")
- outs.Add(match.Groups[2].Value);
- }
-
- return outs;
- }
- }
-}
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
index d0ecd322..95f97214 100644
--- a/src/Commands/QueryBranches.cs
+++ b/src/Commands/QueryBranches.cs
@@ -14,52 +14,22 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = "branch -l --all -v --format=\"%(refname)%00%(committerdate:unix)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
+ Args = "branch -l --all -v --format=\"%(refname)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
}
- public List Result(out int localBranchesCount)
+ public List Result()
{
- localBranchesCount = 0;
-
var branches = new List();
var rs = ReadToEnd();
if (!rs.IsSuccess)
return branches;
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- var remoteHeads = new Dictionary();
+ var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
var b = ParseLine(line);
if (b != null)
- {
branches.Add(b);
- if (!b.IsLocal)
- remoteHeads.Add(b.FullName, b.Head);
- else
- localBranchesCount++;
- }
- }
-
- foreach (var b in branches)
- {
- if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))
- {
- if (remoteHeads.TryGetValue(b.Upstream, out var upstreamHead))
- {
- b.IsUpstreamGone = false;
-
- if (b.TrackStatus == null)
- b.TrackStatus = new QueryTrackStatus(WorkingDirectory, b.Head, upstreamHead).Result();
- }
- else
- {
- b.IsUpstreamGone = true;
-
- if (b.TrackStatus == null)
- b.TrackStatus = new Models.BranchTrackStatus();
- }
- }
}
return branches;
@@ -68,7 +38,7 @@ namespace SourceGit.Commands
private Models.Branch ParseLine(string line)
{
var parts = line.Split('\0');
- if (parts.Length != 6)
+ if (parts.Length != 5)
return null;
var branch = new Models.Branch();
@@ -102,16 +72,13 @@ namespace SourceGit.Commands
}
branch.FullName = refName;
- branch.CommitterDate = ulong.Parse(parts[1]);
- branch.Head = parts[2];
- branch.IsCurrent = parts[3] == "*";
- branch.Upstream = parts[4];
- branch.IsUpstreamGone = false;
+ branch.Head = parts[1];
+ branch.IsCurrent = parts[2] == "*";
+ branch.Upstream = parts[3];
- if (!branch.IsLocal ||
- string.IsNullOrEmpty(branch.Upstream) ||
- string.IsNullOrEmpty(parts[5]) ||
- parts[5].Equals("=", StringComparison.Ordinal))
+ if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
+ branch.TrackStatus = new QueryTrackStatus(WorkingDirectory, branch.Name, branch.Upstream).Result();
+ else
branch.TrackStatus = new Models.BranchTrackStatus();
return branch;
diff --git a/src/Commands/QueryCommitChildren.cs b/src/Commands/QueryCommitChildren.cs
index 4e99ce7a..bef09abb 100644
--- a/src/Commands/QueryCommitChildren.cs
+++ b/src/Commands/QueryCommitChildren.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace SourceGit.Commands
{
@@ -10,26 +9,22 @@ namespace SourceGit.Commands
WorkingDirectory = repo;
Context = repo;
_commit = commit;
- Args = $"rev-list -{max} --parents --branches --remotes --ancestry-path ^{commit}";
+ Args = $"rev-list -{max} --parents --branches --remotes ^{commit}";
}
- public List Result()
+ public IEnumerable Result()
{
- var rs = ReadToEnd();
- var outs = new List();
- if (rs.IsSuccess)
- {
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- {
- if (line.Contains(_commit))
- outs.Add(line.Substring(0, 40));
- }
- }
+ Exec();
+ return _lines;
+ }
- return outs;
+ protected override void OnReadline(string line)
+ {
+ if (line.Contains(_commit))
+ _lines.Add(line.Substring(0, 40));
}
private string _commit;
+ private List _lines = new List();
}
}
diff --git a/src/Commands/QueryCommitFullMessage.cs b/src/Commands/QueryCommitFullMessage.cs
index 36b6d1c7..c8f1867d 100644
--- a/src/Commands/QueryCommitFullMessage.cs
+++ b/src/Commands/QueryCommitFullMessage.cs
@@ -6,7 +6,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = $"show --no-show-signature --format=%B -s {sha}";
+ Args = $"show --no-show-signature --pretty=format:%B -s {sha}";
}
public string Result()
diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs
index 133949af..5c81cf57 100644
--- a/src/Commands/QueryCommitSignInfo.cs
+++ b/src/Commands/QueryCommitSignInfo.cs
@@ -7,7 +7,7 @@
WorkingDirectory = repo;
Context = repo;
- const string baseArgs = "show --no-show-signature --format=%G?%n%GS%n%GK -s";
+ const string baseArgs = "show --no-show-signature --pretty=format:\"%G?%n%GS%n%GK\" -s";
const string fakeSignersFileArg = "-c gpg.ssh.allowedSignersFile=/dev/null";
Args = $"{(useFakeSignersFile ? fakeSignersFileArg : string.Empty)} {baseArgs} {sha}";
}
@@ -18,7 +18,7 @@
if (!rs.IsSuccess)
return null;
- var raw = rs.StdOut.Trim().ReplaceLineEndings("\n");
+ var raw = rs.StdOut.Trim();
if (raw.Length <= 1)
return null;
@@ -29,6 +29,7 @@
Signer = lines[1],
Key = lines[2]
};
+
}
}
}
diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
index 9e1d9918..6318f331 100644
--- a/src/Commands/QueryCommits.cs
+++ b/src/Commands/QueryCommits.cs
@@ -10,7 +10,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = $"log --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {limits}";
+ Args = $"log --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {limits}";
_findFirstMerged = needFindHead;
}
@@ -18,20 +18,20 @@ namespace SourceGit.Commands
{
string search = onlyCurrentBranch ? string.Empty : "--branches --remotes ";
- if (method == Models.CommitSearchMethod.ByAuthor)
+ if (method == Models.CommitSearchMethod.ByUser)
{
- search += $"-i --author=\"{filter}\"";
+ search += $"-i --author=\"{filter}\" --committer=\"{filter}\"";
}
- else if (method == Models.CommitSearchMethod.ByCommitter)
+ else if (method == Models.CommitSearchMethod.ByFile)
{
- search += $"-i --committer=\"{filter}\"";
+ search += $"-- \"{filter}\"";
}
- else if (method == Models.CommitSearchMethod.ByMessage)
+ else
{
var argsBuilder = new StringBuilder();
argsBuilder.Append(search);
- var words = filter.Split([' ', '\t', '\r'], StringSplitOptions.RemoveEmptyEntries);
+ var words = filter.Split(new[] { ' ', '\t', '\r' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var word in words)
{
var escaped = word.Trim().Replace("\"", "\\\"", StringComparison.Ordinal);
@@ -41,18 +41,10 @@ namespace SourceGit.Commands
search = argsBuilder.ToString();
}
- else if (method == Models.CommitSearchMethod.ByFile)
- {
- search += $"-- \"{filter}\"";
- }
- else
- {
- search = $"-G\"{filter}\"";
- }
WorkingDirectory = repo;
Context = repo;
- Args = $"log -1000 --date-order --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {search}";
+ Args = $"log -1000 --date-order --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s " + search;
_findFirstMerged = false;
}
@@ -128,7 +120,7 @@ namespace SourceGit.Commands
Args = $"log --since=\"{_commits[^1].CommitterTimeStr}\" --format=\"%H\"";
var rs = ReadToEnd();
- var shas = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var shas = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
if (shas.Length == 0)
return;
diff --git a/src/Commands/QueryCommitsForInteractiveRebase.cs b/src/Commands/QueryCommitsWithFullMessage.cs
similarity index 83%
rename from src/Commands/QueryCommitsForInteractiveRebase.cs
rename to src/Commands/QueryCommitsWithFullMessage.cs
index 9f238319..c15cdbe1 100644
--- a/src/Commands/QueryCommitsForInteractiveRebase.cs
+++ b/src/Commands/QueryCommitsWithFullMessage.cs
@@ -3,18 +3,18 @@ using System.Collections.Generic;
namespace SourceGit.Commands
{
- public class QueryCommitsForInteractiveRebase : Command
+ public class QueryCommitsWithFullMessage : Command
{
- public QueryCommitsForInteractiveRebase(string repo, string on)
+ public QueryCommitsWithFullMessage(string repo, string args)
{
_boundary = $"----- BOUNDARY OF COMMIT {Guid.NewGuid()} -----";
WorkingDirectory = repo;
Context = repo;
- Args = $"log --date-order --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";
+ Args = $"log --date-order --no-show-signature --decorate=full --pretty=format:\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {args}";
}
- public List Result()
+ public List Result()
{
var rs = ReadToEnd();
if (!rs.IsSuccess)
@@ -29,7 +29,7 @@ namespace SourceGit.Commands
switch (nextPartIdx)
{
case 0:
- _current = new Models.InteractiveCommit();
+ _current = new Models.CommitWithMessage();
_current.Commit.SHA = line;
_commits.Add(_current);
break;
@@ -52,7 +52,7 @@ namespace SourceGit.Commands
_current.Commit.CommitterTime = ulong.Parse(line);
break;
default:
- var boundary = rs.StdOut.IndexOf(_boundary, end + 1, StringComparison.Ordinal);
+ var boundary = rs.StdOut.IndexOf(_boundary, end + 1);
if (boundary > end)
{
_current.Message = rs.StdOut.Substring(start, boundary - start - 1);
@@ -88,8 +88,8 @@ namespace SourceGit.Commands
_current.Commit.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
}
- private List _commits = [];
- private Models.InteractiveCommit _current = null;
- private readonly string _boundary;
+ private List _commits = new List();
+ private Models.CommitWithMessage _current = null;
+ private string _boundary = "";
}
}
diff --git a/src/Commands/QueryFileContent.cs b/src/Commands/QueryFileContent.cs
index 83d0a575..f887859c 100644
--- a/src/Commands/QueryFileContent.cs
+++ b/src/Commands/QueryFileContent.cs
@@ -35,39 +35,5 @@ namespace SourceGit.Commands
return stream;
}
-
- public static Stream FromLFS(string repo, string oid, long size)
- {
- var starter = new ProcessStartInfo();
- starter.WorkingDirectory = repo;
- starter.FileName = Native.OS.GitExecutable;
- starter.Arguments = $"lfs smudge";
- starter.UseShellExecute = false;
- starter.CreateNoWindow = true;
- starter.WindowStyle = ProcessWindowStyle.Hidden;
- starter.RedirectStandardInput = true;
- starter.RedirectStandardOutput = true;
-
- var stream = new MemoryStream();
- try
- {
- var proc = new Process() { StartInfo = starter };
- proc.Start();
- proc.StandardInput.WriteLine("version https://git-lfs.github.com/spec/v1");
- proc.StandardInput.WriteLine($"oid sha256:{oid}");
- proc.StandardInput.WriteLine($"size {size}");
- proc.StandardOutput.BaseStream.CopyTo(stream);
- proc.WaitForExit();
- proc.Close();
-
- stream.Position = 0;
- }
- catch (Exception e)
- {
- App.RaiseException(repo, $"Failed to query file content: {e}");
- }
-
- return stream;
- }
}
}
diff --git a/src/Commands/QueryFileSize.cs b/src/Commands/QueryFileSize.cs
index 30af7715..9016d826 100644
--- a/src/Commands/QueryFileSize.cs
+++ b/src/Commands/QueryFileSize.cs
@@ -16,6 +16,9 @@ namespace SourceGit.Commands
public long Result()
{
+ if (_result != 0)
+ return _result;
+
var rs = ReadToEnd();
if (rs.IsSuccess)
{
@@ -26,5 +29,7 @@ namespace SourceGit.Commands
return 0;
}
+
+ private readonly long _result = 0;
}
}
diff --git a/src/Commands/QueryGitCommonDir.cs b/src/Commands/QueryGitCommonDir.cs
deleted file mode 100644
index 1076243e..00000000
--- a/src/Commands/QueryGitCommonDir.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.IO;
-
-namespace SourceGit.Commands
-{
- public class QueryGitCommonDir : Command
- {
- public QueryGitCommonDir(string workDir)
- {
- WorkingDirectory = workDir;
- Args = "rev-parse --git-common-dir";
- RaiseError = false;
- }
-
- public string Result()
- {
- var rs = ReadToEnd().StdOut;
- if (string.IsNullOrEmpty(rs))
- return null;
-
- rs = rs.Trim();
- if (Path.IsPathRooted(rs))
- return rs;
- return Path.GetFullPath(Path.Combine(WorkingDirectory, rs));
- }
- }
-}
diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs
index 788ed617..ea422215 100644
--- a/src/Commands/QueryLocalChanges.cs
+++ b/src/Commands/QueryLocalChanges.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
-using Avalonia.Threading;
-
namespace SourceGit.Commands
{
public partial class QueryLocalChanges : Command
@@ -16,150 +13,144 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = $"--no-optional-locks status -u{UNTRACKED[includeUntracked ? 1 : 0]} --ignore-submodules=dirty --porcelain";
+ Args = $"status -u{UNTRACKED[includeUntracked ? 1 : 0]} --ignore-submodules=dirty --porcelain";
}
public List Result()
{
- var outs = new List();
- var rs = ReadToEnd();
- if (!rs.IsSuccess)
- {
- Dispatcher.UIThread.Post(() => App.RaiseException(Context, rs.StdErr));
- return outs;
- }
-
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- {
- var match = REG_FORMAT().Match(line);
- if (!match.Success)
- continue;
-
- var change = new Models.Change() { Path = match.Groups[2].Value };
- var status = match.Groups[1].Value;
-
- switch (status)
- {
- case " M":
- change.Set(Models.ChangeState.None, Models.ChangeState.Modified);
- break;
- case " T":
- change.Set(Models.ChangeState.None, Models.ChangeState.TypeChanged);
- break;
- case " A":
- change.Set(Models.ChangeState.None, Models.ChangeState.Added);
- break;
- case " D":
- change.Set(Models.ChangeState.None, Models.ChangeState.Deleted);
- break;
- case " R":
- change.Set(Models.ChangeState.None, Models.ChangeState.Renamed);
- break;
- case " C":
- change.Set(Models.ChangeState.None, Models.ChangeState.Copied);
- break;
- case "M":
- change.Set(Models.ChangeState.Modified);
- break;
- case "MM":
- change.Set(Models.ChangeState.Modified, Models.ChangeState.Modified);
- break;
- case "MT":
- change.Set(Models.ChangeState.Modified, Models.ChangeState.TypeChanged);
- break;
- case "MD":
- change.Set(Models.ChangeState.Modified, Models.ChangeState.Deleted);
- break;
- case "T":
- change.Set(Models.ChangeState.TypeChanged);
- break;
- case "TM":
- change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.Modified);
- break;
- case "TT":
- change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.TypeChanged);
- break;
- case "TD":
- change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.Deleted);
- break;
- case "A":
- change.Set(Models.ChangeState.Added);
- break;
- case "AM":
- change.Set(Models.ChangeState.Added, Models.ChangeState.Modified);
- break;
- case "AT":
- change.Set(Models.ChangeState.Added, Models.ChangeState.TypeChanged);
- break;
- case "AD":
- change.Set(Models.ChangeState.Added, Models.ChangeState.Deleted);
- break;
- case "D":
- change.Set(Models.ChangeState.Deleted);
- break;
- case "R":
- change.Set(Models.ChangeState.Renamed);
- break;
- case "RM":
- change.Set(Models.ChangeState.Renamed, Models.ChangeState.Modified);
- break;
- case "RT":
- change.Set(Models.ChangeState.Renamed, Models.ChangeState.TypeChanged);
- break;
- case "RD":
- change.Set(Models.ChangeState.Renamed, Models.ChangeState.Deleted);
- break;
- case "C":
- change.Set(Models.ChangeState.Copied);
- break;
- case "CM":
- change.Set(Models.ChangeState.Copied, Models.ChangeState.Modified);
- break;
- case "CT":
- change.Set(Models.ChangeState.Copied, Models.ChangeState.TypeChanged);
- break;
- case "CD":
- change.Set(Models.ChangeState.Copied, Models.ChangeState.Deleted);
- break;
- case "DD":
- change.ConflictReason = Models.ConflictReason.BothDeleted;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "AU":
- change.ConflictReason = Models.ConflictReason.AddedByUs;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "UD":
- change.ConflictReason = Models.ConflictReason.DeletedByThem;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "UA":
- change.ConflictReason = Models.ConflictReason.AddedByThem;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "DU":
- change.ConflictReason = Models.ConflictReason.DeletedByUs;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "AA":
- change.ConflictReason = Models.ConflictReason.BothAdded;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "UU":
- change.ConflictReason = Models.ConflictReason.BothModified;
- change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
- break;
- case "??":
- change.Set(Models.ChangeState.None, Models.ChangeState.Untracked);
- break;
- }
-
- if (change.Index != Models.ChangeState.None || change.WorkTree != Models.ChangeState.None)
- outs.Add(change);
- }
-
- return outs;
+ Exec();
+ return _changes;
}
+
+ protected override void OnReadline(string line)
+ {
+ var match = REG_FORMAT().Match(line);
+ if (!match.Success)
+ return;
+
+ var change = new Models.Change() { Path = match.Groups[2].Value };
+ var status = match.Groups[1].Value;
+
+ switch (status)
+ {
+ case " M":
+ change.Set(Models.ChangeState.None, Models.ChangeState.Modified);
+ break;
+ case " T":
+ change.Set(Models.ChangeState.None, Models.ChangeState.TypeChanged);
+ break;
+ case " A":
+ change.Set(Models.ChangeState.None, Models.ChangeState.Added);
+ break;
+ case " D":
+ change.Set(Models.ChangeState.None, Models.ChangeState.Deleted);
+ break;
+ case " R":
+ change.Set(Models.ChangeState.None, Models.ChangeState.Renamed);
+ break;
+ case " C":
+ change.Set(Models.ChangeState.None, Models.ChangeState.Copied);
+ break;
+ case "M":
+ change.Set(Models.ChangeState.Modified);
+ break;
+ case "MM":
+ change.Set(Models.ChangeState.Modified, Models.ChangeState.Modified);
+ break;
+ case "MT":
+ change.Set(Models.ChangeState.Modified, Models.ChangeState.TypeChanged);
+ break;
+ case "MD":
+ change.Set(Models.ChangeState.Modified, Models.ChangeState.Deleted);
+ break;
+ case "T":
+ change.Set(Models.ChangeState.TypeChanged);
+ break;
+ case "TM":
+ change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.Modified);
+ break;
+ case "TT":
+ change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.TypeChanged);
+ break;
+ case "TD":
+ change.Set(Models.ChangeState.TypeChanged, Models.ChangeState.Deleted);
+ break;
+ case "A":
+ change.Set(Models.ChangeState.Added);
+ break;
+ case "AM":
+ change.Set(Models.ChangeState.Added, Models.ChangeState.Modified);
+ break;
+ case "AT":
+ change.Set(Models.ChangeState.Added, Models.ChangeState.TypeChanged);
+ break;
+ case "AD":
+ change.Set(Models.ChangeState.Added, Models.ChangeState.Deleted);
+ break;
+ case "D":
+ change.Set(Models.ChangeState.Deleted);
+ break;
+ case "R":
+ change.Set(Models.ChangeState.Renamed);
+ break;
+ case "RM":
+ change.Set(Models.ChangeState.Renamed, Models.ChangeState.Modified);
+ break;
+ case "RT":
+ change.Set(Models.ChangeState.Renamed, Models.ChangeState.TypeChanged);
+ break;
+ case "RD":
+ change.Set(Models.ChangeState.Renamed, Models.ChangeState.Deleted);
+ break;
+ case "C":
+ change.Set(Models.ChangeState.Copied);
+ break;
+ case "CM":
+ change.Set(Models.ChangeState.Copied, Models.ChangeState.Modified);
+ break;
+ case "CT":
+ change.Set(Models.ChangeState.Copied, Models.ChangeState.TypeChanged);
+ break;
+ case "CD":
+ change.Set(Models.ChangeState.Copied, Models.ChangeState.Deleted);
+ break;
+ case "DR":
+ change.Set(Models.ChangeState.Deleted, Models.ChangeState.Renamed);
+ break;
+ case "DC":
+ change.Set(Models.ChangeState.Deleted, Models.ChangeState.Copied);
+ break;
+ case "DD":
+ change.Set(Models.ChangeState.Deleted, Models.ChangeState.Deleted);
+ break;
+ case "AU":
+ change.Set(Models.ChangeState.Added, Models.ChangeState.Unmerged);
+ break;
+ case "UD":
+ change.Set(Models.ChangeState.Unmerged, Models.ChangeState.Deleted);
+ break;
+ case "UA":
+ change.Set(Models.ChangeState.Unmerged, Models.ChangeState.Added);
+ break;
+ case "DU":
+ change.Set(Models.ChangeState.Deleted, Models.ChangeState.Unmerged);
+ break;
+ case "AA":
+ change.Set(Models.ChangeState.Added, Models.ChangeState.Added);
+ break;
+ case "UU":
+ change.Set(Models.ChangeState.Unmerged, Models.ChangeState.Unmerged);
+ break;
+ case "??":
+ change.Set(Models.ChangeState.Untracked, Models.ChangeState.Untracked);
+ break;
+ default:
+ return;
+ }
+
+ _changes.Add(change);
+ }
+
+ private readonly List _changes = new List();
}
}
diff --git a/src/Commands/QueryRefsContainsCommit.cs b/src/Commands/QueryRefsContainsCommit.cs
index cabe1b50..82e9b341 100644
--- a/src/Commands/QueryRefsContainsCommit.cs
+++ b/src/Commands/QueryRefsContainsCommit.cs
@@ -20,7 +20,7 @@ namespace SourceGit.Commands
if (!output.IsSuccess)
return rs;
- var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var lines = output.StdOut.Split('\n');
foreach (var line in lines)
{
if (line.EndsWith("/HEAD", StringComparison.Ordinal))
diff --git a/src/Commands/QueryRemotes.cs b/src/Commands/QueryRemotes.cs
index 7afec74d..b5b41b4a 100644
--- a/src/Commands/QueryRemotes.cs
+++ b/src/Commands/QueryRemotes.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Text.RegularExpressions;
namespace SourceGit.Commands
@@ -18,31 +17,27 @@ namespace SourceGit.Commands
public List Result()
{
- var outs = new List();
- var rs = ReadToEnd();
- if (!rs.IsSuccess)
- return outs;
-
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- {
- var match = REG_REMOTE().Match(line);
- if (!match.Success)
- continue;
-
- var remote = new Models.Remote()
- {
- Name = match.Groups[1].Value,
- URL = match.Groups[2].Value,
- };
-
- if (outs.Find(x => x.Name == remote.Name) != null)
- continue;
-
- outs.Add(remote);
- }
-
- return outs;
+ Exec();
+ return _loaded;
}
+
+ protected override void OnReadline(string line)
+ {
+ var match = REG_REMOTE().Match(line);
+ if (!match.Success)
+ return;
+
+ var remote = new Models.Remote()
+ {
+ Name = match.Groups[1].Value,
+ URL = match.Groups[2].Value,
+ };
+
+ if (_loaded.Find(x => x.Name == remote.Name) != null)
+ return;
+ _loaded.Add(remote);
+ }
+
+ private readonly List _loaded = new List();
}
}
diff --git a/src/Commands/QueryRevisionByRefName.cs b/src/Commands/QueryRevisionByRefName.cs
deleted file mode 100644
index 7fb4ecfa..00000000
--- a/src/Commands/QueryRevisionByRefName.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace SourceGit.Commands
-{
- public class QueryRevisionByRefName : Command
- {
- public QueryRevisionByRefName(string repo, string refname)
- {
- WorkingDirectory = repo;
- Context = repo;
- Args = $"rev-parse {refname}";
- }
-
- public string Result()
- {
- var rs = ReadToEnd();
- if (rs.IsSuccess && !string.IsNullOrEmpty(rs.StdOut))
- return rs.StdOut.Trim();
-
- return null;
- }
- }
-}
diff --git a/src/Commands/QueryRevisionFileNames.cs b/src/Commands/QueryRevisionFileNames.cs
index c6fd7373..d2d69614 100644
--- a/src/Commands/QueryRevisionFileNames.cs
+++ b/src/Commands/QueryRevisionFileNames.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
{
public class QueryRevisionFileNames : Command
{
@@ -11,17 +9,13 @@ namespace SourceGit.Commands
Args = $"ls-tree -r -z --name-only {revision}";
}
- public List Result()
+ public string[] Result()
{
var rs = ReadToEnd();
- if (!rs.IsSuccess)
- return [];
+ if (rs.IsSuccess)
+ return rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries);
- var lines = rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries);
- var outs = new List();
- foreach (var line in lines)
- outs.Add(line);
- return outs;
+ return [];
}
}
}
diff --git a/src/Commands/QuerySingleCommit.cs b/src/Commands/QuerySingleCommit.cs
index 35289ec5..1e1c9ea4 100644
--- a/src/Commands/QuerySingleCommit.cs
+++ b/src/Commands/QuerySingleCommit.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = $"show --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s -s {sha}";
+ Args = $"show --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s -s {sha}";
}
public Models.Commit Result()
diff --git a/src/Commands/QueryStagedChangesWithAmend.cs b/src/Commands/QueryStagedChangesWithAmend.cs
index 78980401..f5c9659f 100644
--- a/src/Commands/QueryStagedChangesWithAmend.cs
+++ b/src/Commands/QueryStagedChangesWithAmend.cs
@@ -6,87 +6,87 @@ namespace SourceGit.Commands
{
public partial class QueryStagedChangesWithAmend : Command
{
- [GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} ([ACDMT])\d{0,6}\t(.*)$")]
+ [GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} ([ACDMTUX])\d{0,6}\t(.*)$")]
private static partial Regex REG_FORMAT1();
[GeneratedRegex(@"^:[\d]{6} ([\d]{6}) ([0-9a-f]{40}) [0-9a-f]{40} R\d{0,6}\t(.*\t.*)$")]
private static partial Regex REG_FORMAT2();
- public QueryStagedChangesWithAmend(string repo, string parent)
+ public QueryStagedChangesWithAmend(string repo)
{
WorkingDirectory = repo;
Context = repo;
- Args = $"diff-index --cached -M {parent}";
- _parent = parent;
+ Args = "diff-index --cached -M HEAD^";
}
public List Result()
{
var rs = ReadToEnd();
- if (!rs.IsSuccess)
- return [];
-
- var changes = new List();
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
+ if (rs.IsSuccess)
{
- var match = REG_FORMAT2().Match(line);
- if (match.Success)
+ var changes = new List();
+ var lines = rs.StdOut.Split('\n', StringSplitOptions.RemoveEmptyEntries);
+ foreach (var line in lines)
{
- var change = new Models.Change()
+ var match = REG_FORMAT2().Match(line);
+ if (match.Success)
{
- Path = match.Groups[3].Value,
- DataForAmend = new Models.ChangeDataForAmend()
+ var change = new Models.Change()
{
- FileMode = match.Groups[1].Value,
- ObjectHash = match.Groups[2].Value,
- ParentSHA = _parent,
- },
- };
- change.Set(Models.ChangeState.Renamed);
- changes.Add(change);
- continue;
- }
-
- match = REG_FORMAT1().Match(line);
- if (match.Success)
- {
- var change = new Models.Change()
- {
- Path = match.Groups[4].Value,
- DataForAmend = new Models.ChangeDataForAmend()
- {
- FileMode = match.Groups[1].Value,
- ObjectHash = match.Groups[2].Value,
- ParentSHA = _parent,
- },
- };
-
- var type = match.Groups[3].Value;
- switch (type)
- {
- case "A":
- change.Set(Models.ChangeState.Added);
- break;
- case "C":
- change.Set(Models.ChangeState.Copied);
- break;
- case "D":
- change.Set(Models.ChangeState.Deleted);
- break;
- case "M":
- change.Set(Models.ChangeState.Modified);
- break;
- case "T":
- change.Set(Models.ChangeState.TypeChanged);
- break;
+ Path = match.Groups[3].Value,
+ DataForAmend = new Models.ChangeDataForAmend()
+ {
+ FileMode = match.Groups[1].Value,
+ ObjectHash = match.Groups[2].Value,
+ },
+ };
+ change.Set(Models.ChangeState.Renamed);
+ changes.Add(change);
+ continue;
+ }
+
+ match = REG_FORMAT1().Match(line);
+ if (match.Success)
+ {
+ var change = new Models.Change()
+ {
+ Path = match.Groups[4].Value,
+ DataForAmend = new Models.ChangeDataForAmend()
+ {
+ FileMode = match.Groups[1].Value,
+ ObjectHash = match.Groups[2].Value,
+ },
+ };
+
+ var type = match.Groups[3].Value;
+ switch (type)
+ {
+ case "A":
+ change.Set(Models.ChangeState.Added);
+ break;
+ case "C":
+ change.Set(Models.ChangeState.Copied);
+ break;
+ case "D":
+ change.Set(Models.ChangeState.Deleted);
+ break;
+ case "M":
+ change.Set(Models.ChangeState.Modified);
+ break;
+ case "T":
+ change.Set(Models.ChangeState.TypeChanged);
+ break;
+ case "U":
+ change.Set(Models.ChangeState.Unmerged);
+ break;
+ }
+ changes.Add(change);
}
- changes.Add(change);
}
+
+ return changes;
}
- return changes;
+ return [];
}
-
- private readonly string _parent;
}
}
diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs
new file mode 100644
index 00000000..3b8d2db6
--- /dev/null
+++ b/src/Commands/QueryStashChanges.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace SourceGit.Commands
+{
+ public partial class QueryStashChanges : Command
+ {
+ [GeneratedRegex(@"^(\s?[\w\?]{1,4})\s+(.+)$")]
+ private static partial Regex REG_FORMAT();
+
+ public QueryStashChanges(string repo, string sha)
+ {
+ WorkingDirectory = repo;
+ Context = repo;
+ Args = $"diff --name-status --pretty=format: {sha}^ {sha}";
+ }
+
+ public List Result()
+ {
+ Exec();
+ return _changes;
+ }
+
+ protected override void OnReadline(string line)
+ {
+ var match = REG_FORMAT().Match(line);
+ if (!match.Success)
+ return;
+
+ var change = new Models.Change() { Path = match.Groups[2].Value };
+ var status = match.Groups[1].Value;
+
+ switch (status[0])
+ {
+ case 'M':
+ change.Set(Models.ChangeState.Modified);
+ _changes.Add(change);
+ break;
+ case 'A':
+ change.Set(Models.ChangeState.Added);
+ _changes.Add(change);
+ break;
+ case 'D':
+ change.Set(Models.ChangeState.Deleted);
+ _changes.Add(change);
+ break;
+ case 'R':
+ change.Set(Models.ChangeState.Renamed);
+ _changes.Add(change);
+ break;
+ case 'C':
+ change.Set(Models.ChangeState.Copied);
+ _changes.Add(change);
+ break;
+ }
+ }
+
+ private readonly List _changes = new List();
+ }
+}
diff --git a/src/Commands/QueryStashes.cs b/src/Commands/QueryStashes.cs
index b4067aaf..6d089f8e 100644
--- a/src/Commands/QueryStashes.cs
+++ b/src/Commands/QueryStashes.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace SourceGit.Commands
{
@@ -9,65 +8,41 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = "stash list --format=%H%n%P%n%ct%n%gd%n%s";
+ Args = "stash list --pretty=format:%H%n%ct%n%gd%n%s";
}
public List Result()
{
- var outs = new List();
- var rs = ReadToEnd();
- if (!rs.IsSuccess)
- return outs;
+ Exec();
+ return _stashes;
+ }
- var nextPartIdx = 0;
- var start = 0;
- var end = rs.StdOut.IndexOf('\n', start);
- while (end > 0)
+ protected override void OnReadline(string line)
+ {
+ switch (_nextLineIdx)
{
- var line = rs.StdOut.Substring(start, end - start);
-
- switch (nextPartIdx)
- {
- case 0:
- _current = new Models.Stash() { SHA = line };
- outs.Add(_current);
- break;
- case 1:
- ParseParent(line);
- break;
- case 2:
- _current.Time = ulong.Parse(line);
- break;
- case 3:
- _current.Name = line;
- break;
- case 4:
- _current.Message = line;
- break;
- }
-
- nextPartIdx++;
- if (nextPartIdx > 4)
- nextPartIdx = 0;
-
- start = end + 1;
- end = rs.StdOut.IndexOf('\n', start);
+ case 0:
+ _current = new Models.Stash() { SHA = line };
+ _stashes.Add(_current);
+ break;
+ case 1:
+ _current.Time = ulong.Parse(line);
+ break;
+ case 2:
+ _current.Name = line;
+ break;
+ case 3:
+ _current.Message = line;
+ break;
}
- if (start < rs.StdOut.Length)
- _current.Message = rs.StdOut.Substring(start);
-
- return outs;
- }
-
- private void ParseParent(string data)
- {
- if (data.Length < 8)
- return;
-
- _current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
+ _nextLineIdx++;
+ if (_nextLineIdx > 3)
+ _nextLineIdx = 0;
}
+ private readonly List _stashes = new List();
private Models.Stash _current = null;
+ private int _nextLineIdx = 0;
}
}
diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs
index 663c0ea0..5fd6e3d5 100644
--- a/src/Commands/QuerySubmodules.cs
+++ b/src/Commands/QuerySubmodules.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
@@ -7,12 +6,12 @@ namespace SourceGit.Commands
{
public partial class QuerySubmodules : Command
{
- [GeneratedRegex(@"^([U\-\+ ])([0-9a-f]+)\s(.*?)(\s\(.*\))?$")]
- private static partial Regex REG_FORMAT_STATUS();
+ [GeneratedRegex(@"^[\-\+ ][0-9a-f]+\s(.*)\s\(.*\)$")]
+ private static partial Regex REG_FORMAT1();
+ [GeneratedRegex(@"^[\-\+ ][0-9a-f]+\s(.*)$")]
+ private static partial Regex REG_FORMAT2();
[GeneratedRegex(@"^\s?[\w\?]{1,4}\s+(.+)$")]
- private static partial Regex REG_FORMAT_DIRTY();
- [GeneratedRegex(@"^submodule\.(\S*)\.(\w+)=(.*)$")]
- private static partial Regex REG_FORMAT_MODULE_INFO();
+ private static partial Regex REG_FORMAT_STATUS();
public QuerySubmodules(string repo)
{
@@ -25,118 +24,55 @@ namespace SourceGit.Commands
{
var submodules = new List();
var rs = ReadToEnd();
+ if (!rs.IsSuccess)
+ return submodules;
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- var map = new Dictionary();
- var needCheckLocalChanges = false;
+ var builder = new StringBuilder();
+ var lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
- var match = REG_FORMAT_STATUS().Match(line);
+ var match = REG_FORMAT1().Match(line);
if (match.Success)
{
- var stat = match.Groups[1].Value;
- var sha = match.Groups[2].Value;
- var path = match.Groups[3].Value;
+ var path = match.Groups[1].Value;
+ builder.Append($"\"{path}\" ");
+ submodules.Add(new Models.Submodule() { Path = path });
+ continue;
+ }
- var module = new Models.Submodule() { Path = path, SHA = sha };
- switch (stat[0])
- {
- case '-':
- module.Status = Models.SubmoduleStatus.NotInited;
- break;
- case '+':
- module.Status = Models.SubmoduleStatus.RevisionChanged;
- break;
- case 'U':
- module.Status = Models.SubmoduleStatus.Unmerged;
- break;
- default:
- module.Status = Models.SubmoduleStatus.Normal;
- needCheckLocalChanges = true;
- break;
- }
-
- map.Add(path, module);
- submodules.Add(module);
+ match = REG_FORMAT2().Match(line);
+ if (match.Success)
+ {
+ var path = match.Groups[1].Value;
+ builder.Append($"\"{path}\" ");
+ submodules.Add(new Models.Submodule() { Path = path });
}
}
if (submodules.Count > 0)
{
- Args = "config --file .gitmodules --list";
- rs = ReadToEnd();
- if (rs.IsSuccess)
- {
- var modules = new Dictionary();
- lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- {
- var match = REG_FORMAT_MODULE_INFO().Match(line);
- if (match.Success)
- {
- var name = match.Groups[1].Value;
- var key = match.Groups[2].Value;
- var val = match.Groups[3].Value;
-
- if (!modules.TryGetValue(name, out var m))
- {
- m = new ModuleInfo();
- modules.Add(name, m);
- }
-
- if (key.Equals("path", StringComparison.Ordinal))
- m.Path = val;
- else if (key.Equals("url", StringComparison.Ordinal))
- m.URL = val;
- }
- }
-
- foreach (var kv in modules)
- {
- if (map.TryGetValue(kv.Value.Path, out var m))
- m.URL = kv.Value.URL;
- }
- }
- }
-
- if (needCheckLocalChanges)
- {
- var builder = new StringBuilder();
- foreach (var kv in map)
- {
- if (kv.Value.Status == Models.SubmoduleStatus.Normal)
- {
- builder.Append('"');
- builder.Append(kv.Key);
- builder.Append("\" ");
- }
- }
-
- Args = $"--no-optional-locks status --porcelain -- {builder}";
+ Args = $"status -uno --porcelain -- {builder}";
rs = ReadToEnd();
if (!rs.IsSuccess)
return submodules;
- lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var dirty = new HashSet();
+ lines = rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
- var match = REG_FORMAT_DIRTY().Match(line);
+ var match = REG_FORMAT_STATUS().Match(line);
if (match.Success)
{
var path = match.Groups[1].Value;
- if (map.TryGetValue(path, out var m))
- m.Status = Models.SubmoduleStatus.Modified;
+ dirty.Add(path);
}
}
+
+ foreach (var submodule in submodules)
+ submodule.IsDirty = dirty.Contains(submodule.Path);
}
return submodules;
}
-
- private class ModuleInfo
- {
- public string Path { get; set; } = string.Empty;
- public string URL { get; set; } = string.Empty;
- }
}
}
diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs
index 4b706439..3aa20dc2 100644
--- a/src/Commands/QueryTags.cs
+++ b/src/Commands/QueryTags.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Commands
Context = repo;
WorkingDirectory = repo;
- Args = $"tag -l --format=\"{_boundary}%(refname)%00%(objecttype)%00%(objectname)%00%(*objectname)%00%(creatordate:unix)%00%(contents:subject)%0a%0a%(contents:body)\"";
+ Args = $"tag -l --sort=-creatordate --format=\"{_boundary}%(refname)%00%(objectname)%00%(*objectname)%00%(contents:subject)%0a%0a%(contents:body)\"";
}
public List Result()
@@ -25,21 +25,15 @@ namespace SourceGit.Commands
foreach (var record in records)
{
var subs = record.Split('\0', StringSplitOptions.None);
- if (subs.Length != 6)
+ if (subs.Length != 4)
continue;
- var name = subs[0].Substring(10);
- var message = subs[5].Trim();
- if (!string.IsNullOrEmpty(message) && message.Equals(name, StringComparison.Ordinal))
- message = null;
-
+ var message = subs[3].Trim();
tags.Add(new Models.Tag()
{
- Name = name,
- IsAnnotated = subs[1].Equals("tag", StringComparison.Ordinal),
- SHA = string.IsNullOrEmpty(subs[3]) ? subs[2] : subs[3],
- CreatorDate = ulong.Parse(subs[4]),
- Message = message,
+ Name = subs[0].Substring(10),
+ SHA = string.IsNullOrEmpty(subs[2]) ? subs[1] : subs[2],
+ Message = string.IsNullOrEmpty(message) ? null : message,
});
}
diff --git a/src/Commands/QueryTrackStatus.cs b/src/Commands/QueryTrackStatus.cs
index e7e1f1c9..0bf9746f 100644
--- a/src/Commands/QueryTrackStatus.cs
+++ b/src/Commands/QueryTrackStatus.cs
@@ -19,7 +19,7 @@ namespace SourceGit.Commands
if (!rs.IsSuccess)
return status;
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var lines = rs.StdOut.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
if (line[0] == '>')
diff --git a/src/Commands/QueryUpdatableSubmodules.cs b/src/Commands/QueryUpdatableSubmodules.cs
deleted file mode 100644
index 03f4a24d..00000000
--- a/src/Commands/QueryUpdatableSubmodules.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace SourceGit.Commands
-{
- public partial class QueryUpdatableSubmodules : Command
- {
- [GeneratedRegex(@"^([U\-\+ ])([0-9a-f]+)\s(.*?)(\s\(.*\))?$")]
- private static partial Regex REG_FORMAT_STATUS();
-
- public QueryUpdatableSubmodules(string repo)
- {
- WorkingDirectory = repo;
- Context = repo;
- Args = "submodule status";
- }
-
- public List Result()
- {
- var submodules = new List();
- var rs = ReadToEnd();
-
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
- foreach (var line in lines)
- {
- var match = REG_FORMAT_STATUS().Match(line);
- if (match.Success)
- {
- var stat = match.Groups[1].Value;
- var path = match.Groups[3].Value;
- if (!stat.StartsWith(' '))
- submodules.Add(path);
- }
- }
-
- return submodules;
- }
- }
-}
diff --git a/src/Commands/Reset.cs b/src/Commands/Reset.cs
index 6a54533b..da272135 100644
--- a/src/Commands/Reset.cs
+++ b/src/Commands/Reset.cs
@@ -1,7 +1,33 @@
-namespace SourceGit.Commands
+using System.Collections.Generic;
+using System.Text;
+
+namespace SourceGit.Commands
{
public class Reset : Command
{
+ public Reset(string repo)
+ {
+ WorkingDirectory = repo;
+ Context = repo;
+ Args = "reset";
+ }
+
+ public Reset(string repo, List changes)
+ {
+ WorkingDirectory = repo;
+ Context = repo;
+
+ var builder = new StringBuilder();
+ builder.Append("reset --");
+ foreach (var c in changes)
+ {
+ builder.Append(" \"");
+ builder.Append(c.Path);
+ builder.Append("\"");
+ }
+ Args = builder.ToString();
+ }
+
public Reset(string repo, string revision, string mode)
{
WorkingDirectory = repo;
diff --git a/src/Commands/Restore.cs b/src/Commands/Restore.cs
index 663ea975..7a363543 100644
--- a/src/Commands/Restore.cs
+++ b/src/Commands/Restore.cs
@@ -1,52 +1,29 @@
-using System.Text;
+using System.Collections.Generic;
+using System.Text;
namespace SourceGit.Commands
{
public class Restore : Command
{
- ///
- /// Only used for single staged change.
- ///
- ///
- ///
- public Restore(string repo, Models.Change stagedChange)
+ public Restore(string repo)
{
WorkingDirectory = repo;
Context = repo;
-
- var builder = new StringBuilder();
- builder.Append("restore --staged -- \"");
- builder.Append(stagedChange.Path);
- builder.Append('"');
-
- if (stagedChange.Index == Models.ChangeState.Renamed)
- {
- builder.Append(" \"");
- builder.Append(stagedChange.OriginalPath);
- builder.Append('"');
- }
-
- Args = builder.ToString();
+ Args = "restore . --source=HEAD --staged --worktree --recurse-submodules";
}
- ///
- /// Restore changes given in a path-spec file.
- ///
- ///
- ///
- ///
- public Restore(string repo, string pathspecFile, bool isStaged)
+ public Restore(string repo, List files, string extra)
{
WorkingDirectory = repo;
Context = repo;
- var builder = new StringBuilder();
+ StringBuilder builder = new StringBuilder();
builder.Append("restore ");
- builder.Append(isStaged ? "--staged " : "--worktree --recurse-submodules ");
- builder.Append("--pathspec-from-file=\"");
- builder.Append(pathspecFile);
- builder.Append('"');
-
+ if (!string.IsNullOrEmpty(extra))
+ builder.Append(extra).Append(" ");
+ builder.Append("--");
+ foreach (var f in files)
+ builder.Append(' ').Append('"').Append(f).Append('"');
Args = builder.ToString();
}
}
diff --git a/src/Commands/SaveChangesAsPatch.cs b/src/Commands/SaveChangesAsPatch.cs
index b10037a1..461bbfb5 100644
--- a/src/Commands/SaveChangesAsPatch.cs
+++ b/src/Commands/SaveChangesAsPatch.cs
@@ -37,19 +37,6 @@ namespace SourceGit.Commands
return true;
}
- public static bool ProcessStashChanges(string repo, List opts, string saveTo)
- {
- using (var sw = File.Create(saveTo))
- {
- foreach (var opt in opts)
- {
- if (!ProcessSingleChange(repo, opt, sw))
- return false;
- }
- }
- return true;
- }
-
private static bool ProcessSingleChange(string repo, Models.DiffOption opt, FileStream writer)
{
var starter = new ProcessStartInfo();
diff --git a/src/Commands/SaveRevisionFile.cs b/src/Commands/SaveRevisionFile.cs
index 550844ef..99e89093 100644
--- a/src/Commands/SaveRevisionFile.cs
+++ b/src/Commands/SaveRevisionFile.cs
@@ -13,8 +13,12 @@ namespace SourceGit.Commands
var isLFSFiltered = new IsLFSFiltered(repo, revision, file).Result();
if (isLFSFiltered)
{
- var pointerStream = QueryFileContent.Run(repo, revision, file);
- ExecCmd(repo, $"lfs smudge", saveTo, pointerStream);
+ var tmpFile = saveTo + ".tmp";
+ if (ExecCmd(repo, $"show {revision}:\"{file}\"", tmpFile))
+ {
+ ExecCmd(repo, $"lfs smudge", saveTo, tmpFile);
+ }
+ File.Delete(tmpFile);
}
else
{
@@ -22,7 +26,7 @@ namespace SourceGit.Commands
}
}
- private static bool ExecCmd(string repo, string args, string outputFile, Stream input = null)
+ private static bool ExecCmd(string repo, string args, string outputFile, string inputFile = null)
{
var starter = new ProcessStartInfo();
starter.WorkingDirectory = repo;
@@ -41,8 +45,21 @@ namespace SourceGit.Commands
{
var proc = new Process() { StartInfo = starter };
proc.Start();
- if (input != null)
- proc.StandardInput.Write(new StreamReader(input).ReadToEnd());
+
+ if (inputFile != null)
+ {
+ using (StreamReader sr = new StreamReader(inputFile))
+ {
+ while (true)
+ {
+ var line = sr.ReadLine();
+ if (line == null)
+ break;
+ proc.StandardInput.WriteLine(line);
+ }
+ }
+ }
+
proc.StandardOutput.BaseStream.CopyTo(sw);
proc.WaitForExit();
var rs = proc.ExitCode == 0;
diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs
index 7d1a269b..77f1af53 100644
--- a/src/Commands/Stash.cs
+++ b/src/Commands/Stash.cs
@@ -11,84 +11,72 @@ namespace SourceGit.Commands
Context = repo;
}
- public bool Push(string message, bool includeUntracked = true, bool keepIndex = false)
+ public bool Push(string message)
{
- var builder = new StringBuilder();
- builder.Append("stash push ");
- if (includeUntracked)
- builder.Append("--include-untracked ");
- if (keepIndex)
- builder.Append("--keep-index ");
- builder.Append("-m \"");
- builder.Append(message);
- builder.Append("\"");
-
- Args = builder.ToString();
+ Args = $"stash push -m \"{message}\"";
return Exec();
}
- public bool Push(string message, List changes, bool keepIndex)
+ public bool Push(List changes, string message, bool onlyStaged, bool keepIndex)
{
var builder = new StringBuilder();
- builder.Append("stash push --include-untracked ");
+ builder.Append("stash push ");
+ if (onlyStaged)
+ builder.Append("--staged ");
if (keepIndex)
builder.Append("--keep-index ");
builder.Append("-m \"");
builder.Append(message);
builder.Append("\" -- ");
- foreach (var c in changes)
- builder.Append($"\"{c.Path}\" ");
+ if (onlyStaged)
+ {
+ foreach (var c in changes)
+ builder.Append($"\"{c.Path}\" ");
+ }
+ else
+ {
+ var needAdd = new List();
+ foreach (var c in changes)
+ {
+ builder.Append($"\"{c.Path}\" ");
+
+ if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked)
+ {
+ needAdd.Add(c);
+ if (needAdd.Count > 10)
+ {
+ new Add(WorkingDirectory, needAdd).Exec();
+ needAdd.Clear();
+ }
+ }
+ }
+ if (needAdd.Count > 0)
+ {
+ new Add(WorkingDirectory, needAdd).Exec();
+ needAdd.Clear();
+ }
+ }
Args = builder.ToString();
return Exec();
}
- public bool Push(string message, string pathspecFromFile, bool keepIndex)
+ public bool Apply(string name)
{
- var builder = new StringBuilder();
- builder.Append("stash push --include-untracked --pathspec-from-file=\"");
- builder.Append(pathspecFromFile);
- builder.Append("\" ");
- if (keepIndex)
- builder.Append("--keep-index ");
- builder.Append("-m \"");
- builder.Append(message);
- builder.Append("\"");
-
- Args = builder.ToString();
- return Exec();
- }
-
- public bool PushOnlyStaged(string message, bool keepIndex)
- {
- var builder = new StringBuilder();
- builder.Append("stash push --staged ");
- if (keepIndex)
- builder.Append("--keep-index ");
- builder.Append("-m \"");
- builder.Append(message);
- builder.Append("\"");
- Args = builder.ToString();
- return Exec();
- }
-
- public bool Apply(string name, bool restoreIndex)
- {
- var opts = restoreIndex ? "--index" : string.Empty;
- Args = $"stash apply -q {opts} \"{name}\"";
+ Args = $"stash apply -q {name}";
return Exec();
}
public bool Pop(string name)
{
- Args = $"stash pop -q --index \"{name}\"";
+ Args = $"stash pop -q {name}";
return Exec();
}
public bool Drop(string name)
{
- Args = $"stash drop -q \"{name}\"";
+ Args = $"stash drop -q {name}";
return Exec();
}
diff --git a/src/Commands/Statistics.cs b/src/Commands/Statistics.cs
index e11c1740..511c43e8 100644
--- a/src/Commands/Statistics.cs
+++ b/src/Commands/Statistics.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace SourceGit.Commands
{
@@ -8,7 +8,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
- Args = $"log --date-order --branches --remotes -{max} --format=%ct$%aN±%aE";
+ Args = $"log --date-order --branches --remotes -{max} --pretty=format:\"%ct$%aN\"";
}
public Models.Statistics Result()
@@ -40,7 +40,7 @@ namespace SourceGit.Commands
if (dateEndIdx == -1)
return;
- var dateStr = line.AsSpan(0, dateEndIdx);
+ var dateStr = line.Substring(0, dateEndIdx);
if (double.TryParse(dateStr, out var date))
statistics.AddCommit(line.Substring(dateEndIdx + 1), date);
}
diff --git a/src/Commands/Submodule.cs b/src/Commands/Submodule.cs
index 025d035a..9a273703 100644
--- a/src/Commands/Submodule.cs
+++ b/src/Commands/Submodule.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text;
+using System;
namespace SourceGit.Commands
{
@@ -11,9 +10,10 @@ namespace SourceGit.Commands
Context = repo;
}
- public bool Add(string url, string relativePath, bool recursive)
+ public bool Add(string url, string relativePath, bool recursive, Action outputHandler)
{
- Args = $"-c protocol.file.allow=always submodule add \"{url}\" \"{relativePath}\"";
+ _outputHandler = outputHandler;
+ Args = $"submodule add {url} \"{relativePath}\"";
if (!Exec())
return false;
@@ -29,38 +29,38 @@ namespace SourceGit.Commands
}
}
- public bool Update(List modules, bool init, bool recursive, bool useRemote = false)
+ public bool Update(string module, bool init, bool recursive, bool useRemote, Action outputHandler)
{
- var builder = new StringBuilder();
- builder.Append("submodule update");
+ Args = "submodule update";
if (init)
- builder.Append(" --init");
+ Args += " --init";
if (recursive)
- builder.Append(" --recursive");
+ Args += " --recursive";
if (useRemote)
- builder.Append(" --remote");
- if (modules.Count > 0)
- {
- builder.Append(" --");
- foreach (var module in modules)
- builder.Append($" \"{module}\"");
- }
+ Args += " --remote";
+ if (!string.IsNullOrEmpty(module))
+ Args += $" -- \"{module}\"";
- Args = builder.ToString();
+ _outputHandler = outputHandler;
return Exec();
}
- public bool Deinit(string module, bool force)
+ public bool Delete(string relativePath)
{
- Args = force ? $"submodule deinit -f -- \"{module}\"" : $"submodule deinit -- \"{module}\"";
+ Args = $"submodule deinit -f \"{relativePath}\"";
+ if (!Exec())
+ return false;
+
+ Args = $"rm -rf \"{relativePath}\"";
return Exec();
}
- public bool Delete(string module)
+ protected override void OnReadline(string line)
{
- Args = $"rm -rf \"{module}\"";
- return Exec();
+ _outputHandler?.Invoke(line);
}
+
+ private Action _outputHandler;
}
}
diff --git a/src/Commands/Tag.cs b/src/Commands/Tag.cs
index 017afea0..fa11e366 100644
--- a/src/Commands/Tag.cs
+++ b/src/Commands/Tag.cs
@@ -1,51 +1,59 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
namespace SourceGit.Commands
{
public static class Tag
{
- public static bool Add(string repo, string name, string basedOn, Models.ICommandLog log)
+ public static bool Add(string repo, string name, string basedOn)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
- cmd.Args = $"tag --no-sign {name} {basedOn}";
- cmd.Log = log;
+ cmd.Args = $"tag {name} {basedOn}";
return cmd.Exec();
}
- public static bool Add(string repo, string name, string basedOn, string message, bool sign, Models.ICommandLog log)
+ public static bool Add(string repo, string name, string basedOn, string message, bool sign)
{
var param = sign ? "--sign -a" : "--no-sign -a";
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.Args = $"tag {param} {name} {basedOn} ";
- cmd.Log = log;
if (!string.IsNullOrEmpty(message))
{
string tmp = Path.GetTempFileName();
File.WriteAllText(tmp, message);
cmd.Args += $"-F \"{tmp}\"";
-
- var succ = cmd.Exec();
- File.Delete(tmp);
- return succ;
+ }
+ else
+ {
+ cmd.Args += $"-m {name}";
}
- cmd.Args += $"-m {name}";
return cmd.Exec();
}
- public static bool Delete(string repo, string name, Models.ICommandLog log)
+ public static bool Delete(string repo, string name, List remotes)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.Args = $"tag --delete {name}";
- cmd.Log = log;
- return cmd.Exec();
+ if (!cmd.Exec())
+ return false;
+
+ if (remotes != null)
+ {
+ foreach (var r in remotes)
+ {
+ new Push(repo, r.Name, name, true).Exec();
+ }
+ }
+
+ return true;
}
}
}
diff --git a/src/Commands/UnstageChangesForAmend.cs b/src/Commands/UnstageChangesForAmend.cs
index 19def067..c930f136 100644
--- a/src/Commands/UnstageChangesForAmend.cs
+++ b/src/Commands/UnstageChangesForAmend.cs
@@ -23,11 +23,13 @@ namespace SourceGit.Commands
_patchBuilder.Append(c.DataForAmend.ObjectHash);
_patchBuilder.Append("\t");
_patchBuilder.Append(c.OriginalPath);
+ _patchBuilder.Append("\n");
}
else if (c.Index == Models.ChangeState.Added)
{
_patchBuilder.Append("0 0000000000000000000000000000000000000000\t");
_patchBuilder.Append(c.Path);
+ _patchBuilder.Append("\n");
}
else if (c.Index == Models.ChangeState.Deleted)
{
@@ -35,6 +37,7 @@ namespace SourceGit.Commands
_patchBuilder.Append(c.DataForAmend.ObjectHash);
_patchBuilder.Append("\t");
_patchBuilder.Append(c.Path);
+ _patchBuilder.Append("\n");
}
else
{
@@ -43,9 +46,8 @@ namespace SourceGit.Commands
_patchBuilder.Append(c.DataForAmend.ObjectHash);
_patchBuilder.Append("\t");
_patchBuilder.Append(c.Path);
+ _patchBuilder.Append("\n");
}
-
- _patchBuilder.Append("\n");
}
}
diff --git a/src/Commands/UpdateRef.cs b/src/Commands/UpdateRef.cs
new file mode 100644
index 00000000..ba1b3d2f
--- /dev/null
+++ b/src/Commands/UpdateRef.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace SourceGit.Commands
+{
+ public class UpdateRef : Command
+ {
+ public UpdateRef(string repo, string refName, string toRevision, Action outputHandler)
+ {
+ _outputHandler = outputHandler;
+
+ WorkingDirectory = repo;
+ Context = repo;
+ Args = $"update-ref {refName} {toRevision}";
+ }
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private Action _outputHandler;
+ }
+}
diff --git a/src/Commands/Version.cs b/src/Commands/Version.cs
new file mode 100644
index 00000000..ed7c6892
--- /dev/null
+++ b/src/Commands/Version.cs
@@ -0,0 +1,19 @@
+namespace SourceGit.Commands
+{
+ public class Version : Command
+ {
+ public Version()
+ {
+ Args = "--version";
+ RaiseError = false;
+ }
+
+ public string Query()
+ {
+ var rs = ReadToEnd();
+ if (!rs.IsSuccess || string.IsNullOrWhiteSpace(rs.StdOut))
+ return string.Empty;
+ return rs.StdOut.Trim().Substring("git version ".Length);
+ }
+ }
+}
diff --git a/src/Commands/Worktree.cs b/src/Commands/Worktree.cs
index 1198a443..7516b1e3 100644
--- a/src/Commands/Worktree.cs
+++ b/src/Commands/Worktree.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
namespace SourceGit.Commands
{
@@ -21,13 +20,12 @@ namespace SourceGit.Commands
var last = null as Models.Worktree;
if (rs.IsSuccess)
{
- var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+ var lines = rs.StdOut.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
foreach (var line in lines)
{
if (line.StartsWith("worktree ", StringComparison.Ordinal))
{
last = new Models.Worktree() { FullPath = line.Substring(9).Trim() };
- last.RelativePath = Path.GetRelativePath(WorkingDirectory, last.FullPath);
worktrees.Add(last);
}
else if (line.StartsWith("bare", StringComparison.Ordinal))
@@ -56,7 +54,7 @@ namespace SourceGit.Commands
return worktrees;
}
- public bool Add(string fullpath, string name, bool createNew, string tracking)
+ public bool Add(string fullpath, string name, bool createNew, string tracking, Action outputHandler)
{
Args = "worktree add ";
@@ -75,15 +73,15 @@ namespace SourceGit.Commands
if (!string.IsNullOrEmpty(tracking))
Args += tracking;
- else if (!string.IsNullOrEmpty(name) && !createNew)
- Args += name;
+ _outputHandler = outputHandler;
return Exec();
}
- public bool Prune()
+ public bool Prune(Action outputHandler)
{
Args = "worktree prune -v";
+ _outputHandler = outputHandler;
return Exec();
}
@@ -99,14 +97,22 @@ namespace SourceGit.Commands
return Exec();
}
- public bool Remove(string fullpath, bool force)
+ public bool Remove(string fullpath, bool force, Action outputHandler)
{
if (force)
Args = $"worktree remove -f \"{fullpath}\"";
else
Args = $"worktree remove \"{fullpath}\"";
+ _outputHandler = outputHandler;
return Exec();
}
+
+ protected override void OnReadline(string line)
+ {
+ _outputHandler?.Invoke(line);
+ }
+
+ private Action _outputHandler = null;
}
}
diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index 3563fb37..2d738700 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -1,5 +1,4 @@
using Avalonia.Data.Converters;
-using Avalonia.Media;
namespace SourceGit.Converters
{
@@ -7,8 +6,5 @@ namespace SourceGit.Converters
{
public static readonly FuncValueConverter ToPageTabWidth =
new FuncValueConverter(x => x ? 200 : double.NaN);
-
- public static readonly FuncValueConverter IsBoldToFontWeight =
- new FuncValueConverter(x => x ? FontWeight.Bold : FontWeight.Normal);
}
}
diff --git a/src/Converters/IntConverters.cs b/src/Converters/IntConverters.cs
index f21c5d24..17a88da2 100644
--- a/src/Converters/IntConverters.cs
+++ b/src/Converters/IntConverters.cs
@@ -23,10 +23,10 @@ namespace SourceGit.Converters
new FuncValueConverter(v => v != 1);
public static readonly FuncValueConverter IsSubjectLengthBad =
- new FuncValueConverter(v => v > ViewModels.Preferences.Instance.SubjectGuideLength);
+ new FuncValueConverter(v => v > ViewModels.Preference.Instance.SubjectGuideLength);
public static readonly FuncValueConverter IsSubjectLengthGood =
- new FuncValueConverter(v => v <= ViewModels.Preferences.Instance.SubjectGuideLength);
+ new FuncValueConverter(v => v <= ViewModels.Preference.Instance.SubjectGuideLength);
public static readonly FuncValueConverter ToTreeMargin =
new FuncValueConverter(v => new Thickness(v * 16, 0, 0, 0));
diff --git a/src/Converters/ListConverters.cs b/src/Converters/ListConverters.cs
index 6f3ae98b..81cac8b7 100644
--- a/src/Converters/ListConverters.cs
+++ b/src/Converters/ListConverters.cs
@@ -7,11 +7,8 @@ namespace SourceGit.Converters
{
public static class ListConverters
{
- public static readonly FuncValueConverter Count =
- new FuncValueConverter(v => v == null ? "0" : $"{v.Count}");
-
public static readonly FuncValueConverter ToCount =
- new FuncValueConverter(v => v == null ? "(0)" : $"({v.Count})");
+ new FuncValueConverter(v => v == null ? " (0)" : $" ({v.Count})");
public static readonly FuncValueConverter IsNullOrEmpty =
new FuncValueConverter(v => v == null || v.Count == 0);
diff --git a/src/Converters/ObjectConverters.cs b/src/Converters/ObjectConverters.cs
deleted file mode 100644
index f7c57764..00000000
--- a/src/Converters/ObjectConverters.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Data.Converters;
-
-namespace SourceGit.Converters
-{
- public static class ObjectConverters
- {
- public class IsTypeOfConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- if (value == null || parameter == null)
- return false;
-
- return value.GetType().IsAssignableTo((Type)parameter);
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return new NotImplementedException();
- }
- }
-
- public static readonly IsTypeOfConverter IsTypeOf = new IsTypeOfConverter();
- }
-}
diff --git a/src/Converters/PathConverters.cs b/src/Converters/PathConverters.cs
index ac1e61e5..dd7cfa49 100644
--- a/src/Converters/PathConverters.cs
+++ b/src/Converters/PathConverters.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.IO;
using Avalonia.Data.Converters;
@@ -22,7 +22,7 @@ namespace SourceGit.Converters
var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length;
if (v.StartsWith(home, StringComparison.Ordinal))
- return $"~{v.AsSpan(prefixLen)}";
+ return "~" + v.Substring(prefixLen);
return v;
});
diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index bcadfae9..585e0f02 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -1,12 +1,13 @@
using System;
using System.Globalization;
+using System.Text.RegularExpressions;
using Avalonia.Data.Converters;
using Avalonia.Styling;
namespace SourceGit.Converters
{
- public static class StringConverters
+ public static partial class StringConverters
{
public class ToLocaleConverter : IValueConverter
{
@@ -67,6 +68,22 @@ namespace SourceGit.Converters
public static readonly FuncValueConverter ToShortSHA =
new FuncValueConverter(v => v == null ? string.Empty : (v.Length > 10 ? v.Substring(0, 10) : v));
+ public static readonly FuncValueConverter UnderRecommendGitVersion =
+ new(v =>
+ {
+ var match = REG_GIT_VERSION().Match(v ?? "");
+ if (match.Success)
+ {
+ var major = int.Parse(match.Groups[1].Value);
+ var minor = int.Parse(match.Groups[2].Value);
+ var build = int.Parse(match.Groups[3].Value);
+
+ return new Version(major, minor, build) < MINIMAL_GIT_VERSION;
+ }
+
+ return true;
+ });
+
public static readonly FuncValueConverter TrimRefsPrefix =
new FuncValueConverter(v =>
{
@@ -79,10 +96,9 @@ namespace SourceGit.Converters
return v;
});
- public static readonly FuncValueConverter ContainsSpaces =
- new FuncValueConverter(v => v != null && v.Contains(' '));
+ [GeneratedRegex(@"^[\s\w]*(\d+)\.(\d+)[\.\-](\d+).*$")]
+ private static partial Regex REG_GIT_VERSION();
- public static readonly FuncValueConverter IsNotNullOrWhitespace =
- new FuncValueConverter(v => v != null && v.Trim().Length > 0);
+ private static readonly Version MINIMAL_GIT_VERSION = new Version(2, 23, 0);
}
}
diff --git a/src/Models/ApplyWhiteSpaceMode.cs b/src/Models/ApplyWhiteSpaceMode.cs
index aad45f57..6fbce0b2 100644
--- a/src/Models/ApplyWhiteSpaceMode.cs
+++ b/src/Models/ApplyWhiteSpaceMode.cs
@@ -2,22 +2,14 @@
{
public class ApplyWhiteSpaceMode
{
- public static readonly ApplyWhiteSpaceMode[] Supported =
- [
- new ApplyWhiteSpaceMode("No Warn", "Turns off the trailing whitespace warning", "nowarn"),
- new ApplyWhiteSpaceMode("Warn", "Outputs warnings for a few such errors, but applies", "warn"),
- new ApplyWhiteSpaceMode("Error", "Raise errors and refuses to apply the patch", "error"),
- new ApplyWhiteSpaceMode("Error All", "Similar to 'error', but shows more", "error-all"),
- ];
-
public string Name { get; set; }
public string Desc { get; set; }
public string Arg { get; set; }
public ApplyWhiteSpaceMode(string n, string d, string a)
{
- Name = n;
- Desc = d;
+ Name = App.Text(n);
+ Desc = App.Text(d);
Arg = a;
}
}
diff --git a/src/Models/AvatarManager.cs b/src/Models/AvatarManager.cs
index fa07975d..9f0bceaf 100644
--- a/src/Models/AvatarManager.cs
+++ b/src/Models/AvatarManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
@@ -17,7 +17,7 @@ namespace SourceGit.Models
{
public interface IAvatarHost
{
- void OnAvatarResourceChanged(string email, Bitmap image);
+ void OnAvatarResourceChanged(string email);
}
public partial class AvatarManager
@@ -38,7 +38,7 @@ namespace SourceGit.Models
[GeneratedRegex(@"^(?:(\d+)\+)?(.+?)@.+\.github\.com$")]
private static partial Regex REG_GITHUB_USER_EMAIL();
- private readonly Lock _synclock = new();
+ private object _synclock = new object();
private string _storePath;
private List _avatars = new List();
private Dictionary _resources = new Dictionary();
@@ -119,7 +119,7 @@ namespace SourceGit.Models
Dispatcher.UIThread.InvokeAsync(() =>
{
_resources[email] = img;
- NotifyResourceChanged(email, img);
+ NotifyResourceChanged(email);
});
}
@@ -144,13 +144,14 @@ namespace SourceGit.Models
if (_defaultAvatars.Contains(email))
return null;
- _resources.Remove(email);
+ if (_resources.ContainsKey(email))
+ _resources.Remove(email);
var localFile = Path.Combine(_storePath, GetEmailHash(email));
if (File.Exists(localFile))
File.Delete(localFile);
- NotifyResourceChanged(email, null);
+ NotifyResourceChanged(email);
}
else
{
@@ -178,40 +179,13 @@ namespace SourceGit.Models
lock (_synclock)
{
- _requesting.Add(email);
+ if (!_requesting.Contains(email))
+ _requesting.Add(email);
}
return null;
}
- public void SetFromLocal(string email, string file)
- {
- try
- {
- Bitmap image = null;
-
- using (var stream = File.OpenRead(file))
- {
- image = Bitmap.DecodeToWidth(stream, 128);
- }
-
- if (image == null)
- return;
-
- _resources[email] = image;
-
- _requesting.Remove(email);
-
- var store = Path.Combine(_storePath, GetEmailHash(email));
- File.Copy(file, store, true);
- NotifyResourceChanged(email, image);
- }
- catch
- {
- // ignore
- }
- }
-
private void LoadDefaultAvatar(string key, string img)
{
var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/Images/{img}", UriKind.RelativeOrAbsolute));
@@ -222,17 +196,19 @@ namespace SourceGit.Models
private string GetEmailHash(string email)
{
var lowered = email.ToLower(CultureInfo.CurrentCulture).Trim();
- var hash = MD5.HashData(Encoding.Default.GetBytes(lowered));
- var builder = new StringBuilder(hash.Length * 2);
+ var hash = MD5.Create().ComputeHash(Encoding.Default.GetBytes(lowered));
+ var builder = new StringBuilder();
foreach (var c in hash)
builder.Append(c.ToString("x2"));
return builder.ToString();
}
- private void NotifyResourceChanged(string email, Bitmap image)
+ private void NotifyResourceChanged(string email)
{
foreach (var avatar in _avatars)
- avatar.OnAvatarResourceChanged(email, image);
+ {
+ avatar.OnAvatarResourceChanged(email);
+ }
}
}
}
diff --git a/src/Models/Bisect.cs b/src/Models/Bisect.cs
deleted file mode 100644
index 2ed8beb2..00000000
--- a/src/Models/Bisect.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace SourceGit.Models
-{
- public enum BisectState
- {
- None = 0,
- WaitingForRange,
- Detecting,
- }
-
- [Flags]
- public enum BisectCommitFlag
- {
- None = 0,
- Good = 1 << 0,
- Bad = 1 << 1,
- }
-
- public class Bisect
- {
- public HashSet Bads
- {
- get;
- set;
- } = [];
-
- public HashSet Goods
- {
- get;
- set;
- } = [];
- }
-}
diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs
index 7146da3f..0ba320c1 100644
--- a/src/Models/Branch.cs
+++ b/src/Models/Branch.cs
@@ -23,17 +23,10 @@ namespace SourceGit.Models
}
}
- public enum BranchSortMode
- {
- Name = 0,
- CommitterDate,
- }
-
public class Branch
{
public string Name { get; set; }
public string FullName { get; set; }
- public ulong CommitterDate { get; set; }
public string Head { get; set; }
public bool IsLocal { get; set; }
public bool IsCurrent { get; set; }
@@ -41,7 +34,6 @@ namespace SourceGit.Models
public string Upstream { get; set; }
public BranchTrackStatus TrackStatus { get; set; }
public string Remote { get; set; }
- public bool IsUpstreamGone { get; set; }
public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
}
diff --git a/src/Models/Change.cs b/src/Models/Change.cs
index 129678be..36fe20ac 100644
--- a/src/Models/Change.cs
+++ b/src/Models/Change.cs
@@ -18,27 +18,14 @@ namespace SourceGit.Models
Deleted,
Renamed,
Copied,
- Untracked,
- Conflicted,
- }
-
- public enum ConflictReason
- {
- None,
- BothDeleted,
- AddedByUs,
- DeletedByThem,
- AddedByThem,
- DeletedByUs,
- BothAdded,
- BothModified,
+ Unmerged,
+ Untracked
}
public class ChangeDataForAmend
{
public string FileMode { get; set; } = "";
public string ObjectHash { get; set; } = "";
- public string ParentSHA { get; set; } = "";
}
public class Change
@@ -48,14 +35,20 @@ namespace SourceGit.Models
public string Path { get; set; } = "";
public string OriginalPath { get; set; } = "";
public ChangeDataForAmend DataForAmend { get; set; } = null;
- public ConflictReason ConflictReason { get; set; } = ConflictReason.None;
- public bool IsConflicted => WorkTree == ChangeState.Conflicted;
- public string ConflictMarker => CONFLICT_MARKERS[(int)ConflictReason];
- public string ConflictDesc => CONFLICT_DESCS[(int)ConflictReason];
-
- public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree];
- public string IndexDesc => TYPE_DESCS[(int)Index];
+ public bool IsConflit
+ {
+ get
+ {
+ if (Index == ChangeState.Unmerged || WorkTree == ChangeState.Unmerged)
+ return true;
+ if (Index == ChangeState.Added && WorkTree == ChangeState.Added)
+ return true;
+ if (Index == ChangeState.Deleted && WorkTree == ChangeState.Deleted)
+ return true;
+ return false;
+ }
+ }
public void Set(ChangeState index, ChangeState workTree = ChangeState.None)
{
@@ -83,44 +76,8 @@ namespace SourceGit.Models
if (Path[0] == '"')
Path = Path.Substring(1, Path.Length - 2);
-
if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"')
OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2);
}
-
- private static readonly string[] TYPE_DESCS =
- [
- "Unknown",
- "Modified",
- "Type Changed",
- "Added",
- "Deleted",
- "Renamed",
- "Copied",
- "Untracked",
- "Conflict"
- ];
- private static readonly string[] CONFLICT_MARKERS =
- [
- string.Empty,
- "DD",
- "AU",
- "UD",
- "UA",
- "DU",
- "AA",
- "UU"
- ];
- private static readonly string[] CONFLICT_DESCS =
- [
- string.Empty,
- "Both deleted",
- "Added by us",
- "Deleted by them",
- "Added by them",
- "Deleted by us",
- "Both added",
- "Both modified"
- ];
}
}
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index f0f4b39b..534cf5bb 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -8,19 +8,13 @@ namespace SourceGit.Models
{
public enum CommitSearchMethod
{
- BySHA = 0,
- ByAuthor,
- ByCommitter,
+ ByUser,
ByMessage,
ByFile,
- ByContent,
}
public class Commit
{
- // As retrieved by: git mktree Parents { get; set; } = new();
- public List Decorators { get; set; } = new();
+ public List Parents { get; set; } = new List();
+ public List Decorators { get; set; } = new List();
public bool HasDecorators => Decorators.Count > 0;
- public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
- public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
- public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
- public string CommitterTimeShortStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
+ public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
+ public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
+ public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd");
public bool IsMerged { get; set; } = false;
public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;
@@ -49,7 +42,7 @@ namespace SourceGit.Models
public int Color { get; set; } = 0;
public double Opacity => IsMerged ? 1 : OpacityForNotMerged;
public FontWeight FontWeight => IsCurrentHead ? FontWeight.Bold : FontWeight.Regular;
- public Thickness Margin { get; set; } = new(0);
+ public Thickness Margin { get; set; } = new Thickness(0);
public IBrush Brush => CommitGraph.Pens[Color].Brush;
public void ParseDecorators(string data)
@@ -113,14 +106,14 @@ namespace SourceGit.Models
if (l.Type != r.Type)
return (int)l.Type - (int)r.Type;
else
- return NumericSort.Compare(l.Name, r.Name);
+ return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
});
}
}
- public class CommitFullMessage
+ public class CommitWithMessage
{
- public string Message { get; set; } = string.Empty;
- public InlineElementCollector Inlines { get; set; } = new();
+ public Commit Commit { get; set; } = new Commit();
+ public string Message { get; set; } = "";
}
}
diff --git a/src/Models/CommitGraph.cs b/src/Models/CommitGraph.cs
index 01488656..31f5a40e 100644
--- a/src/Models/CommitGraph.cs
+++ b/src/Models/CommitGraph.cs
@@ -25,11 +25,10 @@ namespace SourceGit.Models
s_penCount = colors.Count;
}
- public class Path(int color, bool isMerged)
+ public class Path(int color)
{
public List Points { get; } = [];
public int Color { get; } = color;
- public bool IsMerged { get; } = isMerged;
}
public class Link
@@ -38,7 +37,6 @@ namespace SourceGit.Models
public Point Control;
public Point End;
public int Color;
- public bool IsMerged;
}
public enum DotType
@@ -53,7 +51,6 @@ namespace SourceGit.Models
public DotType Type;
public Point Center;
public int Color;
- public bool IsMerged;
}
public List Paths { get; } = [];
@@ -64,14 +61,14 @@ namespace SourceGit.Models
{
const double unitWidth = 12;
const double halfWidth = 6;
- const double unitHeight = 1;
- const double halfHeight = 0.5;
+ const double unitHeight = 28;
+ const double halfHeight = 14;
var temp = new CommitGraph();
var unsolved = new List();
var ended = new List();
var offsetY = -halfHeight;
- var colorPicker = new ColorPicker();
+ var colorIdx = 0;
foreach (var commit in commits)
{
@@ -111,6 +108,7 @@ namespace SourceGit.Models
}
isMerged = isMerged || l.IsMerged;
+ major.IsMerged = isMerged;
}
else
{
@@ -121,35 +119,28 @@ namespace SourceGit.Models
// Remove ended curves from unsolved
foreach (var l in ended)
- {
- colorPicker.Recycle(l.Path.Color);
unsolved.Remove(l);
- }
ended.Clear();
- // If no path found, create new curve for branch head
- // Otherwise, create new curve for new merged commit
+ // Create new curve for branch head
if (major == null)
{
offsetX += unitWidth;
if (commit.Parents.Count > 0)
{
- major = new PathHelper(commit.Parents[0], isMerged, colorPicker.Next(), new Point(offsetX, offsetY));
+ major = new PathHelper(commit.Parents[0], isMerged, colorIdx, new Point(offsetX, offsetY));
unsolved.Add(major);
temp.Paths.Add(major.Path);
}
- }
- else if (isMerged && !major.IsMerged && commit.Parents.Count > 0)
- {
- major.ReplaceMerged();
- temp.Paths.Add(major.Path);
+
+ colorIdx = (colorIdx + 1) % s_penCount;
}
// Calculate link position of this commit.
var position = new Point(major?.LastX ?? offsetX, offsetY);
var dotColor = major?.Path.Color ?? 0;
- var anchor = new Dot() { Center = position, Color = dotColor, IsMerged = isMerged };
+ var anchor = new Dot() { Center = position, Color = dotColor };
if (commit.IsCurrentHead)
anchor.Type = DotType.Head;
else if (commit.Parents.Count > 1)
@@ -167,20 +158,16 @@ namespace SourceGit.Models
var parent = unsolved.Find(x => x.Next.Equals(parentHash, StringComparison.Ordinal));
if (parent != null)
{
- if (isMerged && !parent.IsMerged)
- {
- parent.Goto(parent.LastX, offsetY + halfHeight, halfHeight);
- parent.ReplaceMerged();
- temp.Paths.Add(parent.Path);
- }
+ // Try to change the merge state of linked graph
+ if (isMerged)
+ parent.IsMerged = true;
temp.Links.Add(new Link
{
Start = position,
End = new Point(parent.LastX, offsetY + halfHeight),
Control = new Point(parent.LastX, position.Y),
- Color = parent.Path.Color,
- IsMerged = isMerged,
+ Color = parent.Path.Color
});
}
else
@@ -188,9 +175,10 @@ namespace SourceGit.Models
offsetX += unitWidth;
// Create new curve for parent commit that not includes before
- var l = new PathHelper(parentHash, isMerged, colorPicker.Next(), position, new Point(offsetX, position.Y + halfHeight));
+ var l = new PathHelper(parentHash, isMerged, colorIdx, position, new Point(offsetX, position.Y + halfHeight));
unsolved.Add(l);
temp.Paths.Add(l.Path);
+ colorIdx = (colorIdx + 1) % s_penCount;
}
}
}
@@ -217,53 +205,32 @@ namespace SourceGit.Models
return temp;
}
- private class ColorPicker
- {
- public int Next()
- {
- if (_colorsQueue.Count == 0)
- {
- for (var i = 0; i < s_penCount; i++)
- _colorsQueue.Enqueue(i);
- }
-
- return _colorsQueue.Dequeue();
- }
-
- public void Recycle(int idx)
- {
- if (!_colorsQueue.Contains(idx))
- _colorsQueue.Enqueue(idx);
- }
-
- private Queue _colorsQueue = new Queue();
- }
-
private class PathHelper
{
- public Path Path { get; private set; }
+ public Path Path { get; }
public string Next { get; set; }
+ public bool IsMerged { get; set; }
public double LastX { get; private set; }
- public bool IsMerged => Path.IsMerged;
-
public PathHelper(string next, bool isMerged, int color, Point start)
{
Next = next;
+ IsMerged = isMerged;
LastX = start.X;
_lastY = start.Y;
- Path = new Path(color, isMerged);
+ Path = new Path(color);
Path.Points.Add(start);
}
public PathHelper(string next, bool isMerged, int color, Point start, Point to)
{
Next = next;
+ IsMerged = isMerged;
LastX = to.X;
_lastY = to.Y;
- Path = new Path(color, isMerged);
+ Path = new Path(color);
Path.Points.Add(start);
Path.Points.Add(to);
}
@@ -343,19 +310,6 @@ namespace SourceGit.Models
_lastY = y;
}
- ///
- /// End the current path and create a new from the end.
- ///
- public void ReplaceMerged()
- {
- var color = Path.Color;
- Add(LastX, _lastY);
-
- Path = new Path(color, true);
- Path.Points.Add(new Point(LastX, _lastY));
- _endY = 0;
- }
-
private void Add(double x, double y)
{
if (_endY < y)
@@ -373,6 +327,7 @@ namespace SourceGit.Models
private static readonly List s_defaultPenColors = [
Colors.Orange,
Colors.ForestGreen,
+ Colors.Gray,
Colors.Turquoise,
Colors.Olive,
Colors.Magenta,
diff --git a/src/Models/CommitLink.cs b/src/Models/CommitLink.cs
index 2891e5d6..955779a8 100644
--- a/src/Models/CommitLink.cs
+++ b/src/Models/CommitLink.cs
@@ -1,49 +1,8 @@
-using System;
-using System.Collections.Generic;
-
-namespace SourceGit.Models
+namespace SourceGit.Models
{
public class CommitLink
{
public string Name { get; set; } = null;
public string URLPrefix { get; set; } = null;
-
- public CommitLink(string name, string prefix)
- {
- Name = name;
- URLPrefix = prefix;
- }
-
- public static List Get(List remotes)
- {
- var outs = new List();
-
- foreach (var remote in remotes)
- {
- if (remote.TryGetVisitURL(out var url))
- {
- var trimmedUrl = url.AsSpan();
- if (url.EndsWith(".git"))
- trimmedUrl = url.AsSpan(0, url.Length - 4);
-
- if (url.StartsWith("https://github.com/", StringComparison.Ordinal))
- outs.Add(new($"Github ({trimmedUrl.Slice(19)})", $"{url}/commit/"));
- else if (url.StartsWith("https://gitlab.", StringComparison.Ordinal))
- outs.Add(new($"GitLab ({trimmedUrl.Slice(trimmedUrl.Slice(15).IndexOf('/') + 16)})", $"{url}/-/commit/"));
- else if (url.StartsWith("https://gitee.com/", StringComparison.Ordinal))
- outs.Add(new($"Gitee ({trimmedUrl.Slice(18)})", $"{url}/commit/"));
- else if (url.StartsWith("https://bitbucket.org/", StringComparison.Ordinal))
- outs.Add(new($"BitBucket ({trimmedUrl.Slice(22)})", $"{url}/commits/"));
- else if (url.StartsWith("https://codeberg.org/", StringComparison.Ordinal))
- outs.Add(new($"Codeberg ({trimmedUrl.Slice(21)})", $"{url}/commit/"));
- else if (url.StartsWith("https://gitea.org/", StringComparison.Ordinal))
- outs.Add(new($"Gitea ({trimmedUrl.Slice(18)})", $"{url}/commit/"));
- else if (url.StartsWith("https://git.sr.ht/", StringComparison.Ordinal))
- outs.Add(new($"sourcehut ({trimmedUrl.Slice(18)})", $"{url}/commit/"));
- }
- }
-
- return outs;
- }
}
}
diff --git a/src/Models/CommitTemplate.cs b/src/Models/CommitTemplate.cs
index 3f331543..56e1992c 100644
--- a/src/Models/CommitTemplate.cs
+++ b/src/Models/CommitTemplate.cs
@@ -4,7 +4,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.Models
{
- public class CommitTemplate : ObservableObject
+ public partial class CommitTemplate : ObservableObject
{
public string Name
{
diff --git a/src/Models/ConventionalCommitType.cs b/src/Models/ConventionalCommitType.cs
index 531a16c0..4fb61d87 100644
--- a/src/Models/ConventionalCommitType.cs
+++ b/src/Models/ConventionalCommitType.cs
@@ -4,28 +4,23 @@ namespace SourceGit.Models
{
public class ConventionalCommitType
{
- public string Name { get; set; }
- public string Type { get; set; }
- public string Description { get; set; }
+ public string Type { get; set; } = string.Empty;
+ public string Description { get; set; } = string.Empty;
- public static readonly List Supported = [
- new("Features", "feat", "Adding a new feature"),
- new("Bug Fixes", "fix", "Fixing a bug"),
- new("Work In Progress", "wip", "Still being developed and not yet complete"),
- new("Reverts", "revert", "Undoing a previous commit"),
- new("Code Refactoring", "refactor", "Restructuring code without changing its external behavior"),
- new("Performance Improvements", "perf", "Improves performance"),
- new("Builds", "build", "Changes that affect the build system or external dependencies"),
- new("Continuous Integrations", "ci", "Changes to CI configuration files and scripts"),
- new("Documentations", "docs", "Updating documentation"),
- new("Styles", "style", "Elements or code styles without changing the code logic"),
- new("Tests", "test", "Adding or updating tests"),
- new("Chores", "chore", "Other changes that don't modify src or test files"),
- ];
-
- public ConventionalCommitType(string name, string type, string description)
+ public static readonly List Supported = new List()
+ {
+ new ConventionalCommitType("feat", "Adding a new feature"),
+ new ConventionalCommitType("fix", "Fixing a bug"),
+ new ConventionalCommitType("docs", "Updating documentation"),
+ new ConventionalCommitType("style", "Elements or code styles without changing the code logic"),
+ new ConventionalCommitType("test", "Adding or updating tests"),
+ new ConventionalCommitType("chore", "Making changes to the build process or auxiliary tools and libraries"),
+ new ConventionalCommitType("revert", "Undoing a previous commit"),
+ new ConventionalCommitType("refactor", "Restructuring code without changing its external behavior")
+ };
+
+ public ConventionalCommitType(string type, string description)
{
- Name = name;
Type = type;
Description = description;
}
diff --git a/src/Models/Count.cs b/src/Models/Count.cs
deleted file mode 100644
index d48b0c08..00000000
--- a/src/Models/Count.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace SourceGit.Models
-{
- public class Count : IDisposable
- {
- public int Value { get; set; } = 0;
-
- public Count(int value)
- {
- Value = value;
- }
-
- public void Dispose()
- {
- // Ignore
- }
- }
-}
diff --git a/src/Models/CustomAction.cs b/src/Models/CustomAction.cs
index a614961a..8452a42d 100644
--- a/src/Models/CustomAction.cs
+++ b/src/Models/CustomAction.cs
@@ -6,7 +6,6 @@ namespace SourceGit.Models
{
Repository,
Commit,
- Branch,
}
public class CustomAction : ObservableObject
@@ -35,16 +34,9 @@ namespace SourceGit.Models
set => SetProperty(ref _arguments, value);
}
- public bool WaitForExit
- {
- get => _waitForExit;
- set => SetProperty(ref _waitForExit, value);
- }
-
private string _name = string.Empty;
private CustomActionScope _scope = CustomActionScope.Repository;
private string _executable = string.Empty;
private string _arguments = string.Empty;
- private bool _waitForExit = true;
}
}
diff --git a/src/Models/DateTimeFormat.cs b/src/Models/DateTimeFormat.cs
deleted file mode 100644
index 16276c40..00000000
--- a/src/Models/DateTimeFormat.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace SourceGit.Models
-{
- public class DateTimeFormat
- {
- public string DateOnly { get; set; }
- public string DateTime { get; set; }
-
- public string Example
- {
- get => _example.ToString(DateTime);
- }
-
- public DateTimeFormat(string dateOnly, string dateTime)
- {
- DateOnly = dateOnly;
- DateTime = dateTime;
- }
-
- public static int ActiveIndex
- {
- get;
- set;
- } = 0;
-
- public static DateTimeFormat Active
- {
- get => Supported[ActiveIndex];
- }
-
- public static readonly List Supported = new List
- {
- new DateTimeFormat("yyyy/MM/dd", "yyyy/MM/dd, HH:mm:ss"),
- new DateTimeFormat("yyyy.MM.dd", "yyyy.MM.dd, HH:mm:ss"),
- new DateTimeFormat("yyyy-MM-dd", "yyyy-MM-dd, HH:mm:ss"),
- new DateTimeFormat("MM/dd/yyyy", "MM/dd/yyyy, HH:mm:ss"),
- new DateTimeFormat("MM.dd.yyyy", "MM.dd.yyyy, HH:mm:ss"),
- new DateTimeFormat("MM-dd-yyyy", "MM-dd-yyyy, HH:mm:ss"),
- new DateTimeFormat("dd/MM/yyyy", "dd/MM/yyyy, HH:mm:ss"),
- new DateTimeFormat("dd.MM.yyyy", "dd.MM.yyyy, HH:mm:ss"),
- new DateTimeFormat("dd-MM-yyyy", "dd-MM-yyyy, HH:mm:ss"),
- new DateTimeFormat("MMM d yyyy", "MMM d yyyy, HH:mm:ss"),
- new DateTimeFormat("d MMM yyyy", "d MMM yyyy, HH:mm:ss"),
- };
-
- private static readonly DateTime _example = new DateTime(2025, 1, 31, 8, 0, 0, DateTimeKind.Local);
- }
-}
diff --git a/src/Models/DealWithLocalChanges.cs b/src/Models/DealWithLocalChanges.cs
new file mode 100644
index 00000000..f308a90c
--- /dev/null
+++ b/src/Models/DealWithLocalChanges.cs
@@ -0,0 +1,9 @@
+namespace SourceGit.Models
+{
+ public enum DealWithLocalChanges
+ {
+ DoNothing,
+ StashAndReaply,
+ Discard,
+ }
+}
diff --git a/src/Models/DiffOption.cs b/src/Models/DiffOption.cs
index 69f93980..98387e7f 100644
--- a/src/Models/DiffOption.cs
+++ b/src/Models/DiffOption.cs
@@ -5,15 +5,6 @@ namespace SourceGit.Models
{
public class DiffOption
{
- ///
- /// Enable `--ignore-cr-at-eol` by default?
- ///
- public static bool IgnoreCRAtEOL
- {
- get;
- set;
- } = true;
-
public Change WorkingCopyChange => _workingCopyChange;
public bool IsUnstaged => _isUnstaged;
public List Revisions => _revisions;
@@ -49,7 +40,7 @@ namespace SourceGit.Models
else
{
if (change.DataForAmend != null)
- _extra = $"--cached {change.DataForAmend.ParentSHA}";
+ _extra = "--cached HEAD^";
else
_extra = "--cached";
@@ -65,7 +56,7 @@ namespace SourceGit.Models
///
public DiffOption(Commit commit, Change change)
{
- var baseRevision = commit.Parents.Count == 0 ? Commit.EmptyTreeSHA1 : $"{commit.SHA}^";
+ var baseRevision = commit.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : $"{commit.SHA}^";
_revisions.Add(baseRevision);
_revisions.Add(commit.SHA);
_path = change.Path;
@@ -79,7 +70,7 @@ namespace SourceGit.Models
///
public DiffOption(Commit commit, string file)
{
- var baseRevision = commit.Parents.Count == 0 ? Commit.EmptyTreeSHA1 : $"{commit.SHA}^";
+ var baseRevision = commit.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : $"{commit.SHA}^";
_revisions.Add(baseRevision);
_revisions.Add(commit.SHA);
_path = file;
@@ -124,6 +115,6 @@ namespace SourceGit.Models
private readonly string _path;
private readonly string _orgPath = string.Empty;
private readonly string _extra = string.Empty;
- private readonly List _revisions = [];
+ private readonly List _revisions = new List();
}
}
diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs
index b2d91310..e0ae82e0 100644
--- a/src/Models/DiffResult.cs
+++ b/src/Models/DiffResult.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
@@ -30,7 +30,6 @@ namespace SourceGit.Models
public int OldLineNumber { get; set; } = 0;
public int NewLineNumber { get; set; } = 0;
public List Highlights { get; set; } = new List();
- public bool NoNewLineEndOfFile { get; set; } = false;
public string OldLine => OldLineNumber == 0 ? string.Empty : OldLineNumber.ToString();
public string NewLine => NewLineNumber == 0 ? string.Empty : NewLineNumber.ToString();
@@ -147,7 +146,7 @@ namespace SourceGit.Models
public void GenerateNewPatchFromSelection(Change change, string fileBlobGuid, TextDiffSelection selection, bool revert, string output)
{
var isTracked = !string.IsNullOrEmpty(fileBlobGuid);
- var fileGuid = isTracked ? fileBlobGuid : "00000000";
+ var fileGuid = isTracked ? fileBlobGuid.Substring(0, 8) : "00000000";
var builder = new StringBuilder();
builder.Append("diff --git a/").Append(change.Path).Append(" b/").Append(change.Path).Append('\n');
@@ -682,18 +681,6 @@ namespace SourceGit.Models
public TextDiff TextDiff { get; set; } = null;
public LFSDiff LFSDiff { get; set; } = null;
- public string FileModeChange
- {
- get
- {
- if (string.IsNullOrEmpty(OldMode) && string.IsNullOrEmpty(NewMode))
- return string.Empty;
-
- var oldDisplay = string.IsNullOrEmpty(OldMode) ? "0" : OldMode;
- var newDisplay = string.IsNullOrEmpty(NewMode) ? "0" : NewMode;
-
- return $"{oldDisplay} → {newDisplay}";
- }
- }
+ public string FileModeChange => string.IsNullOrEmpty(OldMode) ? string.Empty : $"{OldMode} → {NewMode}";
}
}
diff --git a/src/Models/DirtyState.cs b/src/Models/DirtyState.cs
deleted file mode 100644
index 2b9d898d..00000000
--- a/src/Models/DirtyState.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace SourceGit.Models
-{
- [Flags]
- public enum DirtyState
- {
- None = 0,
- HasLocalChanges = 1 << 0,
- HasPendingPullOrPush = 1 << 1,
- }
-}
diff --git a/src/Models/ExternalMerger.cs b/src/Models/ExternalMerger.cs
index fe67ad6a..49d31df5 100644
--- a/src/Models/ExternalMerger.cs
+++ b/src/Models/ExternalMerger.cs
@@ -42,8 +42,6 @@ namespace SourceGit.Models
new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "\"$MERGED\"", "-u -e -sw \"$LOCAL\" \"$REMOTE\""),
new ExternalMerger(8, "codium", "VSCodium", "VSCodium.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
new ExternalMerger(9, "p4merge", "P4Merge", "p4merge.exe", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""),
- new ExternalMerger(10, "plastic_merge", "Plastic SCM", "mergetool.exe", "-s=\"$REMOTE\" -b=\"$BASE\" -d=\"$LOCAL\" -r=\"$MERGED\" --automatic", "-s=\"$LOCAL\" -d=\"$REMOTE\""),
- new ExternalMerger(11, "meld", "Meld", "Meld.exe", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
};
}
else if (OperatingSystem.IsMacOS())
diff --git a/src/Models/GitFlow.cs b/src/Models/GitFlow.cs
deleted file mode 100644
index 5d26072b..00000000
--- a/src/Models/GitFlow.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace SourceGit.Models
-{
- public enum GitFlowBranchType
- {
- None = 0,
- Feature,
- Release,
- Hotfix,
- }
-
- public class GitFlow
- {
- public string Master { get; set; } = string.Empty;
- public string Develop { get; set; } = string.Empty;
- public string FeaturePrefix { get; set; } = string.Empty;
- public string ReleasePrefix { get; set; } = string.Empty;
- public string HotfixPrefix { get; set; } = string.Empty;
-
- public bool IsValid
- {
- get
- {
- return !string.IsNullOrEmpty(Master) &&
- !string.IsNullOrEmpty(Develop) &&
- !string.IsNullOrEmpty(FeaturePrefix) &&
- !string.IsNullOrEmpty(ReleasePrefix) &&
- !string.IsNullOrEmpty(HotfixPrefix);
- }
- }
-
- public string GetPrefix(GitFlowBranchType type)
- {
- switch (type)
- {
- case GitFlowBranchType.Feature:
- return FeaturePrefix;
- case GitFlowBranchType.Release:
- return ReleasePrefix;
- case GitFlowBranchType.Hotfix:
- return HotfixPrefix;
- default:
- return string.Empty;
- }
- }
- }
-}
diff --git a/src/Models/GitVersions.cs b/src/Models/GitVersions.cs
deleted file mode 100644
index 8aae63a3..00000000
--- a/src/Models/GitVersions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace SourceGit.Models
-{
- public static class GitVersions
- {
- ///
- /// The minimal version of Git that required by this app.
- ///
- public static readonly System.Version MINIMAL = new(2, 25, 1);
-
- ///
- /// The minimal version of Git that supports the `stash push` command with the `--pathspec-from-file` option.
- ///
- public static readonly System.Version STASH_PUSH_WITH_PATHSPECFILE = new(2, 26, 0);
-
- ///
- /// The minimal version of Git that supports the `stash push` command with the `--staged` option.
- ///
- public static readonly System.Version STASH_PUSH_ONLY_STAGED = new(2, 35, 0);
- }
-}
diff --git a/src/Models/Hyperlink.cs b/src/Models/Hyperlink.cs
new file mode 100644
index 00000000..81dc980e
--- /dev/null
+++ b/src/Models/Hyperlink.cs
@@ -0,0 +1,29 @@
+namespace SourceGit.Models
+{
+ public class Hyperlink
+ {
+ public int Start { get; set; } = 0;
+ public int Length { get; set; } = 0;
+ public string Link { get; set; } = "";
+ public bool IsCommitSHA { get; set; } = false;
+
+ public Hyperlink(int start, int length, string link, bool isCommitSHA = false)
+ {
+ Start = start;
+ Length = length;
+ Link = link;
+ IsCommitSHA = isCommitSHA;
+ }
+
+ public bool Intersect(int start, int length)
+ {
+ if (start == Start)
+ return true;
+
+ if (start < Start)
+ return start + length > Start;
+
+ return start < Start + Length;
+ }
+ }
+}
diff --git a/src/Models/ICommandLog.cs b/src/Models/ICommandLog.cs
deleted file mode 100644
index 34ec7031..00000000
--- a/src/Models/ICommandLog.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SourceGit.Models
-{
- public interface ICommandLog
- {
- void AppendLine(string line);
- }
-}
diff --git a/src/Models/IRepository.cs b/src/Models/IRepository.cs
index 2fc7c612..12b1adba 100644
--- a/src/Models/IRepository.cs
+++ b/src/Models/IRepository.cs
@@ -2,7 +2,8 @@
{
public interface IRepository
{
- bool MayHaveSubmodules();
+ string FullPath { get; set; }
+ string GitDir { get; set; }
void RefreshBranches();
void RefreshWorktrees();
diff --git a/src/Models/ImageDecoder.cs b/src/Models/ImageDecoder.cs
deleted file mode 100644
index 6fe0f428..00000000
--- a/src/Models/ImageDecoder.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace SourceGit.Models
-{
- public enum ImageDecoder
- {
- None = 0,
- Builtin,
- Pfim,
- Tiff,
- }
-}
diff --git a/src/Models/InlineElement.cs b/src/Models/InlineElement.cs
deleted file mode 100644
index ea7bcee8..00000000
--- a/src/Models/InlineElement.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace SourceGit.Models
-{
- public enum InlineElementType
- {
- Keyword = 0,
- Link,
- CommitSHA,
- Code,
- }
-
- public class InlineElement
- {
- public InlineElementType Type { get; }
- public int Start { get; }
- public int Length { get; }
- public string Link { get; }
-
- public InlineElement(InlineElementType type, int start, int length, string link)
- {
- Type = type;
- Start = start;
- Length = length;
- Link = link;
- }
-
- public bool IsIntersecting(int start, int length)
- {
- if (start == Start)
- return true;
-
- if (start < Start)
- return start + length > Start;
-
- return start < Start + Length;
- }
- }
-}
diff --git a/src/Models/InlineElementCollector.cs b/src/Models/InlineElementCollector.cs
deleted file mode 100644
index d81aaf8d..00000000
--- a/src/Models/InlineElementCollector.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-
-namespace SourceGit.Models
-{
- public class InlineElementCollector
- {
- public int Count => _implementation.Count;
- public InlineElement this[int index] => _implementation[index];
-
- public InlineElement Intersect(int start, int length)
- {
- foreach (var elem in _implementation)
- {
- if (elem.IsIntersecting(start, length))
- return elem;
- }
-
- return null;
- }
-
- public void Add(InlineElement element)
- {
- _implementation.Add(element);
- }
-
- public void Sort()
- {
- _implementation.Sort((l, r) => l.Start.CompareTo(r.Start));
- }
-
- public void Clear()
- {
- _implementation.Clear();
- }
-
- private readonly List _implementation = [];
- }
-}
diff --git a/src/Models/InteractiveRebase.cs b/src/Models/InteractiveRebase.cs
index d1710d4a..0980587a 100644
--- a/src/Models/InteractiveRebase.cs
+++ b/src/Models/InteractiveRebase.cs
@@ -12,12 +12,6 @@ namespace SourceGit.Models
Drop,
}
- public class InteractiveCommit
- {
- public Commit Commit { get; set; } = new Commit();
- public string Message { get; set; } = string.Empty;
- }
-
public class InteractiveRebaseJob
{
public string SHA { get; set; } = string.Empty;
@@ -27,8 +21,6 @@ namespace SourceGit.Models
public class InteractiveRebaseJobCollection
{
- public string OrigHead { get; set; } = string.Empty;
- public string Onto { get; set; } = string.Empty;
public List Jobs { get; set; } = new List();
}
}
diff --git a/src/Models/IpcChannel.cs b/src/Models/IpcChannel.cs
deleted file mode 100644
index c2a6c6c7..00000000
--- a/src/Models/IpcChannel.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.IO;
-using System.IO.Pipes;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SourceGit.Models
-{
- public class IpcChannel : IDisposable
- {
- public bool IsFirstInstance
- {
- get => _isFirstInstance;
- }
-
- public event Action MessageReceived;
-
- public IpcChannel()
- {
- try
- {
- _singletonLock = File.Open(Path.Combine(Native.OS.DataDir, "process.lock"), FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
- _isFirstInstance = true;
- _server = new NamedPipeServerStream(
- "SourceGitIPCChannel" + Environment.UserName,
- PipeDirection.In,
- -1,
- PipeTransmissionMode.Byte,
- PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly);
- _cancellationTokenSource = new CancellationTokenSource();
- Task.Run(StartServer);
- }
- catch
- {
- _isFirstInstance = false;
- }
- }
-
- public void SendToFirstInstance(string cmd)
- {
- try
- {
- using (var client = new NamedPipeClientStream(".", "SourceGitIPCChannel" + Environment.UserName, PipeDirection.Out, PipeOptions.Asynchronous | PipeOptions.CurrentUserOnly))
- {
- client.Connect(1000);
- if (!client.IsConnected)
- return;
-
- using (var writer = new StreamWriter(client))
- {
- writer.WriteLine(cmd);
- writer.Flush();
- }
-
- if (OperatingSystem.IsWindows())
- client.WaitForPipeDrain();
- else
- Thread.Sleep(1000);
- }
- }
- catch
- {
- // IGNORE
- }
- }
-
- public void Dispose()
- {
- _cancellationTokenSource?.Cancel();
- _singletonLock?.Dispose();
- }
-
- private async void StartServer()
- {
- using var reader = new StreamReader(_server);
-
- while (!_cancellationTokenSource.IsCancellationRequested)
- {
- try
- {
- await _server.WaitForConnectionAsync(_cancellationTokenSource.Token);
-
- if (!_cancellationTokenSource.IsCancellationRequested)
- {
- var line = await reader.ReadToEndAsync(_cancellationTokenSource.Token);
- MessageReceived?.Invoke(line?.Trim());
- }
-
- _server.Disconnect();
- }
- catch
- {
- if (!_cancellationTokenSource.IsCancellationRequested && _server.IsConnected)
- _server.Disconnect();
- }
- }
- }
-
- private FileStream _singletonLock = null;
- private bool _isFirstInstance = false;
- private NamedPipeServerStream _server = null;
- private CancellationTokenSource _cancellationTokenSource = null;
- }
-}
diff --git a/src/Models/IssueTrackerRule.cs b/src/Models/IssueTrackerRule.cs
index 40c84b9e..29487a16 100644
--- a/src/Models/IssueTrackerRule.cs
+++ b/src/Models/IssueTrackerRule.cs
@@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
using CommunityToolkit.Mvvm.ComponentModel;
@@ -45,7 +46,7 @@ namespace SourceGit.Models
set => SetProperty(ref _urlTemplate, value);
}
- public void Matches(InlineElementCollector outs, string message)
+ public void Matches(List outs, string message)
{
if (_regex == null || string.IsNullOrEmpty(_urlTemplate))
return;
@@ -59,7 +60,17 @@ namespace SourceGit.Models
var start = match.Index;
var len = match.Length;
- if (outs.Intersect(start, len) != null)
+ var intersect = false;
+ foreach (var exist in outs)
+ {
+ if (exist.Intersect(start, len))
+ {
+ intersect = true;
+ break;
+ }
+ }
+
+ if (intersect)
continue;
var link = _urlTemplate;
@@ -70,7 +81,8 @@ namespace SourceGit.Models
link = link.Replace($"${j}", group.Value);
}
- outs.Add(new InlineElement(InlineElementType.Link, start, len, link));
+ var range = new Hyperlink(start, len, link);
+ outs.Add(range);
}
}
diff --git a/src/Models/LFSObject.cs b/src/Models/LFSObject.cs
index 8bc2dda2..0f281253 100644
--- a/src/Models/LFSObject.cs
+++ b/src/Models/LFSObject.cs
@@ -1,22 +1,8 @@
-using System.Text.RegularExpressions;
-
-namespace SourceGit.Models
+namespace SourceGit.Models
{
- public partial class LFSObject
+ public class LFSObject
{
- [GeneratedRegex(@"^version https://git-lfs.github.com/spec/v\d+\r?\noid sha256:([0-9a-f]+)\r?\nsize (\d+)[\r\n]*$")]
- private static partial Regex REG_FORMAT();
-
public string Oid { get; set; } = string.Empty;
public long Size { get; set; } = 0;
-
- public static LFSObject Parse(string content)
- {
- var match = REG_FORMAT().Match(content);
- if (match.Success)
- return new() { Oid = match.Groups[1].Value, Size = long.Parse(match.Groups[2].Value) };
-
- return null;
- }
}
}
diff --git a/src/Models/Locales.cs b/src/Models/Locales.cs
index 1788a9b2..d5e1534c 100644
--- a/src/Models/Locales.cs
+++ b/src/Models/Locales.cs
@@ -14,12 +14,9 @@ namespace SourceGit.Models
new Locale("Français", "fr_FR"),
new Locale("Italiano", "it_IT"),
new Locale("Português (Brasil)", "pt_BR"),
- new Locale("Українська", "uk_UA"),
new Locale("Русский", "ru_RU"),
new Locale("简体中文", "zh_CN"),
new Locale("繁體中文", "zh_TW"),
- new Locale("日本語", "ja_JP"),
- new Locale("தமிழ் (Tamil)", "ta_IN"),
};
public Locale(string name, string key)
diff --git a/src/Models/MergeMode.cs b/src/Models/MergeMode.cs
index 5dc70030..15e3f7e9 100644
--- a/src/Models/MergeMode.cs
+++ b/src/Models/MergeMode.cs
@@ -5,9 +5,8 @@
public static readonly MergeMode[] Supported =
[
new MergeMode("Default", "Fast-forward if possible", ""),
- new MergeMode("Fast-forward", "Refuse to merge when fast-forward is not possible", "--ff-only"),
new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
- new MergeMode("Squash", "Squash merge", "--squash"),
+ new MergeMode("Squash", "Use '--squash'", "--squash"),
new MergeMode("Don't commit", "Merge without commit", "--no-ff --no-commit"),
];
diff --git a/src/Models/NumericSort.cs b/src/Models/NumericSort.cs
index baaf3da4..ed5002e6 100644
--- a/src/Models/NumericSort.cs
+++ b/src/Models/NumericSort.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace SourceGit.Models
+namespace SourceGit.Models
{
public static class NumericSort
{
@@ -12,35 +10,52 @@ namespace SourceGit.Models
int marker1 = 0;
int marker2 = 0;
+ char[] tmp1 = new char[len1];
+ char[] tmp2 = new char[len2];
+
while (marker1 < len1 && marker2 < len2)
{
char c1 = s1[marker1];
char c2 = s2[marker2];
+ int loc1 = 0;
+ int loc2 = 0;
bool isDigit1 = char.IsDigit(c1);
bool isDigit2 = char.IsDigit(c2);
if (isDigit1 != isDigit2)
return c1.CompareTo(c2);
- int subLen1 = 1;
- while (marker1 + subLen1 < len1 && char.IsDigit(s1[marker1 + subLen1]) == isDigit1)
- subLen1++;
+ do
+ {
+ tmp1[loc1] = c1;
+ loc1++;
+ marker1++;
- int subLen2 = 1;
- while (marker2 + subLen2 < len2 && char.IsDigit(s2[marker2 + subLen2]) == isDigit2)
- subLen2++;
+ if (marker1 < len1)
+ c1 = s1[marker1];
+ else
+ break;
+ } while (char.IsDigit(c1) == isDigit1);
- string sub1 = s1.Substring(marker1, subLen1);
- string sub2 = s2.Substring(marker2, subLen2);
+ do
+ {
+ tmp2[loc2] = c2;
+ loc2++;
+ marker2++;
- marker1 += subLen1;
- marker2 += subLen2;
+ if (marker2 < len2)
+ c2 = s2[marker2];
+ else
+ break;
+ } while (char.IsDigit(c2) == isDigit2);
+ string sub1 = new string(tmp1, 0, loc1);
+ string sub2 = new string(tmp2, 0, loc2);
int result;
if (isDigit1)
- result = (subLen1 == subLen2) ? string.CompareOrdinal(sub1, sub2) : (subLen1 - subLen2);
+ result = loc1 == loc2 ? string.CompareOrdinal(sub1, sub2) : loc1 - loc2;
else
- result = string.Compare(sub1, sub2, StringComparison.OrdinalIgnoreCase);
+ result = string.CompareOrdinal(sub1, sub2);
if (result != 0)
return result;
diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
index 22fbcd51..df67ff66 100644
--- a/src/Models/OpenAI.cs
+++ b/src/Models/OpenAI.cs
@@ -1,99 +1,79 @@
using System;
-using System.ClientModel;
using System.Collections.Generic;
+using System.Net.Http;
using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
using System.Threading;
-using Azure.AI.OpenAI;
+
using CommunityToolkit.Mvvm.ComponentModel;
-using OpenAI;
-using OpenAI.Chat;
namespace SourceGit.Models
{
- public partial class OpenAIResponse
+ public class OpenAIChatMessage
{
- public OpenAIResponse(Action onUpdate)
+ [JsonPropertyName("role")]
+ public string Role
{
- _onUpdate = onUpdate;
+ get;
+ set;
}
- public void Append(string text)
+ [JsonPropertyName("content")]
+ public string Content
{
- var buffer = text;
+ get;
+ set;
+ }
+ }
- if (_thinkTail.Length > 0)
- {
- _thinkTail.Append(buffer);
- buffer = _thinkTail.ToString();
- _thinkTail.Clear();
- }
-
- buffer = REG_COT().Replace(buffer, "");
-
- var startIdx = buffer.IndexOf('<', StringComparison.Ordinal);
- if (startIdx >= 0)
- {
- if (startIdx > 0)
- OnReceive(buffer.Substring(0, startIdx));
-
- var endIdx = buffer.IndexOf(">", startIdx + 1, StringComparison.Ordinal);
- if (endIdx <= startIdx)
- {
- if (buffer.Length - startIdx <= 15)
- _thinkTail.Append(buffer.Substring(startIdx));
- else
- OnReceive(buffer.Substring(startIdx));
- }
- else if (endIdx < startIdx + 15)
- {
- var tag = buffer.Substring(startIdx + 1, endIdx - startIdx - 1);
- if (_thinkTags.Contains(tag))
- _thinkTail.Append(buffer.Substring(startIdx));
- else
- OnReceive(buffer.Substring(startIdx));
- }
- else
- {
- OnReceive(buffer.Substring(startIdx));
- }
- }
- else
- {
- OnReceive(buffer);
- }
+ public class OpenAIChatChoice
+ {
+ [JsonPropertyName("index")]
+ public int Index
+ {
+ get;
+ set;
}
- public void End()
+ [JsonPropertyName("message")]
+ public OpenAIChatMessage Message
{
- if (_thinkTail.Length > 0)
- {
- OnReceive(_thinkTail.ToString());
- _thinkTail.Clear();
- }
+ get;
+ set;
+ }
+ }
+
+ public class OpenAIChatResponse
+ {
+ [JsonPropertyName("choices")]
+ public List Choices
+ {
+ get;
+ set;
+ } = [];
+ }
+
+ public class OpenAIChatRequest
+ {
+ [JsonPropertyName("model")]
+ public string Model
+ {
+ get;
+ set;
}
- private void OnReceive(string text)
+ [JsonPropertyName("messages")]
+ public List Messages
{
- if (!_hasTrimmedStart)
- {
- text = text.TrimStart();
- if (string.IsNullOrEmpty(text))
- return;
+ get;
+ set;
+ } = [];
- _hasTrimmedStart = true;
- }
-
- _onUpdate.Invoke(text);
+ public void AddMessage(string role, string content)
+ {
+ Messages.Add(new OpenAIChatMessage { Role = role, Content = content });
}
-
- [GeneratedRegex(@"<(think|thought|thinking|thought_chain)>.*?", RegexOptions.Singleline)]
- private static partial Regex REG_COT();
-
- private Action _onUpdate = null;
- private StringBuilder _thinkTail = new StringBuilder();
- private HashSet _thinkTags = ["think", "thought", "thinking", "thought_chain"];
- private bool _hasTrimmedStart = false;
}
public class OpenAIService : ObservableObject
@@ -122,12 +102,6 @@ namespace SourceGit.Models
set => SetProperty(ref _model, value);
}
- public bool Streaming
- {
- get => _streaming;
- set => SetProperty(ref _streaming, value);
- }
-
public string AnalyzeDiffPrompt
{
get => _analyzeDiffPrompt;
@@ -173,54 +147,45 @@ namespace SourceGit.Models
""";
}
- public void Chat(string prompt, string question, CancellationToken cancellation, Action onUpdate)
+ public OpenAIChatResponse Chat(string prompt, string question, CancellationToken cancellation)
{
- var server = new Uri(_server);
- var key = new ApiKeyCredential(_apiKey);
- var client = null as ChatClient;
- if (_server.Contains("openai.azure.com/", StringComparison.Ordinal))
+ var chat = new OpenAIChatRequest() { Model = Model };
+ chat.AddMessage("user", prompt);
+ chat.AddMessage("user", question);
+
+ var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(60) };
+ if (!string.IsNullOrEmpty(ApiKey))
{
- var azure = new AzureOpenAIClient(server, key);
- client = azure.GetChatClient(_model);
- }
- else
- {
- var openai = new OpenAIClient(key, new() { Endpoint = server });
- client = openai.GetChatClient(_model);
+ if (Server.Contains("openai.azure.com/", StringComparison.Ordinal))
+ client.DefaultRequestHeaders.Add("api-key", ApiKey);
+ else
+ client.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
}
- var messages = new List();
- messages.Add(_model.Equals("o1-mini", StringComparison.Ordinal) ? new UserChatMessage(prompt) : new SystemChatMessage(prompt));
- messages.Add(new UserChatMessage(question));
-
+ var req = new StringContent(JsonSerializer.Serialize(chat, JsonCodeGen.Default.OpenAIChatRequest), Encoding.UTF8, "application/json");
try
{
- var rsp = new OpenAIResponse(onUpdate);
+ var task = client.PostAsync(Server, req, cancellation);
+ task.Wait(cancellation);
- if (_streaming)
+ var rsp = task.Result;
+ var reader = rsp.Content.ReadAsStringAsync(cancellation);
+ reader.Wait(cancellation);
+
+ var body = reader.Result;
+ if (!rsp.IsSuccessStatusCode)
{
- var updates = client.CompleteChatStreaming(messages, null, cancellation);
-
- foreach (var update in updates)
- {
- if (update.ContentUpdate.Count > 0)
- rsp.Append(update.ContentUpdate[0].Text);
- }
- }
- else
- {
- var completion = client.CompleteChat(messages, null, cancellation);
-
- if (completion.Value.Content.Count > 0)
- rsp.Append(completion.Value.Content[0].Text);
+ throw new Exception($"AI service returns error code {rsp.StatusCode}. Body: {body ?? string.Empty}");
}
- rsp.End();
+ return JsonSerializer.Deserialize(reader.Result, JsonCodeGen.Default.OpenAIChatResponse);
}
catch
{
- if (!cancellation.IsCancellationRequested)
- throw;
+ if (cancellation.IsCancellationRequested)
+ return null;
+
+ throw;
}
}
@@ -228,7 +193,6 @@ namespace SourceGit.Models
private string _server;
private string _apiKey;
private string _model;
- private bool _streaming = true;
private string _analyzeDiffPrompt;
private string _generateSubjectPrompt;
}
diff --git a/src/Models/Remote.cs b/src/Models/Remote.cs
index 6e36cfb9..3c452460 100644
--- a/src/Models/Remote.cs
+++ b/src/Models/Remote.cs
@@ -6,21 +6,18 @@ namespace SourceGit.Models
{
public partial class Remote
{
- [GeneratedRegex(@"^https?://[^/]+/.+[^/\.]$")]
+ [GeneratedRegex(@"^https?://([-a-zA-Z0-9:%._\+~#=]+@)?[-a-zA-Z0-9:%._\+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6})?(:[0-9]{1,5})?\b(/[-a-zA-Z0-9()@:%_\+.~#?&=]+)+(\.git)?$")]
private static partial Regex REG_HTTPS();
- [GeneratedRegex(@"^git://[^/]+/.+[^/\.]$")]
- private static partial Regex REG_GIT();
- [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:([a-zA-z0-9~%][\w\-\./~%]*)?[a-zA-Z0-9](\.git)?$")]
+ [GeneratedRegex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:[\w\-/~%]+/[\w\-\.%]+(\.git)?$")]
private static partial Regex REG_SSH1();
- [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/([a-zA-z0-9~%][\w\-\./~%]*)?[a-zA-Z0-9](\.git)?$")]
+ [GeneratedRegex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/~]+/[\w\-\.]+(\.git)?$")]
private static partial Regex REG_SSH2();
- [GeneratedRegex(@"^git@([\w\.\-]+):([\w\-/~%]+/[\w\-\.%]+)\.git$")]
+ [GeneratedRegex(@"^git@([\w\.\-]+):([\w\-/~]+/[\w\-\.]+)\.git$")]
private static partial Regex REG_TO_VISIT_URL_CAPTURE();
private static readonly Regex[] URL_FORMATS = [
REG_HTTPS(),
- REG_GIT(),
REG_SSH1(),
REG_SSH2(),
];
@@ -33,10 +30,13 @@ namespace SourceGit.Models
if (string.IsNullOrWhiteSpace(url))
return false;
- if (REG_SSH1().IsMatch(url))
- return true;
+ for (int i = 1; i < URL_FORMATS.Length; i++)
+ {
+ if (URL_FORMATS[i].IsMatch(url))
+ return true;
+ }
- return REG_SSH2().IsMatch(url);
+ return false;
}
public static bool IsValidURL(string url)
@@ -50,10 +50,7 @@ namespace SourceGit.Models
return true;
}
- return url.StartsWith("file://", StringComparison.Ordinal) ||
- url.StartsWith("./", StringComparison.Ordinal) ||
- url.StartsWith("../", StringComparison.Ordinal) ||
- Directory.Exists(url);
+ return url.EndsWith(".git", StringComparison.Ordinal) && Directory.Exists(url);
}
public bool TryGetVisitURL(out string url)
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index a54956d3..4673f66a 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Text;
@@ -32,36 +32,24 @@ namespace SourceGit.Models
set;
} = false;
- public bool OnlyHighlightCurrentBranchInHistories
- {
- get;
- set;
- } = false;
-
- public BranchSortMode LocalBranchSortMode
- {
- get;
- set;
- } = BranchSortMode.Name;
-
- public BranchSortMode RemoteBranchSortMode
- {
- get;
- set;
- } = BranchSortMode.Name;
-
- public TagSortMode TagSortMode
- {
- get;
- set;
- } = TagSortMode.CreatorDate;
-
public bool IncludeUntrackedInLocalChanges
{
get;
set;
} = true;
+ public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
+ {
+ get;
+ set;
+ } = DealWithLocalChanges.DoNothing;
+
+ public bool EnablePruneOnFetch
+ {
+ get;
+ set;
+ } = false;
+
public bool EnableForceOnFetch
{
get;
@@ -74,12 +62,30 @@ namespace SourceGit.Models
set;
} = false;
+ public DealWithLocalChanges DealWithLocalChangesOnPull
+ {
+ get;
+ set;
+ } = DealWithLocalChanges.DoNothing;
+
public bool PreferRebaseInsteadOfMerge
{
get;
set;
} = true;
+ public bool FetchWithoutTagsOnPull
+ {
+ get;
+ set;
+ } = false;
+
+ public bool FetchAllBranchesOnPull
+ {
+ get;
+ set;
+ } = true;
+
public bool CheckSubmodulesOnPush
{
get;
@@ -92,17 +98,11 @@ namespace SourceGit.Models
set;
} = false;
- public bool PushToRemoteWhenCreateTag
+ public DealWithLocalChanges DealWithLocalChangesOnCreateBranch
{
get;
set;
- } = true;
-
- public bool PushToRemoteWhenDeleteTag
- {
- get;
- set;
- } = false;
+ } = DealWithLocalChanges.DoNothing;
public bool CheckoutBranchOnCreateBranch
{
@@ -110,12 +110,6 @@ namespace SourceGit.Models
set;
} = true;
- public bool UpdateSubmodulesOnCheckoutBranch
- {
- get;
- set;
- } = true;
-
public AvaloniaList HistoriesFilters
{
get;
@@ -182,13 +176,7 @@ namespace SourceGit.Models
set;
} = false;
- public bool AutoRestoreAfterStash
- {
- get;
- set;
- } = false;
-
- public string PreferredOpenAIService
+ public string PreferedOpenAIService
{
get;
set;
@@ -230,18 +218,6 @@ namespace SourceGit.Models
set;
} = [];
- public int PreferredMergeMode
- {
- get;
- set;
- } = 0;
-
- public string LastCommitMessage
- {
- get;
- set;
- } = string.Empty;
-
public Dictionary CollectHistoriesFilters()
{
var map = new Dictionary();
@@ -287,8 +263,9 @@ namespace SourceGit.Models
return false;
}
- foreach (var filter in HistoriesFilters)
+ for (int i = 0; i < HistoriesFilters.Count; i++)
{
+ var filter = HistoriesFilters[i];
if (filter.Type != type)
continue;
@@ -320,81 +297,128 @@ namespace SourceGit.Models
public string BuildHistoriesFilter()
{
- var includedRefs = new List();
var excludedBranches = new List();
var excludedRemotes = new List();
var excludedTags = new List();
+ var includedBranches = new List();
+ var includedRemotes = new List();
+ var includedTags = new List();
foreach (var filter in HistoriesFilters)
{
if (filter.Type == FilterType.LocalBranch)
{
+ var name = filter.Pattern.Substring(11);
+ var b = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
+
if (filter.Mode == FilterMode.Included)
- includedRefs.Add(filter.Pattern);
+ includedBranches.Add(b);
else if (filter.Mode == FilterMode.Excluded)
- excludedBranches.Add($"--exclude=\"{filter.Pattern.AsSpan(11)}\" --decorate-refs-exclude=\"{filter.Pattern}\"");
+ excludedBranches.Add(b);
}
else if (filter.Type == FilterType.LocalBranchFolder)
{
if (filter.Mode == FilterMode.Included)
- includedRefs.Add($"--branches={filter.Pattern.AsSpan(11)}/*");
+ includedBranches.Add($"{filter.Pattern.Substring(11)}/*");
else if (filter.Mode == FilterMode.Excluded)
- excludedBranches.Add($"--exclude=\"{filter.Pattern.AsSpan(11)}/*\" --decorate-refs-exclude=\"{filter.Pattern}/*\"");
+ excludedBranches.Add($"{filter.Pattern.Substring(11)}/*");
}
else if (filter.Type == FilterType.RemoteBranch)
{
+ var name = filter.Pattern.Substring(13);
+ var r = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
+
if (filter.Mode == FilterMode.Included)
- includedRefs.Add(filter.Pattern);
+ includedRemotes.Add(r);
else if (filter.Mode == FilterMode.Excluded)
- excludedRemotes.Add($"--exclude=\"{filter.Pattern.AsSpan(13)}\" --decorate-refs-exclude=\"{filter.Pattern}\"");
+ excludedRemotes.Add(r);
}
else if (filter.Type == FilterType.RemoteBranchFolder)
{
if (filter.Mode == FilterMode.Included)
- includedRefs.Add($"--remotes={filter.Pattern.AsSpan(13)}/*");
+ includedRemotes.Add($"{filter.Pattern.Substring(13)}/*");
else if (filter.Mode == FilterMode.Excluded)
- excludedRemotes.Add($"--exclude=\"{filter.Pattern.AsSpan(13)}/*\" --decorate-refs-exclude=\"{filter.Pattern}/*\"");
+ excludedRemotes.Add($"{filter.Pattern.Substring(13)}/*");
}
else if (filter.Type == FilterType.Tag)
{
+ var name = filter.Pattern;
+ var t = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
+
if (filter.Mode == FilterMode.Included)
- includedRefs.Add($"refs/tags/{filter.Pattern}");
+ includedTags.Add(t);
else if (filter.Mode == FilterMode.Excluded)
- excludedTags.Add($"--exclude=\"{filter.Pattern}\" --decorate-refs-exclude=\"refs/tags/{filter.Pattern}\"");
+ excludedTags.Add(t);
}
}
+ bool hasIncluded = includedBranches.Count > 0 || includedRemotes.Count > 0 || includedTags.Count > 0;
+ bool hasExcluded = excludedBranches.Count > 0 || excludedRemotes.Count > 0 || excludedTags.Count > 0;
+
var builder = new StringBuilder();
- if (includedRefs.Count > 0)
+ if (hasIncluded)
{
- foreach (var r in includedRefs)
- {
- builder.Append(r);
- builder.Append(' ');
- }
- }
- else if (excludedBranches.Count + excludedRemotes.Count + excludedTags.Count > 0)
- {
- foreach (var b in excludedBranches)
+ foreach (var b in includedBranches)
{
+ builder.Append("--branches=");
builder.Append(b);
builder.Append(' ');
}
- builder.Append("--exclude=HEAD --branches ");
-
- foreach (var r in excludedRemotes)
+ foreach (var r in includedRemotes)
{
+ builder.Append("--remotes=");
builder.Append(r);
builder.Append(' ');
}
- builder.Append("--exclude=origin/HEAD --remotes ");
-
- foreach (var t in excludedTags)
+ foreach (var t in includedTags)
{
+ builder.Append("--tags=");
builder.Append(t);
builder.Append(' ');
}
+ }
+ else if (hasExcluded)
+ {
+ if (excludedBranches.Count > 0)
+ {
+ foreach (var b in excludedBranches)
+ {
+ builder.Append("--exclude=");
+ builder.Append(b);
+ builder.Append(" --decorate-refs-exclude=refs/heads/");
+ builder.Append(b);
+ builder.Append(' ');
+ }
+ }
+
+ builder.Append("--exclude=HEA[D] --branches ");
+
+ if (excludedRemotes.Count > 0)
+ {
+ foreach (var r in excludedRemotes)
+ {
+ builder.Append("--exclude=");
+ builder.Append(r);
+ builder.Append(" --decorate-refs-exclude=refs/remotes/");
+ builder.Append(r);
+ builder.Append(' ');
+ }
+ }
+
+ builder.Append("--exclude=origin/HEA[D] --remotes ");
+
+ if (excludedTags.Count > 0)
+ {
+ foreach (var t in excludedTags)
+ {
+ builder.Append("--exclude=");
+ builder.Append(t);
+ builder.Append(" --decorate-refs-exclude=refs/tags/");
+ builder.Append(t);
+ builder.Append(' ');
+ }
+ }
builder.Append("--tags ");
}
@@ -404,7 +428,6 @@ namespace SourceGit.Models
public void PushCommitMessage(string message)
{
- message = message.Trim().ReplaceLineEndings("\n");
var existIdx = CommitMessages.IndexOf(message);
if (existIdx == 0)
return;
@@ -421,13 +444,65 @@ namespace SourceGit.Models
CommitMessages.Insert(0, message);
}
- public IssueTrackerRule AddIssueTracker(string name, string regex, string url)
+ public IssueTrackerRule AddNewIssueTracker()
{
var rule = new IssueTrackerRule()
{
- Name = name,
- RegexString = regex,
- URLTemplate = url,
+ Name = "New Issue Tracker",
+ RegexString = "#(\\d+)",
+ URLTemplate = "https://xxx/$1",
+ };
+
+ IssueTrackerRules.Add(rule);
+ return rule;
+ }
+
+ public IssueTrackerRule AddGithubIssueTracker(string repoURL)
+ {
+ var rule = new IssueTrackerRule()
+ {
+ Name = "Github ISSUE",
+ RegexString = "#(\\d+)",
+ URLTemplate = string.IsNullOrEmpty(repoURL) ? "https://github.com/username/repository/issues/$1" : $"{repoURL}/issues/$1",
+ };
+
+ IssueTrackerRules.Add(rule);
+ return rule;
+ }
+
+ public IssueTrackerRule AddJiraIssueTracker()
+ {
+ var rule = new IssueTrackerRule()
+ {
+ Name = "Jira Tracker",
+ RegexString = "PROJ-(\\d+)",
+ URLTemplate = "https://jira.yourcompany.com/browse/PROJ-$1",
+ };
+
+ IssueTrackerRules.Add(rule);
+ return rule;
+ }
+
+ public IssueTrackerRule AddGitLabIssueTracker(string repoURL)
+ {
+ var rule = new IssueTrackerRule()
+ {
+ Name = "GitLab ISSUE",
+ RegexString = "#(\\d+)",
+ URLTemplate = string.IsNullOrEmpty(repoURL) ? "https://gitlab.com/username/repository/-/issues/$1" : $"{repoURL}/-/issues/$1",
+ };
+
+ IssueTrackerRules.Add(rule);
+ return rule;
+ }
+
+ public IssueTrackerRule AddGitLabMergeRequestTracker(string repoURL)
+ {
+ var rule = new IssueTrackerRule()
+ {
+ Name = "GitLab MR",
+ RegexString = "!(\\d+)",
+ URLTemplate = string.IsNullOrEmpty(repoURL) ? "https://gitlab.com/username/repository/-/merge_requests/$1" : $"{repoURL}/-/merge_requests/$1",
};
IssueTrackerRules.Add(rule);
@@ -442,7 +517,11 @@ namespace SourceGit.Models
public CustomAction AddNewCustomAction()
{
- var act = new CustomAction() { Name = "Unnamed Action" };
+ var act = new CustomAction()
+ {
+ Name = "Unnamed Custom Action",
+ };
+
CustomActions.Add(act);
return act;
}
@@ -452,19 +531,5 @@ namespace SourceGit.Models
if (act != null)
CustomActions.Remove(act);
}
-
- public void MoveCustomActionUp(CustomAction act)
- {
- var idx = CustomActions.IndexOf(act);
- if (idx > 0)
- CustomActions.Move(idx - 1, idx);
- }
-
- public void MoveCustomActionDown(CustomAction act)
- {
- var idx = CustomActions.IndexOf(act);
- if (idx < CustomActions.Count - 1)
- CustomActions.Move(idx + 1, idx);
- }
}
}
diff --git a/src/Models/RevisionFile.cs b/src/Models/RevisionFile.cs
index 29a23efa..f1f5265f 100644
--- a/src/Models/RevisionFile.cs
+++ b/src/Models/RevisionFile.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-using System.IO;
-using Avalonia.Media.Imaging;
+using Avalonia.Media.Imaging;
namespace SourceGit.Models
{
@@ -11,17 +9,10 @@ namespace SourceGit.Models
public class RevisionImageFile
{
- public Bitmap Image { get; }
- public long FileSize { get; }
- public string ImageType { get; }
+ public Bitmap Image { get; set; } = null;
+ public long FileSize { get; set; } = 0;
+ public string ImageType { get; set; } = string.Empty;
public string ImageSize => Image != null ? $"{Image.PixelSize.Width} x {Image.PixelSize.Height}" : "0 x 0";
-
- public RevisionImageFile(string file, Bitmap img, long size)
- {
- Image = img;
- FileSize = size;
- ImageType = Path.GetExtension(file)!.Substring(1).ToUpper(CultureInfo.CurrentCulture);
- }
}
public class RevisionTextFile
@@ -38,6 +29,6 @@ namespace SourceGit.Models
public class RevisionSubmodule
{
public Commit Commit { get; set; } = null;
- public CommitFullMessage FullMessage { get; set; } = null;
+ public string FullMessage { get; set; } = string.Empty;
}
}
diff --git a/src/Models/ShellOrTerminal.cs b/src/Models/ShellOrTerminal.cs
index 7dfb2237..1decdcfa 100644
--- a/src/Models/ShellOrTerminal.cs
+++ b/src/Models/ShellOrTerminal.cs
@@ -42,8 +42,6 @@ namespace SourceGit.Models
new ShellOrTerminal("mac-terminal", "Terminal", ""),
new ShellOrTerminal("iterm2", "iTerm", ""),
new ShellOrTerminal("warp", "Warp", ""),
- new ShellOrTerminal("ghostty", "Ghostty", ""),
- new ShellOrTerminal("kitty", "kitty", "")
};
}
else
@@ -58,8 +56,6 @@ namespace SourceGit.Models
new ShellOrTerminal("mate-terminal", "MATE Terminal", "mate-terminal"),
new ShellOrTerminal("foot", "Foot", "foot"),
new ShellOrTerminal("wezterm", "WezTerm", "wezterm"),
- new ShellOrTerminal("ptyxis", "Ptyxis", "ptyxis"),
- new ShellOrTerminal("kitty", "kitty", "kitty"),
new ShellOrTerminal("custom", "Custom", ""),
};
}
diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs
index 369ab145..06da763a 100644
--- a/src/Models/Stash.cs
+++ b/src/Models/Stash.cs
@@ -1,5 +1,4 @@
using System;
-using System.Collections.Generic;
namespace SourceGit.Models
{
@@ -7,10 +6,9 @@ namespace SourceGit.Models
{
public string Name { get; set; } = "";
public string SHA { get; set; } = "";
- public List Parents { get; set; } = [];
public ulong Time { get; set; } = 0;
public string Message { get; set; } = "";
- public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Active.DateTime);
+ public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
}
}
diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs
index a86380c3..969d3945 100644
--- a/src/Models/Statistics.cs
+++ b/src/Models/Statistics.cs
@@ -11,47 +11,54 @@ using SkiaSharp;
namespace SourceGit.Models
{
- public enum StatisticsMode
+ public enum StaticsticsMode
{
All,
ThisMonth,
ThisWeek,
}
- public class StatisticsAuthor(User user, int count)
+ public class StaticsticsAuthor(string name, int count)
{
- public User User { get; set; } = user;
+ public string Name { get; set; } = name;
+ public int Count { get; set; } = count;
+ }
+
+ public class StaticsticsSample(DateTime time, int count)
+ {
+ public DateTime Time { get; set; } = time;
public int Count { get; set; } = count;
}
public class StatisticsReport
{
- public int Total { get; set; } = 0;
- public List Authors { get; set; } = new();
- public List Series { get; set; } = new();
- public List XAxes { get; set; } = new();
- public List YAxes { get; set; } = new();
- public StatisticsAuthor SelectedAuthor { get => _selectedAuthor; set => ChangeAuthor(value); }
+ public static readonly string[] WEEKDAYS = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
- public StatisticsReport(StatisticsMode mode, DateTime start)
+ public int Total { get; set; } = 0;
+ public List Authors { get; set; } = new List();
+ public List Series { get; set; } = new List();
+ public List XAxes { get; set; } = new List();
+ public List YAxes { get; set; } = new List();
+
+ public StatisticsReport(StaticsticsMode mode, DateTime start)
{
_mode = mode;
- YAxes.Add(new Axis()
+ YAxes = [new Axis()
{
TextSize = 10,
MinLimit = 0,
SeparatorsPaint = new SolidColorPaint(new SKColor(0x40808080)) { StrokeThickness = 1 }
- });
+ }];
- if (mode == StatisticsMode.ThisWeek)
+ if (mode == StaticsticsMode.ThisWeek)
{
for (int i = 0; i < 7; i++)
_mapSamples.Add(start.AddDays(i), 0);
XAxes.Add(new DateTimeAxis(TimeSpan.FromDays(1), v => WEEKDAYS[(int)v.DayOfWeek]) { TextSize = 10 });
}
- else if (mode == StatisticsMode.ThisMonth)
+ else if (mode == StaticsticsMode.ThisMonth)
{
var now = DateTime.Now;
var maxDays = DateTime.DaysInMonth(now.Year, now.Month);
@@ -66,12 +73,12 @@ namespace SourceGit.Models
}
}
- public void AddCommit(DateTime time, User author)
+ public void AddCommit(DateTime time, string author)
{
Total++;
- DateTime normalized;
- if (_mode == StatisticsMode.ThisWeek || _mode == StatisticsMode.ThisMonth)
+ var normalized = DateTime.MinValue;
+ if (_mode == StaticsticsMode.ThisWeek || _mode == StaticsticsMode.ThisMonth)
normalized = time.Date;
else
normalized = new DateTime(time.Year, time.Month, 1).ToLocalTime();
@@ -85,30 +92,10 @@ namespace SourceGit.Models
_mapUsers[author] = vu + 1;
else
_mapUsers.Add(author, 1);
-
- if (_mapUserSamples.TryGetValue(author, out var vus))
- {
- if (vus.TryGetValue(normalized, out var n))
- vus[normalized] = n + 1;
- else
- vus.Add(normalized, 1);
- }
- else
- {
- _mapUserSamples.Add(author, new Dictionary
- {
- { normalized, 1 }
- });
- }
}
public void Complete()
{
- foreach (var kv in _mapUsers)
- Authors.Add(new StatisticsAuthor(kv.Key, kv.Value));
-
- Authors.Sort((l, r) => r.Count - l.Count);
-
var samples = new List();
foreach (var kv in _mapSamples)
samples.Add(new DateTimePoint(kv.Key, kv.Value));
@@ -123,111 +110,65 @@ namespace SourceGit.Models
}
);
+ foreach (var kv in _mapUsers)
+ Authors.Add(new StaticsticsAuthor(kv.Key, kv.Value));
+
+ Authors.Sort((l, r) => r.Count - l.Count);
+
_mapUsers.Clear();
_mapSamples.Clear();
}
public void ChangeColor(uint color)
{
- _fillColor = color;
-
- var fill = new SKColor(color);
-
- if (Series.Count > 0 && Series[0] is ColumnSeries total)
- total.Fill = new SolidColorPaint(_selectedAuthor == null ? fill : fill.WithAlpha(51));
-
- if (Series.Count > 1 && Series[1] is ColumnSeries user)
- user.Fill = new SolidColorPaint(fill);
+ if (Series is [ColumnSeries series])
+ series.Fill = new SolidColorPaint(new SKColor(color));
}
- public void ChangeAuthor(StatisticsAuthor author)
- {
- if (author == _selectedAuthor)
- return;
-
- _selectedAuthor = author;
- Series.RemoveRange(1, Series.Count - 1);
- if (author == null || !_mapUserSamples.TryGetValue(author.User, out var userSamples))
- {
- ChangeColor(_fillColor);
- return;
- }
-
- var samples = new List();
- foreach (var kv in userSamples)
- samples.Add(new DateTimePoint(kv.Key, kv.Value));
-
- Series.Add(
- new ColumnSeries