diff --git a/.editorconfig b/.editorconfig index 56725e7b..dedc5722 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 @@ -206,9 +206,6 @@ dotnet_diagnostic.CA1854.severity = warning #CA2211:Non-constant fields should not be visible dotnet_diagnostic.CA2211.severity = error -# IDE0005: remove used namespace using -dotnet_diagnostic.IDE0005.severity = error - # Wrapping preferences csharp_wrap_before_ternary_opsigns = false @@ -295,12 +292,3 @@ indent_size = 2 end_of_line = lf [*.{cmd,bat}] end_of_line = crlf - -# Package manifests -[{*.spec,control}] -end_of_line = lf - -# YAML files -[*.{yml,yaml}] -indent_size = 2 -end_of_line = lf diff --git a/.gitattributes b/.gitattributes index bd1dfea9..69139978 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,14 +1,78 @@ +# Auto detect text files and perform LF normalization +# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/ * text=auto + +# +# The above will handle all files NOT found below +# + +# Documents +*.bibtex text diff=bibtex +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain *.md text +*.tex text diff=tex +*.adoc text +*.textile text +*.mustache text +*.csv text +*.tab text +*.tsv text +*.txt text +*.sql text + +# Graphics *.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary *.ico binary +# SVG treated as an asset (binary) by default. +*.svg text +# If you want to treat it as binary, +# use the following line instead. +# *.svg binary +*.eps binary + +# Scripts +*.bash text eol=lf +*.fish text eol=lf *.sh text eol=lf -*.spec text eol=lf -control text eol=lf +# These are explicitly windows files and should use crlf *.bat text eol=crlf *.cmd text eol=crlf *.ps1 text eol=crlf + +# Serialisation *.json text +*.toml text +*.xml text +*.yaml text +*.yml text + +# Archives +*.7z binary +*.gz binary +*.tar binary +*.tgz binary +*.zip binary + +# Text files where line endings should be preserved +*.patch -text + +# +# Exclude files from exporting +# .gitattributes export-ignore -.gitignore export-ignore +.gitignore export-ignore \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 12792cf6..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Build -on: - workflow_call: -jobs: - build: - strategy: - matrix: - include: - - name : Windows x64 - os: windows-2019 - runtime: win-x64 - - name : Windows ARM64 - os: windows-2019 - runtime: win-arm64 - - name : macOS (Intel) - os: macos-13 - runtime: osx-x64 - - name : macOS (Apple Silicon) - os: macos-latest - runtime: osx-arm64 - - name : Linux - os: ubuntu-latest - runtime: linux-x64 - container: ubuntu:20.04 - - name : Linux (arm64) - os: ubuntu-latest - 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 - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 9.0.x - - name: Configure arm64 packages - if: ${{ matrix.runtime == 'linux-arm64' }} - run: | - sudo dpkg --add-architecture arm64 - echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted' \ - | sudo tee /etc/apt/sources.list.d/arm64.list - sudo sed -i -e 's/^deb http/deb [arch=amd64] http/g' /etc/apt/sources.list - sudo sed -i -e 's/^deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list - - name: Install cross-compiling dependencies - if: ${{ matrix.runtime == 'linux-arm64' }} - run: | - sudo apt-get update - sudo apt-get install -y llvm gcc-aarch64-linux-gnu - - name: Build - run: dotnet build -c Release - - name: Publish - run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.runtime }} - - name: Rename executable file - if: ${{ startsWith(matrix.runtime, 'linux-') }} - run: mv publish/SourceGit publish/sourcegit - - name: Tar artifact - if: ${{ startsWith(matrix.runtime, 'linux-') || startsWith(matrix.runtime, 'osx-') }} - run: | - tar -cvf "sourcegit.${{ matrix.runtime }}.tar" -C publish . - rm -r publish/* - mv "sourcegit.${{ matrix.runtime }}.tar" publish - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: sourcegit.${{ matrix.runtime }} - path: publish/* diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50e02dc9..c8e1ea8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,29 +1,42 @@ name: Continuous Integration on: push: - branches: [develop] + branches: + - develop pull_request: branches: [develop] workflow_dispatch: - workflow_call: jobs: build: name: Build - uses: ./.github/workflows/build.yml - version: - name: Prepare version string - runs-on: ubuntu-latest - outputs: - version: ${{ steps.version.outputs.version }} + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-latest + platform: linux-x64 + - os: windows-latest + platform: win-x64 + - os: macos-latest + platform: osx-x64 + - os: macos-latest + platform: osx-arm64 + runs-on: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v4 - - name: Output version string - id: version - run: echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT" - package: - needs: [build, version] - name: Package - uses: ./.github/workflows/package.yml - with: - version: ${{ needs.version.outputs.version }} + with: + fetch-depth: 0 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Build + run: dotnet build -c Release + - name: Publish + run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.platform }} -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.platform }} + path: publish diff --git a/.github/workflows/localization-check.yml b/.github/workflows/localization-check.yml deleted file mode 100644 index 8dcd61c8..00000000 --- a/.github/workflows/localization-check.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Localization Check -on: - push: - branches: [ develop ] - paths: - - 'src/Resources/Locales/**' - workflow_dispatch: - workflow_call: - -jobs: - localization-check: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: '20.x' - - - name: Install dependencies - run: npm install fs-extra@11.2.0 path@0.12.7 xml2js@0.6.2 - - - name: Run localization check - run: node build/scripts/localization-check.js - - - name: Commit changes - run: | - 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 push - else - echo "No changes to commit" - fi - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml deleted file mode 100644 index 2dfc97fd..00000000 --- a/.github/workflows/package.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: Package -on: - workflow_call: - inputs: - version: - description: SourceGit package version - required: true - type: string -jobs: - windows: - name: Package Windows - runs-on: windows-2019 - strategy: - matrix: - runtime: [ win-x64, win-arm64 ] - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Download build - uses: actions/download-artifact@v4 - with: - name: sourcegit.${{ matrix.runtime }} - path: build/SourceGit - - name: Package - shell: bash - env: - VERSION: ${{ inputs.version }} - RUNTIME: ${{ matrix.runtime }} - run: ./build/scripts/package.windows.sh - - name: Upload package artifact - uses: actions/upload-artifact@v4 - with: - name: package.${{ matrix.runtime }} - path: build/sourcegit_*.zip - - name: Delete temp artifacts - uses: geekyeggo/delete-artifact@v5 - with: - name: sourcegit.${{ matrix.runtime }} - osx-app: - name: Package macOS - runs-on: macos-latest - strategy: - matrix: - runtime: [osx-x64, osx-arm64] - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Download build - uses: actions/download-artifact@v4 - with: - name: sourcegit.${{ matrix.runtime }} - path: build - - name: Package - env: - VERSION: ${{ inputs.version }} - RUNTIME: ${{ matrix.runtime }} - run: | - mkdir build/SourceGit - tar -xf "build/sourcegit.${{ matrix.runtime }}.tar" -C build/SourceGit - ./build/scripts/package.osx-app.sh - - name: Upload package artifact - uses: actions/upload-artifact@v4 - with: - name: package.${{ matrix.runtime }} - path: build/sourcegit_*.zip - - name: Delete temp artifacts - uses: geekyeggo/delete-artifact@v5 - with: - name: sourcegit.${{ matrix.runtime }} - linux: - name: Package Linux - runs-on: ubuntu-latest - container: ubuntu:20.04 - strategy: - matrix: - runtime: [linux-x64, linux-arm64] - steps: - - name: Checkout sources - 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 - - name: Download build - uses: actions/download-artifact@v4 - with: - name: sourcegit.${{ matrix.runtime }} - path: build - - name: Package - 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 - ./build/scripts/package.linux.sh - - name: Upload package artifacts - uses: actions/upload-artifact@v4 - with: - name: package.${{ matrix.runtime }} - path: | - build/sourcegit-*.AppImage - build/sourcegit_*.deb - build/sourcegit-*.rpm - - name: Delete temp artifacts - uses: geekyeggo/delete-artifact@v5 - with: - name: sourcegit.${{ matrix.runtime }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index e61e608b..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Release -on: - push: - tags: - - v* -jobs: - build: - name: Build - uses: ./.github/workflows/build.yml - version: - name: Prepare version string - runs-on: ubuntu-latest - outputs: - version: ${{ steps.version.outputs.version }} - steps: - - name: Output version string - id: version - env: - TAG: ${{ github.ref_name }} - run: echo "version=${TAG#v}" >> "$GITHUB_OUTPUT" - package: - needs: [build, version] - name: Package - uses: ./.github/workflows/package.yml - with: - version: ${{ needs.version.outputs.version }} - release: - needs: [package, version] - name: Release - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Create release - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAG: ${{ github.ref_name }} - VERSION: ${{ needs.version.outputs.version }} - run: gh release create "$TAG" -t "$VERSION" --notes-from-tag - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - pattern: package.* - path: packages - merge-multiple: true - - name: Upload assets - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAG: ${{ github.ref_name }} - run: gh release upload "$TAG" packages/* diff --git a/.gitignore b/.gitignore index e686a534..05b24d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,425 @@ -.vs/ -.vscode/ -.idea/ - -*.sln.docstates -*.user +# User-specific files +*.rsuser *.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Nuke Build - Uncomment if you are using it +.nuke/temp + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json *.code-workspace +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +### Linux ### + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General .DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd .Spotlight-V100 @@ -16,26 +428,182 @@ .VolumeIcon.icns .com.apple.timemachine.donotpresent +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### Rider ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +.idea/ + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### VisualStudioCode ### +!.vscode/*.code-snippets + +# Local History for Visual Studio Code + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +### Windows ### +# Windows thumbnail cache files Thumbs.db Thumbs.db:encryptable ehthumbs.db ehthumbs_vista.db -bin/ -obj/ -# ignore ci node files -node_modules/ -package.json -package-lock.json +# Dump file +*.stackdump -build/resources/ -build/SourceGit/ -build/SourceGit.app/ -build/*.zip -build/*.tar.gz -build/*.deb -build/*.rpm -build/*.AppImage -SourceGit.app/ -build.command -src/Properties/launchSettings.json +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files + +# Windows shortcuts +*.lnk + +### Specifics ### + +# Specials +*.zip +archives +package-lock.json +*.private.env.json +**/**/[Dd]ata/*.json +**/**/[Dd]ata/*.csv + +# SpecFlow +*.feature.cs + +# Azurite +*azurite*.json + +# Build Folders +[Pp]ublish +[Oo]utput +[Ss]cripts +[Tt]ests/[Rr]esults + +# LibraryManager +**/lib + +# BuildBundlerMinifier +*.min.* +*.map + +# Sass Output +**/css + +# SQLite files +*.db +*.sqlite3 +*.sqlite +*.db-journal +*.sqlite3-journal +*.sqlite-journal +*.db-shm +*.db-wal + +## SourceGit ### + +# Output folders. +[Bb]uild/[Ss]ource[Gg]it/ +[Bb]uild/[Ss]ource[Gg]it.app/ + +# Files +SourceGit.win-x64.zip +SourceGit.linux-x64.tar.gz +SourceGit.osx-x64.zip +SourceGit.osx-arm64.zip \ No newline at end of file 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..e84afc3b 100644 --- a/README.md +++ b/README.md @@ -1,207 +1,86 @@ -# SourceGit - Opensource Git GUI client. +# SourceGit -[![stars](https://img.shields.io/github/stars/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/stargazers) -[![forks](https://img.shields.io/github/forks/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/forks) -[![license](https://img.shields.io/github/license/sourcegit-scm/sourcegit.svg)](LICENSE) -[![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/releases/latest) -[![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)](https://github.com/sourcegit-scm/sourcegit/releases) +Opensource Git GUI client. ## Highlights * Supports Windows/macOS/Linux * Opensource/Free * Fast -* Deutsch/English/Español/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil) +* English/简体中文 * 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 * Branches * Remotes * Tags * Stashes * Submodules - * Worktrees * Archive * Diff * Save as patch/apply * File histories * Blame * 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)) +* GitFlow support -> [!WARNING] -> **Linux** only tested on **Debian 12** on both **X11** & **Wayland**. +> **Linux** only tested on **Ubuntu 22.04** on **X11**. -## Translation Status +## How to use -You can find the current translation status in [TRANSLATION.md](https://github.com/sourcegit-scm/sourcegit/blob/develop/TRANSLATION.md) +**To use this tool, you need to install Git first.** -## How to Use - -**To use this tool, you need to install Git(>=2.25.1) 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. - -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` | -| 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 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. For **Windows** users: * **MSYS Git is NOT supported**. Please use official [Git for Windows](https://git-scm.com/download/win) instead. -* You can install the latest stable from `winget` with follow commands: - ```shell - winget install SourceGit - ``` -> [!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: - ```shell - scoop bucket add extras - scoop install sourcegit - ``` -* Pre-built binaries can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) +* `Source.win-x64.zip` may be reported as virus by Windows Defender. I don't know why. I have manually tested the zip to be uploaded using Windows Defender before uploading and no virus was found. If you have installed .NET 8 SDK locally, I suggest you to compile it yourself. And if you have any idea about how to fix this, please open an issue. For **macOS** users: -* Thanks [@ybeapps](https://github.com/ybeapps) for making `SourceGit` available on `Homebrew`. You can simply install it with following command: - ```shell - 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: - ```shell - sudo xattr -cr /Applications/SourceGit.app - ``` +* Download `SourceGit.osx-x64.zip` or `SourceGit.osx-arm64.zip` from Releases. `x64` for Intel and `arm64` for Apple Silicon. +* Move `SourceGit.app` to `Applications` folder. +* Make sure your mac trusts all software from anywhere. For more information, search `spctl --master-disable`. * Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your mac. -* You can run `echo $PATH > ~/Library/Application\ Support/SourceGit/PATH` to generate a custom PATH env file to introduce `PATH` env to SourceGit. +* You may need to run `sudo xattr -cr /Applications/SourceGit.app` to make sure the software works. 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: - ```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 - ``` - - `rpm` how to: - ```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 - ``` - - 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. -* 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`. - -## 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. - -For `OpenAI`: - -* `Server` must be `https://api.openai.com/v1` - -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 `API Key` is optional that depends on the service +* `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, and it requires `ttf-mscorefonts-installer` installed. +* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI. +* Modify `SourceGit.desktop.template` (replace SOURCEGIT_LOCAL_FOLDER with real path) and move it into `~/.local/share/applications`. ## External Tools This app supports open repository in external tools listed in the table below. -| Tool | Windows | macOS | Linux | -|-------------------------------|---------|-------|-------| -| Visual Studio Code | YES | YES | YES | -| Visual Studio Code - Insiders | YES | YES | YES | -| VSCodium | YES | YES | YES | -| Fleet | YES | YES | YES | -| Sublime Text | YES | YES | YES | -| Zed | NO | YES | YES | -| Visual Studio | YES | NO | NO | +| Tool | Windows | macOS | Linux | Environment Variable | +| --- | --- | --- | --- | --- | +| Visual Studio Code | YES | YES | YES | VSCODE_PATH | +| Visual Studio Code - Insiders | YES | YES | YES | VSCODE_INSIDERS_PATH | +| JetBrains Fleet | YES | YES | YES | FLEET_PATH | +| Sublime Text | YES | YES | YES | SUBLIME_TEXT_PATH | -> [!NOTE] -> This app will try to find those tools based on some pre-defined or expected locations automatically. If you are using one portable version of these tools, it will not be detected by this app. -> To solve this problem you can add a file named `external_editors.json` in app data storage directory and provide the path directly. For example: -```json -{ - "tools": { - "Visual Studio Code": "D:\\VSCode\\Code.exe" - } -} -``` - -> [!NOTE] -> This app also supports a lot of `JetBrains` IDEs, installing `JetBrains Toolbox` will help this app to find them. +You can set the given environment variable for special tool if it can NOT be found by this app automatically. ## Screenshots * Dark Theme - ![Theme Dark](./screenshots/theme_dark.png) +![Theme Dark](./screenshots/theme_dark.png) * Light Theme - ![Theme Light](./screenshots/theme_light.png) - -* Custom - - You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git). And welcome to share your own themes. +![Theme Light](./screenshots/theme_light.png) ## Contributing -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. -[![Contributors](https://contrib.rocks/image?repo=sourcegit-scm/sourcegit&columns=20)](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..1efe00f1 100644 --- a/SourceGit.sln +++ b/SourceGit.sln @@ -6,18 +6,24 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGit", "src\SourceGit.csproj", "{2091C34D-4A17-4375-BEF3-4D60BE8113E4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{773082AC-D9C8-4186-8521-4B6A7BEE6158}" + ProjectSection(SolutionItems) = preProject + build\build.linux.sh = build\build.linux.sh + build\build.osx.command = build\build.osx.command + build\build.windows.ps1 = build\build.windows.ps1 + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{FD384607-ED99-47B7-AF31-FB245841BC92}" + ProjectSection(SolutionItems) = preProject + build\resources\App.icns = build\resources\App.icns + build\resources\App.plist = build\resources\App.plist + build\resources\SourceGit.desktop.template = build\resources\SourceGit.desktop.template + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F45A9D95-AF25-42D8-BBAC-8259C9EEE820}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{67B6D05F-A000-40BA-ADB4-C9065F880D7B}" ProjectSection(SolutionItems) = preProject - .github\workflows\build.yml = .github\workflows\build.yml .github\workflows\ci.yml = .github\workflows\ci.yml - .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 EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49A7C2D6-558C-4FAA-8F5D-EEE81497AED7}" @@ -30,59 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "files", "files", "{3AB707DB global.json = global.json LICENSE = LICENSE README.md = README.md - VERSION = VERSION - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{ABC98884-F023-4EF4-A9C9-5DE9452BE955}" - ProjectSection(SolutionItems) = preProject - build\resources\app\App.icns = build\resources\app\App.icns - build\resources\app\App.plist = build\resources\app\App.plist - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_common", "_common", "{04FD74B1-FBDB-496E-A48F-3D59D71FF952}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "usr", "usr", "{76639799-54BC-45E8-BD90-F45F63ACD11D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "share", "share", "{A3ABAA7C-EE14-4448-B466-6E69C1347E7D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{2AF28D3B-14A8-46A8-B828-157FAAB1B06F}" - ProjectSection(SolutionItems) = preProject - build\resources\_common\usr\share\applications\sourcegit.desktop = build\resources\_common\usr\share\applications\sourcegit.desktop - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "icons", "icons", "{7166EC6C-17F5-4B5E-B38E-1E53C81EACF6}" - ProjectSection(SolutionItems) = preProject - build\resources\_common\usr\share\icons\sourcegit.png = build\resources\_common\usr\share\icons\sourcegit.png - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deb", "deb", "{9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC}" -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}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPECS", "SPECS", "{7802CD7A-591B-4EDD-96F8-9BF3F61692E4}" - ProjectSection(SolutionItems) = preProject - build\resources\rpm\SPECS\build.spec = build\resources\rpm\SPECS\build.spec - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "appimage", "appimage", "{5D125DD9-B48A-491F-B2FB-D7830D74C4DC}" - ProjectSection(SolutionItems) = preProject - build\resources\appimage\sourcegit.appdata.xml = build\resources\appimage\sourcegit.appdata.xml - build\resources\appimage\sourcegit.png = build\resources\appimage\sourcegit.png - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{C54D4001-9940-477C-A0B6-E795ED0A3209}" - ProjectSection(SolutionItems) = preProject - build\scripts\localization-check.js = build\scripts\localization-check.js - build\scripts\package.linux.sh = build\scripts\package.linux.sh - build\scripts\package.osx-app.sh = build\scripts\package.osx-app.sh - build\scripts\package.windows.sh = build\scripts\package.windows.sh EndProjectSection EndProject Global @@ -103,18 +56,6 @@ Global {2091C34D-4A17-4375-BEF3-4D60BE8113E4} = {49A7C2D6-558C-4FAA-8F5D-EEE81497AED7} {FD384607-ED99-47B7-AF31-FB245841BC92} = {773082AC-D9C8-4186-8521-4B6A7BEE6158} {67B6D05F-A000-40BA-ADB4-C9065F880D7B} = {F45A9D95-AF25-42D8-BBAC-8259C9EEE820} - {ABC98884-F023-4EF4-A9C9-5DE9452BE955} = {FD384607-ED99-47B7-AF31-FB245841BC92} - {04FD74B1-FBDB-496E-A48F-3D59D71FF952} = {FD384607-ED99-47B7-AF31-FB245841BC92} - {76639799-54BC-45E8-BD90-F45F63ACD11D} = {04FD74B1-FBDB-496E-A48F-3D59D71FF952} - {A3ABAA7C-EE14-4448-B466-6E69C1347E7D} = {76639799-54BC-45E8-BD90-F45F63ACD11D} - {2AF28D3B-14A8-46A8-B828-157FAAB1B06F} = {A3ABAA7C-EE14-4448-B466-6E69C1347E7D} - {7166EC6C-17F5-4B5E-B38E-1E53C81EACF6} = {A3ABAA7C-EE14-4448-B466-6E69C1347E7D} - {9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC} = {FD384607-ED99-47B7-AF31-FB245841BC92} - {F101849D-BDB7-40D4-A516-751150C3CCFC} = {9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC} - {9BA0B044-0CC9-46F8-B551-204F149BF45D} = {FD384607-ED99-47B7-AF31-FB245841BC92} - {7802CD7A-591B-4EDD-96F8-9BF3F61692E4} = {9BA0B044-0CC9-46F8-B551-204F149BF45D} - {5D125DD9-B48A-491F-B2FB-D7830D74C4DC} = {FD384607-ED99-47B7-AF31-FB245841BC92} - {C54D4001-9940-477C-A0B6-E795ED0A3209} = {773082AC-D9C8-4186-8521-4B6A7BEE6158} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7FF1B9C6-B5BF-4A50-949F-4B407A0E31C9} 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 deleted file mode 100644 index 051440f0..00000000 --- a/TRANSLATION.md +++ /dev/null @@ -1,511 +0,0 @@ -# Translation Status - -This document shows the translation status of each locale file in the repository. - -## Details - -### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen) - -### ![de__DE](https://img.shields.io/badge/de__DE-96.14%25-yellow) - -
-Missing keys in de_DE.axaml - -- 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](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen) - -### ![fr__FR](https://img.shields.io/badge/fr__FR-92.03%25-yellow) - -
-Missing keys in fr_FR.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.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 - -
- -### ![it__IT](https://img.shields.io/badge/it__IT-97.38%25-yellow) - -
-Missing keys in it_IT.axaml - -- 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 - -
- -### ![ja__JP](https://img.shields.io/badge/ja__JP-91.78%25-yellow) - -
-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 - -
- -### ![pt__BR](https://img.shields.io/badge/pt__BR-83.81%25-yellow) - -
-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.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.Repository.FilterCommits -- Text.Repository.HistoriesLayout -- Text.Repository.HistoriesLayout.Horizontal -- Text.Repository.HistoriesLayout.Vertical -- Text.Repository.HistoriesOrder -- Text.Repository.Notifications.Clear -- Text.Repository.OnlyHighlightCurrentBranchInHistories -- Text.Repository.Search.ByContent -- Text.Repository.ShowSubmodulesAsTree -- 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.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 - -
- -### ![ru__RU](https://img.shields.io/badge/ru__RU-99.75%25-yellow) - -
-Missing keys in ru_RU.axaml - -- Text.Checkout.WithFastForward -- Text.Checkout.WithFastForward.Upstream - -
- -### ![ta__IN](https://img.shields.io/badge/ta__IN-91.91%25-yellow) - -
-Missing keys in ta_IN.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.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 - -
- -### ![uk__UA](https://img.shields.io/badge/uk__UA-93.15%25-yellow) - -
-Missing keys in uk_UA.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.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](https://img.shields.io/badge/zh__CN-%E2%88%9A-brightgreen) - -### ![zh__TW](https://img.shields.io/badge/zh__TW-%E2%88%9A-brightgreen) \ No newline at end of file diff --git a/VERSION b/VERSION deleted file mode 100644 index d3e094ba..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2025.22 \ No newline at end of file diff --git a/build/README.md b/build/README.md deleted file mode 100644 index 17305edf..00000000 --- a/build/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# build - -> [!WARNING] -> The files under the `build` folder is used for `Github Action` only, **NOT** for end users. - -## How to build this project manually - -1. Make sure [.NET SDK 9](https://dotnet.microsoft.com/en-us/download) is installed on your machine. -2. Clone this project -3. Run the follow command under the project root dir -```sh -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. diff --git a/build/build.linux.sh b/build/build.linux.sh new file mode 100644 index 00000000..60db33e8 --- /dev/null +++ b/build/build.linux.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +rm -rf SourceGit +dotnet publish ../src/SourceGit.csproj -c Release -r linux-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained +cp resources/SourceGit.desktop.template SourceGit/SourceGit.desktop.template +cp resources/App.icns SourceGit/SourceGit.icns +tar -zcvf SourceGit.linux-x64.tar.gz --exclude="*/*.dbg" SourceGit +rm -rf SourceGit diff --git a/build/build.osx.command b/build/build.osx.command new file mode 100644 index 00000000..2d4127c1 --- /dev/null +++ b/build/build.osx.command @@ -0,0 +1,17 @@ +#!/bin/sh + +rm -rf SourceGit.app + +mkdir -p SourceGit.app/Contents/Resources +cp resources/App.plist SourceGit.app/Contents/Info.plist +cp resources/App.icns SourceGit.app/Contents/Resources/App.icns + +mkdir -p SourceGit.app/Contents/MacOS +dotnet publish ../src/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained +zip SourceGit.osx-arm64.zip -r SourceGit.app -x "*/*\.dsym/*" + +rm -rf SourceGit.app/Contents/MacOS + +mkdir -p SourceGit.app/Contents/MacOS +dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained +zip SourceGit.osx-x64.zip -r SourceGit.app -x "*/*\.dsym/*" diff --git a/build/build.windows.ps1 b/build/build.windows.ps1 new file mode 100644 index 00000000..e18e58e8 --- /dev/null +++ b/build/build.windows.ps1 @@ -0,0 +1,13 @@ +if (Test-Path SourceGit) { + Remove-Item SourceGit -Recurse -Force +} + +if (Test-Path SourceGit.win-x64.zip) { + Remove-Item SourceGit.win-x64.zip -Force +} + +dotnet publish ..\src\SourceGit.csproj -c Release -r win-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained + +Remove-Item SourceGit\*.pdb -Force + +Compress-Archive -Path SourceGit -DestinationPath SourceGit.win-x64.zip diff --git a/build/resources/app/App.icns b/build/resources/App.icns similarity index 100% rename from build/resources/app/App.icns rename to build/resources/App.icns diff --git a/build/resources/App.plist b/build/resources/App.plist new file mode 100644 index 00000000..3327c5d8 --- /dev/null +++ b/build/resources/App.plist @@ -0,0 +1,26 @@ + + + + + CFBundleIconFile + App.icns + CFBundleIdentifier + com.sourcegit-scm.sourcegit + CFBundleName + SourceGit + CFBundleVersion + 8.8.0 + LSMinimumSystemVersion + 10.12 + CFBundleExecutable + SourceGit + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleShortVersionString + 8.8 + NSHighResolutionCapable + + + diff --git a/build/resources/SourceGit.desktop.template b/build/resources/SourceGit.desktop.template new file mode 100644 index 00000000..ec4b7c41 --- /dev/null +++ b/build/resources/SourceGit.desktop.template @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=SourceGit +Comment=Free & OpenSource Git Client +Exec=SOURCEGIT_LOCAL_FOLDER/SourceGit +Icon=SOURCEGIT_LOCAL_FOLDER/SourceGit.icns +Type=Application +Terminal=false \ No newline at end of file diff --git a/build/resources/_common/applications/sourcegit.desktop b/build/resources/_common/applications/sourcegit.desktop deleted file mode 100644 index bcf9c813..00000000 --- a/build/resources/_common/applications/sourcegit.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=SourceGit -Comment=Open-source & Free Git GUI Client -Exec=/opt/sourcegit/sourcegit -Icon=/usr/share/icons/sourcegit.png -Terminal=false -Type=Application -Categories=Development -MimeType=inode/directory; diff --git a/build/resources/_common/icons/sourcegit.png b/build/resources/_common/icons/sourcegit.png deleted file mode 100644 index 8cdcd3a8..00000000 Binary files a/build/resources/_common/icons/sourcegit.png and /dev/null differ diff --git a/build/resources/app/App.plist b/build/resources/app/App.plist deleted file mode 100644 index ba6f40a2..00000000 --- a/build/resources/app/App.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleIconFile - App.icns - CFBundleIdentifier - com.sourcegit-scm.sourcegit - CFBundleName - SourceGit - CFBundleVersion - SOURCE_GIT_VERSION.0 - LSMinimumSystemVersion - 11.0 - CFBundleExecutable - SourceGit - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleShortVersionString - SOURCE_GIT_VERSION - NSHighResolutionCapable - - - diff --git a/build/resources/appimage/sourcegit.appdata.xml b/build/resources/appimage/sourcegit.appdata.xml deleted file mode 100644 index 012c82d3..00000000 --- a/build/resources/appimage/sourcegit.appdata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - com.sourcegit_scm.SourceGit - MIT - MIT - SourceGit - Open-source GUI client for git users - -

Open-source GUI client for git users

- - https://github.com/sourcegit-scm/sourcegit - com.sourcegit_scm.SourceGit.desktop - - com.sourcegit_scm.SourceGit.desktop - - diff --git a/build/resources/appimage/sourcegit.png b/build/resources/appimage/sourcegit.png deleted file mode 100644 index 8cdcd3a8..00000000 Binary files a/build/resources/appimage/sourcegit.png and /dev/null differ diff --git a/build/resources/deb/DEBIAN/control b/build/resources/deb/DEBIAN/control deleted file mode 100755 index 71786b43..00000000 --- a/build/resources/deb/DEBIAN/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: sourcegit -Version: 2025.10 -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 -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 deleted file mode 100644 index 2a684837..00000000 --- a/build/resources/rpm/SPECS/build.spec +++ /dev/null @@ -1,38 +0,0 @@ -Name: sourcegit -Version: %_version -Release: 1 -Summary: Open-source & Free Git Gui Client -License: MIT -URL: https://sourcegit-scm.github.io/ -Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz -Requires: libX11.so.6()(%{__isa_bits}bit) -Requires: libSM.so.6()(%{__isa_bits}bit) -Requires: libicu -Requires: xdg-utils - -%define _build_id_links none - -%description -Open-source & Free Git Gui Client - -%install -mkdir -p %{buildroot}/opt/sourcegit -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/usr/share/applications -mkdir -p %{buildroot}/usr/share/icons -cp -f ../../../SourceGit/* %{buildroot}/opt/sourcegit/ -ln -rsf %{buildroot}/opt/sourcegit/sourcegit %{buildroot}/%{_bindir} -cp -r ../../_common/applications %{buildroot}/%{_datadir} -cp -r ../../_common/icons %{buildroot}/%{_datadir} -chmod 755 -R %{buildroot}/opt/sourcegit -chmod 755 %{buildroot}/%{_datadir}/applications/sourcegit.desktop - -%files -%dir /opt/sourcegit/ -/opt/sourcegit/* -/usr/share/applications/sourcegit.desktop -/usr/share/icons/* -%{_bindir}/sourcegit - -%changelog -# skip diff --git a/build/scripts/localization-check.js b/build/scripts/localization-check.js deleted file mode 100644 index 8d636b5b..00000000 --- a/build/scripts/localization-check.js +++ /dev/null @@ -1,83 +0,0 @@ -const fs = require('fs-extra'); -const path = require('path'); -const xml2js = require('xml2js'); - -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 parser = new xml2js.Parser(); - -async function parseXml(filePath) { - const data = await fs.readFile(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 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(`### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)`); - - 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)); - - // Sort and clean up extra translations - const sortedAndCleaned = await filterAndSortTranslations(localeData, enUSKeys, enUSData); - localeData.ResourceDictionary['x:String'] = sortedAndCleaned; - - // 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(`### ![${locale}](https://img.shields.io/badge/${locale}-${progress.toFixed(2)}%25-${badgeColor})`); - lines.push(`
\nMissing keys in ${file}\n\n${missingKeys.map(key => `- ${key}`).join('\n')}\n\n
`) - } else { - lines.push(`### ![${locale}](https://img.shields.io/badge/${locale}-%E2%88%9A-brightgreen)`); - } - } - - const content = lines.join('\n\n'); - console.log(content); - await fs.writeFile(outputFile, content, 'utf8'); -} - -calculateTranslationRate().catch(err => console.error(err)); diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh deleted file mode 100755 index 1b4adbdc..00000000 --- a/build/scripts/package.linux.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o -set -u -set pipefail - -arch= -appimage_arch= -target= -case "$RUNTIME" in - linux-x64) - arch=amd64 - appimage_arch=x86_64 - target=x86_64;; - linux-arm64) - arch=arm64 - appimage_arch=arm_aarch64 - target=aarch64;; - *) - echo "Unknown runtime $RUNTIME" - exit 1;; -esac - -APPIMAGETOOL_URL=https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage - -cd build - -if [[ ! -f "appimagetool" ]]; then - curl -o appimagetool -L "$APPIMAGETOOL_URL" - chmod +x appimagetool -fi - -rm -f SourceGit/*.dbg - -mkdir -p SourceGit.AppDir/opt -mkdir -p SourceGit.AppDir/usr/share/metainfo -mkdir -p SourceGit.AppDir/usr/share/applications - -cp -r SourceGit SourceGit.AppDir/opt/sourcegit -desktop-file-install resources/_common/applications/sourcegit.desktop --dir SourceGit.AppDir/usr/share/applications \ - --set-icon com.sourcegit_scm.SourceGit --set-key=Exec --set-value=AppRun -mv SourceGit.AppDir/usr/share/applications/{sourcegit,com.sourcegit_scm.SourceGit}.desktop -cp resources/appimage/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png -ln -rsf SourceGit.AppDir/opt/sourcegit/sourcegit SourceGit.AppDir/AppRun -ln -rsf SourceGit.AppDir/usr/share/applications/com.sourcegit_scm.SourceGit.desktop SourceGit.AppDir -cp resources/appimage/sourcegit.appdata.xml SourceGit.AppDir/usr/share/metainfo/com.sourcegit_scm.SourceGit.appdata.xml - -ARCH="$appimage_arch" ./appimagetool -v SourceGit.AppDir "sourcegit-$VERSION.linux.$arch.AppImage" - -mkdir -p resources/deb/opt/sourcegit/ -mkdir -p resources/deb/usr/bin -mkdir -p resources/deb/usr/share/applications -mkdir -p resources/deb/usr/share/icons -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" - -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.osx-app.sh b/build/scripts/package.osx-app.sh deleted file mode 100755 index 2d43e24a..00000000 --- a/build/scripts/package.osx-app.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o -set -u -set pipefail - -cd build - -mkdir -p SourceGit.app/Contents/Resources -mv SourceGit SourceGit.app/Contents/MacOS -cp resources/app/App.icns SourceGit.app/Contents/Resources/App.icns -sed "s/SOURCE_GIT_VERSION/$VERSION/g" resources/app/App.plist > SourceGit.app/Contents/Info.plist -rm -rf SourceGit.app/Contents/MacOS/SourceGit.dsym - -zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit.app diff --git a/build/scripts/package.windows.sh b/build/scripts/package.windows.sh deleted file mode 100755 index c22a9d35..00000000 --- a/build/scripts/package.windows.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o -set -u -set pipefail - -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 diff --git a/global.json b/global.json index a27a2b82..b5b37b60 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "8.0.0", "rollForward": "latestMajor", "allowPrerelease": false } diff --git a/screenshots/theme_dark.png b/screenshots/theme_dark.png index 85e18481..4a9646dc 100644 Binary files a/screenshots/theme_dark.png and b/screenshots/theme_dark.png differ diff --git a/screenshots/theme_light.png b/screenshots/theme_light.png index 2e8cf6fc..669b4d18 100644 Binary files a/screenshots/theme_light.png and b/screenshots/theme_light.png differ diff --git a/src/App.Commands.cs b/src/App.Commands.cs deleted file mode 100644 index 22e9fb51..00000000 --- a/src/App.Commands.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Windows.Input; -using Avalonia.Controls; - -namespace SourceGit -{ - public partial class App - { - public class Command : ICommand - { - public event EventHandler CanExecuteChanged - { - add { } - remove { } - } - - public Command(Action action) - { - _action = action; - } - - public bool CanExecute(object parameter) => _action != null; - public void Execute(object parameter) => _action?.Invoke(parameter); - - private Action _action = null; - } - - public static bool IsCheckForUpdateCommandVisible - { - get - { -#if DISABLE_UPDATE_DETECTION - return false; -#else - return true; -#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 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 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); - }); - } -} diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs index 9cad0792..af73a68e 100644 --- a/src/App.JsonCodeGen.cs +++ b/src/App.JsonCodeGen.cs @@ -1,54 +1,9 @@ -using System; -using System.Text.Json; -using System.Text.Json.Serialization; - -using Avalonia.Controls; -using Avalonia.Media; +using System.Text.Json.Serialization; namespace SourceGit { - public class ColorConverter : JsonConverter - { - public override Color Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - return Color.Parse(reader.GetString()); - } - - public override void Write(Utf8JsonWriter writer, Color value, JsonSerializerOptions options) - { - writer.WriteStringValue(value.ToString()); - } - } - - public class GridLengthConverter : JsonConverter - { - public override GridLength Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var size = reader.GetDouble(); - return new GridLength(size, GridUnitType.Pixel); - } - - public override void Write(Utf8JsonWriter writer, GridLength value, JsonSerializerOptions options) - { - writer.WriteNumberValue(value.Value); - } - } - - [JsonSourceGenerationOptions( - WriteIndented = true, - IgnoreReadOnlyFields = true, - IgnoreReadOnlyProperties = true, - Converters = [ - typeof(ColorConverter), - typeof(GridLengthConverter), - ] - )] - [JsonSerializable(typeof(Models.ExternalToolPaths))] - [JsonSerializable(typeof(Models.InteractiveRebaseJobCollection))] - [JsonSerializable(typeof(Models.JetBrainsState))] - [JsonSerializable(typeof(Models.ThemeOverrides))] + [JsonSourceGenerationOptions(WriteIndented = true, IgnoreReadOnlyFields = true, IgnoreReadOnlyProperties = true)] [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..768ff267 100644 --- a/src/App.axaml +++ b/src/App.axaml @@ -1,6 +1,5 @@ @@ -11,37 +10,15 @@ - - - - - - - - - - + - - - - - - - - - - - - - diff --git a/src/App.axaml.cs b/src/App.axaml.cs index 8e579373..8ef9e336 100644 --- a/src/App.axaml.cs +++ b/src/App.axaml.cs @@ -1,13 +1,9 @@ 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; @@ -17,7 +13,6 @@ using Avalonia.Data.Core.Plugins; using Avalonia.Markup.Xaml; using Avalonia.Media; using Avalonia.Media.Fonts; -using Avalonia.Platform.Storage; using Avalonia.Styling; using Avalonia.Threading; @@ -25,34 +20,33 @@ namespace SourceGit { public partial class App : Application { - #region App Entry Point + [STAThread] public static void Main(string[] args) { - Native.OS.SetupDataDir(); - - AppDomain.CurrentDomain.UnhandledException += (_, e) => - { - LogException(e.ExceptionObject as Exception); - }; - - TaskScheduler.UnobservedTaskException += (_, e) => - { - e.SetObserved(); - }; - try { - if (TryLaunchAsRebaseTodoEditor(args, out int exitTodo)) - Environment.Exit(exitTodo); - else if (TryLaunchAsRebaseMessageEditor(args, out int exitMessage)) - Environment.Exit(exitMessage); - else - BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); + BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); } catch (Exception ex) { - LogException(ex); + var builder = new StringBuilder(); + builder.Append("Crash: "); + builder.Append(ex.Message); + builder.Append("\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); + + var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"); + var file = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + "SourceGit", + $"crash_{time}.log"); + File.WriteAllText(file, builder.ToString()); } } @@ -61,11 +55,6 @@ namespace SourceGit var builder = AppBuilder.Configure(); builder.UsePlatformDetect(); builder.LogToTrace(); - builder.WithInterFont(); - builder.With(new FontManagerOptions() - { - DefaultFamilyName = "fonts:Inter#Inter" - }); builder.ConfigureFonts(manager => { var monospace = new EmbeddedFontCollection( @@ -78,241 +67,74 @@ namespace SourceGit return builder; } - public static void LogException(Exception ex) - { - 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}\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 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()); - } - #endregion - - #region Utility Functions - public static void ShowWindow(object data, bool showAsDialog) - { - var impl = (Views.ChromelessWindow target, bool isDialog) => - { - if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner }) - { - if (isDialog) - target.ShowDialog(owner); - else - target.Show(owner); - } - else - { - target.Show(); - } - }; - - if (data is Views.ChromelessWindow window) - { - impl(window, showAsDialog); - return; - } - - 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 RaiseException(string context, string message) { - if (Current is App app && app._launcher != null) - app._launcher.DispatchNotification(context, message, true); + if (Current is App app && app._notificationReceiver != null) + { + var notice = new Models.Notification() { IsError = true, Message = message }; + app._notificationReceiver.OnReceiveNotification(context, notice); + } } public static void SendNotification(string context, string message) { - if (Current is App app && app._launcher != null) - app._launcher.DispatchNotification(context, message, false); + if (Current is App app && app._notificationReceiver != null) + { + var notice = new Models.Notification() { IsError = false, Message = message }; + app._notificationReceiver.OnReceiveNotification(context, notice); + } } public static void SetLocale(string localeKey) { var app = Current as App; - if (app == null) - return; - var targetLocale = app.Resources[localeKey] as ResourceDictionary; if (targetLocale == null || targetLocale == app._activeLocale) + { return; + } if (app._activeLocale != null) + { app.Resources.MergedDictionaries.Remove(app._activeLocale); + } app.Resources.MergedDictionaries.Add(targetLocale); app._activeLocale = targetLocale; } - public static void SetTheme(string theme, string themeOverridesFile) + public static void SetTheme(string theme) { - var app = Current as App; - if (app == null) - return; - if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase)) - app.RequestedThemeVariant = ThemeVariant.Light; + { + Current.RequestedThemeVariant = ThemeVariant.Light; + } else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase)) - app.RequestedThemeVariant = ThemeVariant.Dark; - else - app.RequestedThemeVariant = ThemeVariant.Default; - - if (app._themeOverrides != null) { - app.Resources.MergedDictionaries.Remove(app._themeOverrides); - app._themeOverrides = null; - } - - if (!string.IsNullOrEmpty(themeOverridesFile) && File.Exists(themeOverridesFile)) - { - try - { - var resDic = new ResourceDictionary(); - var overrides = JsonSerializer.Deserialize(File.ReadAllText(themeOverridesFile), JsonCodeGen.Default.ThemeOverrides); - foreach (var kv in overrides.BasicColors) - { - if (kv.Key.Equals("SystemAccentColor", StringComparison.Ordinal)) - resDic["SystemAccentColor"] = kv.Value; - else - resDic[$"Color.{kv.Key}"] = kv.Value; - } - - if (overrides.GraphColors.Count > 0) - Models.CommitGraph.SetPens(overrides.GraphColors, overrides.GraphPenThickness); - else - Models.CommitGraph.SetDefaultPens(overrides.GraphPenThickness); - - Models.Commit.OpacityForNotMerged = overrides.OpacityForNotMergedCommits; - - app.Resources.MergedDictionaries.Add(resDic); - app._themeOverrides = resDic; - } - catch - { - // ignore - } + Current.RequestedThemeVariant = ThemeVariant.Dark; } else { - Models.CommitGraph.SetDefaultPens(); - } - } - - public static void SetFonts(string defaultFont, string monospaceFont, bool onlyUseMonospaceFontInEditor) - { - var app = Current as App; - if (app == null) - return; - - if (app._fontsOverrides != null) - { - app.Resources.MergedDictionaries.Remove(app._fontsOverrides); - 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)); - - if (string.IsNullOrEmpty(monospaceFont)) - { - if (!string.IsNullOrEmpty(defaultFont)) - { - monospaceFont = $"fonts:SourceGit#JetBrains Mono,{defaultFont}"; - resDic.Add("Fonts.Monospace", new FontFamily(monospaceFont)); - } - } - else - { - if (!string.IsNullOrEmpty(defaultFont) && !monospaceFont.Contains(defaultFont, StringComparison.Ordinal)) - monospaceFont = $"{monospaceFont},{defaultFont}"; - - resDic.Add("Fonts.Monospace", new FontFamily(monospaceFont)); - } - - if (onlyUseMonospaceFontInEditor) - { - if (string.IsNullOrEmpty(defaultFont)) - resDic.Add("Fonts.Primary", new FontFamily("fonts:Inter#Inter")); - else - resDic.Add("Fonts.Primary", new FontFamily(defaultFont)); - } - else - { - if (!string.IsNullOrEmpty(monospaceFont)) - resDic.Add("Fonts.Primary", new FontFamily(monospaceFont)); - } - - if (resDic.Count > 0) - { - app.Resources.MergedDictionaries.Add(resDic); - app._fontsOverrides = resDic; + Current.RequestedThemeVariant = ThemeVariant.Default; } } public static async void CopyText(string data) { - if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { - if (desktop.MainWindow?.Clipboard is { } clipboard) - await clipboard.SetTextAsync(data ?? ""); - } - } - - public static async Task GetClipboardTextAsync() - { - if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) - { - if (desktop.MainWindow?.Clipboard is { } clipboard) + if (desktop.MainWindow.Clipboard is { } clipbord) { - return await clipboard.GetTextAsync(); + await clipbord.SetTextAsync(data); } } - return null; } public static string Text(string key, params object[] args) { - var fmt = Current?.FindResource($"Text.{key}") as string; + var fmt = Current.FindResource($"Text.{key}") as string; if (string.IsNullOrWhiteSpace(fmt)) return $"Text.{key}"; - - if (args == null || args.Length == 0) - return fmt; - return string.Format(fmt, args); } @@ -322,300 +144,30 @@ namespace SourceGit icon.Width = 12; icon.Height = 12; icon.Stretch = Stretch.Uniform; - - if (Current?.FindResource(key) is StreamGeometry geo) - icon.Data = geo; - + icon.Data = Current.FindResource(key) as StreamGeometry; return icon; } - public static IStorageProvider GetStorageProvider() + public static TopLevel GetTopLevel() { - if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) - return desktop.MainWindow?.StorageProvider; - + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + return desktop.MainWindow; + } return null; } - public static ViewModels.Launcher GetLauncher() - { - return Current is App app ? app._launcher : null; - } - - public static void Quit(int exitCode) - { - if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) - { - desktop.MainWindow?.Close(); - desktop.Shutdown(exitCode); - } - else - { - Environment.Exit(exitCode); - } - } - #endregion - - #region Overrides - public override void Initialize() - { - AvaloniaXamlLoader.Load(this); - - var pref = ViewModels.Preferences.Instance; - pref.PropertyChanged += (_, _) => pref.Save(); - - SetLocale(pref.Locale); - SetTheme(pref.Theme, pref.ThemeOverrides); - SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily, pref.OnlyUseMonoFontInEditor); - } - - public override void OnFrameworkInitializationCompleted() - { - if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) - { - BindingPlugins.DataValidators.RemoveAt(0); - - // Disable tooltip if window is not active. - ToolTip.ToolTipOpeningEvent.AddClassHandler((c, e) => - { - var topLevel = TopLevel.GetTopLevel(c); - if (topLevel is not Window { IsActive: true }) - e.Cancel = true; - }); - - if (TryLaunchAsCoreEditor(desktop)) - 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)) - { - if (arg.StartsWith('"') && arg.EndsWith('"')) - arg = arg.Substring(1, arg.Length - 2).Trim(); - - if (arg.Length > 0 && !Path.IsPathFullyQualified(arg)) - arg = Path.GetFullPath(arg); - } - - _ipcChannel.SendToFirstInstance(arg); - Environment.Exit(0); - } - else - { - _ipcChannel.MessageReceived += TryOpenRepository; - desktop.Exit += (_, _) => _ipcChannel.Dispose(); - TryLaunchAsNormal(desktop); - } - } - } - #endregion - - private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode) - { - exitCode = -1; - - if (args.Length <= 1 || !args[0].Equals("--rebase-todo-editor", StringComparison.Ordinal)) - return false; - - var file = args[1]; - var filename = Path.GetFileName(file); - if (!filename.Equals("git-rebase-todo", StringComparison.OrdinalIgnoreCase)) - return true; - - var dirInfo = new DirectoryInfo(Path.GetDirectoryName(file)!); - if (!dirInfo.Exists || !dirInfo.Name.Equals("rebase-merge", StringComparison.Ordinal)) - return true; - - var jobsFile = Path.Combine(dirInfo.Parent!.FullName, "sourcegit_rebase_jobs.json"); - if (!File.Exists(jobsFile)) - return true; - - var collection = JsonSerializer.Deserialize(File.ReadAllText(jobsFile), JsonCodeGen.Default.InteractiveRebaseJobCollection); - var lines = new List(); - foreach (var job in collection.Jobs) - { - switch (job.Action) - { - case Models.InteractiveRebaseAction.Pick: - lines.Add($"p {job.SHA}"); - break; - case Models.InteractiveRebaseAction.Edit: - lines.Add($"e {job.SHA}"); - break; - case Models.InteractiveRebaseAction.Reword: - lines.Add($"r {job.SHA}"); - break; - case Models.InteractiveRebaseAction.Squash: - lines.Add($"s {job.SHA}"); - break; - case Models.InteractiveRebaseAction.Fixup: - lines.Add($"f {job.SHA}"); - break; - default: - lines.Add($"d {job.SHA}"); - break; - } - } - - File.WriteAllLines(file, lines); - - exitCode = 0; - return true; - } - - private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCode) - { - exitCode = -1; - - if (args.Length <= 1 || !args[0].Equals("--rebase-message-editor", StringComparison.Ordinal)) - return false; - - exitCode = 0; - - var file = args[1]; - var filename = Path.GetFileName(file); - if (!filename.Equals("COMMIT_EDITMSG", StringComparison.OrdinalIgnoreCase)) - 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)) - 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)) - return true; - - var done = File.ReadAllText(doneFile).Trim().Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - if (done.Length == 0) - 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; - } - } - - return true; - } - - private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop) - { - var args = desktop.Args; - if (args == null || args.Length <= 1 || !args[0].Equals("--core-editor", StringComparison.Ordinal)) - return false; - - var file = args[1]; - if (!File.Exists(file)) - { - desktop.Shutdown(-1); - return true; - } - - var editor = new Views.StandaloneCommitMessageEditor(); - editor.SetFile(file); - desktop.MainWindow = editor; - return true; - } - - private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop) - { - var launchAsAskpass = Environment.GetEnvironmentVariable("SOURCEGIT_LAUNCH_AS_ASKPASS"); - if (launchAsAskpass is not "TRUE") - return false; - - var args = desktop.Args; - if (args?.Length > 0) - { - var askpass = new Views.Askpass(); - askpass.TxtDescription.Text = args[0]; - desktop.MainWindow = askpass; - return true; - } - - return false; - } - - private void TryLaunchAsNormal(IClassicDesktopStyleApplicationLifetime desktop) - { - Native.OS.SetupExternalTools(); - 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 (pref.ShouldCheck4UpdateOnStartup()) - Check4Update(); -#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) + public static 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"); + // Fetch lastest release information. + var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(2) }; + var data = await client.GetStringAsync("https://api.github.com/repos/sourcegit-scm/sourcegit/releases/latest"); - // Parse JSON into Models.Version. + // Parse json into Models.Version. var ver = JsonSerializer.Deserialize(data, JsonCodeGen.Default.Version); if (ver == null) return; @@ -631,7 +183,7 @@ namespace SourceGit // Should not check ignored tag if this is called manually. if (!manually) { - var pref = ViewModels.Preferences.Instance; + var pref = ViewModels.Preference.Instance; if (ver.TagName == pref.IgnoreUpdateTag) return; } @@ -641,66 +193,70 @@ namespace SourceGit catch (Exception e) { if (manually) - ShowSelfUpdateResult(new Models.SelfUpdateFailed(e)); + ShowSelfUpdateResult(e); } }); } - private void ShowSelfUpdateResult(object data) + public static void Quit() + { + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + desktop.MainWindow.Close(); + desktop.Shutdown(); + } + } + + public override void Initialize() + { + AvaloniaXamlLoader.Load(this); + + var pref = ViewModels.Preference.Instance; + + SetLocale(pref.Locale); + SetTheme(pref.Theme); + } + + public override void OnFrameworkInitializationCompleted() + { + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + BindingPlugins.DataValidators.RemoveAt(0); + + var launcher = new Views.Launcher(); + _notificationReceiver = launcher; + desktop.MainWindow = launcher; + + if (ViewModels.Preference.Instance.ShouldCheck4UpdateOnStartup) + { + ViewModels.Preference.Save(); + Check4Update(); + } + } + + base.OnFrameworkInitializationCompleted(); + } + + private static void ShowSelfUpdateResult(object data) { Dispatcher.UIThread.Post(() => { - ShowWindow(new ViewModels.SelfUpdate() { Data = data }, true); + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + var dialog = new Views.SelfUpdate() + { + DataContext = new ViewModels.SelfUpdate + { + Data = data + } + }; + + dialog.Show(desktop.MainWindow); + } }); } - 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; - private ResourceDictionary _fontsOverrides = null; + private Models.INotificationReceiver _notificationReceiver = 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..2251c892 100644 --- a/src/Commands/Add.cs +++ b/src/Commands/Add.cs @@ -1,26 +1,31 @@ -namespace SourceGit.Commands +using System.Collections.Generic; +using System.Text; + +namespace SourceGit.Commands { public class Add : Command { - public Add(string repo, bool includeUntracked) + public Add(string repo, List changes = null) { WorkingDirectory = repo; Context = repo; - Args = includeUntracked ? "add ." : "add -u ."; - } - public Add(string repo, Models.Change change) - { - WorkingDirectory = repo; - Context = repo; - Args = $"add -- \"{change.Path}\""; - } - - public Add(string repo, string pathspecFromFile) - { - WorkingDirectory = repo; - Context = repo; - Args = $"add --pathspec-from-file=\"{pathspecFromFile}\""; + if (changes == null || changes.Count == 0) + { + Args = "add ."; + } + else + { + 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..f4cfe32b 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 + { + partial class ViewCommand : Command + { + [GeneratedRegex(@"^(\w)\s+(.+)$")] + private static partial Regex REG(); + + 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().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..5d047d8c 100644 --- a/src/Commands/Blame.cs +++ b/src/Commands/Blame.cs @@ -6,8 +6,10 @@ namespace SourceGit.Commands { public partial class Blame : Command { + [GeneratedRegex(@"^\^?([0-9a-f]+)\s+.*\((.*)\s+(\d+)\s+[\-\+]?\d+\s+\d+\) (.*)")] private static partial Regex REG_FORMAT(); + private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); public Blame(string repo, string file, string revision) { @@ -21,17 +23,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 +44,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 +67,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 = UTC_START.AddSeconds(timestamp).ToString("yyyy/MM/dd"); var info = new Models.BlameLineInfo() { @@ -89,7 +89,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..21210238 100644 --- a/src/Commands/Branch.cs +++ b/src/Commands/Branch.cs @@ -1,82 +1,47 @@ -using System.Text; - -namespace SourceGit.Commands +namespace SourceGit.Commands { public static class Branch { - public static string ShowCurrent(string repo) + public static bool Create(string repo, string name, string basedOn) { var cmd = new Command(); cmd.WorkingDirectory = repo; cmd.Context = repo; - cmd.Args = $"branch --show-current"; - return cmd.ReadToEnd().StdOut.Trim(); - } - - public static bool Create(string repo, string name, string basedOn, bool force, Models.ICommandLog log) - { - 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"; + } else + { cmd.Args = $"branch {name} -u {upstream}"; - + } return cmd.Exec(); } - public static bool DeleteLocal(string repo, string name, Models.ICommandLog log) + public static bool Delete(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) - { - 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; return cmd.Exec(); } } diff --git a/src/Commands/Checkout.cs b/src/Commands/Checkout.cs index d2876740..d65e9e73 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,43 +12,25 @@ 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 --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 --progress -b {branch} {basedOn}"; + TraitErrorAsOutput = true; + _outputHandler = onProgress; return Exec(); } public bool UseTheirs(List files) { - var builder = new StringBuilder(); + StringBuilder builder = new StringBuilder(); builder.Append("checkout --theirs --"); foreach (var f in files) { @@ -61,7 +44,7 @@ namespace SourceGit.Commands public bool UseMine(List files) { - var builder = new StringBuilder(); + StringBuilder builder = new StringBuilder(); builder.Append("checkout --ours --"); foreach (var f in files) { @@ -75,8 +58,29 @@ namespace SourceGit.Commands public bool FileWithRevision(string file, string revision) { - Args = $"checkout --no-overlay {revision} -- \"{file}\""; + Args = $"checkout {revision} -- \"{file}\""; return Exec(); } + + public bool Files(List files) + { + StringBuilder builder = new StringBuilder(); + builder.Append("checkout -f -q --"); + foreach (var f in files) + { + builder.Append(" \""); + builder.Append(f); + builder.Append("\""); + } + Args = builder.ToString(); + return Exec(); + } + + protected override void OnReadline(string line) + { + _outputHandler?.Invoke(line); + } + + private Action _outputHandler; } } diff --git a/src/Commands/CherryPick.cs b/src/Commands/CherryPick.cs index 0c82b9fd..504769c0 100644 --- a/src/Commands/CherryPick.cs +++ b/src/Commands/CherryPick.cs @@ -2,19 +2,12 @@ { public class CherryPick : Command { - public CherryPick(string repo, string commits, bool noCommit, bool appendSourceToMessage, string extraParams) + public CherryPick(string repo, string commit, bool noCommit) { + var mode = noCommit ? "-n" : "--ff"; WorkingDirectory = repo; Context = repo; - - Args = "cherry-pick "; - if (noCommit) - Args += "-n "; - if (appendSourceToMessage) - Args += "-x "; - if (!string.IsNullOrEmpty(extraParams)) - Args += $"{extraParams} "; - Args += commits; + Args = $"cherry-pick {mode} {commit}"; } } } diff --git a/src/Commands/Clean.cs b/src/Commands/Clean.cs index 6ed74999..900a7f93 100644 --- a/src/Commands/Clean.cs +++ b/src/Commands/Clean.cs @@ -1,4 +1,7 @@ -namespace SourceGit.Commands +using System.Collections.Generic; +using System.Text; + +namespace SourceGit.Commands { public class Clean : Command { @@ -6,7 +9,23 @@ { WorkingDirectory = repo; Context = repo; - Args = "clean -qfdx"; + Args = "clean -qfd"; + } + + public Clean(string repo, List files) + { + StringBuilder 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..80e0df50 100644 --- a/src/Commands/Clone.cs +++ b/src/Commands/Clone.cs @@ -1,21 +1,40 @@ -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; - SSHKey = sshKey; - Args = "clone --progress --verbose "; + TraitErrorAsOutput = true; + + if (string.IsNullOrEmpty(sshKey)) + { + Args = "-c credential.helper=manager "; + } + else + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } + + Args += "clone --progress --verbose --recurse-submodules "; if (!string.IsNullOrEmpty(extraArgs)) Args += $"{extraArgs} "; - Args += $"{url} "; - 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..c30a3d45 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,66 +10,110 @@ namespace SourceGit.Commands { public partial class Command { - public class ReadToEndResult + public class CancelToken { - public bool IsSuccess { get; set; } = false; - public string StdOut { get; set; } = ""; - public string StdErr { get; set; } = ""; + public bool Requested { get; set; } = false; } - public enum EditorType + public class ReadToEndResult { - None, - CoreEditor, - RebaseEditor, + public bool IsSuccess { get; set; } + public string StdOut { get; set; } + public string StdErr { get; set; } } 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 = new ProcessStartInfo(); + start.FileName = Native.OS.GitExecutable; + start.Arguments = "--no-pager -c core.quotepath=off " + Args; + start.UseShellExecute = false; + start.CreateNoWindow = true; + start.RedirectStandardOutput = true; + start.RedirectStandardError = true; + start.StandardOutputEncoding = Encoding.UTF8; + start.StandardErrorEncoding = Encoding.UTF8; + + // Force using en_US.UTF-8 locale to avoid GCM crash + if (OperatingSystem.IsLinux()) + { + start.Environment.Add("LANG", "en_US.UTF-8"); + } + + if (!string.IsNullOrEmpty(WorkingDirectory)) + start.WorkingDirectory = WorkingDirectory; - 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)) + 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 (_progressRegex().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); + { + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(Context, e.Message); + }); + } return false; } @@ -78,38 +121,42 @@ 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 && errs.Count > 0) { if (RaiseError) { - var errMsg = string.Join("\n", errs).Trim(); - if (!string.IsNullOrEmpty(errMsg)) - Dispatcher.UIThread.Post(() => App.RaiseException(Context, errMsg)); + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(Context, string.Join("\n", errs)); + }); } - return false; } - - return true; + else + { + return true; + } } public ReadToEndResult ReadToEnd() { - var start = CreateGitStartInfo(); - var proc = new Process() { StartInfo = start }; + var start = new ProcessStartInfo(); + start.FileName = Native.OS.GitExecutable; + start.Arguments = "--no-pager -c core.quotepath=off " + Args; + start.UseShellExecute = false; + start.CreateNoWindow = true; + start.RedirectStandardOutput = true; + start.RedirectStandardError = true; + start.StandardOutputEncoding = Encoding.UTF8; + start.StandardErrorEncoding = Encoding.UTF8; + if (!string.IsNullOrEmpty(WorkingDirectory)) + start.WorkingDirectory = WorkingDirectory; + + var proc = new Process() { StartInfo = start }; try { proc.Start(); @@ -137,84 +184,9 @@ namespace SourceGit.Commands return rs; } - private ProcessStartInfo CreateGitStartInfo() - { - var start = new ProcessStartInfo(); - start.FileName = Native.OS.GitExecutable; - start.Arguments = "--no-pager -c core.quotepath=off -c credential.helper=manager "; - start.UseShellExecute = false; - start.CreateNoWindow = true; - start.RedirectStandardOutput = true; - start.RedirectStandardError = true; - start.StandardOutputEncoding = Encoding.UTF8; - start.StandardErrorEncoding = Encoding.UTF8; - - // Force using this app as SSH askpass program - var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName; - if (!OperatingSystem.IsLinux()) - start.Environment.Add("DISPLAY", "required"); - start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec` - start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer"); - start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE"); - - // If an SSH private key was provided, sets the environment. - 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 - if (OperatingSystem.IsLinux()) - { - start.Environment.Add("LANG", "C"); - start.Environment.Add("LC_ALL", "C"); - } - - // Force using this app as git editor. - switch (Editor) - { - case EditorType.CoreEditor: - start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" "; - break; - case EditorType.RebaseEditor: - start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true "; - break; - default: - start.Arguments += "-c core.editor=true "; - break; - } - - // Append command args - start.Arguments += Args; - - // Working directory - if (!string.IsNullOrEmpty(WorkingDirectory)) - start.WorkingDirectory = WorkingDirectory; - - 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); - } + protected virtual void OnReadline(string line) { } [GeneratedRegex(@"\d+%")] - private static partial Regex REG_PROGRESS(); + private static partial Regex _progressRegex(); } } diff --git a/src/Commands/Commit.cs b/src/Commands/Commit.cs index 1585e7e3..8ac6501f 100644 --- a/src/Commands/Commit.cs +++ b/src/Commands/Commit.cs @@ -4,36 +4,18 @@ 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 allowEmpty = false) { - _tmpFile = Path.GetTempFileName(); - File.WriteAllText(_tmpFile, message); + var file = Path.GetTempFileName(); + File.WriteAllText(file, message); WorkingDirectory = repo; Context = repo; - Args = $"commit --allow-empty --file=\"{_tmpFile}\""; - if (signOff) - Args += " --signoff"; + Args = $"commit --file=\"{file}\""; if (amend) - Args += resetAuthor ? " --amend --reset-author --no-edit" : " --amend --no-edit"; + Args += " --amend --no-edit"; + if (allowEmpty) + Args += " --allow-empty"; } - - public bool Run() - { - var succ = Exec(); - - try - { - File.Delete(_tmpFile); - } - catch - { - // Ignore - } - - return succ; - } - - private readonly string _tmpFile; } } diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs index c88e087a..a9efb36c 100644 --- a/src/Commands/CompareRevisions.cs +++ b/src/Commands/CompareRevisions.cs @@ -1,63 +1,32 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.RegularExpressions; 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) { WorkingDirectory = repo; Context = repo; - - var based = string.IsNullOrEmpty(start) ? "-R" : start; - 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}\""; + Args = $"diff --name-status {start} {end}"; } 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) => l.Path.CompareTo(r.Path)); 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 +45,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..62340aa3 100644 --- a/src/Commands/Config.cs +++ b/src/Commands/Config.cs @@ -7,17 +7,8 @@ namespace SourceGit.Commands { public Config(string repository) { - if (string.IsNullOrEmpty(repository)) - { - WorkingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - } - else - { - WorkingDirectory = repository; - Context = repository; - _isLocal = true; - } - + WorkingDirectory = repository; + Context = repository; RaiseError = false; } @@ -29,7 +20,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 char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); foreach (var line in lines) { var idx = line.IndexOf('=', StringComparison.Ordinal); @@ -37,7 +28,14 @@ namespace SourceGit.Commands { var key = line.Substring(0, idx).Trim(); var val = line.Substring(idx + 1).Trim(); - rs[key] = val; + if (rs.ContainsKey(key)) + { + rs[key] = val; + } + else + { + rs.Add(key, val); + } } } } @@ -53,16 +51,30 @@ namespace SourceGit.Commands public bool Set(string key, string value, bool allowEmpty = false) { - var scope = _isLocal ? "--local" : "--global"; - if (!allowEmpty && string.IsNullOrWhiteSpace(value)) - Args = $"config {scope} --unset {key}"; + { + if (string.IsNullOrEmpty(WorkingDirectory)) + { + Args = $"config --global --unset {key}"; + } + else + { + Args = $"config --unset {key}"; + } + } else - Args = $"config {scope} {key} \"{value}\""; + { + if (string.IsNullOrWhiteSpace(WorkingDirectory)) + { + Args = $"config --global {key} \"{value}\""; + } + else + { + Args = $"config {key} \"{value}\""; + } + } return Exec(); } - - private bool _isLocal = false; } } diff --git a/src/Commands/CountLocalChangesWithoutUntracked.cs b/src/Commands/CountLocalChangesWithoutUntracked.cs deleted file mode 100644 index a704f313..00000000 --- a/src/Commands/CountLocalChangesWithoutUntracked.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; - -namespace SourceGit.Commands -{ - public class CountLocalChangesWithoutUntracked : Command - { - public CountLocalChangesWithoutUntracked(string repo) - { - WorkingDirectory = repo; - Context = repo; - Args = "--no-optional-locks status -uno --ignore-submodules=all --porcelain"; - } - - public int Result() - { - var rs = ReadToEnd(); - if (rs.IsSuccess) - { - var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - return lines.Length; - } - - return 0; - } - } -} diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs index 6af0a3cc..e92b2234 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; @@ -8,68 +8,44 @@ namespace SourceGit.Commands { [GeneratedRegex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@")] private static partial Regex REG_INDICATOR(); - - [GeneratedRegex(@"^index\s([0-9a-f]{6,40})\.\.([0-9a-f]{6,40})(\s[1-9]{6})?")] - private static partial Regex REG_HASH_CHANGE(); - private const string PREFIX_LFS_NEW = "+version https://git-lfs.github.com/spec/"; private const string PREFIX_LFS_DEL = "-version https://git-lfs.github.com/spec/"; private const string PREFIX_LFS_MODIFY = " version https://git-lfs.github.com/spec/"; - public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespace) + public Diff(string repo, Models.DiffOption opt) { - _result.TextDiff = new Models.TextDiff() - { - Repo = repo, - Option = opt, - }; - WorkingDirectory = repo; 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}"; - else - Args = $"diff --no-ext-diff --patch --unified={unified} {opt}"; + Args = $"diff --ignore-cr-at-eol --unified=4 {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 +58,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 +72,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,52 +83,36 @@ 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; } if (_result.TextDiff.Lines.Count == 0) { - if (line.StartsWith("Binary", StringComparison.Ordinal)) + var match = REG_INDICATOR().Match(line); + if (!match.Success) { - _result.IsBinary = true; + if (line.StartsWith("Binary", StringComparison.Ordinal)) + _result.IsBinary = true; return; } - if (string.IsNullOrEmpty(_result.OldHash)) - { - var match = REG_HASH_CHANGE().Match(line); - if (!match.Success) - return; - - _result.OldHash = match.Groups[1].Value; - _result.NewHash = match.Groups[2].Value; - } - else - { - var match = REG_INDICATOR().Match(line); - if (!match.Success) - return; - - _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); - } + _oldLine = int.Parse(match.Groups[1].Value); + _newLine = int.Parse(match.Groups[2].Value); + _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0)); } else { 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 +128,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 +140,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 +151,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 +162,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; - } } } @@ -271,10 +214,9 @@ namespace SourceGit.Commands } } - private readonly Models.DiffResult _result = new Models.DiffResult(); + private readonly Models.DiffResult _result = new Models.DiffResult() { TextDiff = new Models.TextDiff() }; 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..072dc59a 100644 --- a/src/Commands/Discard.cs +++ b/src/Commands/Discard.cs @@ -1,95 +1,55 @@ 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) { - 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 Reset(repo, "HEAD", "--hard").Exec(); + new Clean(repo).Exec(); } - /// - /// Discard selected changes (only unstaged). - /// - /// - /// - /// - public static void Changes(string repo, List changes, Models.ICommandLog log) + public static void ChangesInWorkTree(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) { - 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); - } + needClean.Add(c.Path); + } + else + { + needCheckout.Add(c.Path); } } - catch (Exception e) + + for (int i = 0; i < needClean.Count; i += 10) { - Dispatcher.UIThread.Invoke(() => - { - App.RaiseException(repo, $"Failed to discard changes. Reason: {e.Message}"); - }); + var count = Math.Min(10, needClean.Count - i); + new Clean(repo, needClean.GetRange(i, count)).Exec(); } - if (restores.Count > 0) + for (int i = 0; i < needCheckout.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, needCheckout.Count - i); + new Checkout(repo).Files(needCheckout.GetRange(i, count)); + } + } + + public static void ChangesInStaged(string repo, List changes) + { + for (int i = 0; i < changes.Count; i += 10) + { + var count = Math.Min(10, changes.Count - i); + var files = new List(); + for (int j = 0; j < count; j++) + files.Add(changes[i + j].Path); + new Restore(repo, files, "--staged --worktree").Exec(); } } } diff --git a/src/Commands/ExecuteCustomAction.cs b/src/Commands/ExecuteCustomAction.cs deleted file mode 100644 index e59bc068..00000000 --- a/src/Commands/ExecuteCustomAction.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Diagnostics; -using System.Text; - -using Avalonia.Threading; - -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) - { - var start = new ProcessStartInfo(); - start.FileName = file; - start.Arguments = args; - start.UseShellExecute = false; - start.CreateNoWindow = true; - start.RedirectStandardOutput = true; - start.RedirectStandardError = true; - start.StandardOutputEncoding = Encoding.UTF8; - start.StandardErrorEncoding = Encoding.UTF8; - start.WorkingDirectory = repo; - - log?.AppendLine($"$ {file} {args}\n"); - - var proc = new Process() { StartInfo = start }; - var builder = new StringBuilder(); - - proc.OutputDataReceived += (_, e) => - { - if (e.Data != null) - log?.AppendLine(e.Data); - }; - - proc.ErrorDataReceived += (_, e) => - { - if (e.Data != null) - { - log?.AppendLine(e.Data); - builder.AppendLine(e.Data); - } - }; - - try - { - proc.Start(); - 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)); - } - - proc.Close(); - } - } -} diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs index edf2a6dd..8f84c346 100644 --- a/src/Commands/Fetch.cs +++ b/src/Commands/Fetch.cs @@ -1,31 +1,158 @@ -namespace SourceGit.Commands +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; + +namespace SourceGit.Commands { public class Fetch : Command { - public Fetch(string repo, string remote, bool noTags, bool force) + public Fetch(string repo, string remote, bool prune, Action outputHandler) { + _outputHandler = outputHandler; WorkingDirectory = repo; Context = repo; - SSHKey = new Config(repo).Get($"remote.{remote}.sshkey"); - Args = "fetch --progress --verbose "; + TraitErrorAsOutput = true; - if (noTags) - Args += "--no-tags "; + var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); + if (!string.IsNullOrEmpty(sshKey)) + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } else - Args += "--tags "; - - if (force) - Args += "--force "; + { + Args = "-c credential.helper=manager "; + } + Args += "fetch --force --progress --verbose "; + if (prune) + Args += "--prune "; Args += remote; + + AutoFetch.MarkFetched(repo); } - public Fetch(string repo, Models.Branch local, Models.Branch remote) + public Fetch(string repo, string remote, string localBranch, string remoteBranch, Action outputHandler) { + _outputHandler = outputHandler; WorkingDirectory = repo; Context = repo; - SSHKey = new Config(repo).Get($"remote.{remote.Remote}.sshkey"); - Args = $"fetch --progress --verbose {remote.Remote} {remote.Name}:{local.Name}"; + TraitErrorAsOutput = true; + + var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); + if (!string.IsNullOrEmpty(sshKey)) + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } + else + { + Args = "-c credential.helper=manager "; + } + + Args += $"fetch --progress --verbose {remote} {remoteBranch}:{localBranch}"; } + + protected override void OnReadline(string line) + { + _outputHandler?.Invoke(line); + } + + private readonly Action _outputHandler; + } + + public class AutoFetch + { + private const double INTERVAL = 10 * 60; + + public static bool IsEnabled + { + get; + set; + } = false; + + class Job + { + public Fetch Cmd = null; + public DateTime NextRunTimepoint = DateTime.MinValue; + } + + static AutoFetch() + { + Task.Run(() => + { + while (true) + { + if (!IsEnabled) + { + Thread.Sleep(10000); + continue; + } + + var now = DateTime.Now; + var uptodate = new List(); + lock (_lock) + { + foreach (var job in _jobs) + { + if (job.Value.NextRunTimepoint.Subtract(now).TotalSeconds <= 0) + { + uptodate.Add(job.Value); + } + } + } + + foreach (var job in uptodate) + { + job.Cmd.Exec(); + job.NextRunTimepoint = DateTime.Now.AddSeconds(INTERVAL); + } + + Thread.Sleep(2000); + } + }); + } + + public static void AddRepository(string repo) + { + var job = new Job + { + Cmd = new Fetch(repo, "--all", true, null) { RaiseError = false }, + NextRunTimepoint = DateTime.Now.AddSeconds(INTERVAL), + }; + + lock (_lock) + { + if (_jobs.ContainsKey(repo)) + { + _jobs[repo] = job; + } + else + { + _jobs.Add(repo, job); + } + } + } + + public static void RemoveRepository(string repo) + { + lock (_lock) + { + _jobs.Remove(repo); + } + } + + public static void MarkFetched(string repo) + { + lock (_lock) + { + if (_jobs.TryGetValue(repo, out var value)) + { + value.NextRunTimepoint = DateTime.Now.AddSeconds(INTERVAL); + } + } + } + + private static readonly Dictionary _jobs = new Dictionary(); + private static readonly object _lock = new object(); } } diff --git a/src/Commands/FormatPatch.cs b/src/Commands/FormatPatch.cs index bf850d60..2c7359c0 100644 --- a/src/Commands/FormatPatch.cs +++ b/src/Commands/FormatPatch.cs @@ -6,8 +6,7 @@ { WorkingDirectory = repo; Context = repo; - Editor = EditorType.None; - Args = $"format-patch {commit} -1 --output=\"{saveTo}\""; + Args = $"format-patch {commit} -1 -o \"{saveTo}\""; } } } diff --git a/src/Commands/GC.cs b/src/Commands/GC.cs index 0b27f487..f40b665c 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; - Args = "gc --prune=now"; + TraitErrorAsOutput = true; + Args = "gc"; } + + 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 deleted file mode 100644 index df61fdd2..00000000 --- a/src/Commands/GenerateCommitMessage.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; - -using Avalonia.Threading; - -namespace SourceGit.Commands -{ - /// - /// A C# version of https://github.com/anjerodev/commitollama - /// - public class GenerateCommitMessage - { - public class GetDiffContent : Command - { - public GetDiffContent(string repo, Models.DiffOption opt) - { - WorkingDirectory = repo; - Context = repo; - Args = $"diff --diff-algorithm=minimal {opt}"; - } - } - - public GenerateCommitMessage(Models.OpenAIService service, string repo, List changes, CancellationToken cancelToken, Action onResponse) - { - _service = service; - _repo = repo; - _changes = changes; - _cancelToken = cancelToken; - _onResponse = onResponse; - } - - public void Exec() - { - try - { - _onResponse?.Invoke("Waiting for pre-file analyzing to completed...\n\n"); - - var responseBuilder = new StringBuilder(); - var summaryBuilder = new StringBuilder(); - foreach (var change in _changes) - { - if (_cancelToken.IsCancellationRequested) - return; - - responseBuilder.Append("- "); - summaryBuilder.Append("- "); - - 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); - - _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"); - } - - if (_cancelToken.IsCancellationRequested) - 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}"); - }); - } - catch (Exception e) - { - Dispatcher.UIThread.Post(() => App.RaiseException(_repo, $"Failed to generate commit message: {e}")); - } - } - - private Models.OpenAIService _service; - private string _repo; - private List _changes; - private CancellationToken _cancelToken; - private Action _onResponse; - } -} diff --git a/src/Commands/GitFlow.cs b/src/Commands/GitFlow.cs index 1d33fa3a..e47631c1 100644 --- a/src/Commands/GitFlow.cs +++ b/src/Commands/GitFlow.cs @@ -1,92 +1,90 @@ -using System.Text; +using System.Collections.Generic; + using Avalonia.Threading; namespace SourceGit.Commands { - public static class GitFlow + public class GitFlow : Command { - public static bool Init(string repo, string master, string develop, string feature, string release, string hotfix, string version, Models.ICommandLog log) + public GitFlow(string repo) { - var config = new Config(repo); - config.Set("gitflow.branch.master", master); - config.Set("gitflow.branch.develop", develop); - config.Set("gitflow.prefix.feature", feature); - config.Set("gitflow.prefix.bugfix", "bugfix/"); - config.Set("gitflow.prefix.release", release); - config.Set("gitflow.prefix.hotfix", hotfix); - config.Set("gitflow.prefix.support", "support/"); - config.Set("gitflow.prefix.versiontag", version, true); - - var init = new Command(); - init.WorkingDirectory = repo; - init.Context = repo; - init.Args = "flow init -d"; - init.Log = log; - return init.Exec(); + WorkingDirectory = repo; + Context = repo; } - public static bool Start(string repo, Models.GitFlowBranchType type, string name, Models.ICommandLog log) + public bool Init(List branches, string master, string develop, string feature, string release, string hotfix, string version) { - var start = new Command(); - start.WorkingDirectory = repo; - start.Context = repo; + var current = branches.Find(x => x.IsCurrent); + var masterBranch = branches.Find(x => x.Name == master); + if (masterBranch == null && current != null) + Branch.Create(WorkingDirectory, master, current.Head); + + var devBranch = branches.Find(x => x.Name == develop); + if (devBranch == null && current != null) + Branch.Create(WorkingDirectory, develop, current.Head); + + var cmd = new Config(WorkingDirectory); + cmd.Set("gitflow.branch.master", master); + cmd.Set("gitflow.branch.develop", develop); + cmd.Set("gitflow.prefix.feature", feature); + cmd.Set("gitflow.prefix.bugfix", "bugfix/"); + cmd.Set("gitflow.prefix.release", release); + cmd.Set("gitflow.prefix.hotfix", hotfix); + cmd.Set("gitflow.prefix.support", "support/"); + cmd.Set("gitflow.prefix.versiontag", version, true); + + Args = "flow init -d"; + return Exec(); + } + + public bool Start(Models.GitFlowBranchType type, string name) + { switch (type) { case Models.GitFlowBranchType.Feature: - start.Args = $"flow feature start {name}"; + Args = $"flow feature start {name}"; break; case Models.GitFlowBranchType.Release: - start.Args = $"flow release start {name}"; + Args = $"flow release start {name}"; break; case Models.GitFlowBranchType.Hotfix: - start.Args = $"flow hotfix start {name}"; + Args = $"flow hotfix start {name}"; break; default: - Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!")); + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(Context, "Bad branch type!!!"); + }); return false; } - start.Log = log; - return start.Exec(); + return Exec(); } - public static bool Finish(string repo, Models.GitFlowBranchType type, string name, bool squash, bool push, bool keepBranch, Models.ICommandLog log) + public bool Finish(Models.GitFlowBranchType type, string name, bool keepBranch) { - var builder = new StringBuilder(); - builder.Append("flow "); - + var option = keepBranch ? "-k" : string.Empty; switch (type) { case Models.GitFlowBranchType.Feature: - builder.Append("feature"); + Args = $"flow feature finish {option} {name}"; break; case Models.GitFlowBranchType.Release: - builder.Append("release"); + Args = $"flow release finish {option} {name} -m \"RELEASE_DONE\""; break; case Models.GitFlowBranchType.Hotfix: - builder.Append("hotfix"); + Args = $"flow hotfix finish {option} {name} -m \"HOTFIX_DONE\""; break; default: - Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, "Bad git-flow branch type!!!")); + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(Context, "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 finish = new Command(); - finish.WorkingDirectory = repo; - finish.Context = repo; - finish.Args = builder.ToString(); - finish.Log = log; - return finish.Exec(); + return Exec(); } } } diff --git a/src/Commands/GitIgnore.cs b/src/Commands/GitIgnore.cs deleted file mode 100644 index 8b351f5e..00000000 --- a/src/Commands/GitIgnore.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.IO; - -namespace SourceGit.Commands -{ - public static class GitIgnore - { - public static void Add(string repo, string pattern) - { - 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 deleted file mode 100644 index 9b243451..00000000 --- a/src/Commands/IsConflictResolved.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace SourceGit.Commands -{ - public class IsConflictResolved : Command - { - public IsConflictResolved(string repo, Models.Change change) - { - var opt = new Models.DiffOption(change, true); - - WorkingDirectory = repo; - Context = repo; - Args = $"diff -a --ignore-cr-at-eol --check {opt}"; - } - - public bool Result() - { - return ReadToEnd().IsSuccess; - } - } -} diff --git a/src/Commands/IsLFSFiltered.cs b/src/Commands/IsLFSFiltered.cs index 2a7234bb..b29039de 100644 --- a/src/Commands/IsLFSFiltered.cs +++ b/src/Commands/IsLFSFiltered.cs @@ -6,15 +6,7 @@ { WorkingDirectory = repo; Context = repo; - Args = $"check-attr -z filter \"{path}\""; - RaiseError = false; - } - - public IsLFSFiltered(string repo, string sha, string path) - { - WorkingDirectory = repo; - Context = repo; - Args = $"check-attr --source {sha} -z filter \"{path}\""; + Args = $"check-attr -a -z \"{path}\""; RaiseError = false; } diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs index 18d2ba93..3b8a1cc2 100644 --- a/src/Commands/LFS.cs +++ b/src/Commands/LFS.cs @@ -1,24 +1,27 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Text.RegularExpressions; namespace SourceGit.Commands { - public partial class LFS + public class LFS { - [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")] - private static partial Regex REG_LOCK(); - - private class SubCmd : Command + class PruneCmd : Command { - public SubCmd(string repo, string args, Models.ICommandLog log) + public PruneCmd(string repo, Action onProgress) { WorkingDirectory = repo; Context = repo; - Args = args; - Log = log; + Args = "lfs prune"; + TraitErrorAsOutput = true; + _outputHandler = onProgress; } + + protected override void OnReadline(string line) + { + _outputHandler?.Invoke(line); + } + + private readonly Action _outputHandler; } public LFS(string repo) @@ -36,78 +39,9 @@ namespace SourceGit.Commands return content.Contains("git lfs pre-push"); } - public bool Install(Models.ICommandLog log) + public void Prune(Action outputHandler) { - return new SubCmd(_repo, "lfs install --local", log).Exec(); - } - - public bool Track(string pattern, bool isFilenameMode, Models.ICommandLog log) - { - var opt = isFilenameMode ? "--filename" : ""; - return new SubCmd(_repo, $"lfs track {opt} \"{pattern}\"", log).Exec(); - } - - public void Fetch(string remote, Models.ICommandLog log) - { - new SubCmd(_repo, $"lfs fetch {remote}", log).Exec(); - } - - public void Pull(string remote, Models.ICommandLog log) - { - new SubCmd(_repo, $"lfs pull {remote}", log).Exec(); - } - - public void Push(string remote, Models.ICommandLog log) - { - new SubCmd(_repo, $"lfs push {remote}", log).Exec(); - } - - public void Prune(Models.ICommandLog log) - { - new SubCmd(_repo, "lfs prune", log).Exec(); - } - - public List Locks(string remote) - { - var locks = new List(); - var cmd = new SubCmd(_repo, $"lfs locks --remote={remote}", null); - var rs = cmd.ReadToEnd(); - if (rs.IsSuccess) - { - var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - foreach (var line in lines) - { - var match = REG_LOCK().Match(line); - if (match.Success) - { - locks.Add(new Models.LFSLock() - { - File = match.Groups[1].Value, - User = match.Groups[2].Value, - ID = long.Parse(match.Groups[3].Value), - }); - } - } - } - - return locks; - } - - public bool Lock(string remote, string file, Models.ICommandLog log) - { - return new SubCmd(_repo, $"lfs lock --remote={remote} \"{file}\"", log).Exec(); - } - - public bool Unlock(string remote, string file, bool force, Models.ICommandLog log) - { - var opt = force ? "-f" : ""; - return new SubCmd(_repo, $"lfs unlock --remote={remote} {opt} \"{file}\"", log).Exec(); - } - - public bool Unlock(string remote, long id, bool force, Models.ICommandLog log) - { - var opt = force ? "-f" : ""; - return new SubCmd(_repo, $"lfs unlock --remote={remote} {opt} --id={id}", log).Exec(); + new PruneCmd(_repo, outputHandler).Exec(); } private readonly string _repo; diff --git a/src/Commands/Merge.cs b/src/Commands/Merge.cs index b08377b9..cf2e285f 100644 --- a/src/Commands/Merge.cs +++ b/src/Commands/Merge.cs @@ -1,36 +1,23 @@ -using System.Collections.Generic; -using System.Text; +using System; 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) + protected override void OnReadline(string line) { - WorkingDirectory = repo; - Context = repo; - - var builder = new StringBuilder(); - builder.Append("merge --progress "); - if (!string.IsNullOrEmpty(strategy)) - builder.Append($"--strategy={strategy} "); - if (!autoCommit) - builder.Append("--no-commit "); - - foreach (var t in targets) - { - builder.Append(t); - builder.Append(' '); - } - - Args = builder.ToString(); + _outputHandler?.Invoke(line); } + + private readonly Action _outputHandler = null; } } diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs index fc6d0d75..75b88bc9 100644 --- a/src/Commands/MergeTool.cs +++ b/src/Commands/MergeTool.cs @@ -6,66 +6,57 @@ namespace SourceGit.Commands { public static class MergeTool { - public static bool OpenForMerge(string repo, int toolType, string toolPath, string file) + public static bool OpenForMerge(string repo, string tool, string mergeCmd, string file) { + if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(mergeCmd)) + { + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(repo, "Invalid external merge tool settings!"); + }); + return false; + } + + if (!File.Exists(tool)) + { + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!"); + }); + return false; + } + var cmd = new Command(); cmd.WorkingDirectory = repo; - 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}"; - return cmd.Exec(); - } - - if (!File.Exists(toolPath)) - { - Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!")); - return false; - } - - var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType); - if (supported == null) - { - Dispatcher.UIThread.Post(() => App.RaiseException(repo, "Invalid merge tool in preference setting!")); - 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.RaiseError = false; + cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{tool}\\\" {mergeCmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\""; return cmd.Exec(); } - public static bool OpenForDiff(string repo, int toolType, string toolPath, Models.DiffOption option) + public static bool OpenForDiff(string repo, string tool, string diffCmd, Models.DiffOption option) { + if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(diffCmd)) + { + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(repo, "Invalid external merge tool settings!"); + }); + return false; + } + + if (!File.Exists(tool)) + { + Dispatcher.UIThread.Invoke(() => + { + App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!"); + }); + return false; + } + var cmd = new Command(); cmd.WorkingDirectory = repo; - cmd.Context = repo; - cmd.RaiseError = true; - - if (toolType == 0) - { - cmd.Args = $"difftool -g --no-prompt {option}"; - return cmd.Exec(); - } - - if (!File.Exists(toolPath)) - { - Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!")); - return false; - } - - var supported = Models.ExternalMerger.Supported.Find(x => x.Type == toolType); - if (supported == null) - { - Dispatcher.UIThread.Post(() => App.RaiseException(repo, "Invalid merge tool in preference setting!")); - return false; - } - - cmd.Args = $"-c difftool.sourcegit.cmd=\"\\\"{toolPath}\\\" {supported.DiffCmd}\" difftool --tool=sourcegit --no-prompt {option}"; + cmd.RaiseError = false; + cmd.Args = $"-c difftool.sourcegit.cmd=\"\\\"{tool}\\\" {diffCmd}\" difftool --tool=sourcegit --no-prompt {option}"; return cmd.Exec(); } } diff --git a/src/Commands/Pull.cs b/src/Commands/Pull.cs index 698fbfce..d4f15dda 100644 --- a/src/Commands/Pull.cs +++ b/src/Commands/Pull.cs @@ -1,18 +1,37 @@ -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, Action outputHandler) { + _outputHandler = outputHandler; WorkingDirectory = repo; Context = repo; - SSHKey = new Config(repo).Get($"remote.{remote}.sshkey"); - Args = "pull --verbose --progress "; + TraitErrorAsOutput = true; + var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); + if (!string.IsNullOrEmpty(sshKey)) + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } + else + { + Args = "-c credential.helper=manager "; + } + + Args += "pull --verbose --progress --tags "; if (useRebase) - Args += "--rebase=true "; - + Args += "--rebase "; 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..b3e4814a 100644 --- a/src/Commands/Push.cs +++ b/src/Commands/Push.cs @@ -1,18 +1,30 @@ -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 force, bool track, Action onProgress) { WorkingDirectory = repo; Context = repo; - SSHKey = new Config(repo).Get($"remote.{remote}.sshkey"); - Args = "push --progress --verbose "; + TraitErrorAsOutput = true; + _outputHandler = onProgress; + + var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); + if (!string.IsNullOrEmpty(sshKey)) + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } + else + { + Args = "-c credential.helper=manager "; + } + + Args += "push --progress --verbose "; if (withTags) Args += "--tags "; - if (checkSubmodules) - Args += "--recurse-submodules=check "; if (track) Args += "-u "; if (force) @@ -21,17 +33,57 @@ Args += $"{remote} {local}:{remoteBranch}"; } - public Push(string repo, string remote, string refname, bool isDelete) + /// + /// Only used to delete a remote branch!!!!!! + /// + /// + /// + /// + public Push(string repo, string remote, string branch) { WorkingDirectory = repo; Context = repo; - SSHKey = new Config(repo).Get($"remote.{remote}.sshkey"); - Args = "push "; + TraitErrorAsOutput = true; + var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); + if (!string.IsNullOrEmpty(sshKey)) + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } + else + { + Args = "-c credential.helper=manager "; + } + + Args += $"push {remote} --delete {branch}"; + } + + public Push(string repo, string remote, string tag, bool isDelete) + { + WorkingDirectory = repo; + Context = repo; + + var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); + if (!string.IsNullOrEmpty(sshKey)) + { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; + } + else + { + Args = "-c credential.helper=manager "; + } + + Args += "push "; 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..cc726fd9 100644 --- a/src/Commands/QueryBranches.cs +++ b/src/Commands/QueryBranches.cs @@ -1,83 +1,56 @@ using System; using System.Collections.Generic; +using System.Text.RegularExpressions; namespace SourceGit.Commands { - public class QueryBranches : Command + public partial class QueryBranches : Command { private const string PREFIX_LOCAL = "refs/heads/"; private const string PREFIX_REMOTE = "refs/remotes/"; - private const string PREFIX_DETACHED_AT = "(HEAD detached at"; - private const string PREFIX_DETACHED_FROM = "(HEAD detached from"; + + [GeneratedRegex(@"^(\d+)\s(\d+)$")] + private static partial Regex REG_AHEAD_BEHIND(); public QueryBranches(string repo) { 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)$%(objectname)$%(HEAD)$%(upstream)$%(upstream:trackshort)\""; } - public List Result(out int localBranchesCount) + public List Result() { - localBranchesCount = 0; + Exec(); - 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(); - foreach (var line in lines) + foreach (var b in _branches) { - var b = ParseLine(line); - if (b != null) + if (b.IsLocal && !string.IsNullOrEmpty(b.UpstreamTrackStatus)) { - 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)) + if (b.UpstreamTrackStatus == "=") { - b.IsUpstreamGone = false; - - if (b.TrackStatus == null) - b.TrackStatus = new QueryTrackStatus(WorkingDirectory, b.Head, upstreamHead).Result(); + b.UpstreamTrackStatus = string.Empty; } else { - b.IsUpstreamGone = true; - - if (b.TrackStatus == null) - b.TrackStatus = new Models.BranchTrackStatus(); + b.UpstreamTrackStatus = ParseTrackStatus(b.Name, b.Upstream); } } } - return branches; + return _branches; } - private Models.Branch ParseLine(string line) + protected override void OnReadline(string line) { - var parts = line.Split('\0'); - if (parts.Length != 6) - return null; + var parts = line.Split('$'); + if (parts.Length != 5) + return; var branch = new Models.Branch(); var refName = parts[0]; if (refName.EndsWith("/HEAD", StringComparison.Ordinal)) - return null; - - branch.IsDetachedHead = refName.StartsWith(PREFIX_DETACHED_AT, StringComparison.Ordinal) || - refName.StartsWith(PREFIX_DETACHED_FROM, StringComparison.Ordinal); + return; if (refName.StartsWith(PREFIX_LOCAL, StringComparison.Ordinal)) { @@ -89,7 +62,7 @@ namespace SourceGit.Commands var name = refName.Substring(PREFIX_REMOTE.Length); var shortNameIdx = name.IndexOf('/', StringComparison.Ordinal); if (shortNameIdx < 0) - return null; + return; branch.Remote = name.Substring(0, shortNameIdx); branch.Name = name.Substring(branch.Remote.Length + 1); @@ -102,19 +75,38 @@ 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; - - if (!branch.IsLocal || - string.IsNullOrEmpty(branch.Upstream) || - string.IsNullOrEmpty(parts[5]) || - parts[5].Equals("=", StringComparison.Ordinal)) - branch.TrackStatus = new Models.BranchTrackStatus(); - - return branch; + branch.Head = parts[1]; + branch.IsCurrent = parts[2] == "*"; + branch.Upstream = parts[3]; + branch.UpstreamTrackStatus = parts[4]; + _branches.Add(branch); } + + private string ParseTrackStatus(string local, string upstream) + { + var cmd = new Command(); + cmd.WorkingDirectory = WorkingDirectory; + cmd.Context = Context; + cmd.Args = $"rev-list --left-right --count {local}...{upstream}"; + + var rs = cmd.ReadToEnd(); + if (!rs.IsSuccess) + return string.Empty; + + var match = REG_AHEAD_BEHIND().Match(rs.StdOut); + if (!match.Success) + return string.Empty; + + var ahead = int.Parse(match.Groups[1].Value); + var behind = int.Parse(match.Groups[2].Value); + var track = ""; + if (ahead > 0) + track += $"{ahead}↑"; + if (behind > 0) + track += $" {behind}↓"; + return track.Trim(); + } + + private readonly List _branches = new List(); } } diff --git a/src/Commands/QueryCommitChildren.cs b/src/Commands/QueryCommitChildren.cs deleted file mode 100644 index 4e99ce7a..00000000 --- a/src/Commands/QueryCommitChildren.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SourceGit.Commands -{ - public class QueryCommitChildren : Command - { - public QueryCommitChildren(string repo, string commit, int max) - { - WorkingDirectory = repo; - Context = repo; - _commit = commit; - Args = $"rev-list -{max} --parents --branches --remotes --ancestry-path ^{commit}"; - } - - public List 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)); - } - } - - return outs; - } - - private string _commit; - } -} diff --git a/src/Commands/QueryCommitFullMessage.cs b/src/Commands/QueryCommitFullMessage.cs deleted file mode 100644 index 36b6d1c7..00000000 --- a/src/Commands/QueryCommitFullMessage.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace SourceGit.Commands -{ - public class QueryCommitFullMessage : Command - { - public QueryCommitFullMessage(string repo, string sha) - { - WorkingDirectory = repo; - Context = repo; - Args = $"show --no-show-signature --format=%B -s {sha}"; - } - - public string Result() - { - var rs = ReadToEnd(); - if (rs.IsSuccess) - return rs.StdOut.TrimEnd(); - return string.Empty; - } - } -} diff --git a/src/Commands/QueryCommitSignInfo.cs b/src/Commands/QueryCommitSignInfo.cs deleted file mode 100644 index 133949af..00000000 --- a/src/Commands/QueryCommitSignInfo.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace SourceGit.Commands -{ - public class QueryCommitSignInfo : Command - { - public QueryCommitSignInfo(string repo, string sha, bool useFakeSignersFile) - { - WorkingDirectory = repo; - Context = repo; - - const string baseArgs = "show --no-show-signature --format=%G?%n%GS%n%GK -s"; - const string fakeSignersFileArg = "-c gpg.ssh.allowedSignersFile=/dev/null"; - Args = $"{(useFakeSignersFile ? fakeSignersFileArg : string.Empty)} {baseArgs} {sha}"; - } - - public Models.CommitSignInfo Result() - { - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return null; - - var raw = rs.StdOut.Trim().ReplaceLineEndings("\n"); - if (raw.Length <= 1) - return null; - - var lines = raw.Split('\n'); - return new Models.CommitSignInfo() - { - VerifyResult = lines[0][0], - Signer = lines[1], - Key = lines[2] - }; - } - } -} diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs index 9e1d9918..7d6ad169 100644 --- a/src/Commands/QueryCommits.cs +++ b/src/Commands/QueryCommits.cs @@ -1,134 +1,190 @@ using System; using System.Collections.Generic; -using System.Text; namespace SourceGit.Commands { public class QueryCommits : Command { + private const string GPGSIG_START = "gpgsig -----BEGIN PGP SIGNATURE-----"; + private const string GPGSIG_END = " -----END PGP SIGNATURE-----"; + + private readonly List commits = new List(); + private Models.Commit current = null; + private bool isSkipingGpgsig = false; + private bool isHeadFounded = false; + private readonly bool findFirstMerged = true; + public QueryCommits(string repo, string limits, bool needFindHead = true) { 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}"; - _findFirstMerged = needFindHead; - } - - public QueryCommits(string repo, string filter, Models.CommitSearchMethod method, bool onlyCurrentBranch) - { - string search = onlyCurrentBranch ? string.Empty : "--branches --remotes "; - - if (method == Models.CommitSearchMethod.ByAuthor) - { - search += $"-i --author=\"{filter}\""; - } - else if (method == Models.CommitSearchMethod.ByCommitter) - { - search += $"-i --committer=\"{filter}\""; - } - else if (method == Models.CommitSearchMethod.ByMessage) - { - var argsBuilder = new StringBuilder(); - argsBuilder.Append(search); - - var words = filter.Split([' ', '\t', '\r'], StringSplitOptions.RemoveEmptyEntries); - foreach (var word in words) - { - var escaped = word.Trim().Replace("\"", "\\\"", StringComparison.Ordinal); - argsBuilder.Append($"--grep=\"{escaped}\" "); - } - argsBuilder.Append("--all-match -i"); - - 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}"; - _findFirstMerged = false; + Args = "log --date-order --decorate=full --pretty=raw " + limits; + findFirstMerged = needFindHead; } public List Result() { - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return _commits; + Exec(); - var nextPartIdx = 0; - var start = 0; - var end = rs.StdOut.IndexOf('\n', start); - while (end > 0) + if (current != null) { - var line = rs.StdOut.Substring(start, end - start); - switch (nextPartIdx) - { - case 0: - _current = new Models.Commit() { SHA = line }; - _commits.Add(_current); - break; - case 1: - ParseParent(line); - break; - case 2: - _current.ParseDecorators(line); - if (_current.IsMerged && !_isHeadFounded) - _isHeadFounded = true; - break; - case 3: - _current.Author = Models.User.FindOrAdd(line); - break; - case 4: - _current.AuthorTime = ulong.Parse(line); - break; - case 5: - _current.Committer = Models.User.FindOrAdd(line); - break; - case 6: - _current.CommitterTime = ulong.Parse(line); - break; - case 7: - _current.Subject = line; - nextPartIdx = -1; - break; - } - - nextPartIdx++; - - start = end + 1; - end = rs.StdOut.IndexOf('\n', start); + current.Message = current.Message.Trim(); + commits.Add(current); } - if (start < rs.StdOut.Length) - _current.Subject = rs.StdOut.Substring(start); - - if (_findFirstMerged && !_isHeadFounded && _commits.Count > 0) + if (findFirstMerged && !isHeadFounded && commits.Count > 0) + { MarkFirstMerged(); + } - return _commits; + return commits; } - private void ParseParent(string data) + protected override void OnReadline(string line) { - if (data.Length < 8) + if (isSkipingGpgsig) + { + if (line.StartsWith(GPGSIG_END, StringComparison.Ordinal)) + isSkipingGpgsig = false; + return; + } + else if (line.StartsWith(GPGSIG_START, StringComparison.Ordinal)) + { + isSkipingGpgsig = true; + return; + } + + if (line.StartsWith("commit ", StringComparison.Ordinal)) + { + if (current != null) + { + current.Message = current.Message.Trim(); + commits.Add(current); + } + + current = new Models.Commit(); + line = line.Substring(7); + + var decoratorStart = line.IndexOf('(', StringComparison.Ordinal); + if (decoratorStart < 0) + { + current.SHA = line.Trim(); + } + else + { + current.SHA = line.Substring(0, decoratorStart).Trim(); + current.IsMerged = ParseDecorators(current.Decorators, line.Substring(decoratorStart + 1)); + if (!isHeadFounded) + isHeadFounded = current.IsMerged; + } + + return; + } + + if (current == null) return; - _current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries)); + if (line.StartsWith("tree ", StringComparison.Ordinal)) + { + return; + } + else if (line.StartsWith("parent ", StringComparison.Ordinal)) + { + current.Parents.Add(line.Substring("parent ".Length)); + } + else if (line.StartsWith("author ", StringComparison.Ordinal)) + { + Models.User user = Models.User.Invalid; + ulong time = 0; + Models.Commit.ParseUserAndTime(line.Substring(7), ref user, ref time); + current.Author = user; + current.AuthorTime = time; + } + else if (line.StartsWith("committer ", StringComparison.Ordinal)) + { + Models.User user = Models.User.Invalid; + ulong time = 0; + Models.Commit.ParseUserAndTime(line.Substring(10), ref user, ref time); + current.Committer = user; + current.CommitterTime = time; + } + else if (string.IsNullOrEmpty(current.Subject)) + { + current.Subject = line.Trim(); + } + else + { + current.Message += (line.Trim() + "\n"); + } + } + + private bool ParseDecorators(List decorators, string data) + { + bool isHeadOfCurrent = false; + + var subs = data.Split(new char[] { ',', ')', '(' }, StringSplitOptions.RemoveEmptyEntries); + foreach (var sub in subs) + { + var d = sub.Trim(); + if (d.StartsWith("tag: refs/tags/", StringComparison.Ordinal)) + { + decorators.Add(new Models.Decorator() + { + Type = Models.DecoratorType.Tag, + Name = d.Substring(15).Trim(), + }); + } + else if (d.EndsWith("/HEAD", StringComparison.Ordinal)) + { + continue; + } + else if (d.StartsWith("HEAD -> refs/heads/", StringComparison.Ordinal)) + { + isHeadOfCurrent = true; + decorators.Add(new Models.Decorator() + { + Type = Models.DecoratorType.CurrentBranchHead, + Name = d.Substring(19).Trim(), + }); + } + else if (d.StartsWith("refs/heads/", StringComparison.Ordinal)) + { + decorators.Add(new Models.Decorator() + { + Type = Models.DecoratorType.LocalBranchHead, + Name = d.Substring(11).Trim(), + }); + } + else if (d.StartsWith("refs/remotes/", StringComparison.Ordinal)) + { + decorators.Add(new Models.Decorator() + { + Type = Models.DecoratorType.RemoteBranchHead, + Name = d.Substring(13).Trim(), + }); + } + } + + decorators.Sort((l, r) => + { + if (l.Type != r.Type) + { + return (int)l.Type - (int)r.Type; + } + else + { + return l.Name.CompareTo(r.Name); + } + }); + + return isHeadOfCurrent; } private void MarkFirstMerged() { - Args = $"log --since=\"{_commits[^1].CommitterTimeStr}\" --format=\"%H\""; + Args = $"log --since=\"{commits[commits.Count - 1].CommitterTimeStr}\" --format=\"%H\""; var rs = ReadToEnd(); - var shas = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); + var shas = rs.StdOut.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); if (shas.Length == 0) return; @@ -136,7 +192,7 @@ namespace SourceGit.Commands foreach (var sha in shas) set.Add(sha); - foreach (var c in _commits) + foreach (var c in commits) { if (set.Contains(c.SHA)) { @@ -145,10 +201,5 @@ namespace SourceGit.Commands } } } - - private List _commits = new List(); - private Models.Commit _current = null; - private bool _findFirstMerged = false; - private bool _isHeadFounded = false; } } diff --git a/src/Commands/QueryCommitsForInteractiveRebase.cs b/src/Commands/QueryCommitsForInteractiveRebase.cs deleted file mode 100644 index 9f238319..00000000 --- a/src/Commands/QueryCommitsForInteractiveRebase.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SourceGit.Commands -{ - public class QueryCommitsForInteractiveRebase : Command - { - public QueryCommitsForInteractiveRebase(string repo, string on) - { - _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"; - } - - public List Result() - { - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return _commits; - - var nextPartIdx = 0; - var start = 0; - var end = rs.StdOut.IndexOf('\n', start); - while (end > 0) - { - var line = rs.StdOut.Substring(start, end - start); - switch (nextPartIdx) - { - case 0: - _current = new Models.InteractiveCommit(); - _current.Commit.SHA = line; - _commits.Add(_current); - break; - case 1: - ParseParent(line); - break; - case 2: - _current.Commit.ParseDecorators(line); - break; - case 3: - _current.Commit.Author = Models.User.FindOrAdd(line); - break; - case 4: - _current.Commit.AuthorTime = ulong.Parse(line); - break; - case 5: - _current.Commit.Committer = Models.User.FindOrAdd(line); - break; - case 6: - _current.Commit.CommitterTime = ulong.Parse(line); - break; - default: - var boundary = rs.StdOut.IndexOf(_boundary, end + 1, StringComparison.Ordinal); - if (boundary > end) - { - _current.Message = rs.StdOut.Substring(start, boundary - start - 1); - end = boundary + _boundary.Length; - } - else - { - _current.Message = rs.StdOut.Substring(start); - end = rs.StdOut.Length - 2; - } - - nextPartIdx = -1; - break; - } - - nextPartIdx++; - - start = end + 1; - if (start >= rs.StdOut.Length - 1) - break; - - end = rs.StdOut.IndexOf('\n', start); - } - - return _commits; - } - - private void ParseParent(string data) - { - if (data.Length < 8) - return; - - _current.Commit.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries)); - } - - private List _commits = []; - private Models.InteractiveCommit _current = null; - private readonly 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..5ce7641e 100644 --- a/src/Commands/QueryFileSize.cs +++ b/src/Commands/QueryFileSize.cs @@ -4,6 +4,7 @@ namespace SourceGit.Commands { public partial class QueryFileSize : Command { + [GeneratedRegex(@"^\d+\s+\w+\s+[0-9a-f]+\s+(\d+)\s+.*$")] private static partial Regex REG_FORMAT(); @@ -11,20 +12,27 @@ namespace SourceGit.Commands { WorkingDirectory = repo; Context = repo; - Args = $"ls-tree {revision} -l -- \"{file}\""; + Args = $"ls-tree {revision} -l -- {file}"; } public long Result() { + if (_result != 0) + return _result; + var rs = ReadToEnd(); if (rs.IsSuccess) { var match = REG_FORMAT().Match(rs.StdOut); if (match.Success) + { return long.Parse(match.Groups[1].Value); + } } 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..2f1e89b8 100644 --- a/src/Commands/QueryLocalChanges.cs +++ b/src/Commands/QueryLocalChanges.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -using Avalonia.Threading; - namespace SourceGit.Commands { public partial class QueryLocalChanges : Command @@ -16,150 +14,119 @@ 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; + if (line.EndsWith("/", StringComparison.Ordinal)) + return; // Ignore changes with git-worktree + + 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 " 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, Models.ChangeState.None); + break; + case "MM": + change.Set(Models.ChangeState.Modified, Models.ChangeState.Modified); + break; + case "MD": + change.Set(Models.ChangeState.Modified, Models.ChangeState.Deleted); + break; + case "A": + change.Set(Models.ChangeState.Added, Models.ChangeState.None); + break; + case "AM": + change.Set(Models.ChangeState.Added, Models.ChangeState.Modified); + break; + case "AD": + change.Set(Models.ChangeState.Added, Models.ChangeState.Deleted); + break; + case "D": + change.Set(Models.ChangeState.Deleted, Models.ChangeState.None); + break; + case "R": + change.Set(Models.ChangeState.Renamed, Models.ChangeState.None); + break; + case "RM": + change.Set(Models.ChangeState.Renamed, Models.ChangeState.Modified); + break; + case "RD": + change.Set(Models.ChangeState.Renamed, Models.ChangeState.Deleted); + break; + case "C": + change.Set(Models.ChangeState.Copied, Models.ChangeState.None); + break; + case "CM": + change.Set(Models.ChangeState.Copied, Models.ChangeState.Modified); + 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 deleted file mode 100644 index cabe1b50..00000000 --- a/src/Commands/QueryRefsContainsCommit.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SourceGit.Commands -{ - public class QueryRefsContainsCommit : Command - { - public QueryRefsContainsCommit(string repo, string commit) - { - WorkingDirectory = repo; - RaiseError = false; - Args = $"for-each-ref --format=\"%(refname)\" --contains {commit}"; - } - - public List Result() - { - var rs = new List(); - - var output = ReadToEnd(); - if (!output.IsSuccess) - return rs; - - var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - foreach (var line in lines) - { - if (line.EndsWith("/HEAD", StringComparison.Ordinal)) - continue; - - if (line.StartsWith("refs/heads/", StringComparison.Ordinal)) - rs.Add(new() { Name = line.Substring("refs/heads/".Length), Type = Models.DecoratorType.LocalBranchHead }); - else if (line.StartsWith("refs/remotes/", StringComparison.Ordinal)) - rs.Add(new() { Name = line.Substring("refs/remotes/".Length), Type = Models.DecoratorType.RemoteBranchHead }); - else if (line.StartsWith("refs/tags/", StringComparison.Ordinal)) - rs.Add(new() { Name = line.Substring("refs/tags/".Length), Type = Models.DecoratorType.Tag }); - } - - return rs; - } - } -} 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/QueryRepositoryRootPath.cs b/src/Commands/QueryRepositoryRootPath.cs index 016621c8..1eef5af8 100644 --- a/src/Commands/QueryRepositoryRootPath.cs +++ b/src/Commands/QueryRepositoryRootPath.cs @@ -6,6 +6,15 @@ { WorkingDirectory = path; Args = "rev-parse --show-toplevel"; + RaiseError = false; + } + + public string Result() + { + var rs = ReadToEnd().StdOut; + if (string.IsNullOrEmpty(rs)) + return null; + return rs.Trim(); } } } 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 deleted file mode 100644 index c6fd7373..00000000 --- a/src/Commands/QueryRevisionFileNames.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Commands -{ - public class QueryRevisionFileNames : Command - { - public QueryRevisionFileNames(string repo, string revision) - { - WorkingDirectory = repo; - Context = repo; - Args = $"ls-tree -r -z --name-only {revision}"; - } - - public List Result() - { - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return []; - - var lines = rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries); - var outs = new List(); - foreach (var line in lines) - outs.Add(line); - return outs; - } - } -} diff --git a/src/Commands/QueryRevisionObjects.cs b/src/Commands/QueryRevisionObjects.cs index de3406e8..7a3db057 100644 --- a/src/Commands/QueryRevisionObjects.cs +++ b/src/Commands/QueryRevisionObjects.cs @@ -5,42 +5,25 @@ namespace SourceGit.Commands { public partial class QueryRevisionObjects : Command { + [GeneratedRegex(@"^\d+\s+(\w+)\s+([0-9a-f]+)\s+(.*)$")] private static partial Regex REG_FORMAT(); + private readonly List objects = new List(); - public QueryRevisionObjects(string repo, string sha, string parentFolder) + public QueryRevisionObjects(string repo, string sha) { WorkingDirectory = repo; Context = repo; - Args = $"ls-tree -z {sha}"; - - if (!string.IsNullOrEmpty(parentFolder)) - Args += $" -- \"{parentFolder}\""; + Args = $"ls-tree -r {sha}"; } public List Result() { - var rs = ReadToEnd(); - if (rs.IsSuccess) - { - var start = 0; - var end = rs.StdOut.IndexOf('\0', start); - while (end > 0) - { - var line = rs.StdOut.Substring(start, end - start); - Parse(line); - start = end + 1; - end = rs.StdOut.IndexOf('\0', start); - } - - if (start < rs.StdOut.Length) - Parse(rs.StdOut.Substring(start)); - } - - return _objects; + Exec(); + return objects; } - private void Parse(string line) + protected override void OnReadline(string line) { var match = REG_FORMAT().Match(line); if (!match.Success) @@ -67,9 +50,7 @@ namespace SourceGit.Commands break; } - _objects.Add(obj); + objects.Add(obj); } - - private List _objects = new List(); } } diff --git a/src/Commands/QuerySingleCommit.cs b/src/Commands/QuerySingleCommit.cs deleted file mode 100644 index 35289ec5..00000000 --- a/src/Commands/QuerySingleCommit.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; - -namespace SourceGit.Commands -{ - public class QuerySingleCommit : Command - { - public QuerySingleCommit(string repo, string sha) - { - 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}"; - } - - public Models.Commit Result() - { - var rs = ReadToEnd(); - if (rs.IsSuccess && !string.IsNullOrEmpty(rs.StdOut)) - { - var commit = new Models.Commit(); - var lines = rs.StdOut.Split('\n'); - if (lines.Length < 8) - return null; - - commit.SHA = lines[0]; - if (!string.IsNullOrEmpty(lines[1])) - commit.Parents.AddRange(lines[1].Split(' ', StringSplitOptions.RemoveEmptyEntries)); - if (!string.IsNullOrEmpty(lines[2])) - commit.ParseDecorators(lines[2]); - commit.Author = Models.User.FindOrAdd(lines[3]); - commit.AuthorTime = ulong.Parse(lines[4]); - commit.Committer = Models.User.FindOrAdd(lines[5]); - commit.CommitterTime = ulong.Parse(lines[6]); - commit.Subject = lines[7]; - - return commit; - } - - return null; - } - } -} diff --git a/src/Commands/QueryStagedChangesWithAmend.cs b/src/Commands/QueryStagedChangesWithAmend.cs deleted file mode 100644 index 78980401..00000000 --- a/src/Commands/QueryStagedChangesWithAmend.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text.RegularExpressions; - -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(.*)$")] - 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) - { - WorkingDirectory = repo; - Context = repo; - Args = $"diff-index --cached -M {parent}"; - _parent = parent; - } - - 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) - { - var match = REG_FORMAT2().Match(line); - if (match.Success) - { - var change = new Models.Change() - { - Path = match.Groups[3].Value, - DataForAmend = new Models.ChangeDataForAmend() - { - 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; - } - changes.Add(change); - } - } - - return changes; - } - - private readonly string _parent; - } -} diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs new file mode 100644 index 00000000..bf61ca2d --- /dev/null +++ b/src/Commands/QueryStashChanges.cs @@ -0,0 +1,61 @@ +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..5362f87b 100644 --- a/src/Commands/QueryStashes.cs +++ b/src/Commands/QueryStashes.cs @@ -1,73 +1,64 @@ using System; using System.Collections.Generic; +using System.Text.RegularExpressions; namespace SourceGit.Commands { - public class QueryStashes : Command + public partial class QueryStashes : Command { + + [GeneratedRegex(@"^Reflog: refs/(stash@\{\d+\}).*$")] + private static partial Regex REG_STASH(); + public QueryStashes(string repo) { WorkingDirectory = repo; Context = repo; - Args = "stash list --format=%H%n%P%n%ct%n%gd%n%s"; + Args = "stash list --pretty=raw"; } public List Result() { - var outs = new List(); - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return outs; + Exec(); + if (_current != null) + _stashes.Add(_current); + return _stashes; + } - var nextPartIdx = 0; - var start = 0; - var end = rs.StdOut.IndexOf('\n', start); - while (end > 0) + protected override void OnReadline(string line) + { + if (line.StartsWith("commit ", StringComparison.Ordinal)) { - 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); + if (_current != null && !string.IsNullOrEmpty(_current.Name)) + _stashes.Add(_current); + _current = new Models.Stash() { SHA = line.Substring(7, 8) }; + return; } - if (start < rs.StdOut.Length) - _current.Message = rs.StdOut.Substring(start); - - return outs; - } - - private void ParseParent(string data) - { - if (data.Length < 8) + if (_current == null) return; - _current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries)); + if (line.StartsWith("Reflog: refs/stash@", StringComparison.Ordinal)) + { + var match = REG_STASH().Match(line); + if (match.Success) + _current.Name = match.Groups[1].Value; + } + else if (line.StartsWith("Reflog message: ", StringComparison.Ordinal)) + { + _current.Message = line.Substring(16); + } + else if (line.StartsWith("author ", StringComparison.Ordinal)) + { + Models.User user = Models.User.Invalid; + ulong time = 0; + Models.Commit.ParseUserAndTime(line.Substring(7), ref user, ref time); + _current.Author = user; + _current.Time = time; + } } + private readonly List _stashes = new List(); private Models.Stash _current = null; } } diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs index 663c0ea0..622de2fc 100644 --- a/src/Commands/QuerySubmodules.cs +++ b/src/Commands/QuerySubmodules.cs @@ -1,18 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using System.Text.RegularExpressions; namespace SourceGit.Commands { public partial class QuerySubmodules : Command { - [GeneratedRegex(@"^([U\-\+ ])([0-9a-f]+)\s(.*?)(\s\(.*\))?$")] - private static partial Regex REG_FORMAT_STATUS(); - [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(); + [GeneratedRegex(@"^[\-\+ ][0-9a-f]+\s(.*)\s\(.*\)$")] + private static partial Regex REG_FORMAT1(); + [GeneratedRegex(@"^[\-\+ ][0-9a-f]+\s(.*)$")] + private static partial Regex REG_FORMAT2(); public QuerySubmodules(string repo) { @@ -21,122 +17,28 @@ namespace SourceGit.Commands Args = "submodule status"; } - public List Result() + public List Result() { - var submodules = new List(); - var rs = ReadToEnd(); - - var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - var map = new Dictionary(); - var needCheckLocalChanges = false; - foreach (var line in lines) - { - var match = REG_FORMAT_STATUS().Match(line); - if (match.Success) - { - var stat = match.Groups[1].Value; - var sha = match.Groups[2].Value; - var path = match.Groups[3].Value; - - 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); - } - } - - 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}"; - rs = ReadToEnd(); - if (!rs.IsSuccess) - return submodules; - - lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - foreach (var line in lines) - { - var match = REG_FORMAT_DIRTY().Match(line); - if (match.Success) - { - var path = match.Groups[1].Value; - if (map.TryGetValue(path, out var m)) - m.Status = Models.SubmoduleStatus.Modified; - } - } - } - - return submodules; + Exec(); + return _submodules; } - private class ModuleInfo + protected override void OnReadline(string line) { - public string Path { get; set; } = string.Empty; - public string URL { get; set; } = string.Empty; + var match = REG_FORMAT1().Match(line); + if (match.Success) + { + _submodules.Add(match.Groups[1].Value); + return; + } + + match = REG_FORMAT2().Match(line); + if (match.Success) + { + _submodules.Add(match.Groups[1].Value); + } } + + private readonly List _submodules = new List(); } } diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs index 4b706439..0b5b747f 100644 --- a/src/Commands/QueryTags.cs +++ b/src/Commands/QueryTags.cs @@ -7,45 +7,38 @@ namespace SourceGit.Commands { public QueryTags(string repo) { - _boundary = $"----- BOUNDARY OF TAGS {Guid.NewGuid()} -----"; - 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 = "for-each-ref --sort=-creatordate --format=\"$%(refname:short)$%(objectname)$%(*objectname)\" refs/tags"; } public List Result() { - var tags = new List(); - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return tags; - - var records = rs.StdOut.Split(_boundary, StringSplitOptions.RemoveEmptyEntries); - foreach (var record in records) - { - var subs = record.Split('\0', StringSplitOptions.None); - if (subs.Length != 6) - continue; - - var name = subs[0].Substring(10); - var message = subs[5].Trim(); - if (!string.IsNullOrEmpty(message) && message.Equals(name, StringComparison.Ordinal)) - message = null; - - 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, - }); - } - - return tags; + Exec(); + return _loaded; } - private string _boundary = string.Empty; + protected override void OnReadline(string line) + { + var subs = line.Split(new char[] { '$' }, StringSplitOptions.RemoveEmptyEntries); + if (subs.Length == 2) + { + _loaded.Add(new Models.Tag() + { + Name = subs[0], + SHA = subs[1], + }); + } + else if (subs.Length == 3) + { + _loaded.Add(new Models.Tag() + { + Name = subs[0], + SHA = subs[2], + }); + } + } + + private readonly List _loaded = new List(); } } diff --git a/src/Commands/QueryTrackStatus.cs b/src/Commands/QueryTrackStatus.cs deleted file mode 100644 index e7e1f1c9..00000000 --- a/src/Commands/QueryTrackStatus.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; - -namespace SourceGit.Commands -{ - public class QueryTrackStatus : Command - { - public QueryTrackStatus(string repo, string local, string upstream) - { - WorkingDirectory = repo; - Context = repo; - Args = $"rev-list --left-right {local}...{upstream}"; - } - - public Models.BranchTrackStatus Result() - { - var status = new Models.BranchTrackStatus(); - - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return status; - - var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries); - foreach (var line in lines) - { - if (line[0] == '>') - status.Behind.Add(line.Substring(1)); - else - status.Ahead.Add(line.Substring(1)); - } - - return status; - } - } -} 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/Rebase.cs b/src/Commands/Rebase.cs index 2ec50f3c..d08d55ad 100644 --- a/src/Commands/Rebase.cs +++ b/src/Commands/Rebase.cs @@ -12,15 +12,4 @@ Args += basedOn; } } - - public class InteractiveRebase : Command - { - public InteractiveRebase(string repo, string basedOn) - { - WorkingDirectory = repo; - Context = repo; - Editor = EditorType.RebaseEditor; - Args = $"rebase -i --autosquash {basedOn}"; - } - } } diff --git a/src/Commands/Remote.cs b/src/Commands/Remote.cs index beaf412b..46aa37e3 100644 --- a/src/Commands/Remote.cs +++ b/src/Commands/Remote.cs @@ -32,27 +32,10 @@ return Exec(); } - public string GetURL(string name, bool isPush) + public bool SetURL(string name, string url) { - Args = "remote get-url" + (isPush ? " --push " : " ") + name; - - var rs = ReadToEnd(); - return rs.IsSuccess ? rs.StdOut.Trim() : string.Empty; - } - - public bool SetURL(string name, string url, bool isPush) - { - Args = "remote set-url" + (isPush ? " --push " : " ") + $"{name} {url}"; + Args = $"remote set-url {name} {url}"; return Exec(); } - - public bool HasBranch(string remote, string branch) - { - SSHKey = new Config(WorkingDirectory).Get($"remote.{remote}.sshkey"); - Args = $"ls-remote {remote} {branch}"; - - var rs = ReadToEnd(); - return rs.IsSuccess && rs.StdOut.Trim().Length > 0; - } } } 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..12a2eaa1 100644 --- a/src/Commands/Restore.cs +++ b/src/Commands/Restore.cs @@ -1,52 +1,22 @@ -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, List files, string extra) { 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(); - } - - /// - /// Restore changes given in a path-spec file. - /// - /// - /// - /// - public Restore(string repo, string pathspecFile, bool isStaged) - { - 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/Revert.cs b/src/Commands/Revert.cs index 2e7afd11..b6c3913a 100644 --- a/src/Commands/Revert.cs +++ b/src/Commands/Revert.cs @@ -6,9 +6,9 @@ { WorkingDirectory = repo; Context = repo; - Args = $"revert -m 1 {commit} --no-edit"; + Args = $"revert {commit} --no-edit"; if (!autoCommit) - Args += " --no-commit"; + Args += " --no-commit"; } } } diff --git a/src/Commands/SaveChangesAsPatch.cs b/src/Commands/SaveChangesAsPatch.cs index b10037a1..409127ba 100644 --- a/src/Commands/SaveChangesAsPatch.cs +++ b/src/Commands/SaveChangesAsPatch.cs @@ -9,7 +9,7 @@ namespace SourceGit.Commands { public static class SaveChangesAsPatch { - public static bool ProcessLocalChanges(string repo, List changes, bool isUnstaged, string saveTo) + public static bool Exec(string repo, List changes, bool isUnstaged, string saveTo) { using (var sw = File.Create(saveTo)) { @@ -23,33 +23,6 @@ namespace SourceGit.Commands return true; } - public static bool ProcessRevisionCompareChanges(string repo, List changes, string baseRevision, string targetRevision, string saveTo) - { - using (var sw = File.Create(saveTo)) - { - foreach (var change in changes) - { - if (!ProcessSingleChange(repo, new Models.DiffOption(baseRevision, targetRevision, change), sw)) - return false; - } - } - - 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..6c200940 100644 --- a/src/Commands/SaveRevisionFile.cs +++ b/src/Commands/SaveRevisionFile.cs @@ -10,11 +10,15 @@ namespace SourceGit.Commands { public static void Run(string repo, string revision, string file, string saveTo) { - var isLFSFiltered = new IsLFSFiltered(repo, revision, file).Result(); + var isLFSFiltered = new IsLFSFiltered(repo, 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..3e784f60 100644 --- a/src/Commands/Stash.cs +++ b/src/Commands/Stash.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Text; +using System.IO; namespace SourceGit.Commands { @@ -11,84 +11,65 @@ 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) { - var builder = new StringBuilder(); - builder.Append("stash push --include-untracked "); - if (keepIndex) - builder.Append("--keep-index "); - builder.Append("-m \""); - builder.Append(message); - builder.Append("\" -- "); + var temp = Path.GetTempFileName(); + var stream = new FileStream(temp, FileMode.Create); + var writer = new StreamWriter(stream); + var needAdd = new List(); foreach (var c in changes) - builder.Append($"\"{c.Path}\" "); + { + writer.WriteLine(c.Path); - Args = builder.ToString(); - return Exec(); + 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(); + } + + writer.Flush(); + stream.Flush(); + writer.Close(); + stream.Close(); + + Args = $"stash push -m \"{message}\" --pathspec-from-file=\"{temp}\""; + var succ = Exec(); + File.Delete(temp); + return succ; } - 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..85f5a4fb 100644 --- a/src/Commands/Statistics.cs +++ b/src/Commands/Statistics.cs @@ -1,48 +1,39 @@ -using System; +using System; namespace SourceGit.Commands { public class Statistics : Command { - public Statistics(string repo, int max) + public Statistics(string repo) { + _statistics = new Models.Statistics(); + WorkingDirectory = repo; Context = repo; - Args = $"log --date-order --branches --remotes -{max} --format=%ct$%aN±%aE"; + Args = $"log --date-order --branches --remotes --since=\"{_statistics.Since()}\" --pretty=format:\"%ct$%cn\""; } public Models.Statistics Result() { - var statistics = new Models.Statistics(); - var rs = ReadToEnd(); - if (!rs.IsSuccess) - return statistics; - - var start = 0; - var end = rs.StdOut.IndexOf('\n', start); - while (end > 0) - { - ParseLine(statistics, rs.StdOut.Substring(start, end - start)); - start = end + 1; - end = rs.StdOut.IndexOf('\n', start); - } - - if (start < rs.StdOut.Length) - ParseLine(statistics, rs.StdOut.Substring(start)); - - statistics.Complete(); - return statistics; + Exec(); + _statistics.Complete(); + return _statistics; } - private void ParseLine(Models.Statistics statistics, string line) + protected override void OnReadline(string line) { var dateEndIdx = line.IndexOf('$', StringComparison.Ordinal); if (dateEndIdx == -1) return; - var dateStr = line.AsSpan(0, dateEndIdx); - if (double.TryParse(dateStr, out var date)) - statistics.AddCommit(line.Substring(dateEndIdx + 1), date); + var dateStr = line.Substring(0, dateEndIdx); + var date = 0.0; + if (!double.TryParse(dateStr, out date)) + return; + + _statistics.AddCommit(line.Substring(dateEndIdx + 1), date); } + + private readonly Models.Statistics _statistics = null; } } diff --git a/src/Commands/Submodule.cs b/src/Commands/Submodule.cs index 025d035a..428c10d1 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,56 +10,46 @@ 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; if (recursive) { - Args = $"submodule update --init --recursive -- \"{relativePath}\""; + Args = $"submodule update --init --recursive -- {relativePath}"; return Exec(); } else { - Args = $"submodule update --init -- \"{relativePath}\""; + Args = $"submodule update --init -- {relativePath}"; return true; } } - public bool Update(List modules, bool init, bool recursive, bool useRemote = false) + public bool Update() { - var builder = new StringBuilder(); - builder.Append("submodule update"); - - if (init) - builder.Append(" --init"); - if (recursive) - builder.Append(" --recursive"); - if (useRemote) - builder.Append(" --remote"); - if (modules.Count > 0) - { - builder.Append(" --"); - foreach (var module in modules) - builder.Append($" \"{module}\""); - } - - Args = builder.ToString(); + Args = $"submodule update --rebase --remote"; 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..f96d3bc7 100644 --- a/src/Commands/Tag.cs +++ b/src/Commands/Tag.cs @@ -1,51 +1,49 @@ -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, string message) { var cmd = new Command(); cmd.WorkingDirectory = repo; cmd.Context = repo; - cmd.Args = $"tag --no-sign {name} {basedOn}"; - cmd.Log = log; - return cmd.Exec(); - } - - public static bool Add(string repo, string name, string basedOn, string message, bool sign, Models.ICommandLog log) - { - 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; + cmd.Args = $"tag -a {name} {basedOn} "; 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 deleted file mode 100644 index 19def067..00000000 --- a/src/Commands/UnstageChangesForAmend.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; - -using Avalonia.Threading; - -namespace SourceGit.Commands -{ - public class UnstageChangesForAmend - { - public UnstageChangesForAmend(string repo, List changes) - { - _repo = repo; - - foreach (var c in changes) - { - if (c.Index == Models.ChangeState.Renamed) - { - _patchBuilder.Append("0 0000000000000000000000000000000000000000\t"); - _patchBuilder.Append(c.Path); - _patchBuilder.Append("\0100644 "); - _patchBuilder.Append(c.DataForAmend.ObjectHash); - _patchBuilder.Append("\t"); - _patchBuilder.Append(c.OriginalPath); - } - else if (c.Index == Models.ChangeState.Added) - { - _patchBuilder.Append("0 0000000000000000000000000000000000000000\t"); - _patchBuilder.Append(c.Path); - } - else if (c.Index == Models.ChangeState.Deleted) - { - _patchBuilder.Append("100644 "); - _patchBuilder.Append(c.DataForAmend.ObjectHash); - _patchBuilder.Append("\t"); - _patchBuilder.Append(c.Path); - } - else - { - _patchBuilder.Append(c.DataForAmend.FileMode); - _patchBuilder.Append(" "); - _patchBuilder.Append(c.DataForAmend.ObjectHash); - _patchBuilder.Append("\t"); - _patchBuilder.Append(c.Path); - } - - _patchBuilder.Append("\n"); - } - } - - public bool Exec() - { - var starter = new ProcessStartInfo(); - starter.WorkingDirectory = _repo; - starter.FileName = Native.OS.GitExecutable; - starter.Arguments = "-c core.editor=true update-index --index-info"; - starter.UseShellExecute = false; - starter.CreateNoWindow = true; - starter.WindowStyle = ProcessWindowStyle.Hidden; - starter.RedirectStandardInput = true; - starter.RedirectStandardOutput = false; - starter.RedirectStandardError = true; - - try - { - var proc = new Process() { StartInfo = starter }; - proc.Start(); - proc.StandardInput.Write(_patchBuilder.ToString()); - proc.StandardInput.Close(); - - var err = proc.StandardError.ReadToEnd(); - proc.WaitForExit(); - var rs = proc.ExitCode == 0; - proc.Close(); - - if (!rs) - Dispatcher.UIThread.Invoke(() => App.RaiseException(_repo, err)); - - return rs; - } - catch (Exception e) - { - Dispatcher.UIThread.Invoke(() => - { - App.RaiseException(_repo, "Failed to unstage changes: " + e.Message); - }); - return false; - } - } - - private string _repo = ""; - private StringBuilder _patchBuilder = new StringBuilder(); - } -} 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 deleted file mode 100644 index 1198a443..00000000 --- a/src/Commands/Worktree.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; - -namespace SourceGit.Commands -{ - public class Worktree : Command - { - public Worktree(string repo) - { - WorkingDirectory = repo; - Context = repo; - } - - public List List() - { - Args = "worktree list --porcelain"; - - var rs = ReadToEnd(); - var worktrees = new List(); - var last = null as Models.Worktree; - if (rs.IsSuccess) - { - var lines = rs.StdOut.Split(['\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)) - { - last!.IsBare = true; - } - else if (line.StartsWith("HEAD ", StringComparison.Ordinal)) - { - last!.Head = line.Substring(5).Trim(); - } - else if (line.StartsWith("branch ", StringComparison.Ordinal)) - { - last!.Branch = line.Substring(7).Trim(); - } - else if (line.StartsWith("detached", StringComparison.Ordinal)) - { - last!.IsDetached = true; - } - else if (line.StartsWith("locked", StringComparison.Ordinal)) - { - last!.IsLocked = true; - } - } - } - - return worktrees; - } - - public bool Add(string fullpath, string name, bool createNew, string tracking) - { - Args = "worktree add "; - - if (!string.IsNullOrEmpty(tracking)) - Args += "--track "; - - if (!string.IsNullOrEmpty(name)) - { - if (createNew) - Args += $"-b {name} "; - else - Args += $"-B {name} "; - } - - Args += $"\"{fullpath}\" "; - - if (!string.IsNullOrEmpty(tracking)) - Args += tracking; - else if (!string.IsNullOrEmpty(name) && !createNew) - Args += name; - - return Exec(); - } - - public bool Prune() - { - Args = "worktree prune -v"; - return Exec(); - } - - public bool Lock(string fullpath) - { - Args = $"worktree lock \"{fullpath}\""; - return Exec(); - } - - public bool Unlock(string fullpath) - { - Args = $"worktree unlock \"{fullpath}\""; - return Exec(); - } - - public bool Remove(string fullpath, bool force) - { - if (force) - Args = $"worktree remove -f \"{fullpath}\""; - else - Args = $"worktree remove \"{fullpath}\""; - - return Exec(); - } - } -} diff --git a/src/Converters/BookmarkConverters.cs b/src/Converters/BookmarkConverters.cs new file mode 100644 index 00000000..9896d9aa --- /dev/null +++ b/src/Converters/BookmarkConverters.cs @@ -0,0 +1,14 @@ +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters +{ + public static class BookmarkConverters + { + public static readonly FuncValueConverter ToBrush = + new FuncValueConverter(bookmark => Models.Bookmarks.Brushes[bookmark]); + + public static readonly FuncValueConverter ToStrokeThickness = + new FuncValueConverter(bookmark => bookmark == 0 ? 1.0 : 0); + } +} diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs index 3563fb37..bfe3bf41 100644 --- a/src/Converters/BoolConverters.cs +++ b/src/Converters/BoolConverters.cs @@ -5,10 +5,10 @@ namespace SourceGit.Converters { public static class BoolConverters { - public static readonly FuncValueConverter ToPageTabWidth = - new FuncValueConverter(x => x ? 200 : double.NaN); + public static readonly FuncValueConverter ToCommitOpacity = + new FuncValueConverter(x => x ? 1 : 0.5); - public static readonly FuncValueConverter IsBoldToFontWeight = - new FuncValueConverter(x => x ? FontWeight.Bold : FontWeight.Normal); + public static readonly FuncValueConverter ToCommitFontWeight = + new FuncValueConverter(x => x ? FontWeight.Bold : FontWeight.Regular); } } diff --git a/src/Converters/BranchConverters.cs b/src/Converters/BranchConverters.cs new file mode 100644 index 00000000..d20ed89f --- /dev/null +++ b/src/Converters/BranchConverters.cs @@ -0,0 +1,10 @@ +using Avalonia.Data.Converters; + +namespace SourceGit.Converters +{ + public static class BranchConverters + { + public static readonly FuncValueConverter ToName = + new FuncValueConverter(v => v.IsLocal ? v.Name : $"{v.Remote}/{v.Name}"); + } +} diff --git a/src/Converters/ChangeViewModeConverters.cs b/src/Converters/ChangeViewModeConverters.cs new file mode 100644 index 00000000..01bc1774 --- /dev/null +++ b/src/Converters/ChangeViewModeConverters.cs @@ -0,0 +1,32 @@ +using Avalonia.Controls; +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters +{ + public static class ChangeViewModeConverters + { + public static readonly FuncValueConverter ToIcon = + new FuncValueConverter(v => + { + switch (v) + { + case Models.ChangeViewMode.List: + return App.Current?.FindResource("Icons.List") as StreamGeometry; + case Models.ChangeViewMode.Grid: + return App.Current?.FindResource("Icons.Grid") as StreamGeometry; + default: + return App.Current?.FindResource("Icons.Tree") as StreamGeometry; + } + }); + + public static readonly FuncValueConverter IsList = + new FuncValueConverter(v => v == Models.ChangeViewMode.List); + + public static readonly FuncValueConverter IsGrid = + new FuncValueConverter(v => v == Models.ChangeViewMode.Grid); + + public static readonly FuncValueConverter IsTree = + new FuncValueConverter(v => v == Models.ChangeViewMode.Tree); + } +} diff --git a/src/Converters/DecoratorTypeConverters.cs b/src/Converters/DecoratorTypeConverters.cs new file mode 100644 index 00000000..eb016360 --- /dev/null +++ b/src/Converters/DecoratorTypeConverters.cs @@ -0,0 +1,43 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters +{ + public static class DecoratorTypeConverters + { + public static readonly FuncValueConverter ToBackground = + new FuncValueConverter(v => + { + if (v == Models.DecoratorType.Tag) + return Models.DecoratorResources.Backgrounds[0]; + return Models.DecoratorResources.Backgrounds[1]; + }); + + public static readonly FuncValueConverter ToIcon = + new FuncValueConverter(v => + { + var key = "Icons.Tag"; + switch (v) + { + case Models.DecoratorType.CurrentBranchHead: + key = "Icons.Check"; + break; + case Models.DecoratorType.RemoteBranchHead: + key = "Icons.Remote"; + break; + case Models.DecoratorType.LocalBranchHead: + key = "Icons.Branch"; + break; + default: + break; + } + + return Application.Current?.FindResource(key) as StreamGeometry; + }); + + public static readonly FuncValueConverter ToFontWeight = + new FuncValueConverter(v => v == Models.DecoratorType.CurrentBranchHead ? FontWeight.Bold : FontWeight.Regular); + } +} diff --git a/src/Converters/DoubleConverters.cs b/src/Converters/DoubleConverters.cs deleted file mode 100644 index 5b7c0a03..00000000 --- a/src/Converters/DoubleConverters.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Avalonia.Data.Converters; - -namespace SourceGit.Converters -{ - public static class DoubleConverters - { - public static readonly FuncValueConverter Increase = - new FuncValueConverter(v => v + 1.0); - - public static readonly FuncValueConverter Decrease = - new FuncValueConverter(v => v - 1.0); - - public static readonly FuncValueConverter ToPercentage = - new FuncValueConverter(v => (v * 100).ToString("F3") + "%"); - - public static readonly FuncValueConverter OneMinusToPercentage = - new FuncValueConverter(v => ((1.0 - v) * 100).ToString("F3") + "%"); - } -} diff --git a/src/Converters/FilterModeConverters.cs b/src/Converters/FilterModeConverters.cs deleted file mode 100644 index c486af5e..00000000 --- a/src/Converters/FilterModeConverters.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Avalonia.Data.Converters; -using Avalonia.Media; - -namespace SourceGit.Converters -{ - public static class FilterModeConverters - { - public static readonly FuncValueConverter ToBorderBrush = - new FuncValueConverter(v => - { - switch (v) - { - case Models.FilterMode.Included: - return Brushes.Green; - case Models.FilterMode.Excluded: - return Brushes.Red; - default: - return Brushes.Transparent; - } - }); - } -} diff --git a/src/Converters/FontSizeModifyConverters.cs b/src/Converters/FontSizeModifyConverters.cs new file mode 100644 index 00000000..4c885e38 --- /dev/null +++ b/src/Converters/FontSizeModifyConverters.cs @@ -0,0 +1,13 @@ +using Avalonia.Data.Converters; + +namespace SourceGit.Converters +{ + public static class FontSizeModifyConverters + { + public static readonly FuncValueConverter Increase = + new FuncValueConverter(v => v + 1.0); + + public static readonly FuncValueConverter Decrease = + new FuncValueConverter(v => v - 1.0); + } +} diff --git a/src/Converters/IntConverters.cs b/src/Converters/IntConverters.cs index f21c5d24..820f62c5 100644 --- a/src/Converters/IntConverters.cs +++ b/src/Converters/IntConverters.cs @@ -1,7 +1,4 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Data.Converters; -using Avalonia.Media; +using Avalonia.Data.Converters; namespace SourceGit.Converters { @@ -10,9 +7,6 @@ namespace SourceGit.Converters public static readonly FuncValueConverter IsGreaterThanZero = new FuncValueConverter(v => v > 0); - public static readonly FuncValueConverter IsGreaterThanFour = - new FuncValueConverter(v => v > 4); - public static readonly FuncValueConverter IsZero = new FuncValueConverter(v => v == 0); @@ -21,23 +15,5 @@ namespace SourceGit.Converters public static readonly FuncValueConverter IsNotOne = new FuncValueConverter(v => v != 1); - - public static readonly FuncValueConverter IsSubjectLengthBad = - new FuncValueConverter(v => v > ViewModels.Preferences.Instance.SubjectGuideLength); - - public static readonly FuncValueConverter IsSubjectLengthGood = - new FuncValueConverter(v => v <= ViewModels.Preferences.Instance.SubjectGuideLength); - - public static readonly FuncValueConverter ToTreeMargin = - new FuncValueConverter(v => new Thickness(v * 16, 0, 0, 0)); - - public static readonly FuncValueConverter ToBookmarkBrush = - new FuncValueConverter(bookmark => - { - if (bookmark == 0) - return Application.Current?.FindResource("Brush.FG1") as IBrush; - else - return Models.Bookmarks.Brushes[bookmark]; - }); } } diff --git a/src/Converters/InteractiveRebaseActionConverters.cs b/src/Converters/InteractiveRebaseActionConverters.cs deleted file mode 100644 index dbd183bd..00000000 --- a/src/Converters/InteractiveRebaseActionConverters.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Avalonia.Data.Converters; -using Avalonia.Media; - -namespace SourceGit.Converters -{ - public static class InteractiveRebaseActionConverters - { - public static readonly FuncValueConverter ToIconBrush = - new FuncValueConverter(v => - { - switch (v) - { - case Models.InteractiveRebaseAction.Pick: - return Brushes.Green; - case Models.InteractiveRebaseAction.Edit: - return Brushes.Orange; - case Models.InteractiveRebaseAction.Reword: - return Brushes.Orange; - case Models.InteractiveRebaseAction.Squash: - return Brushes.LightGray; - case Models.InteractiveRebaseAction.Fixup: - return Brushes.LightGray; - default: - return Brushes.Red; - } - }); - - public static readonly FuncValueConverter ToName = - new FuncValueConverter(v => - { - switch (v) - { - case Models.InteractiveRebaseAction.Pick: - return "Pick"; - case Models.InteractiveRebaseAction.Edit: - return "Edit"; - case Models.InteractiveRebaseAction.Reword: - return "Reword"; - case Models.InteractiveRebaseAction.Squash: - return "Squash"; - case Models.InteractiveRebaseAction.Fixup: - return "Fixup"; - default: - return "Drop"; - } - }); - - public static readonly FuncValueConverter CanEditMessage = - new FuncValueConverter(v => v == Models.InteractiveRebaseAction.Reword || v == Models.InteractiveRebaseAction.Squash); - } -} diff --git a/src/Converters/LauncherPageConverters.cs b/src/Converters/LauncherPageConverters.cs new file mode 100644 index 00000000..05eec2b1 --- /dev/null +++ b/src/Converters/LauncherPageConverters.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; + +using Avalonia.Collections; +using Avalonia.Data.Converters; + +namespace SourceGit.Converters +{ + public static class LauncherPageConverters + { + public static readonly FuncMultiValueConverter ToTabSeperatorVisible = + new FuncMultiValueConverter(v => + { + if (v == null) + return false; + + var array = new List(); + array.AddRange(v); + if (array.Count != 3) + return false; + + var self = array[0] as ViewModels.LauncherPage; + if (self == null) + return false; + + var selected = array[1] as ViewModels.LauncherPage; + var collections = array[2] as AvaloniaList; + + if (selected != null && collections != null && (self == selected || collections.IndexOf(self) + 1 == collections.IndexOf(selected))) + { + return false; + } + else + { + return true; + } + }); + } +} diff --git a/src/Converters/ListConverters.cs b/src/Converters/ListConverters.cs index 6f3ae98b..dac55076 100644 --- a/src/Converters/ListConverters.cs +++ b/src/Converters/ListConverters.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using Avalonia.Data.Converters; @@ -7,22 +6,10 @@ 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})"); - - public static readonly FuncValueConverter IsNullOrEmpty = - new FuncValueConverter(v => v == null || v.Count == 0); + new FuncValueConverter(v => v == null ? " (0)" : $" ({v.Count})"); public static readonly FuncValueConverter IsNotNullOrEmpty = new FuncValueConverter(v => v != null && v.Count > 0); - - public static readonly FuncValueConverter, List> Top100Changes = - new FuncValueConverter, List>(v => (v == null || v.Count < 100) ? v : v.GetRange(0, 100)); - - public static readonly FuncValueConverter IsOnlyTop100Shows = - new FuncValueConverter(v => v != null && v.Count > 100); } } 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..6f10b66d 100644 --- a/src/Converters/PathConverters.cs +++ b/src/Converters/PathConverters.cs @@ -1,5 +1,4 @@ -using System; -using System.IO; +using System.IO; using Avalonia.Data.Converters; @@ -8,23 +7,9 @@ namespace SourceGit.Converters public static class PathConverters { public static readonly FuncValueConverter PureFileName = - new(v => Path.GetFileName(v) ?? ""); + new FuncValueConverter(fullpath => Path.GetFileName(fullpath) ?? ""); public static readonly FuncValueConverter PureDirectoryName = - new(v => Path.GetDirectoryName(v) ?? ""); - - public static readonly FuncValueConverter RelativeToHome = - new(v => - { - if (OperatingSystem.IsWindows()) - return v; - - 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; - }); + new FuncValueConverter(fullpath => Path.GetDirectoryName(fullpath) ?? ""); } } diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs index bcadfae9..f743f69f 100644 --- a/src/Converters/StringConverters.cs +++ b/src/Converters/StringConverters.cs @@ -17,7 +17,7 @@ namespace SourceGit.Converters public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - return (value as Models.Locale)?.Key; + return (value as Models.Locale).Key; } } @@ -28,21 +28,24 @@ namespace SourceGit.Converters public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { var theme = (string)value; - if (string.IsNullOrEmpty(theme)) - return ThemeVariant.Default; - if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase)) + { return ThemeVariant.Light; - - if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase)) + } + else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase)) + { return ThemeVariant.Dark; - - return ThemeVariant.Default; + } + else + { + return ThemeVariant.Default; + } } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - return (value as ThemeVariant)?.Key; + var theme = (ThemeVariant)value; + return theme.Key; } } @@ -65,24 +68,6 @@ namespace SourceGit.Converters public static readonly FormatByResourceKeyConverter FormatByResourceKey = new FormatByResourceKeyConverter(); public static readonly FuncValueConverter ToShortSHA = - new FuncValueConverter(v => v == null ? string.Empty : (v.Length > 10 ? v.Substring(0, 10) : v)); - - public static readonly FuncValueConverter TrimRefsPrefix = - new FuncValueConverter(v => - { - if (v == null) - return string.Empty; - if (v.StartsWith("refs/heads/", StringComparison.Ordinal)) - return v.Substring(11); - if (v.StartsWith("refs/remotes/", StringComparison.Ordinal)) - return v.Substring(13); - return v; - }); - - public static readonly FuncValueConverter ContainsSpaces = - new FuncValueConverter(v => v != null && v.Contains(' ')); - - public static readonly FuncValueConverter IsNotNullOrWhitespace = - new FuncValueConverter(v => v != null && v.Trim().Length > 0); + new FuncValueConverter(v => v.Length > 10 ? v.Substring(0, 10) : v); } } diff --git a/src/Converters/WindowStateConverters.cs b/src/Converters/WindowStateConverters.cs new file mode 100644 index 00000000..c73c86a8 --- /dev/null +++ b/src/Converters/WindowStateConverters.cs @@ -0,0 +1,58 @@ +using System; + +using Avalonia; +using Avalonia.Controls; +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters +{ + public static class WindowStateConverters + { + public static readonly FuncValueConverter ToContentMargin = + new FuncValueConverter(state => + { + if (OperatingSystem.IsWindows() && state == WindowState.Maximized) + { + return new Thickness(6); + } + else if (OperatingSystem.IsLinux() && state != WindowState.Maximized) + { + return new Thickness(6); + } + else + { + return new Thickness(0); + } + }); + + public static readonly FuncValueConverter ToTitleBarHeight = + new FuncValueConverter(state => + { + if (state == WindowState.Maximized) + { + return new GridLength(30); + } + else + { + return new GridLength(38); + } + }); + + public static readonly FuncValueConverter ToMaxOrRestoreIcon = + new FuncValueConverter(state => + { + if (state == WindowState.Maximized) + { + return Application.Current?.FindResource("Icons.Window.Restore") as StreamGeometry; + } + else + { + return Application.Current?.FindResource("Icons.Window.Maximize") as StreamGeometry; + } + }); + + public static readonly FuncValueConverter IsNormal = + new FuncValueConverter(state => state == WindowState.Normal); + } +} 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..fded94e3 100644 --- a/src/Models/AvatarManager.cs +++ b/src/Models/AvatarManager.cs @@ -1,92 +1,61 @@ -using System; +using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Net.Http; -using System.Security.Cryptography; -using System.Text; -using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using Avalonia.Media.Imaging; -using Avalonia.Platform; using Avalonia.Threading; namespace SourceGit.Models { public interface IAvatarHost { - void OnAvatarResourceChanged(string email, Bitmap image); + void OnAvatarResourceChanged(string md5); } - public partial class AvatarManager + public static class AvatarManager { - public static AvatarManager Instance + public static string SelectedServer { - get - { - if (_instance == null) - _instance = new AvatarManager(); + get; + set; + } = "https://www.gravatar.com/avatar/"; - return _instance; - } - } - - private static AvatarManager _instance = null; - - [GeneratedRegex(@"^(?:(\d+)\+)?(.+?)@.+\.github\.com$")] - private static partial Regex REG_GITHUB_USER_EMAIL(); - - private readonly Lock _synclock = new(); - private string _storePath; - private List _avatars = new List(); - private Dictionary _resources = new Dictionary(); - private HashSet _requesting = new HashSet(); - private HashSet _defaultAvatars = new HashSet(); - - public void Start() + static AvatarManager() { - _storePath = Path.Combine(Native.OS.DataDir, "avatars"); + _storePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SourceGit", "avatars"); if (!Directory.Exists(_storePath)) Directory.CreateDirectory(_storePath); - LoadDefaultAvatar("noreply@github.com", "github.png"); - LoadDefaultAvatar("unrealbot@epicgames.com", "unreal.png"); - Task.Run(() => { while (true) { - var email = null as string; + var md5 = null as string; lock (_synclock) { foreach (var one in _requesting) { - email = one; + md5 = one; break; } } - if (email == null) + if (md5 == null) { Thread.Sleep(100); continue; } - var md5 = GetEmailHash(email); - var matchGithubUser = REG_GITHUB_USER_EMAIL().Match(email); - var url = matchGithubUser.Success ? - $"https://avatars.githubusercontent.com/{matchGithubUser.Groups[2].Value}" : - $"https://www.gravatar.com/avatar/{md5}?d=404"; - var localFile = Path.Combine(_storePath, md5); var img = null as Bitmap; try { var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(2) }; - var task = client.GetAsync(url); + var task = client.GetAsync($"{SelectedServer}{md5}?d=404"); task.Wait(); var rsp = task.Result; @@ -106,58 +75,54 @@ namespace SourceGit.Models } } } - catch - { - // ignored - } + catch { } lock (_synclock) { - _requesting.Remove(email); + _requesting.Remove(md5); } Dispatcher.UIThread.InvokeAsync(() => { - _resources[email] = img; - NotifyResourceChanged(email, img); + if (_resources.ContainsKey(md5)) + _resources[md5] = img; + else + _resources.Add(md5, img); + NotifyResourceChanged(md5); }); } - - // ReSharper disable once FunctionNeverReturns }); } - public void Subscribe(IAvatarHost host) + public static void Subscribe(IAvatarHost host) { _avatars.Add(host); } - public void Unsubscribe(IAvatarHost host) + public static void Unsubscribe(IAvatarHost host) { _avatars.Remove(host); } - public Bitmap Request(string email, bool forceRefetch) + public static Bitmap Request(string md5, bool forceRefetch = false) { if (forceRefetch) { - if (_defaultAvatars.Contains(email)) - return null; + if (_resources.ContainsKey(md5)) + _resources.Remove(md5); - _resources.Remove(email); - - var localFile = Path.Combine(_storePath, GetEmailHash(email)); + var localFile = Path.Combine(_storePath, md5); if (File.Exists(localFile)) File.Delete(localFile); - NotifyResourceChanged(email, null); + NotifyResourceChanged(md5); } else { - if (_resources.TryGetValue(email, out var value)) + if (_resources.TryGetValue(md5, out var value)) return value; - var localFile = Path.Combine(_storePath, GetEmailHash(email)); + var localFile = Path.Combine(_storePath, md5); if (File.Exists(localFile)) { try @@ -165,74 +130,35 @@ namespace SourceGit.Models using (var stream = File.OpenRead(localFile)) { var img = Bitmap.DecodeToWidth(stream, 128); - _resources.Add(email, img); + _resources.Add(md5, img); return img; } } - catch - { - // ignore - } + catch { } } } lock (_synclock) { - _requesting.Add(email); + if (!_requesting.Contains(md5)) + _requesting.Add(md5); } 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)); - _resources.Add(key, new Bitmap(icon)); - _defaultAvatars.Add(key); - } - - 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); - foreach (var c in hash) - builder.Append(c.ToString("x2")); - return builder.ToString(); - } - - private void NotifyResourceChanged(string email, Bitmap image) + private static void NotifyResourceChanged(string md5) { foreach (var avatar in _avatars) - avatar.OnAvatarResourceChanged(email, image); + { + avatar.OnAvatarResourceChanged(md5); + } } + + private static readonly object _synclock = new object(); + private static readonly string _storePath = string.Empty; + private static readonly List _avatars = new List(); + private static readonly Dictionary _resources = new Dictionary(); + private static readonly HashSet _requesting = new HashSet(); } } 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..c23718d4 100644 --- a/src/Models/Branch.cs +++ b/src/Models/Branch.cs @@ -1,48 +1,14 @@ -using System.Collections.Generic; - -namespace SourceGit.Models +namespace SourceGit.Models { - public class BranchTrackStatus - { - public List Ahead { get; set; } = new List(); - public List Behind { get; set; } = new List(); - - public bool IsVisible => Ahead.Count > 0 || Behind.Count > 0; - - public override string ToString() - { - if (Ahead.Count == 0 && Behind.Count == 0) - return string.Empty; - - var track = ""; - if (Ahead.Count > 0) - track += $"{Ahead.Count}↑"; - if (Behind.Count > 0) - track += $" {Behind.Count}↓"; - return track.Trim(); - } - } - - 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; } - public bool IsDetachedHead { get; set; } public string Upstream { get; set; } - public BranchTrackStatus TrackStatus { get; set; } + public string UpstreamTrackStatus { get; set; } public string Remote { get; set; } - public bool IsUpstreamGone { get; set; } - - public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}"; } } diff --git a/src/Models/BranchTreeNode.cs b/src/Models/BranchTreeNode.cs new file mode 100644 index 00000000..66296519 --- /dev/null +++ b/src/Models/BranchTreeNode.cs @@ -0,0 +1,204 @@ +using System; +using System.Collections.Generic; + +using Avalonia.Collections; + +namespace SourceGit.Models +{ + public enum BranchTreeNodeType + { + Remote, + Folder, + Branch, + } + + public class BranchTreeNode + { + public string Name { get; set; } + public BranchTreeNodeType Type { get; set; } + public object Backend { get; set; } + public bool IsExpanded { get; set; } + public bool IsFiltered { get; set; } + public List Children { get; set; } = new List(); + + public bool IsUpstreamTrackStatusVisible + { + get => IsBranch && !string.IsNullOrEmpty((Backend as Branch).UpstreamTrackStatus); + } + + public string UpstreamTrackStatus + { + get => Type == BranchTreeNodeType.Branch ? (Backend as Branch).UpstreamTrackStatus : ""; + } + + public bool IsRemote + { + get => Type == BranchTreeNodeType.Remote; + } + + public bool IsFolder + { + get => Type == BranchTreeNodeType.Folder; + } + + public bool IsBranch + { + get => Type == BranchTreeNodeType.Branch; + } + + public bool IsCurrent + { + get => IsBranch && (Backend as Branch).IsCurrent; + } + + public class Builder + { + public List Locals => _locals; + public List Remotes => _remotes; + + public void Run(List branches, List remotes) + { + foreach (var remote in remotes) + { + var path = $"remote/{remote.Name}"; + var node = new BranchTreeNode() + { + Name = remote.Name, + Type = BranchTreeNodeType.Remote, + Backend = remote, + IsExpanded = _expanded.Contains(path), + }; + + _maps.Add(path, node); + _remotes.Add(node); + } + + foreach (var branch in branches) + { + var isFiltered = _filters.Contains(branch.FullName); + if (branch.IsLocal) + { + MakeBranchNode(branch, _locals, "local", isFiltered); + } + else + { + var remote = _remotes.Find(x => x.Name == branch.Remote); + if (remote != null) + MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}", isFiltered); + } + } + + SortNodes(_locals); + SortNodes(_remotes); + } + + public void SetFilters(AvaloniaList filters) + { + _filters.AddRange(filters); + } + + public void CollectExpandedNodes(List nodes, bool isLocal) + { + CollectExpandedNodes(nodes, isLocal ? "local" : "remote"); + } + + private void CollectExpandedNodes(List nodes, string prefix) + { + foreach (var node in nodes) + { + var path = prefix + "/" + node.Name; + if (node.Type != BranchTreeNodeType.Branch && node.IsExpanded) + _expanded.Add(path); + CollectExpandedNodes(node.Children, path); + } + } + + private void MakeBranchNode(Branch branch, List roots, string prefix, bool isFiltered) + { + var subs = branch.Name.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + if (subs.Length == 1) + { + var node = new BranchTreeNode() + { + Name = subs[0], + Type = BranchTreeNodeType.Branch, + Backend = branch, + IsExpanded = false, + IsFiltered = isFiltered, + }; + roots.Add(node); + return; + } + + BranchTreeNode lastFolder = null; + string path = prefix; + for (int i = 0; i < subs.Length - 1; i++) + { + path = string.Concat(path, "/", subs[i]); + if (_maps.TryGetValue(path, out var value)) + { + lastFolder = value; + } + else if (lastFolder == null) + { + lastFolder = new BranchTreeNode() + { + Name = subs[i], + Type = BranchTreeNodeType.Folder, + IsExpanded = branch.IsCurrent || _expanded.Contains(path), + }; + roots.Add(lastFolder); + _maps.Add(path, lastFolder); + } + else + { + var folder = new BranchTreeNode() + { + Name = subs[i], + Type = BranchTreeNodeType.Folder, + IsExpanded = branch.IsCurrent || _expanded.Contains(path), + }; + _maps.Add(path, folder); + lastFolder.Children.Add(folder); + lastFolder = folder; + } + } + + var last = new BranchTreeNode() + { + Name = subs[subs.Length - 1], + Type = BranchTreeNodeType.Branch, + Backend = branch, + IsExpanded = false, + IsFiltered = isFiltered, + }; + lastFolder.Children.Add(last); + } + + private void SortNodes(List nodes) + { + nodes.Sort((l, r) => + { + if (l.Type == r.Type) + { + return l.Name.CompareTo(r.Name); + } + else + { + return (int)(l.Type) - (int)(r.Type); + } + }); + + foreach (var node in nodes) + SortNodes(node.Children); + } + + private readonly List _locals = new List(); + private readonly List _remotes = new List(); + private readonly HashSet _expanded = new HashSet(); + private readonly List _filters = new List(); + private readonly Dictionary _maps = new Dictionary(); + } + } +} diff --git a/src/Models/Change.cs b/src/Models/Change.cs index 129678be..5350c169 100644 --- a/src/Models/Change.cs +++ b/src/Models/Change.cs @@ -13,49 +13,34 @@ namespace SourceGit.Models { None, Modified, - TypeChanged, Added, Deleted, Renamed, Copied, - Untracked, - Conflicted, - } - - public enum ConflictReason - { - None, - BothDeleted, - AddedByUs, - DeletedByThem, - AddedByThem, - DeletedByUs, - BothAdded, - BothModified, - } - - public class ChangeDataForAmend - { - public string FileMode { get; set; } = ""; - public string ObjectHash { get; set; } = ""; - public string ParentSHA { get; set; } = ""; + Unmerged, + Untracked } public class Change { - public ChangeState Index { get; set; } = ChangeState.None; + public ChangeState Index { get; set; } public ChangeState WorkTree { get; set; } = ChangeState.None; 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 +68,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..4b3f0ed3 100644 --- a/src/Models/Commit.cs +++ b/src/Models/Commit.cs @@ -2,125 +2,55 @@ using System.Collections.Generic; using Avalonia; -using Avalonia.Media; namespace SourceGit.Models { - public enum CommitSearchMethod - { - BySHA = 0, - ByAuthor, - ByCommitter, - ByMessage, - ByFile, - ByContent, - } - public class Commit { - // As retrieved by: git mktree Parents { get; set; } = new(); - public List Decorators { get; set; } = new(); + public string Message { get; set; } = string.Empty; + 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 bool IsMerged { get; set; } = false; - public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime; - public bool IsCurrentHead => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null; + public Thickness Margin { get; set; } = new Thickness(0); - 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 IBrush Brush => CommitGraph.Pens[Color].Brush; + public string AuthorTimeStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd HH:mm:ss"); + public string CommitterTimeStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd HH:mm:ss"); + public string AuthorTimeShortStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd"); + public string CommitterTimeShortStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd"); - public void ParseDecorators(string data) + public bool IsCommitterVisible { - if (data.Length < 3) + get => Author != Committer || AuthorTime != CommitterTime; + } + + public bool IsCurrentHead + { + get => Decorators.Find(x => x.Type == DecoratorType.CurrentBranchHead) != null; + } + + public string FullMessage + { + get => string.IsNullOrWhiteSpace(Message) ? Subject : $"{Subject}\n\n{Message}"; + } + + public static void ParseUserAndTime(string data, ref User user, ref ulong time) + { + var userEndIdx = data.IndexOf('>', StringComparison.Ordinal); + if (userEndIdx < 0) return; - var subs = data.Split(',', StringSplitOptions.RemoveEmptyEntries); - foreach (var sub in subs) - { - var d = sub.Trim(); - if (d.EndsWith("/HEAD", StringComparison.Ordinal)) - continue; - - if (d.StartsWith("tag: refs/tags/", StringComparison.Ordinal)) - { - Decorators.Add(new Decorator() - { - Type = DecoratorType.Tag, - Name = d.Substring(15), - }); - } - else if (d.StartsWith("HEAD -> refs/heads/", StringComparison.Ordinal)) - { - IsMerged = true; - Decorators.Add(new Decorator() - { - Type = DecoratorType.CurrentBranchHead, - Name = d.Substring(19), - }); - } - else if (d.Equals("HEAD")) - { - IsMerged = true; - Decorators.Add(new Decorator() - { - Type = DecoratorType.CurrentCommitHead, - Name = d, - }); - } - else if (d.StartsWith("refs/heads/", StringComparison.Ordinal)) - { - Decorators.Add(new Decorator() - { - Type = DecoratorType.LocalBranchHead, - Name = d.Substring(11), - }); - } - else if (d.StartsWith("refs/remotes/", StringComparison.Ordinal)) - { - Decorators.Add(new Decorator() - { - Type = DecoratorType.RemoteBranchHead, - Name = d.Substring(13), - }); - } - } - - Decorators.Sort((l, r) => - { - if (l.Type != r.Type) - return (int)l.Type - (int)r.Type; - else - return NumericSort.Compare(l.Name, r.Name); - }); + var timeEndIdx = data.IndexOf(' ', userEndIdx + 2); + user = User.FindOrAdd(data.Substring(0, userEndIdx)); + time = timeEndIdx < 0 ? 0 : ulong.Parse(data.Substring(userEndIdx + 2, timeEndIdx - userEndIdx - 2)); } - } - public class CommitFullMessage - { - public string Message { get; set; } = string.Empty; - public InlineElementCollector Inlines { get; set; } = new(); + private static readonly DateTime _utcStart = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); } } diff --git a/src/Models/CommitGraph.cs b/src/Models/CommitGraph.cs index 01488656..201a1e69 100644 --- a/src/Models/CommitGraph.cs +++ b/src/Models/CommitGraph.cs @@ -2,34 +2,85 @@ using System.Collections.Generic; using Avalonia; -using Avalonia.Media; namespace SourceGit.Models { public class CommitGraph { - public static List Pens { get; } = []; - - public static void SetDefaultPens(double thickness = 2) + public class Path { - SetPens(s_defaultPenColors, thickness); + public List Points = new List(); + public int Color = 0; } - public static void SetPens(List colors, double thickness) + public class PathHelper { - Pens.Clear(); + public string Next; + public bool IsMerged; + public double LastX; + public double LastY; + public double EndY; + public Path Path; - foreach (var c in colors) - Pens.Add(new Pen(c.ToUInt32(), thickness)); + public PathHelper(string next, bool isMerged, int color, Point start) + { + Next = next; + IsMerged = isMerged; + LastX = start.X; + LastY = start.Y; + EndY = LastY; - s_penCount = colors.Count; - } + Path = new Path(); + Path.Color = color; + Path.Points.Add(start); + } - public class Path(int color, bool isMerged) - { - public List Points { get; } = []; - public int Color { get; } = color; - public bool IsMerged { get; } = isMerged; + public PathHelper(string next, bool isMerged, int color, Point start, Point to) + { + Next = next; + IsMerged = isMerged; + LastX = to.X; + LastY = to.Y; + EndY = LastY; + + Path = new Path(); + Path.Color = color; + Path.Points.Add(start); + Path.Points.Add(to); + } + + public void Add(double x, double y, double halfHeight, bool isEnd = false) + { + if (x > LastX) + { + Add(new Point(LastX, LastY)); + Add(new Point(x, y - halfHeight)); + if (isEnd) + Add(new Point(x, y)); + } + else if (x < LastX) + { + if (y > LastY + halfHeight) + Add(new Point(LastX, LastY + halfHeight)); + Add(new Point(x, y)); + } + else if (isEnd) + { + Add(new Point(x, y)); + } + + LastX = x; + LastY = y; + } + + private void Add(Point p) + { + if (EndY < p.Y) + { + Path.Points.Add(p); + EndY = p.Y; + } + } } public class Link @@ -38,75 +89,68 @@ namespace SourceGit.Models public Point Control; public Point End; public int Color; - public bool IsMerged; - } - - public enum DotType - { - Default, - Head, - Merge, } public class Dot { - public DotType Type; public Point Center; public int Color; - public bool IsMerged; } - public List Paths { get; } = []; - public List Links { get; } = []; - public List Dots { get; } = []; + public List Paths { get; set; } = new List(); + public List Links { get; set; } = new List(); + public List Dots { get; set; } = new List(); - public static CommitGraph Parse(List commits, bool firstParentOnlyEnabled) + public static CommitGraph Parse(List commits, double rowHeight, int colorCount) { - const double unitWidth = 12; - const double halfWidth = 6; - const double unitHeight = 1; - const double halfHeight = 0.5; + double UNIT_WIDTH = 12; + double HALF_WIDTH = 6; + double UNIT_HEIGHT = rowHeight; + double HALF_HEIGHT = rowHeight / 2; var temp = new CommitGraph(); var unsolved = new List(); + var mapUnsolved = new Dictionary(); var ended = new List(); - var offsetY = -halfHeight; - var colorPicker = new ColorPicker(); + var offsetY = -HALF_HEIGHT; + var colorIdx = 0; foreach (var commit in commits) { var major = null as PathHelper; var isMerged = commit.IsMerged; + var oldCount = unsolved.Count; // Update current y offset - offsetY += unitHeight; + offsetY += UNIT_HEIGHT; // Find first curves that links to this commit and marks others that links to this commit ended. - var offsetX = 4 - halfWidth; - var maxOffsetOld = unsolved.Count > 0 ? unsolved[^1].LastX : offsetX + unitWidth; + double offsetX = -HALF_WIDTH; foreach (var l in unsolved) { - if (l.Next.Equals(commit.SHA, StringComparison.Ordinal)) + if (l.Next == commit.SHA) { if (major == null) { - offsetX += unitWidth; + offsetX += UNIT_WIDTH; major = l; if (commit.Parents.Count > 0) { major.Next = commit.Parents[0]; - major.Goto(offsetX, offsetY, halfHeight); + if (!mapUnsolved.ContainsKey(major.Next)) + mapUnsolved.Add(major.Next, major); } else { - major.End(offsetX, offsetY, halfHeight); + major.Next = "ENDED"; ended.Add(l); } + + major.Add(offsetX, offsetY, HALF_HEIGHT); } else { - l.End(major.LastX, offsetY, halfHeight); ended.Add(l); } @@ -114,273 +158,92 @@ namespace SourceGit.Models } else { - offsetX += unitWidth; - l.Pass(offsetX, offsetY, halfHeight); + if (!mapUnsolved.ContainsKey(l.Next)) + mapUnsolved.Add(l.Next, l); + offsetX += UNIT_WIDTH; + l.Add(offsetX, offsetY, HALF_HEIGHT); + } + } + + // Create new curve for branch head + if (major == null && commit.Parents.Count > 0) + { + offsetX += UNIT_WIDTH; + major = new PathHelper(commit.Parents[0], isMerged, colorIdx, new Point(offsetX, offsetY)); + unsolved.Add(major); + temp.Paths.Add(major.Path); + colorIdx = (colorIdx + 1) % colorCount; + } + + // Calculate link position of this commit. + Point position = new Point(offsetX, offsetY); + if (major != null) + { + major.IsMerged = isMerged; + position = new Point(major.LastX, offsetY); + temp.Dots.Add(new Dot() { Center = position, Color = major.Path.Color }); + } + else + { + temp.Dots.Add(new Dot() { Center = position, Color = 0 }); + } + + // Deal with parents + for (int j = 1; j < commit.Parents.Count; j++) + { + var parent = commit.Parents[j]; + if (mapUnsolved.TryGetValue(parent, out var value)) + { + var l = value; + var link = new Link(); + + link.Start = position; + link.End = new Point(l.LastX, offsetY + HALF_HEIGHT); + link.Control = new Point(link.End.X, link.Start.Y); + link.Color = l.Path.Color; + temp.Links.Add(link); + } + else + { + offsetX += UNIT_WIDTH; + + // Create new curve for parent commit that not includes before + var l = new PathHelper(commit.Parents[j], isMerged, colorIdx, position, new Point(offsetX, position.Y + HALF_HEIGHT)); + unsolved.Add(l); + temp.Paths.Add(l.Path); + colorIdx = (colorIdx + 1) % colorCount; } } // Remove ended curves from unsolved foreach (var l in ended) { - colorPicker.Recycle(l.Path.Color); + l.Add(position.X, position.Y, HALF_HEIGHT, true); unsolved.Remove(l); } - ended.Clear(); - // If no path found, create new curve for branch head - // Otherwise, create new curve for new merged commit - if (major == null) - { - offsetX += unitWidth; - - if (commit.Parents.Count > 0) - { - major = new PathHelper(commit.Parents[0], isMerged, colorPicker.Next(), 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); - } - - // 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 }; - if (commit.IsCurrentHead) - anchor.Type = DotType.Head; - else if (commit.Parents.Count > 1) - anchor.Type = DotType.Merge; - else - anchor.Type = DotType.Default; - temp.Dots.Add(anchor); - - // Deal with other parents (the first parent has been processed) - if (!firstParentOnlyEnabled) - { - for (int j = 1; j < commit.Parents.Count; j++) - { - var parentHash = commit.Parents[j]; - 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); - } - - 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, - }); - } - else - { - 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)); - unsolved.Add(l); - temp.Paths.Add(l.Path); - } - } - } - - // Margins & merge state (used by Views.Histories). + // Margins & merge state (used by datagrid). commit.IsMerged = isMerged; - commit.Margin = new Thickness(Math.Max(offsetX, maxOffsetOld) + halfWidth + 2, 0, 0, 0); - commit.Color = dotColor; + commit.Margin = new Thickness(Math.Max(offsetX + HALF_WIDTH, oldCount * UNIT_WIDTH), 0, 0, 0); + + // Clean up + ended.Clear(); + mapUnsolved.Clear(); } // Deal with curves haven't ended yet. - for (var i = 0; i < unsolved.Count; i++) + for (int i = 0; i < unsolved.Count; i++) { var path = unsolved[i]; - var endY = (commits.Count - 0.5) * unitHeight; + var endY = (commits.Count - 0.5) * UNIT_HEIGHT; - if (path.Path.Points.Count == 1 && Math.Abs(path.Path.Points[0].Y - endY) < 0.0001) + if (path.Path.Points.Count == 1 && path.Path.Points[0].Y == endY) continue; - - path.End((i + 0.5) * unitWidth + 4, endY + halfHeight, halfHeight); + path.Add((i + 0.5) * UNIT_WIDTH, endY + HALF_HEIGHT, HALF_HEIGHT, true); } unsolved.Clear(); 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 string Next { 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; - LastX = start.X; - _lastY = start.Y; - - Path = new Path(color, isMerged); - Path.Points.Add(start); - } - - public PathHelper(string next, bool isMerged, int color, Point start, Point to) - { - Next = next; - LastX = to.X; - _lastY = to.Y; - - Path = new Path(color, isMerged); - Path.Points.Add(start); - Path.Points.Add(to); - } - - /// - /// A path that just passed this row. - /// - /// - /// - /// - public void Pass(double x, double y, double halfHeight) - { - if (x > LastX) - { - Add(LastX, _lastY); - Add(x, y - halfHeight); - } - else if (x < LastX) - { - Add(LastX, y - halfHeight); - y += halfHeight; - Add(x, y); - } - - LastX = x; - _lastY = y; - } - - /// - /// A path that has commit in this row but not ended - /// - /// - /// - /// - public void Goto(double x, double y, double halfHeight) - { - if (x > LastX) - { - Add(LastX, _lastY); - Add(x, y - halfHeight); - } - else if (x < LastX) - { - var minY = y - halfHeight; - if (minY > _lastY) - minY -= halfHeight; - - Add(LastX, minY); - Add(x, y); - } - - LastX = x; - _lastY = y; - } - - /// - /// A path that has commit in this row and end. - /// - /// - /// - /// - public void End(double x, double y, double halfHeight) - { - if (x > LastX) - { - Add(LastX, _lastY); - Add(x, y - halfHeight); - } - else if (x < LastX) - { - Add(LastX, y - halfHeight); - } - - Add(x, y); - - LastX = x; - _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) - { - Path.Points.Add(new Point(x, y)); - _endY = y; - } - } - - private double _lastY = 0; - private double _endY = 0; - } - - private static int s_penCount = 0; - private static readonly List s_defaultPenColors = [ - Colors.Orange, - Colors.ForestGreen, - Colors.Turquoise, - Colors.Olive, - Colors.Magenta, - Colors.Red, - Colors.Khaki, - Colors.Lime, - Colors.RoyalBlue, - Colors.Teal, - ]; } } diff --git a/src/Models/CommitLink.cs b/src/Models/CommitLink.cs deleted file mode 100644 index 2891e5d6..00000000 --- a/src/Models/CommitLink.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; - -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/CommitSignInfo.cs b/src/Models/CommitSignInfo.cs deleted file mode 100644 index 44b95e61..00000000 --- a/src/Models/CommitSignInfo.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Avalonia.Media; - -namespace SourceGit.Models -{ - public class CommitSignInfo - { - public char VerifyResult { get; init; } = 'N'; - public string Signer { get; init; } = string.Empty; - public string Key { get; init; } = string.Empty; - public bool HasSigner => !string.IsNullOrEmpty(Signer); - - public IBrush Brush - { - get - { - switch (VerifyResult) - { - case 'G': - case 'U': - return Brushes.Green; - case 'X': - case 'Y': - case 'R': - return Brushes.DarkOrange; - case 'B': - case 'E': - return Brushes.Red; - default: - return Brushes.Transparent; - } - } - } - - public string ToolTip - { - get - { - switch (VerifyResult) - { - case 'G': - return "Good signature."; - case 'U': - return "Good signature with unknown validity."; - case 'X': - return "Good signature but has expired."; - case 'Y': - return "Good signature made by expired key."; - case 'R': - return "Good signature made by a revoked key."; - case 'B': - return "Bad signature."; - case 'E': - return "Signature cannot be checked."; - default: - return "No signature."; - } - } - } - } -} diff --git a/src/Models/CommitTemplate.cs b/src/Models/CommitTemplate.cs deleted file mode 100644 index 3f331543..00000000 --- a/src/Models/CommitTemplate.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections.Generic; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.Models -{ - public class CommitTemplate : ObservableObject - { - public string Name - { - get => _name; - set => SetProperty(ref _name, value); - } - - public string Content - { - get => _content; - set => SetProperty(ref _content, value); - } - - public string Apply(Branch branch, List changes) - { - var te = new TemplateEngine(); - return te.Eval(_content, branch, changes); - } - - private string _name = string.Empty; - private string _content = string.Empty; - } -} diff --git a/src/Models/ConventionalCommitType.cs b/src/Models/ConventionalCommitType.cs deleted file mode 100644 index 531a16c0..00000000 --- a/src/Models/ConventionalCommitType.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models -{ - public class ConventionalCommitType - { - public string Name { get; set; } - public string Type { get; set; } - public string Description { get; set; } - - 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) - { - 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 deleted file mode 100644 index a614961a..00000000 --- a/src/Models/CustomAction.cs +++ /dev/null @@ -1,50 +0,0 @@ -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.Models -{ - public enum CustomActionScope - { - Repository, - Commit, - Branch, - } - - public class CustomAction : ObservableObject - { - public string Name - { - get => _name; - set => SetProperty(ref _name, value); - } - - public CustomActionScope Scope - { - get => _scope; - set => SetProperty(ref _scope, value); - } - - public string Executable - { - get => _executable; - set => SetProperty(ref _executable, value); - } - - public string Arguments - { - get => _arguments; - 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/Decorator.cs b/src/Models/Decorator.cs index 7d985e31..10967b45 100644 --- a/src/Models/Decorator.cs +++ b/src/Models/Decorator.cs @@ -1,11 +1,12 @@ -namespace SourceGit.Models +using Avalonia.Media; + +namespace SourceGit.Models { public enum DecoratorType { None, CurrentBranchHead, LocalBranchHead, - CurrentCommitHead, RemoteBranchHead, Tag, } @@ -14,6 +15,13 @@ { public DecoratorType Type { get; set; } = DecoratorType.None; public string Name { get; set; } = ""; - public bool IsTag => Type == DecoratorType.Tag; + } + + public static class DecoratorResources + { + public static readonly IBrush[] Backgrounds = [ + new SolidColorBrush(0xFF02C302), + new SolidColorBrush(0xFFFFB835), + ]; } } diff --git a/src/Models/DiffOption.cs b/src/Models/DiffOption.cs index 69f93980..e98edffb 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; @@ -48,11 +39,7 @@ namespace SourceGit.Models } else { - if (change.DataForAmend != null) - _extra = $"--cached {change.DataForAmend.ParentSHA}"; - else - _extra = "--cached"; - + _extra = "--cached"; _path = change.Path; _orgPath = change.OriginalPath; } @@ -65,7 +52,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 +66,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; @@ -93,7 +80,7 @@ namespace SourceGit.Models /// public DiffOption(string baseRevision, string targetRevision, Change change) { - _revisions.Add(string.IsNullOrEmpty(baseRevision) ? "-R" : baseRevision); + _revisions.Add(baseRevision); _revisions.Add(targetRevision); _path = change.Path; _orgPath = change.OriginalPath; @@ -121,9 +108,9 @@ namespace SourceGit.Models private readonly Change _workingCopyChange = null; private readonly bool _isUnstaged = false; - private readonly string _path; private readonly string _orgPath = string.Empty; + private readonly string _path = 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..70219dcf 100644 --- a/src/Models/DiffResult.cs +++ b/src/Models/DiffResult.cs @@ -1,8 +1,7 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; -using Avalonia; using Avalonia.Media.Imaging; namespace SourceGit.Models @@ -19,8 +18,8 @@ namespace SourceGit.Models public class TextInlineRange { public int Start { get; set; } - public int End { get; set; } - public TextInlineRange(int p, int n) { Start = p; End = p + n - 1; } + public int Count { get; set; } + public TextInlineRange(int p, int n) { Start = p; Count = n; } } public class TextDiffLine @@ -30,7 +29,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(); @@ -64,90 +62,12 @@ namespace SourceGit.Models { public string File { get; set; } = string.Empty; public List Lines { get; set; } = new List(); - public Vector ScrollOffset { get; set; } = Vector.Zero; public int MaxLineNumber = 0; - public string Repo { get; set; } = null; - public DiffOption Option { get; set; } = null; - - public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombined, bool isOldSide) - { - var rs = new TextDiffSelection(); - rs.StartLine = startLine; - rs.EndLine = endLine; - - for (int i = 0; i < startLine - 1; i++) - { - var line = Lines[i]; - if (line.Type == TextDiffLineType.Added) - { - rs.HasLeftChanges = true; - rs.IgnoredAdds++; - } - else if (line.Type == TextDiffLineType.Deleted) - { - rs.HasLeftChanges = true; - rs.IgnoredDeletes++; - } - } - - for (int i = startLine - 1; i < endLine; i++) - { - var line = Lines[i]; - if (line.Type == TextDiffLineType.Added) - { - if (isCombined) - { - rs.HasChanges = true; - break; - } - else if (isOldSide) - { - rs.HasLeftChanges = true; - } - else - { - rs.HasChanges = true; - } - } - else if (line.Type == TextDiffLineType.Deleted) - { - if (isCombined) - { - rs.HasChanges = true; - break; - } - else if (isOldSide) - { - rs.HasChanges = true; - } - else - { - rs.HasLeftChanges = true; - } - } - } - - if (!rs.HasLeftChanges) - { - for (int i = endLine; i < Lines.Count; i++) - { - var line = Lines[i]; - if (line.Type == TextDiffLineType.Added || line.Type == TextDiffLineType.Deleted) - { - rs.HasLeftChanges = true; - break; - } - } - } - - return rs; - } - 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'); @@ -467,9 +387,12 @@ namespace SourceGit.Models System.IO.File.WriteAllText(output, builder.ToString()); } + [GeneratedRegex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@")] + private static partial Regex indicatorRegex(); + private bool ProcessIndicatorForPatch(StringBuilder builder, TextDiffLine indicator, int idx, int start, int end, int ignoreRemoves, int ignoreAdds, bool revert, bool tailed) { - var match = REG_INDICATOR().Match(indicator.Content); + var match = indicatorRegex().Match(indicator.Content); var oldStart = int.Parse(match.Groups[1].Value); var newStart = int.Parse(match.Groups[2].Value) + ignoreRemoves - ignoreAdds; var oldCount = 0; @@ -538,7 +461,7 @@ namespace SourceGit.Models private bool ProcessIndicatorForPatchSingleSide(StringBuilder builder, TextDiffLine indicator, int idx, int start, int end, int ignoreRemoves, int ignoreAdds, bool revert, bool isOldSide, bool tailed) { - var match = REG_INDICATOR().Match(indicator.Content); + var match = indicatorRegex().Match(indicator.Content); var oldStart = int.Parse(match.Groups[1].Value); var newStart = int.Parse(match.Groups[2].Value) + ignoreRemoves - ignoreAdds; var oldCount = 0; @@ -626,9 +549,6 @@ namespace SourceGit.Models builder.Append($"\n@@ -{oldStart},{oldCount} +{newStart},{newCount} @@"); return true; } - - [GeneratedRegex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@")] - private static partial Regex REG_INDICATOR(); } public class LFSDiff @@ -648,11 +568,8 @@ namespace SourceGit.Models public Bitmap Old { get; set; } = null; public Bitmap New { get; set; } = null; - public long OldFileSize { get; set; } = 0; - public long NewFileSize { get; set; } = 0; - - public string OldImageSize => Old != null ? $"{Old.PixelSize.Width} x {Old.PixelSize.Height}" : "0 x 0"; - public string NewImageSize => New != null ? $"{New.PixelSize.Width} x {New.PixelSize.Height}" : "0 x 0"; + public string OldSize => Old != null ? $"{Old.PixelSize.Width} x {Old.PixelSize.Height}" : "0 x 0"; + public string NewSize => New != null ? $"{New.PixelSize.Width} x {New.PixelSize.Height}" : "0 x 0"; } public class NoOrEOLChange @@ -665,35 +582,15 @@ namespace SourceGit.Models public string New { get; set; } = string.Empty; } - public class SubmoduleDiff - { - public RevisionSubmodule Old { get; set; } = null; - public RevisionSubmodule New { get; set; } = null; - } - public class DiffResult { public bool IsBinary { get; set; } = false; public bool IsLFS { get; set; } = false; - public string OldHash { get; set; } = string.Empty; - public string NewHash { get; set; } = string.Empty; public string OldMode { get; set; } = string.Empty; public string NewMode { get; set; } = string.Empty; 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..773a7f94 100644 --- a/src/Models/ExternalMerger.cs +++ b/src/Models/ExternalMerger.cs @@ -20,7 +20,7 @@ namespace SourceGit.Models { get { - var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/Images/ExternalToolIcons/{Icon}.png", UriKind.RelativeOrAbsolute)); + var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/ExternalToolIcons/{Icon}.png", UriKind.RelativeOrAbsolute)); return new Bitmap(icon); } } @@ -32,50 +32,42 @@ namespace SourceGit.Models if (OperatingSystem.IsWindows()) { Supported = new List() { - new ExternalMerger(0, "git", "Use Git Settings", "", "", ""), + new ExternalMerger(0, "custom_diff", "Custom", "", "", ""), new ExternalMerger(1, "vscode", "Visual Studio Code", "Code.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(2, "vscode_insiders", "Visual Studio Code - Insiders", "Code - Insiders.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(3, "vs", "Visual Studio", "vsDiffMerge.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m", "\"$LOCAL\" \"$REMOTE\""), new ExternalMerger(4, "tortoise_merge", "Tortoise Merge", "TortoiseMerge.exe;TortoiseGitMerge.exe", "-base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\"", "-base:\"$LOCAL\" -theirs:\"$REMOTE\""), new ExternalMerger(5, "kdiff3", "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), new ExternalMerger(6, "beyond_compare", "Beyond Compare", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), - 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\""), + new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""), }; } else if (OperatingSystem.IsMacOS()) { Supported = new List() { - new ExternalMerger(0, "git", "Use Git Settings", "", "", ""), + new ExternalMerger(0, "custom_diff", "Custom", "", "", ""), new ExternalMerger(1, "xcode", "FileMerge", "/usr/bin/opendiff", "\"$BASE\" \"$LOCAL\" \"$REMOTE\" -ancestor \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), new ExternalMerger(2, "vscode", "Visual Studio Code", "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(3, "vscode_insiders", "Visual Studio Code - Insiders", "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(4, "kdiff3", "KDiff3", "/Applications/kdiff3.app/Contents/MacOS/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), new ExternalMerger(5, "beyond_compare", "Beyond Compare", "/Applications/Beyond Compare.app/Contents/MacOS/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), - new ExternalMerger(6, "codium", "VSCodium", "/Applications/VSCodium.app/Contents/Resources/app/bin/codium", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), - new ExternalMerger(7, "p4merge", "P4Merge", "/Applications/p4merge.app/Contents/Resources/launchp4merge", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""), }; } else if (OperatingSystem.IsLinux()) { Supported = new List() { - new ExternalMerger(0, "git", "Use Git Settings", "", "", ""), + new ExternalMerger(0, "custom_diff", "Custom", "", "", ""), new ExternalMerger(1, "vscode", "Visual Studio Code", "/usr/share/code/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(2, "vscode_insiders", "Visual Studio Code - Insiders", "/usr/share/code-insiders/code-insiders", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), new ExternalMerger(3, "kdiff3", "KDiff3", "/usr/bin/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), new ExternalMerger(4, "beyond_compare", "Beyond Compare", "/usr/bin/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), - new ExternalMerger(5, "meld", "Meld", "/usr/bin/meld", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), - new ExternalMerger(6, "codium", "VSCodium", "/usr/share/codium/bin/codium", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), - new ExternalMerger(7, "p4merge", "P4Merge", "/usr/local/bin/p4merge", "-tw 4 \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"", "-tw 4 \"$LOCAL\" \"$REMOTE\""), + new ExternalMerger(5, "meld", "Meld", "/usr/bin/meld", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" -output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), }; } else { Supported = new List() { - new ExternalMerger(0, "git", "Use Git Settings", "", "", ""), + new ExternalMerger(0, "custom_diff", "Custom", "", "", ""), }; } } diff --git a/src/Models/ExternalTool.cs b/src/Models/ExternalTool.cs index 103e91bc..cb50df58 100644 --- a/src/Models/ExternalTool.cs +++ b/src/Models/ExternalTool.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Text.Json; -using System.Text.Json.Serialization; using Avalonia.Media.Imaging; using Avalonia.Platform; @@ -12,24 +10,17 @@ namespace SourceGit.Models { public class ExternalTool { - public string Name { get; private set; } - public Bitmap IconImage { get; private set; } = null; + public string Name { get; set; } = string.Empty; + public string Icon { get; set; } = string.Empty; + public string Executable { get; set; } = string.Empty; + public string OpenCmdArgs { get; set; } = string.Empty; - public ExternalTool(string name, string icon, string execFile, Func execArgsGenerator = null) + public Bitmap IconImage { - Name = name; - _execFile = execFile; - _execArgsGenerator = execArgsGenerator ?? (repo => $"\"{repo}\""); - - try + get { - var asset = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/Images/ExternalToolIcons/{icon}.png", - UriKind.RelativeOrAbsolute)); - IconImage = new Bitmap(asset); - } - catch - { - // ignore + var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/ExternalToolIcons/{Icon}.png", UriKind.RelativeOrAbsolute)); + return new Bitmap(icon); } } @@ -38,52 +29,11 @@ namespace SourceGit.Models Process.Start(new ProcessStartInfo() { WorkingDirectory = repo, - FileName = _execFile, - Arguments = _execArgsGenerator.Invoke(repo), + FileName = Executable, + Arguments = string.Format(OpenCmdArgs, repo), UseShellExecute = false, }); } - - private string _execFile = string.Empty; - private Func _execArgsGenerator = null; - } - - public class JetBrainsState - { - [JsonPropertyName("version")] - public int Version { get; set; } = 0; - [JsonPropertyName("appVersion")] - public string AppVersion { get; set; } = string.Empty; - [JsonPropertyName("tools")] - public List Tools { get; set; } = new List(); - } - - public class JetBrainsTool - { - [JsonPropertyName("channelId")] - public string ChannelId { get; set; } - [JsonPropertyName("toolId")] - public string ToolId { get; set; } - [JsonPropertyName("productCode")] - public string ProductCode { get; set; } - [JsonPropertyName("tag")] - public string Tag { get; set; } - [JsonPropertyName("displayName")] - public string DisplayName { get; set; } - [JsonPropertyName("displayVersion")] - public string DisplayVersion { get; set; } - [JsonPropertyName("buildNumber")] - public string BuildNumber { get; set; } - [JsonPropertyName("installLocation")] - public string InstallLocation { get; set; } - [JsonPropertyName("launchCommand")] - public string LaunchCommand { get; set; } - } - - public class ExternalToolPaths - { - [JsonPropertyName("tools")] - public Dictionary Tools { get; set; } = new Dictionary(); } public class ExternalToolsFinder @@ -94,88 +44,43 @@ namespace SourceGit.Models private set; } = new List(); - public ExternalToolsFinder() + public void VSCode(Func platform_finder) { - var customPathsConfig = Path.Combine(Native.OS.DataDir, "external_editors.json"); - try + TryAdd("Visual Studio Code", "vscode", "\"{0}\"", "VSCODE_PATH", platform_finder); + } + + public void VSCodeInsiders(Func platform_finder) + { + TryAdd("Visual Studio Code - Insiders", "vscode_insiders", "\"{0}\"", "VSCODE_INSIDERS_PATH", platform_finder); + } + + public void Fleet(Func platform_finder) + { + TryAdd("JetBrains Fleet", "fleet", "\"{0}\"", "FLEET_PATH", platform_finder); + } + + public void SublimeText(Func platform_finder) + { + TryAdd("Sublime Text", "sublime_text", "\"{0}\"", "SUBLIME_TEXT_PATH", platform_finder); + } + + public void TryAdd(string name, string icon, string args, string env, Func finder) + { + var path = Environment.GetEnvironmentVariable(env); + if (string.IsNullOrEmpty(path) || !File.Exists(path)) { - if (File.Exists(customPathsConfig)) - _customPaths = JsonSerializer.Deserialize(File.ReadAllText(customPathsConfig), JsonCodeGen.Default.ExternalToolPaths); - } - catch - { - // Ignore + path = finder(); + if (string.IsNullOrEmpty(path) || !File.Exists(path)) + return; } - if (_customPaths == null) - _customPaths = new ExternalToolPaths(); - } - - public void TryAdd(string name, string icon, Func finder, Func execArgsGenerator = null) - { - if (_customPaths.Tools.TryGetValue(name, out var customPath) && File.Exists(customPath)) + Founded.Add(new ExternalTool { - Founded.Add(new ExternalTool(name, icon, customPath, execArgsGenerator)); - } - else - { - var path = finder(); - if (!string.IsNullOrEmpty(path) && File.Exists(path)) - Founded.Add(new ExternalTool(name, icon, path, execArgsGenerator)); - } + Name = name, + Icon = icon, + OpenCmdArgs = args, + Executable = path, + }); } - - public void VSCode(Func platformFinder) - { - TryAdd("Visual Studio Code", "vscode", platformFinder); - } - - public void VSCodeInsiders(Func platformFinder) - { - TryAdd("Visual Studio Code - Insiders", "vscode_insiders", platformFinder); - } - - public void VSCodium(Func platformFinder) - { - TryAdd("VSCodium", "codium", platformFinder); - } - - public void Fleet(Func platformFinder) - { - TryAdd("Fleet", "fleet", platformFinder); - } - - public void SublimeText(Func platformFinder) - { - TryAdd("Sublime Text", "sublime_text", platformFinder); - } - - public void Zed(Func platformFinder) - { - TryAdd("Zed", "zed", platformFinder); - } - - public void FindJetBrainsFromToolbox(Func platformFinder) - { - var exclude = new List { "fleet", "dotmemory", "dottrace", "resharper-u", "androidstudio" }; - var supported_icons = new List { "CL", "DB", "DL", "DS", "GO", "JB", "PC", "PS", "PY", "QA", "QD", "RD", "RM", "RR", "WRS", "WS" }; - var state = Path.Combine(platformFinder(), "state.json"); - if (File.Exists(state)) - { - var stateData = JsonSerializer.Deserialize(File.ReadAllText(state), JsonCodeGen.Default.JetBrainsState); - foreach (var tool in stateData.Tools) - { - if (exclude.Contains(tool.ToolId.ToLowerInvariant())) - continue; - - Founded.Add(new ExternalTool( - $"{tool.DisplayName} {tool.DisplayVersion}", - supported_icons.Contains(tool.ProductCode) ? $"JetBrains/{tool.ProductCode}" : "JetBrains/JB", - Path.Combine(tool.InstallLocation, tool.LaunchCommand))); - } - } - } - - private ExternalToolPaths _customPaths = null; } } diff --git a/src/Models/Filter.cs b/src/Models/Filter.cs deleted file mode 100644 index af4569fa..00000000 --- a/src/Models/Filter.cs +++ /dev/null @@ -1,60 +0,0 @@ -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.Models -{ - public enum FilterType - { - LocalBranch = 0, - LocalBranchFolder, - RemoteBranch, - RemoteBranchFolder, - Tag, - } - - public enum FilterMode - { - None = 0, - Included, - Excluded, - } - - public class Filter : ObservableObject - { - public string Pattern - { - get => _pattern; - set => SetProperty(ref _pattern, value); - } - - public FilterType Type - { - get; - set; - } = FilterType.LocalBranch; - - public FilterMode Mode - { - get => _mode; - set => SetProperty(ref _mode, value); - } - - public bool IsBranch - { - get => Type != FilterType.Tag; - } - - public Filter() - { - } - - public Filter(string pattern, FilterType type, FilterMode mode) - { - _pattern = pattern; - _mode = mode; - Type = type; - } - - private string _pattern = string.Empty; - private FilterMode _mode = FilterMode.None; - } -} diff --git a/src/Models/GPGFormat.cs b/src/Models/GPGFormat.cs deleted file mode 100644 index 0ba4e9e2..00000000 --- a/src/Models/GPGFormat.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models -{ - public class GPGFormat(string name, string value, string desc, string program, bool needFindProgram) - { - public string Name { get; set; } = name; - public string Value { get; set; } = value; - public string Desc { get; set; } = desc; - public string Program { get; set; } = program; - public bool NeedFindProgram { get; set; } = needFindProgram; - - public static readonly List Supported = [ - new GPGFormat("OPENPGP", "openpgp", "DEFAULT", "gpg", true), - new GPGFormat("X.509", "x509", "", "gpgsm", true), - new GPGFormat("SSH", "ssh", "Requires Git >= 2.34.0", "ssh-keygen", false), - ]; - } -} diff --git a/src/Models/GitFlow.cs b/src/Models/GitFlow.cs index 5d26072b..9522236d 100644 --- a/src/Models/GitFlow.cs +++ b/src/Models/GitFlow.cs @@ -2,7 +2,7 @@ { public enum GitFlowBranchType { - None = 0, + None, Feature, Release, Hotfix, @@ -10,37 +10,31 @@ 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 string Feature { get; set; } + public string Release { get; set; } + public string Hotfix { get; set; } - public bool IsValid + public bool IsEnabled { get { - return !string.IsNullOrEmpty(Master) && - !string.IsNullOrEmpty(Develop) && - !string.IsNullOrEmpty(FeaturePrefix) && - !string.IsNullOrEmpty(ReleasePrefix) && - !string.IsNullOrEmpty(HotfixPrefix); + return !string.IsNullOrEmpty(Feature) + && !string.IsNullOrEmpty(Release) + && !string.IsNullOrEmpty(Hotfix); } } - public string GetPrefix(GitFlowBranchType type) + public GitFlowBranchType GetBranchType(string name) { - switch (type) - { - case GitFlowBranchType.Feature: - return FeaturePrefix; - case GitFlowBranchType.Release: - return ReleasePrefix; - case GitFlowBranchType.Hotfix: - return HotfixPrefix; - default: - return string.Empty; - } + if (!IsEnabled) + return GitFlowBranchType.None; + if (name.StartsWith(Feature)) + return GitFlowBranchType.Feature; + if (name.StartsWith(Release)) + return GitFlowBranchType.Release; + if (name.StartsWith(Hotfix)) + return GitFlowBranchType.Hotfix; + return GitFlowBranchType.None; } } } 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/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 deleted file mode 100644 index 2fc7c612..00000000 --- a/src/Models/IRepository.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace SourceGit.Models -{ - public interface IRepository - { - bool MayHaveSubmodules(); - - void RefreshBranches(); - void RefreshWorktrees(); - void RefreshTags(); - void RefreshCommits(); - void RefreshSubmodules(); - void RefreshWorkingCopyChanges(); - void RefreshStashes(); - } -} 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 deleted file mode 100644 index d1710d4a..00000000 --- a/src/Models/InteractiveRebase.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models -{ - public enum InteractiveRebaseAction - { - Pick, - Edit, - Reword, - Squash, - Fixup, - 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; - public InteractiveRebaseAction Action { get; set; } = InteractiveRebaseAction.Pick; - public string Message { get; set; } = string.Empty; - } - - 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 deleted file mode 100644 index 40c84b9e..00000000 --- a/src/Models/IssueTrackerRule.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System.Text.RegularExpressions; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.Models -{ - public class IssueTrackerRule : ObservableObject - { - public string Name - { - get => _name; - set => SetProperty(ref _name, value); - } - - public string RegexString - { - get => _regexString; - set - { - if (SetProperty(ref _regexString, value)) - { - try - { - _regex = null; - _regex = new Regex(_regexString, RegexOptions.Multiline); - } - catch - { - // Ignore errors. - } - } - - OnPropertyChanged(nameof(IsRegexValid)); - } - } - - public bool IsRegexValid - { - get => _regex != null; - } - - public string URLTemplate - { - get => _urlTemplate; - set => SetProperty(ref _urlTemplate, value); - } - - public void Matches(InlineElementCollector outs, string message) - { - if (_regex == null || string.IsNullOrEmpty(_urlTemplate)) - return; - - var matches = _regex.Matches(message); - for (var i = 0; i < matches.Count; i++) - { - var match = matches[i]; - if (!match.Success) - continue; - - var start = match.Index; - var len = match.Length; - if (outs.Intersect(start, len) != null) - continue; - - var link = _urlTemplate; - for (var j = 1; j < match.Groups.Count; j++) - { - var group = match.Groups[j]; - if (group.Success) - link = link.Replace($"${j}", group.Value); - } - - outs.Add(new InlineElement(InlineElementType.Link, start, len, link)); - } - } - - private string _name; - private string _regexString; - private string _urlTemplate; - private Regex _regex = null; - } -} diff --git a/src/Models/LFSLock.cs b/src/Models/LFSLock.cs deleted file mode 100644 index 0a328cfb..00000000 --- a/src/Models/LFSLock.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace SourceGit.Models -{ - public class LFSLock - { - public string File { get; set; } = string.Empty; - public string User { get; set; } = string.Empty; - public long ID { get; set; } = 0; - } -} 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..022da0fe 100644 --- a/src/Models/Locales.cs +++ b/src/Models/Locales.cs @@ -8,18 +8,8 @@ namespace SourceGit.Models public string Key { get; set; } public static readonly List Supported = new List() { - new Locale("Deutsch", "de_DE"), new Locale("English", "en_US"), - new Locale("Español", "es_ES"), - 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 deleted file mode 100644 index 5dc70030..00000000 --- a/src/Models/MergeMode.cs +++ /dev/null @@ -1,25 +0,0 @@ -namespace SourceGit.Models -{ - public class MergeMode - { - 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("Don't commit", "Merge without commit", "--no-ff --no-commit"), - ]; - - public string Name { get; set; } - public string Desc { get; set; } - public string Arg { get; set; } - - public MergeMode(string n, string d, string a) - { - Name = n; - Desc = d; - Arg = a; - } - } -} diff --git a/src/Models/MergeStrategy.cs b/src/Models/MergeStrategy.cs deleted file mode 100644 index ab1d446b..00000000 --- a/src/Models/MergeStrategy.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models -{ - public class MergeStrategy - { - public string Name { get; internal set; } - public string Desc { get; internal set; } - public string Arg { get; internal set; } - - public static List ForMultiple { get; private set; } = [ - new MergeStrategy("Default", "Let Git automatically select a strategy", string.Empty), - new MergeStrategy("Octopus", "Attempt merging multiple heads", "octopus"), - new MergeStrategy("Ours", "Record the merge without modifying the tree", "ours"), - ]; - - public MergeStrategy(string n, string d, string a) - { - Name = n; - Desc = d; - Arg = a; - } - } -} diff --git a/src/Models/Notification.cs b/src/Models/Notification.cs index 473947b0..2d175da9 100644 --- a/src/Models/Notification.cs +++ b/src/Models/Notification.cs @@ -5,4 +5,9 @@ public bool IsError { get; set; } = false; public string Message { get; set; } = string.Empty; } + + public interface INotificationReceiver + { + void OnReceiveNotification(string ctx, Notification notice); + } } diff --git a/src/Models/Null.cs b/src/Models/Null.cs deleted file mode 100644 index e22ef8b3..00000000 --- a/src/Models/Null.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace SourceGit.Models -{ - public class Null - { - } -} diff --git a/src/Models/NumericSort.cs b/src/Models/NumericSort.cs deleted file mode 100644 index baaf3da4..00000000 --- a/src/Models/NumericSort.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; - -namespace SourceGit.Models -{ - public static class NumericSort - { - public static int Compare(string s1, string s2) - { - int len1 = s1.Length; - int len2 = s2.Length; - - int marker1 = 0; - int marker2 = 0; - - while (marker1 < len1 && marker2 < len2) - { - char c1 = s1[marker1]; - char c2 = s2[marker2]; - - 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++; - - int subLen2 = 1; - while (marker2 + subLen2 < len2 && char.IsDigit(s2[marker2 + subLen2]) == isDigit2) - subLen2++; - - string sub1 = s1.Substring(marker1, subLen1); - string sub2 = s2.Substring(marker2, subLen2); - - marker1 += subLen1; - marker2 += subLen2; - - int result; - if (isDigit1) - result = (subLen1 == subLen2) ? string.CompareOrdinal(sub1, sub2) : (subLen1 - subLen2); - else - result = string.Compare(sub1, sub2, StringComparison.OrdinalIgnoreCase); - - if (result != 0) - return result; - } - - return len1 - len2; - } - } -} diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs deleted file mode 100644 index 22fbcd51..00000000 --- a/src/Models/OpenAI.cs +++ /dev/null @@ -1,235 +0,0 @@ -using System; -using System.ClientModel; -using System.Collections.Generic; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading; -using Azure.AI.OpenAI; -using CommunityToolkit.Mvvm.ComponentModel; -using OpenAI; -using OpenAI.Chat; - -namespace SourceGit.Models -{ - public partial class OpenAIResponse - { - public OpenAIResponse(Action onUpdate) - { - _onUpdate = onUpdate; - } - - public void Append(string text) - { - var buffer = text; - - 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 void End() - { - if (_thinkTail.Length > 0) - { - OnReceive(_thinkTail.ToString()); - _thinkTail.Clear(); - } - } - - private void OnReceive(string text) - { - if (!_hasTrimmedStart) - { - text = text.TrimStart(); - if (string.IsNullOrEmpty(text)) - return; - - _hasTrimmedStart = true; - } - - _onUpdate.Invoke(text); - } - - [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 - { - public string Name - { - get => _name; - set => SetProperty(ref _name, value); - } - - public string Server - { - get => _server; - set => SetProperty(ref _server, value); - } - - public string ApiKey - { - get => _apiKey; - set => SetProperty(ref _apiKey, value); - } - - public string Model - { - get => _model; - set => SetProperty(ref _model, value); - } - - public bool Streaming - { - get => _streaming; - set => SetProperty(ref _streaming, value); - } - - public string AnalyzeDiffPrompt - { - get => _analyzeDiffPrompt; - set => SetProperty(ref _analyzeDiffPrompt, value); - } - - public string GenerateSubjectPrompt - { - get => _generateSubjectPrompt; - set => SetProperty(ref _generateSubjectPrompt, value); - } - - public OpenAIService() - { - AnalyzeDiffPrompt = """ - You are an expert developer specialist in creating commits. - Provide a super concise one sentence overall changes summary of the user `git diff` output following strictly the next rules: - - Do not use any code snippets, imports, file routes or bullets points. - - Do not mention the route of file that has been change. - - Write clear, concise, and descriptive messages that explain the MAIN GOAL made of the changes. - - Use the present tense and active voice in the message, for example, "Fix bug" instead of "Fixed bug.". - - Use the imperative mood, which gives the message a sense of command, e.g. "Add feature" instead of "Added feature". - - Avoid using general terms like "update" or "change", be specific about what was updated or changed. - - Avoid using terms like "The main goal of", just output directly the summary in plain text - """; - - GenerateSubjectPrompt = """ - You are an expert developer specialist in creating commits messages. - Your only goal is to retrieve a single commit message. - Based on the provided user changes, combine them in ONE SINGLE commit message retrieving the global idea, following strictly the next rules: - - Assign the commit {type} according to the next conditions: - feat: Only when adding a new feature. - fix: When fixing a bug. - docs: When updating documentation. - style: When changing elements styles or design and/or making changes to the code style (formatting, missing semicolons, etc.) without changing the code logic. - test: When adding or updating tests. - chore: When making changes to the build process or auxiliary tools and libraries. - revert: When undoing a previous commit. - refactor: When restructuring code without changing its external behavior, or is any of the other refactor types. - - Do not add any issues numeration, explain your output nor introduce your answer. - - Output directly only one commit message in plain text with the next format: {type}: {commit_message}. - - Be as concise as possible, keep the message under 50 characters. - """; - } - - public void Chat(string prompt, string question, CancellationToken cancellation, Action onUpdate) - { - var server = new Uri(_server); - var key = new ApiKeyCredential(_apiKey); - var client = null as ChatClient; - if (_server.Contains("openai.azure.com/", StringComparison.Ordinal)) - { - var azure = new AzureOpenAIClient(server, key); - client = azure.GetChatClient(_model); - } - else - { - var openai = new OpenAIClient(key, new() { Endpoint = server }); - client = openai.GetChatClient(_model); - } - - var messages = new List(); - messages.Add(_model.Equals("o1-mini", StringComparison.Ordinal) ? new UserChatMessage(prompt) : new SystemChatMessage(prompt)); - messages.Add(new UserChatMessage(question)); - - try - { - var rsp = new OpenAIResponse(onUpdate); - - if (_streaming) - { - 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); - } - - rsp.End(); - } - catch - { - if (!cancellation.IsCancellationRequested) - throw; - } - } - - private string _name; - 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..e3eaf36d 100644 --- a/src/Models/Remote.cs +++ b/src/Models/Remote.cs @@ -1,26 +1,18 @@ -using System; -using System.IO; -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; namespace SourceGit.Models { public partial class Remote { - [GeneratedRegex(@"^https?://[^/]+/.+[^/\.]$")] + [GeneratedRegex(@"^http[s]?://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-/]+/[\w\-\.]+\.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$")] - private static partial Regex REG_TO_VISIT_URL_CAPTURE(); - private static readonly Regex[] URL_FORMATS = [ REG_HTTPS(), - REG_GIT(), REG_SSH1(), REG_SSH2(), ]; @@ -33,52 +25,22 @@ 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) { - if (string.IsNullOrWhiteSpace(url)) - return false; - foreach (var fmt in URL_FORMATS) { if (fmt.IsMatch(url)) return true; } - - return url.StartsWith("file://", StringComparison.Ordinal) || - url.StartsWith("./", StringComparison.Ordinal) || - url.StartsWith("../", StringComparison.Ordinal) || - Directory.Exists(url); - } - - public bool TryGetVisitURL(out string url) - { - url = null; - - if (URL.StartsWith("http", StringComparison.Ordinal)) - { - // Try to remove the user before host and `.git` extension. - var uri = new Uri(URL.EndsWith(".git", StringComparison.Ordinal) ? URL.Substring(0, URL.Length - 4) : URL); - if (uri.Port != 80 && uri.Port != 443) - url = $"{uri.Scheme}://{uri.Host}:{uri.Port}{uri.LocalPath}"; - else - url = $"{uri.Scheme}://{uri.Host}{uri.LocalPath}"; - - return true; - } - - var match = REG_TO_VISIT_URL_CAPTURE().Match(URL); - if (match.Success) - { - url = $"https://{match.Groups[1].Value}/{match.Groups[2].Value}"; - return true; - } - return false; } } diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs deleted file mode 100644 index a54956d3..00000000 --- a/src/Models/RepositorySettings.cs +++ /dev/null @@ -1,470 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using Avalonia.Collections; - -namespace SourceGit.Models -{ - public class RepositorySettings - { - public string DefaultRemote - { - get; - set; - } = string.Empty; - - public bool EnableReflog - { - get; - set; - } = false; - - public bool EnableFirstParentInHistories - { - get; - set; - } = false; - - public bool EnableTopoOrderInHistories - { - get; - 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 bool EnableForceOnFetch - { - get; - set; - } = false; - - public bool FetchWithoutTags - { - get; - set; - } = false; - - public bool PreferRebaseInsteadOfMerge - { - get; - set; - } = true; - - public bool CheckSubmodulesOnPush - { - get; - set; - } = true; - - public bool PushAllTags - { - get; - set; - } = false; - - public bool PushToRemoteWhenCreateTag - { - get; - set; - } = true; - - public bool PushToRemoteWhenDeleteTag - { - get; - set; - } = false; - - public bool CheckoutBranchOnCreateBranch - { - get; - set; - } = true; - - public bool UpdateSubmodulesOnCheckoutBranch - { - get; - set; - } = true; - - public AvaloniaList HistoriesFilters - { - get; - set; - } = []; - - public AvaloniaList CommitTemplates - { - get; - set; - } = []; - - public AvaloniaList CommitMessages - { - get; - set; - } = []; - - public AvaloniaList IssueTrackerRules - { - get; - set; - } = []; - - public AvaloniaList CustomActions - { - get; - set; - } = []; - - public bool EnableAutoFetch - { - get; - set; - } = false; - - public int AutoFetchInterval - { - get; - set; - } = 10; - - public bool EnableSignOffForCommit - { - get; - set; - } = false; - - public bool IncludeUntrackedWhenStash - { - get; - set; - } = true; - - public bool OnlyStagedWhenStash - { - get; - set; - } = false; - - public bool KeepIndexWhenStash - { - get; - set; - } = false; - - public bool AutoRestoreAfterStash - { - get; - set; - } = false; - - public string PreferredOpenAIService - { - get; - set; - } = "---"; - - public bool IsLocalBranchesExpandedInSideBar - { - get; - set; - } = true; - - public bool IsRemotesExpandedInSideBar - { - get; - set; - } = false; - - public bool IsTagsExpandedInSideBar - { - get; - set; - } = false; - - public bool IsSubmodulesExpandedInSideBar - { - get; - set; - } = false; - - public bool IsWorktreeExpandedInSideBar - { - get; - set; - } = false; - - public List ExpandedBranchNodesInSideBar - { - get; - set; - } = []; - - public int PreferredMergeMode - { - get; - set; - } = 0; - - public string LastCommitMessage - { - get; - set; - } = string.Empty; - - public Dictionary CollectHistoriesFilters() - { - var map = new Dictionary(); - foreach (var filter in HistoriesFilters) - map.Add(filter.Pattern, filter.Mode); - return map; - } - - public bool UpdateHistoriesFilter(string pattern, FilterType type, FilterMode mode) - { - // Clear all filters when there's a filter that has different mode. - if (mode != FilterMode.None) - { - var clear = false; - foreach (var filter in HistoriesFilters) - { - if (filter.Mode != mode) - { - clear = true; - break; - } - } - - if (clear) - { - HistoriesFilters.Clear(); - HistoriesFilters.Add(new Filter(pattern, type, mode)); - return true; - } - } - else - { - for (int i = 0; i < HistoriesFilters.Count; i++) - { - var filter = HistoriesFilters[i]; - if (filter.Type == type && filter.Pattern.Equals(pattern, StringComparison.Ordinal)) - { - HistoriesFilters.RemoveAt(i); - return true; - } - } - - return false; - } - - foreach (var filter in HistoriesFilters) - { - if (filter.Type != type) - continue; - - if (filter.Pattern.Equals(pattern, StringComparison.Ordinal)) - return false; - } - - HistoriesFilters.Add(new Filter(pattern, type, mode)); - return true; - } - - public void RemoveChildrenBranchFilters(string pattern) - { - var dirty = new List(); - var prefix = $"{pattern}/"; - - foreach (var filter in HistoriesFilters) - { - if (filter.Type == FilterType.Tag) - continue; - - if (filter.Pattern.StartsWith(prefix, StringComparison.Ordinal)) - dirty.Add(filter); - } - - foreach (var filter in dirty) - HistoriesFilters.Remove(filter); - } - - public string BuildHistoriesFilter() - { - var includedRefs = new List(); - var excludedBranches = new List(); - var excludedRemotes = new List(); - var excludedTags = new List(); - foreach (var filter in HistoriesFilters) - { - if (filter.Type == FilterType.LocalBranch) - { - if (filter.Mode == FilterMode.Included) - includedRefs.Add(filter.Pattern); - else if (filter.Mode == FilterMode.Excluded) - excludedBranches.Add($"--exclude=\"{filter.Pattern.AsSpan(11)}\" --decorate-refs-exclude=\"{filter.Pattern}\""); - } - else if (filter.Type == FilterType.LocalBranchFolder) - { - if (filter.Mode == FilterMode.Included) - includedRefs.Add($"--branches={filter.Pattern.AsSpan(11)}/*"); - else if (filter.Mode == FilterMode.Excluded) - excludedBranches.Add($"--exclude=\"{filter.Pattern.AsSpan(11)}/*\" --decorate-refs-exclude=\"{filter.Pattern}/*\""); - } - else if (filter.Type == FilterType.RemoteBranch) - { - if (filter.Mode == FilterMode.Included) - includedRefs.Add(filter.Pattern); - else if (filter.Mode == FilterMode.Excluded) - excludedRemotes.Add($"--exclude=\"{filter.Pattern.AsSpan(13)}\" --decorate-refs-exclude=\"{filter.Pattern}\""); - } - else if (filter.Type == FilterType.RemoteBranchFolder) - { - if (filter.Mode == FilterMode.Included) - includedRefs.Add($"--remotes={filter.Pattern.AsSpan(13)}/*"); - else if (filter.Mode == FilterMode.Excluded) - excludedRemotes.Add($"--exclude=\"{filter.Pattern.AsSpan(13)}/*\" --decorate-refs-exclude=\"{filter.Pattern}/*\""); - } - else if (filter.Type == FilterType.Tag) - { - if (filter.Mode == FilterMode.Included) - includedRefs.Add($"refs/tags/{filter.Pattern}"); - else if (filter.Mode == FilterMode.Excluded) - excludedTags.Add($"--exclude=\"{filter.Pattern}\" --decorate-refs-exclude=\"refs/tags/{filter.Pattern}\""); - } - } - - var builder = new StringBuilder(); - if (includedRefs.Count > 0) - { - foreach (var r in includedRefs) - { - builder.Append(r); - builder.Append(' '); - } - } - else if (excludedBranches.Count + excludedRemotes.Count + excludedTags.Count > 0) - { - foreach (var b in excludedBranches) - { - builder.Append(b); - builder.Append(' '); - } - - builder.Append("--exclude=HEAD --branches "); - - foreach (var r in excludedRemotes) - { - builder.Append(r); - builder.Append(' '); - } - - builder.Append("--exclude=origin/HEAD --remotes "); - - foreach (var t in excludedTags) - { - builder.Append(t); - builder.Append(' '); - } - - builder.Append("--tags "); - } - - return builder.ToString(); - } - - public void PushCommitMessage(string message) - { - message = message.Trim().ReplaceLineEndings("\n"); - var existIdx = CommitMessages.IndexOf(message); - if (existIdx == 0) - return; - - if (existIdx > 0) - { - CommitMessages.Move(existIdx, 0); - return; - } - - if (CommitMessages.Count > 9) - CommitMessages.RemoveRange(9, CommitMessages.Count - 9); - - CommitMessages.Insert(0, message); - } - - public IssueTrackerRule AddIssueTracker(string name, string regex, string url) - { - var rule = new IssueTrackerRule() - { - Name = name, - RegexString = regex, - URLTemplate = url, - }; - - IssueTrackerRules.Add(rule); - return rule; - } - - public void RemoveIssueTracker(IssueTrackerRule rule) - { - if (rule != null) - IssueTrackerRules.Remove(rule); - } - - public CustomAction AddNewCustomAction() - { - var act = new CustomAction() { Name = "Unnamed Action" }; - CustomActions.Add(act); - return act; - } - - public void RemoveCustomAction(CustomAction act) - { - 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/ResetMode.cs b/src/Models/ResetMode.cs deleted file mode 100644 index 827ccaa9..00000000 --- a/src/Models/ResetMode.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Avalonia.Media; - -namespace SourceGit.Models -{ - public class ResetMode - { - public static readonly ResetMode[] Supported = - [ - new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", "S", Brushes.Green), - new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", "M", Brushes.Orange), - new ResetMode("Merge", "Reset while keeping unmerged changes", "--merge", "G", Brushes.Purple), - new ResetMode("Keep", "Reset while keeping local modifications", "--keep", "K", Brushes.Purple), - new ResetMode("Hard", "Discard all changes", "--hard", "H", Brushes.Red), - ]; - - public string Name { get; set; } - public string Desc { get; set; } - public string Arg { get; set; } - public string Key { get; set; } - public IBrush Color { get; set; } - - public ResetMode(string n, string d, string a, string k, IBrush b) - { - Name = n; - Desc = d; - Arg = a; - Key = k; - Color = b; - } - } -} diff --git a/src/Models/RevisionFile.cs b/src/Models/RevisionFile.cs index 29a23efa..b918e2e7 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,7 @@ namespace SourceGit.Models public class RevisionImageFile { - public Bitmap Image { get; } - public long FileSize { get; } - public string ImageType { get; } - 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 Bitmap Image { get; set; } = null; } public class RevisionTextFile @@ -37,7 +25,6 @@ namespace SourceGit.Models public class RevisionSubmodule { - public Commit Commit { get; set; } = null; - public CommitFullMessage FullMessage { get; set; } = null; + public string SHA { get; set; } } } diff --git a/src/Models/SelfUpdate.cs b/src/Models/SelfUpdate.cs deleted file mode 100644 index e02f80d8..00000000 --- a/src/Models/SelfUpdate.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Reflection; -using System.Text.Json.Serialization; - -namespace SourceGit.Models -{ - public class Version - { - [JsonPropertyName("name")] - public string Name { get; set; } - - [JsonPropertyName("tag_name")] - public string TagName { get; set; } - - [JsonPropertyName("body")] - public string Body { get; set; } - - public bool IsNewVersion - { - get - { - try - { - System.Version version = new System.Version(TagName.Substring(1)); - System.Version current = Assembly.GetExecutingAssembly().GetName().Version!; - return current.CompareTo(version) < 0; - } - catch - { - return false; - } - } - } - } - - public class AlreadyUpToDate - { - } - - public class SelfUpdateFailed - { - public string Reason - { - get; - private set; - } - - public SelfUpdateFailed(Exception e) - { - if (e.InnerException is { } inner) - Reason = inner.Message; - else - Reason = e.Message; - } - } -} diff --git a/src/Models/Shell.cs b/src/Models/Shell.cs new file mode 100644 index 00000000..9960d136 --- /dev/null +++ b/src/Models/Shell.cs @@ -0,0 +1,10 @@ +namespace SourceGit.Models +{ + public enum Shell + { + Default = 0, + PowerShell, + CommandPrompt, + DefaultShellOfWindowsTerminal, + } +} diff --git a/src/Models/ShellOrTerminal.cs b/src/Models/ShellOrTerminal.cs deleted file mode 100644 index 7dfb2237..00000000 --- a/src/Models/ShellOrTerminal.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; - -using Avalonia.Media.Imaging; -using Avalonia.Platform; - -namespace SourceGit.Models -{ - public class ShellOrTerminal - { - public string Type { get; set; } - public string Name { get; set; } - public string Exec { get; set; } - - public Bitmap Icon - { - get - { - var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/Images/ShellIcons/{Type}.png", UriKind.RelativeOrAbsolute)); - return new Bitmap(icon); - } - } - - public static readonly List Supported; - - static ShellOrTerminal() - { - if (OperatingSystem.IsWindows()) - { - Supported = new List() - { - new ShellOrTerminal("git-bash", "Git Bash", "bash.exe"), - new ShellOrTerminal("pwsh", "PowerShell", "pwsh.exe|powershell.exe"), - new ShellOrTerminal("cmd", "Command Prompt", "cmd.exe"), - new ShellOrTerminal("wt", "Windows Terminal", "wt.exe") - }; - } - else if (OperatingSystem.IsMacOS()) - { - Supported = new List() - { - new ShellOrTerminal("mac-terminal", "Terminal", ""), - new ShellOrTerminal("iterm2", "iTerm", ""), - new ShellOrTerminal("warp", "Warp", ""), - new ShellOrTerminal("ghostty", "Ghostty", ""), - new ShellOrTerminal("kitty", "kitty", "") - }; - } - else - { - Supported = new List() - { - new ShellOrTerminal("gnome-terminal", "Gnome Terminal", "gnome-terminal"), - new ShellOrTerminal("konsole", "Konsole", "konsole"), - new ShellOrTerminal("xfce4-terminal", "Xfce4 Terminal", "xfce4-terminal"), - new ShellOrTerminal("lxterminal", "LXTerminal", "lxterminal"), - new ShellOrTerminal("deepin-terminal", "Deepin Terminal", "deepin-terminal"), - 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", ""), - }; - } - } - - public ShellOrTerminal(string type, string name, string exec) - { - Type = type; - Name = name; - Exec = exec; - } - } -} diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs index 369ab145..2376959a 100644 --- a/src/Models/Stash.cs +++ b/src/Models/Stash.cs @@ -1,16 +1,17 @@ using System; -using System.Collections.Generic; namespace SourceGit.Models { public class Stash { + private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); + public string Name { get; set; } = ""; public string SHA { get; set; } = ""; - public List Parents { get; set; } = []; + public User Author { get; set; } = User.Invalid; 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 => UTC_START.AddSeconds(Time).ToString("yyyy/MM/dd HH:mm:ss"); } } diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs index a86380c3..b0d619e1 100644 --- a/src/Models/Statistics.cs +++ b/src/Models/Statistics.cs @@ -1,233 +1,144 @@ using System; using System.Collections.Generic; -using System.Globalization; - -using LiveChartsCore; -using LiveChartsCore.Defaults; -using LiveChartsCore.SkiaSharpView; -using LiveChartsCore.SkiaSharpView.Painting; - -using SkiaSharp; namespace SourceGit.Models { - public enum StatisticsMode + public class StatisticsSample { - All, - ThisMonth, - ThisWeek, - } - - public class StatisticsAuthor(User user, int count) - { - public User User { get; set; } = user; - public int Count { get; set; } = count; + public string Name { get; set; } + public int Count { get; set; } } 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 List Samples { get; set; } = new List(); + public List ByCommitter { get; set; } = new List(); - public StatisticsReport(StatisticsMode mode, DateTime start) - { - _mode = mode; - - YAxes.Add(new Axis() - { - TextSize = 10, - MinLimit = 0, - SeparatorsPaint = new SolidColorPaint(new SKColor(0x40808080)) { StrokeThickness = 1 } - }); - - if (mode == StatisticsMode.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) - { - var now = DateTime.Now; - var maxDays = DateTime.DaysInMonth(now.Year, now.Month); - for (int i = 0; i < maxDays; i++) - _mapSamples.Add(start.AddDays(i), 0); - - XAxes.Add(new DateTimeAxis(TimeSpan.FromDays(1), v => $"{v:MM/dd}") { TextSize = 10 }); - } - else - { - XAxes.Add(new DateTimeAxis(TimeSpan.FromDays(30), v => $"{v:yyyy/MM}") { TextSize = 10 }); - } - } - - public void AddCommit(DateTime time, User author) + public void AddCommit(int index, string committer) { Total++; + Samples[index].Count++; - DateTime normalized; - if (_mode == StatisticsMode.ThisWeek || _mode == StatisticsMode.ThisMonth) - normalized = time.Date; - else - normalized = new DateTime(time.Year, time.Month, 1).ToLocalTime(); - - if (_mapSamples.TryGetValue(normalized, out var vs)) - _mapSamples[normalized] = vs + 1; - else - _mapSamples.Add(normalized, 1); - - if (_mapUsers.TryGetValue(author, out var vu)) - _mapUsers[author] = vu + 1; - else - _mapUsers.Add(author, 1); - - if (_mapUserSamples.TryGetValue(author, out var vus)) + if (_mapByCommitter.TryGetValue(committer, out var value)) { - if (vus.TryGetValue(normalized, out var n)) - vus[normalized] = n + 1; - else - vus.Add(normalized, 1); + value.Count++; } else { - _mapUserSamples.Add(author, new Dictionary - { - { normalized, 1 } - }); + var sample = new StatisticsSample() { Name = committer, Count = 1 }; + _mapByCommitter.Add(committer, sample); + ByCommitter.Add(sample); } } 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)); - - Series.Add( - new ColumnSeries() - { - Values = samples, - Stroke = null, - Fill = null, - Padding = 1, - } - ); - - _mapUsers.Clear(); - _mapSamples.Clear(); + ByCommitter.Sort((l, r) => r.Count - l.Count); + _mapByCommitter.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); - } - - 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() - { - Values = samples, - Stroke = null, - Fill = null, - Padding = 1, - } - ); - - ChangeColor(_fillColor); - } - - private static readonly string[] WEEKDAYS = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"]; - private StatisticsMode _mode; - private Dictionary _mapUsers = new(); - private Dictionary _mapSamples = new(); - private Dictionary> _mapUserSamples = new(); - private StatisticsAuthor _selectedAuthor = null; - private uint _fillColor = 255; + private readonly Dictionary _mapByCommitter = new Dictionary(); } public class Statistics { - public StatisticsReport All { get; } - public StatisticsReport Month { get; } - public StatisticsReport Week { get; } + public StatisticsReport Year { get; set; } = new StatisticsReport(); + public StatisticsReport Month { get; set; } = new StatisticsReport(); + public StatisticsReport Week { get; set; } = new StatisticsReport(); public Statistics() { - var today = DateTime.Now.ToLocalTime().Date; - var weekOffset = (7 + (int)today.DayOfWeek - (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek) % 7; - _thisWeekStart = today.AddDays(-weekOffset); - _thisMonthStart = today.AddDays(1 - today.Day); + _utcStart = DateTime.UnixEpoch; + _today = DateTime.Today; + _thisWeekStart = _today.AddSeconds(-(int)_today.DayOfWeek * 3600 * 24 - _today.Hour * 3600 - _today.Minute * 60 - _today.Second); + _thisWeekEnd = _thisWeekStart.AddDays(7); - All = new StatisticsReport(StatisticsMode.All, DateTime.MinValue); - Month = new StatisticsReport(StatisticsMode.ThisMonth, _thisMonthStart); - Week = new StatisticsReport(StatisticsMode.ThisWeek, _thisWeekStart); - } + string[] monthNames = [ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ]; - public void AddCommit(string author, double timestamp) - { - var emailIdx = author.IndexOf('±', StringComparison.Ordinal); - var email = author.Substring(emailIdx + 1).ToLower(CultureInfo.CurrentCulture); - if (!_users.TryGetValue(email, out var user)) + for (int i = 0; i < monthNames.Length; i++) { - user = User.FindOrAdd(author); - _users.Add(email, user); + Year.Samples.Add(new StatisticsSample + { + Name = monthNames[i], + Count = 0, + }); } - var time = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime(); - if (time >= _thisWeekStart) - Week.AddCommit(time, user); + var monthDays = DateTime.DaysInMonth(_today.Year, _today.Month); + for (int i = 0; i < monthDays; i++) + { + Month.Samples.Add(new StatisticsSample + { + Name = $"{i + 1}", + Count = 0, + }); + } - if (time >= _thisMonthStart) - Month.AddCommit(time, user); + string[] weekDayNames = [ + "SUN", + "MON", + "TUE", + "WED", + "THU", + "FRI", + "SAT", + ]; - All.AddCommit(time, user); + for (int i = 0; i < weekDayNames.Length; i++) + { + Week.Samples.Add(new StatisticsSample + { + Name = weekDayNames[i], + Count = 0, + }); + } + } + + public string Since() + { + return _today.ToString("yyyy-01-01 00:00:00"); + } + + public void AddCommit(string committer, double timestamp) + { + var time = _utcStart.AddSeconds(timestamp).ToLocalTime(); + if (time.CompareTo(_thisWeekStart) >= 0 && time.CompareTo(_thisWeekEnd) < 0) + { + Week.AddCommit((int)time.DayOfWeek, committer); + } + + if (time.Month == _today.Month) + { + Month.AddCommit(time.Day - 1, committer); + } + + Year.AddCommit(time.Month - 1, committer); } public void Complete() { - _users.Clear(); - - All.Complete(); + Year.Complete(); Month.Complete(); Week.Complete(); } - private readonly DateTime _thisMonthStart; + private readonly DateTime _utcStart; + private readonly DateTime _today; private readonly DateTime _thisWeekStart; - private readonly Dictionary _users = new(); + private readonly DateTime _thisWeekEnd; } } diff --git a/src/Models/Submodule.cs b/src/Models/Submodule.cs deleted file mode 100644 index ca73a8de..00000000 --- a/src/Models/Submodule.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace SourceGit.Models -{ - public enum SubmoduleStatus - { - Normal = 0, - NotInited, - RevisionChanged, - Unmerged, - Modified, - } - - public class Submodule - { - public string Path { get; set; } = string.Empty; - public string SHA { get; set; } = string.Empty; - public string URL { get; set; } = string.Empty; - public SubmoduleStatus Status { get; set; } = SubmoduleStatus.Normal; - public bool IsDirty => Status > SubmoduleStatus.NotInited; - } -} diff --git a/src/Models/Tag.cs b/src/Models/Tag.cs index 87944637..c1a34bfa 100644 --- a/src/Models/Tag.cs +++ b/src/Models/Tag.cs @@ -1,27 +1,9 @@ -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.Models +namespace SourceGit.Models { - public enum TagSortMode + public class Tag { - CreatorDate = 0, - Name, - } - - public class Tag : ObservableObject - { - public string Name { get; set; } = string.Empty; - public bool IsAnnotated { get; set; } = false; - public string SHA { get; set; } = string.Empty; - public ulong CreatorDate { get; set; } = 0; - public string Message { get; set; } = string.Empty; - - public FilterMode FilterMode - { - get => _filterMode; - set => SetProperty(ref _filterMode, value); - } - - private FilterMode _filterMode = FilterMode.None; + public string Name { get; set; } + public string SHA { get; set; } + public bool IsFiltered { get; set; } } } diff --git a/src/Models/TemplateEngine.cs b/src/Models/TemplateEngine.cs deleted file mode 100644 index c54f55fb..00000000 --- a/src/Models/TemplateEngine.cs +++ /dev/null @@ -1,410 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.RegularExpressions; - -namespace SourceGit.Models -{ - public class TemplateEngine - { - private class Context(Branch branch, IReadOnlyList changes) - { - public Branch branch = branch; - public IReadOnlyList changes = changes; - } - - private class Text(string text) - { - public string text = text; - } - - private class Variable(string name) - { - public string name = name; - } - - private class SlicedVariable(string name, int count) - { - public string name = name; - public int count = count; - } - - private class RegexVariable(string name, Regex regex, string replacement) - { - public string name = name; - public Regex regex = regex; - public string replacement = replacement; - } - - private const char ESCAPE = '\\'; - private const char VARIABLE_ANCHOR = '$'; - private const char VARIABLE_START = '{'; - private const char VARIABLE_END = '}'; - private const char VARIABLE_SLICE = ':'; - private const char VARIABLE_REGEX = '/'; - private const char NEWLINE = '\n'; - private const RegexOptions REGEX_OPTIONS = RegexOptions.Singleline | RegexOptions.IgnoreCase; - - public string Eval(string text, Branch branch, IReadOnlyList changes) - { - Reset(); - - _chars = text.ToCharArray(); - Parse(); - - var context = new Context(branch, changes); - var sb = new StringBuilder(); - sb.EnsureCapacity(text.Length); - foreach (var token in _tokens) - { - switch (token) - { - case Text text_token: - sb.Append(text_token.text); - break; - case Variable var_token: - sb.Append(EvalVariable(context, var_token)); - break; - case SlicedVariable sliced_var: - sb.Append(EvalVariable(context, sliced_var)); - break; - case RegexVariable regex_var: - sb.Append(EvalVariable(context, regex_var)); - break; - } - } - - return sb.ToString(); - } - - private void Reset() - { - _pos = 0; - _chars = []; - _tokens.Clear(); - } - - private char? Next() - { - var c = Peek(); - if (c is not null) - { - _pos++; - } - return c; - } - - private char? Peek() - { - return (_pos >= _chars.Length) ? null : _chars[_pos]; - } - - private int? Integer() - { - var start = _pos; - while (Peek() is char c && c >= '0' && c <= '9') - { - _pos++; - } - if (start >= _pos) - return null; - - var chars = new ReadOnlySpan(_chars, start, _pos - start); - return int.Parse(chars); - } - - private void Parse() - { - // text token start - var tok = _pos; - bool esc = false; - while (Next() is char c) - { - if (esc) - { - esc = false; - continue; - } - switch (c) - { - case ESCAPE: - // allow to escape only \ and $ - if (Peek() is char nc && (nc == ESCAPE || nc == VARIABLE_ANCHOR)) - { - esc = true; - FlushText(tok, _pos - 1); - tok = _pos; - } - break; - case VARIABLE_ANCHOR: - // backup the position - var bak = _pos; - var variable = TryParseVariable(); - if (variable is null) - { - // no variable found, rollback - _pos = bak; - } - else - { - // variable found, flush a text token - FlushText(tok, bak - 1); - _tokens.Add(variable); - tok = _pos; - } - break; - } - } - // flush text token - FlushText(tok, _pos); - } - - private void FlushText(int start, int end) - { - int len = end - start; - if (len <= 0) - return; - var text = new string(_chars, start, len); - _tokens.Add(new Text(text)); - } - - private object TryParseVariable() - { - if (Next() != VARIABLE_START) - return null; - int name_start = _pos; - while (Next() is char c) - { - // name character, continue advancing - if (IsNameChar(c)) - continue; - - var name_end = _pos - 1; - // not a name character but name is empty, cancel - if (name_start >= name_end) - return null; - var name = new string(_chars, name_start, name_end - name_start); - - return c switch - { - // variable - VARIABLE_END => new Variable(name), - // sliced variable - VARIABLE_SLICE => TryParseSlicedVariable(name), - // regex variable - VARIABLE_REGEX => TryParseRegexVariable(name), - _ => null, - }; - } - - return null; - } - - private object TryParseSlicedVariable(string name) - { - int? n = Integer(); - if (n is null) - return null; - if (Next() != VARIABLE_END) - return null; - - return new SlicedVariable(name, (int)n); - } - - private object TryParseRegexVariable(string name) - { - var regex = ParseRegex(); - if (regex == null) - return null; - var replacement = ParseReplacement(); - if (replacement == null) - return null; - - return new RegexVariable(name, regex, replacement); - } - - private Regex ParseRegex() - { - var sb = new StringBuilder(); - var tok = _pos; - var esc = false; - while (Next() is char c) - { - if (esc) - { - esc = false; - continue; - } - switch (c) - { - case ESCAPE: - // allow to escape only / as \ and { used frequently in regexes - if (Peek() == VARIABLE_REGEX) - { - esc = true; - sb.Append(_chars, tok, _pos - 1 - tok); - tok = _pos; - } - break; - case VARIABLE_REGEX: - // goto is fine - goto Loop_exit; - case NEWLINE: - // no newlines allowed - return null; - } - } - Loop_exit: - sb.Append(_chars, tok, _pos - 1 - tok); - - try - { - var pattern = sb.ToString(); - if (pattern.Length == 0) - return null; - var regex = new Regex(pattern, REGEX_OPTIONS); - - return regex; - } - catch (RegexParseException) - { - return null; - } - } - - private string ParseReplacement() - { - var sb = new StringBuilder(); - var tok = _pos; - var esc = false; - while (Next() is char c) - { - if (esc) - { - esc = false; - continue; - } - switch (c) - { - case ESCAPE: - // allow to escape only } - if (Peek() == VARIABLE_END) - { - esc = true; - sb.Append(_chars, tok, _pos - 1 - tok); - tok = _pos; - } - break; - case VARIABLE_END: - // goto is fine - goto Loop_exit; - case NEWLINE: - // no newlines allowed - return null; - } - } - Loop_exit: - sb.Append(_chars, tok, _pos - 1 - tok); - - var replacement = sb.ToString(); - - return replacement; - } - - private static bool IsNameChar(char c) - { - return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_'; - } - - // (?) notice or log if variable is not found - private static string EvalVariable(Context context, string name) - { - if (!s_variables.TryGetValue(name, out var getter)) - { - return string.Empty; - } - return getter(context); - } - - private static string EvalVariable(Context context, Variable variable) - { - return EvalVariable(context, variable.name); - } - - private static string EvalVariable(Context context, SlicedVariable variable) - { - if (!s_slicedVariables.TryGetValue(variable.name, out var getter)) - { - return string.Empty; - } - return getter(context, variable.count); - } - - private static string EvalVariable(Context context, RegexVariable variable) - { - var str = EvalVariable(context, variable.name); - if (string.IsNullOrEmpty(str)) - return str; - return variable.regex.Replace(str, variable.replacement); - } - - private int _pos = 0; - private char[] _chars = []; - private readonly List _tokens = []; - - private delegate string VariableGetter(Context context); - - private static readonly IReadOnlyDictionary s_variables = new Dictionary() { - // legacy variables - {"branch_name", GetBranchName}, - {"files_num", GetFilesCount}, - {"files", GetFiles}, - // - {"BRANCH", GetBranchName}, - {"FILES_COUNT", GetFilesCount}, - {"FILES", GetFiles}, - }; - - private static string GetBranchName(Context context) - { - return context.branch.Name; - } - - private static string GetFilesCount(Context context) - { - return context.changes.Count.ToString(); - } - - private static string GetFiles(Context context) - { - var paths = new List(); - foreach (var c in context.changes) - paths.Add(c.Path); - return string.Join(", ", paths); - } - - private delegate string VariableSliceGetter(Context context, int count); - - private static readonly IReadOnlyDictionary s_slicedVariables = new Dictionary() { - // legacy variables - {"files", GetFilesSliced}, - // - {"FILES", GetFilesSliced}, - }; - - private static string GetFilesSliced(Context context, int count) - { - var sb = new StringBuilder(); - var paths = new List(); - var max = Math.Min(count, context.changes.Count); - for (int i = 0; i < max; i++) - paths.Add(context.changes[i].Path); - - sb.AppendJoin(", ", paths); - if (max < context.changes.Count) - sb.Append($" and {context.changes.Count - max} other files"); - - return sb.ToString(); - } - } -} diff --git a/src/Models/TextInlineChange.cs b/src/Models/TextInlineChange.cs index 15901d03..c96d839f 100644 --- a/src/Models/TextInlineChange.cs +++ b/src/Models/TextInlineChange.cs @@ -9,7 +9,7 @@ namespace SourceGit.Models public int AddedStart { get; set; } public int AddedCount { get; set; } - private class Chunk + class Chunk { public int Hash; public bool Modified; @@ -25,7 +25,7 @@ namespace SourceGit.Models } } - private enum Edit + enum Edit { None, DeletedRight, @@ -34,7 +34,7 @@ namespace SourceGit.Models AddedLeft, } - private class EditResult + class EditResult { public Edit State; public int DeleteStart; @@ -204,10 +204,11 @@ namespace SourceGit.Models for (int i = 0; i <= half; i++) { + for (int j = -i; j <= i; j += 2) { var idx = j + half; - int o; + int o, n; if (j == -i || (j != i && forward[idx - 1] < forward[idx + 1])) { o = forward[idx + 1]; @@ -219,7 +220,7 @@ namespace SourceGit.Models rs.State = Edit.DeletedRight; } - var n = o - j; + n = o - j; var startX = o; var startY = n; @@ -257,7 +258,7 @@ namespace SourceGit.Models for (int j = -i; j <= i; j += 2) { var idx = j + half; - int o; + int o, n; if (j == -i || (j != i && reverse[idx + 1] <= reverse[idx - 1])) { o = reverse[idx + 1] - 1; @@ -269,7 +270,7 @@ namespace SourceGit.Models rs.State = Edit.AddedLeft; } - var n = o - (j + delta); + n = o - (j + delta); var endX = o; var endY = n; @@ -311,7 +312,8 @@ namespace SourceGit.Models private static void AddChunk(List chunks, Dictionary hashes, string data, int start) { - if (hashes.TryGetValue(data, out var hash)) + int hash; + if (hashes.TryGetValue(data, out hash)) { chunks.Add(new Chunk(hash, start, data.Length)); } diff --git a/src/Models/TextMateHelper.cs b/src/Models/TextMateHelper.cs index b7efae72..044f2b29 100644 --- a/src/Models/TextMateHelper.cs +++ b/src/Models/TextMateHelper.cs @@ -1,130 +1,63 @@ using System; -using System.Collections.Generic; using System.IO; -using Avalonia; -using Avalonia.Platform; using Avalonia.Styling; using AvaloniaEdit; using AvaloniaEdit.TextMate; using TextMateSharp.Grammars; -using TextMateSharp.Internal.Grammars.Reader; -using TextMateSharp.Internal.Types; -using TextMateSharp.Registry; -using TextMateSharp.Themes; namespace SourceGit.Models { - public static class GrammarUtility - { - private static readonly ExtraGrammar[] s_extraGrammars = - [ - new ExtraGrammar("source.toml", [".toml"], "toml.json"), - new ExtraGrammar("source.kotlin", [".kotlin", ".kt", ".kts"], "kotlin.json"), - new ExtraGrammar("source.hx", [".hx"], "haxe.json"), - new ExtraGrammar("source.hxml", [".hxml"], "hxml.json"), - new ExtraGrammar("text.html.jsp", [".jsp", ".jspf", ".tag"], "jsp.json"), - ]; - - public static string GetScope(string file, RegistryOptions reg) - { - var extension = Path.GetExtension(file); - if (extension == ".h") - extension = ".cpp"; - else if (extension == ".resx" || extension == ".plist" || extension == ".manifest") - extension = ".xml"; - else if (extension == ".command") - extension = ".sh"; - - foreach (var grammar in s_extraGrammars) - { - foreach (var ext in grammar.Extensions) - { - if (ext.Equals(extension, StringComparison.OrdinalIgnoreCase)) - return grammar.Scope; - } - } - - return reg.GetScopeByExtension(extension); - } - - public static IRawGrammar GetGrammar(string scopeName, RegistryOptions reg) - { - foreach (var grammar in s_extraGrammars) - { - if (grammar.Scope.Equals(scopeName, StringComparison.OrdinalIgnoreCase)) - { - var asset = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/Grammars/{grammar.File}", - UriKind.RelativeOrAbsolute)); - - try - { - return GrammarReader.ReadGrammarSync(new StreamReader(asset)); - } - catch - { - break; - } - } - } - - return reg.GetGrammar(scopeName); - } - - private record ExtraGrammar(string Scope, List Extensions, string File) - { - public readonly string Scope = Scope; - public readonly List Extensions = Extensions; - public readonly string File = File; - } - } - - public class RegistryOptionsWrapper(ThemeName defaultTheme) : IRegistryOptions - { - public string LastScope { get; set; } = string.Empty; - - public IRawTheme GetTheme(string scopeName) => _backend.GetTheme(scopeName); - public IRawTheme GetDefaultTheme() => _backend.GetDefaultTheme(); - public IRawTheme LoadTheme(ThemeName name) => _backend.LoadTheme(name); - public ICollection GetInjections(string scopeName) => _backend.GetInjections(scopeName); - public IRawGrammar GetGrammar(string scopeName) => GrammarUtility.GetGrammar(scopeName, _backend); - public string GetScope(string filename) => GrammarUtility.GetScope(filename, _backend); - - private readonly RegistryOptions _backend = new(defaultTheme); - } - public static class TextMateHelper { public static TextMate.Installation CreateForEditor(TextEditor editor) { - return editor.InstallTextMate(Application.Current?.ActualThemeVariant == ThemeVariant.Dark ? - new RegistryOptionsWrapper(ThemeName.DarkPlus) : - new RegistryOptionsWrapper(ThemeName.LightPlus)); + if (App.Current?.ActualThemeVariant == ThemeVariant.Dark) + { + return editor.InstallTextMate(new RegistryOptions(ThemeName.DarkPlus)); + } + else + { + return editor.InstallTextMate(new RegistryOptions(ThemeName.LightPlus)); + } } public static void SetThemeByApp(TextMate.Installation installation) { - if (installation is { RegistryOptions: RegistryOptionsWrapper reg }) + if (installation == null) + return; + + var reg = installation.RegistryOptions as RegistryOptions; + if (App.Current?.ActualThemeVariant == ThemeVariant.Dark) { - var isDark = Application.Current?.ActualThemeVariant == ThemeVariant.Dark; - installation.SetTheme(reg.LoadTheme(isDark ? ThemeName.DarkPlus : ThemeName.LightPlus)); + installation.SetTheme(reg.LoadTheme(ThemeName.DarkPlus)); + } + else + { + installation.SetTheme(reg.LoadTheme(ThemeName.LightPlus)); } } public static void SetGrammarByFileName(TextMate.Installation installation, string filePath) { - if (installation is { RegistryOptions: RegistryOptionsWrapper reg } && !string.IsNullOrEmpty(filePath)) + if (installation == null) + return; + + var ext = Path.GetExtension(filePath); + if (ext == ".h") { - var scope = reg.GetScope(filePath); - if (reg.LastScope != scope) - { - reg.LastScope = scope; - installation.SetGrammar(reg.GetScope(filePath)); - GC.Collect(); - } + ext = ".cpp"; } + else if (ext == ".resx" || ext == ".plist") + { + ext = ".xml"; + } + + var reg = installation.RegistryOptions as RegistryOptions; + installation.SetGrammar(reg.GetScopeByExtension(ext)); + GC.Collect(); } } } diff --git a/src/Models/ThemeOverrides.cs b/src/Models/ThemeOverrides.cs deleted file mode 100644 index ccd9f57e..00000000 --- a/src/Models/ThemeOverrides.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; - -using Avalonia.Media; - -namespace SourceGit.Models -{ - public class ThemeOverrides - { - public Dictionary BasicColors { get; set; } = new Dictionary(); - public double GraphPenThickness { get; set; } = 2; - public double OpacityForNotMergedCommits { get; set; } = 0.5; - public List GraphColors { get; set; } = new List(); - } -} diff --git a/src/Models/User.cs b/src/Models/User.cs index 0b4816fe..2ef770cf 100644 --- a/src/Models/User.cs +++ b/src/Models/User.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Concurrent; +using System.Collections.Generic; namespace SourceGit.Models { @@ -10,41 +9,38 @@ namespace SourceGit.Models public string Name { get; set; } = string.Empty; public string Email { get; set; } = string.Empty; - public User() - { - // Only used by User.Invalid - } - - public User(string data) - { - var nameEndIdx = data.IndexOf('±', StringComparison.Ordinal); - - Name = nameEndIdx > 0 ? data.Substring(0, nameEndIdx) : string.Empty; - Email = data.Substring(nameEndIdx + 1); - _hash = data.GetHashCode(); - } - public override bool Equals(object obj) { - return obj is User other && Name == other.Name && Email == other.Email; + if (obj == null || !(obj is User)) + return false; + + var other = obj as User; + return Name == other.Name && Email == other.Email; } public override int GetHashCode() { - return _hash; + return base.GetHashCode(); } public static User FindOrAdd(string data) { - return _caches.GetOrAdd(data, key => new User(key)); + if (_caches.TryGetValue(data, out var value)) + { + return value; + } + else + { + var nameEndIdx = data.IndexOf('<', System.StringComparison.Ordinal); + var name = nameEndIdx >= 2 ? data.Substring(0, nameEndIdx - 1) : string.Empty; + var email = data.Substring(nameEndIdx + 1); + + User user = new User() { Name = name, Email = email }; + _caches.Add(data, user); + return user; + } } - public override string ToString() - { - return $"{Name} <{Email}>"; - } - - private static ConcurrentDictionary _caches = new ConcurrentDictionary(); - private readonly int _hash; + private static Dictionary _caches = new Dictionary(); } } diff --git a/src/Models/Version.cs b/src/Models/Version.cs new file mode 100644 index 00000000..c16c1233 --- /dev/null +++ b/src/Models/Version.cs @@ -0,0 +1,38 @@ +using System.Reflection; +using System.Text.Json.Serialization; +using System.Text.RegularExpressions; + +namespace SourceGit.Models +{ + public partial class Version + { + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("tag_name")] + public string TagName { get; set; } + + [JsonPropertyName("body")] + public string Body { get; set; } + + [GeneratedRegex(@"^v(\d+)\.(\d+)$")] + private static partial Regex REG_VERSION_TAG(); + + public bool IsNewVersion + { + get + { + var match = REG_VERSION_TAG().Match(TagName); + if (!match.Success) + return false; + + var major = int.Parse(match.Groups[1].Value); + var minor = int.Parse(match.Groups[2].Value); + var ver = Assembly.GetExecutingAssembly().GetName().Version; + return ver.Major < major || (ver.Major == major && ver.Minor < minor); + } + } + } + + public class AlreadyUpToDate { } +} diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs index a3cfc329..ceefc942 100644 --- a/src/Models/Watcher.cs +++ b/src/Models/Watcher.cs @@ -1,19 +1,31 @@ using System; -using System.Collections.Generic; using System.IO; using System.Threading; using System.Threading.Tasks; namespace SourceGit.Models { + public interface IRepository + { + string FullPath { get; set; } + string GitDir { get; set; } + + void RefreshBranches(); + void RefreshTags(); + void RefreshCommits(); + void RefreshSubmodules(); + void RefreshWorkingCopyChanges(); + void RefreshStashes(); + } + public class Watcher : IDisposable { - public Watcher(IRepository repo, string fullpath, string gitDir) + public Watcher(IRepository repo) { _repo = repo; _wcWatcher = new FileSystemWatcher(); - _wcWatcher.Path = fullpath; + _wcWatcher.Path = _repo.FullPath; _wcWatcher.Filter = "*"; _wcWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName | NotifyFilters.Size | NotifyFilters.CreationTime; _wcWatcher.IncludeSubdirectories = true; @@ -24,7 +36,7 @@ namespace SourceGit.Models _wcWatcher.EnableRaisingEvents = true; _repoWatcher = new FileSystemWatcher(); - _repoWatcher.Path = gitDir; + _repoWatcher.Path = _repo.GitDir; _repoWatcher.Filter = "*"; _repoWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName; _repoWatcher.IncludeSubdirectories = true; @@ -50,26 +62,11 @@ namespace SourceGit.Models } } - public void SetSubmodules(List submodules) - { - lock (_lockSubmodule) - { - _submodules.Clear(); - foreach (var submodule in submodules) - _submodules.Add(submodule.Path); - } - } - public void MarkBranchDirtyManually() { _updateBranch = DateTime.Now.ToFileTime() - 1; } - public void MarkTagDirtyManually() - { - _updateTags = DateTime.Now.ToFileTime() - 1; - } - public void MarkWorkingCopyDirtyManually() { _updateWC = DateTime.Now.ToFileTime() - 1; @@ -111,19 +108,23 @@ namespace SourceGit.Models if (_updateTags > 0) { _updateTags = 0; - Task.Run(_repo.RefreshTags); + Task.Run(() => + { + _repo.RefreshTags(); + _repo.RefreshBranches(); + _repo.RefreshCommits(); + }); } - - if (_updateSubmodules > 0 || _repo.MayHaveSubmodules()) + else { - _updateSubmodules = 0; - Task.Run(_repo.RefreshSubmodules); + Task.Run(() => + { + _repo.RefreshBranches(); + _repo.RefreshCommits(); + }); } - Task.Run(_repo.RefreshBranches); - Task.Run(_repo.RefreshCommits); Task.Run(_repo.RefreshWorkingCopyChanges); - Task.Run(_repo.RefreshWorktrees); } if (_updateWC > 0 && now > _updateWC) @@ -135,20 +136,20 @@ namespace SourceGit.Models if (_updateSubmodules > 0 && now > _updateSubmodules) { _updateSubmodules = 0; - Task.Run(_repo.RefreshSubmodules); + _repo.RefreshSubmodules(); } if (_updateStashes > 0 && now > _updateStashes) { _updateStashes = 0; - Task.Run(_repo.RefreshStashes); + _repo.RefreshStashes(); } if (_updateTags > 0 && now > _updateTags) { _updateTags = 0; - Task.Run(_repo.RefreshTags); - Task.Run(_repo.RefreshCommits); + _repo.RefreshTags(); + _repo.RefreshCommits(); } } @@ -157,26 +158,10 @@ namespace SourceGit.Models if (string.IsNullOrEmpty(e.Name)) return; - var name = e.Name.Replace('\\', '/').TrimEnd('/'); - if (name.Contains("fsmonitor--daemon/", StringComparison.Ordinal) || - name.EndsWith(".lock", StringComparison.Ordinal) || - name.StartsWith("lfs/", StringComparison.Ordinal)) - return; - + var name = e.Name.Replace("\\", "/"); if (name.StartsWith("modules", StringComparison.Ordinal)) { - if (name.EndsWith("/HEAD", StringComparison.Ordinal) || - name.EndsWith("/ORIG_HEAD", StringComparison.Ordinal)) - { - _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); - _updateWC = DateTime.Now.AddSeconds(1).ToFileTime(); - } - } - else if (name.Equals("MERGE_HEAD", StringComparison.Ordinal) || - name.Equals("AUTO_MERGE", StringComparison.Ordinal)) - { - if (_repo.MayHaveSubmodules()) - _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); + _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); } else if (name.StartsWith("refs/tags", StringComparison.Ordinal)) { @@ -187,10 +172,9 @@ namespace SourceGit.Models _updateStashes = DateTime.Now.AddSeconds(.5).ToFileTime(); } else if (name.Equals("HEAD", StringComparison.Ordinal) || - name.Equals("BISECT_START", StringComparison.Ordinal) || name.StartsWith("refs/heads/", StringComparison.Ordinal) || name.StartsWith("refs/remotes/", StringComparison.Ordinal) || - (name.StartsWith("worktrees/", StringComparison.Ordinal) && name.EndsWith("/HEAD", StringComparison.Ordinal))) + name.StartsWith("worktrees/", StringComparison.Ordinal)) { _updateBranch = DateTime.Now.AddSeconds(.5).ToFileTime(); } @@ -205,33 +189,9 @@ namespace SourceGit.Models if (string.IsNullOrEmpty(e.Name)) return; - var name = e.Name.Replace('\\', '/').TrimEnd('/'); - if (name.Equals(".git", StringComparison.Ordinal) || - name.StartsWith(".git/", StringComparison.Ordinal) || - name.EndsWith("/.git", StringComparison.Ordinal)) + var name = e.Name.Replace("\\", "/"); + if (name == ".git" || name.StartsWith(".git/", StringComparison.Ordinal)) return; - - if (name.StartsWith(".vs/", StringComparison.Ordinal)) - return; - - if (name.Equals(".gitmodules", StringComparison.Ordinal)) - { - _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); - return; - } - - lock (_lockSubmodule) - { - foreach (var submodule in _submodules) - { - if (name.StartsWith(submodule, StringComparison.Ordinal)) - { - _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); - return; - } - } - } - _updateWC = DateTime.Now.AddSeconds(1).ToFileTime(); } @@ -245,8 +205,5 @@ namespace SourceGit.Models private long _updateSubmodules = 0; private long _updateStashes = 0; private long _updateTags = 0; - - private readonly Lock _lockSubmodule = new(); - private List _submodules = new List(); } } diff --git a/src/Models/Worktree.cs b/src/Models/Worktree.cs deleted file mode 100644 index 26f88a8a..00000000 --- a/src/Models/Worktree.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.Models -{ - public class Worktree : ObservableObject - { - public string Branch { get; set; } = string.Empty; - public string FullPath { get; set; } = string.Empty; - public string RelativePath { get; set; } = string.Empty; - public string Head { get; set; } = string.Empty; - public bool IsBare { get; set; } = false; - public bool IsDetached { get; set; } = false; - - public bool IsLocked - { - get => _isLocked; - set => SetProperty(ref _isLocked, value); - } - - public string Name - { - get - { - if (IsDetached) - return $"detached HEAD at {Head.AsSpan(10)}"; - - if (Branch.StartsWith("refs/heads/", StringComparison.Ordinal)) - return Branch.Substring(11); - - if (Branch.StartsWith("refs/remotes/", StringComparison.Ordinal)) - return Branch.Substring(13); - - return Branch; - } - } - - private bool _isLocked = false; - } -} diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs index 3f6de903..172d598b 100644 --- a/src/Native/Linux.cs +++ b/src/Native/Linux.cs @@ -5,32 +5,46 @@ using System.IO; using System.Runtime.Versioning; using Avalonia; -using Avalonia.Controls; -using Avalonia.Platform; +using Avalonia.Dialogs; +using Avalonia.Media; namespace SourceGit.Native { [SupportedOSPlatform("linux")] internal class Linux : OS.IBackend { - public void SetupApp(AppBuilder builder) + class Terminal { - builder.With(new X11PlatformOptions() { EnableIme = true }); + public string FilePath { get; set; } = string.Empty; + public string OpenArgFormat { get; set; } = string.Empty; + + public Terminal(string exec, string fmt) + { + FilePath = exec; + OpenArgFormat = fmt; + } + + public void Open(string dir) + { + Process.Start(FilePath, string.Format(OpenArgFormat, dir)); + } } - public void SetupWindow(Window window) + public Linux() { - if (OS.UseSystemWindowFrame) + _xdgOpenPath = FindExecutable("xdg-open"); + _terminal = FindTerminal(); + } + + public void SetupApp(AppBuilder builder) + { + builder.With(new FontManagerOptions() { - window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.Default; - window.ExtendClientAreaToDecorationsHint = false; - } - else - { - window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome; - window.ExtendClientAreaToDecorationsHint = true; - window.Classes.Add("custom_window_frame"); - } + DefaultFamilyName = "fonts:SourceGit#JetBrains Mono", + }); + + // Free-desktop file picker has an extra black background panel. + builder.UseManagedSystemDialogs(); } public string FindGitExecutable() @@ -38,103 +52,129 @@ namespace SourceGit.Native return FindExecutable("git"); } - public string FindTerminal(Models.ShellOrTerminal shell) - { - if (shell.Type.Equals("custom", StringComparison.Ordinal)) - return string.Empty; - - return FindExecutable(shell.Exec); - } - public List FindExternalTools() { var finder = new Models.ExternalToolsFinder(); finder.VSCode(() => FindExecutable("code")); finder.VSCodeInsiders(() => FindExecutable("code-insiders")); - finder.VSCodium(() => FindExecutable("codium")); - finder.Fleet(FindJetBrainsFleet); - finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox"); + finder.Fleet(FindJetBrainFleet); finder.SublimeText(() => FindExecutable("subl")); - finder.Zed(() => FindExecutable("zeditor")); return finder.Founded; } public void OpenBrowser(string url) { - Process.Start("xdg-open", $"\"{url}\""); + if (string.IsNullOrEmpty(_xdgOpenPath)) + App.RaiseException("", $"Can NOT find `xdg-open` command!!!"); + else + Process.Start(_xdgOpenPath, $"\"{url}\""); } public void OpenInFileManager(string path, bool select) { + if (string.IsNullOrEmpty(_xdgOpenPath)) + { + App.RaiseException("", $"Can NOT find `xdg-open` command!!!"); + return; + } + if (Directory.Exists(path)) { - Process.Start("xdg-open", $"\"{path}\""); + Process.Start(_xdgOpenPath, $"\"{path}\""); } else { var dir = Path.GetDirectoryName(path); if (Directory.Exists(dir)) - Process.Start("xdg-open", $"\"{dir}\""); + { + Process.Start(_xdgOpenPath, $"\"{dir}\""); + } } } public void OpenTerminal(string workdir) { - var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var cwd = string.IsNullOrEmpty(workdir) ? home : workdir; - var terminal = OS.ShellOrTerminal; - - var startInfo = new ProcessStartInfo(); - startInfo.WorkingDirectory = cwd; - startInfo.FileName = terminal; - - if (terminal.EndsWith("wezterm", StringComparison.OrdinalIgnoreCase)) - startInfo.Arguments = $"start --cwd \"{cwd}\""; - else if (terminal.EndsWith("ptyxis", StringComparison.OrdinalIgnoreCase)) - startInfo.Arguments = $"--new-window --working-directory=\"{cwd}\""; - - try - { - Process.Start(startInfo); - } - catch (Exception e) - { - App.RaiseException(workdir, $"Failed to start '{OS.ShellOrTerminal}'. Reason: {e.Message}"); - } + var dir = string.IsNullOrEmpty(workdir) ? "~" : workdir; + if (_terminal == null) + App.RaiseException(dir, $"Only supports gnome-terminal/konsole/xfce4-terminal/deepin-terminal!"); + else + _terminal.Open(dir); } public void OpenWithDefaultEditor(string file) { - var proc = Process.Start("xdg-open", $"\"{file}\""); - if (proc != null) + if (string.IsNullOrEmpty(_xdgOpenPath)) { - proc.WaitForExit(); - - if (proc.ExitCode != 0) - App.RaiseException("", $"Failed to open \"{file}\""); - - proc.Close(); + App.RaiseException("", $"Can NOT find `xdg-open` command!!!"); + return; } + + var proc = Process.Start(_xdgOpenPath, $"\"{file}\""); + proc.WaitForExit(); + + if (proc.ExitCode != 0) + App.RaiseException("", $"Failed to open \"{file}\""); + + proc.Close(); } private string FindExecutable(string filename) { var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty; - var paths = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); - foreach (var path in paths) + var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); + foreach (var path in pathes) { var test = Path.Combine(path, filename); if (File.Exists(test)) + { return test; + } } return string.Empty; } - private string FindJetBrainsFleet() + private Terminal FindTerminal() + { + var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty; + var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); + foreach (var path in pathes) + { + var test = Path.Combine(path, "gnome-terminal"); + if (File.Exists(test)) + { + return new Terminal(test, "--working-directory=\"{0}\""); + } + + test = Path.Combine(path, "konsole"); + if (File.Exists(test)) + { + return new Terminal(test, "--workdir \"{0}\""); + } + + test = Path.Combine(path, "xfce4-terminal"); + if (File.Exists(test)) + { + return new Terminal(test, "--working-directory=\"{0}\""); + } + + test = Path.Combine(path, "deepin-terminal"); + if (File.Exists(test)) + { + return new Terminal(test, "--work-directory \"{0}\""); + } + } + + return null; + } + + private string FindJetBrainFleet() { var path = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox/apps/fleet/bin/Fleet"; return File.Exists(path) ? path : FindExecutable("fleet"); } + + private string _xdgOpenPath = string.Empty; + private Terminal _terminal = null; } } diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs index b76d239a..28519e40 100644 --- a/src/Native/MacOS.cs +++ b/src/Native/MacOS.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Runtime.Versioning; +using System.Text; using Avalonia; -using Avalonia.Controls; -using Avalonia.Platform; +using Avalonia.Media; namespace SourceGit.Native { @@ -15,62 +15,16 @@ namespace SourceGit.Native { public void SetupApp(AppBuilder builder) { - builder.With(new MacOSPlatformOptions() + builder.With(new FontManagerOptions() { - DisableDefaultApplicationMenuItems = true, + DefaultFamilyName = "PingFang SC", }); - - // Fix `PATH` env on macOS. - var path = Environment.GetEnvironmentVariable("PATH"); - if (string.IsNullOrEmpty(path)) - path = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"; - else if (!path.Contains("/opt/homebrew/", StringComparison.Ordinal)) - path = "/opt/homebrew/bin:/opt/homebrew/sbin:" + path; - - var customPathFile = Path.Combine(OS.DataDir, "PATH"); - if (File.Exists(customPathFile)) - { - var env = File.ReadAllText(customPathFile).Trim(); - if (!string.IsNullOrEmpty(env)) - path = env; - } - - Environment.SetEnvironmentVariable("PATH", path); - } - - public void SetupWindow(Window window) - { - window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome; - window.ExtendClientAreaToDecorationsHint = true; } public string FindGitExecutable() { - var gitPathVariants = new List() { - "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" - }; - foreach (var path in gitPathVariants) - if (File.Exists(path)) - return path; - return string.Empty; - } - - public string FindTerminal(Models.ShellOrTerminal shell) - { - switch (shell.Type) - { - case "mac-terminal": - return "Terminal"; - case "iterm2": - return "iTerm"; - case "warp": - return "Warp"; - case "ghostty": - return "Ghostty"; - case "kitty": - return "kitty"; - } - + if (File.Exists("/usr/bin/git")) + return "/usr/bin/git"; return string.Empty; } @@ -79,11 +33,8 @@ namespace SourceGit.Native var finder = new Models.ExternalToolsFinder(); finder.VSCode(() => "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"); finder.VSCodeInsiders(() => "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"); - finder.VSCodium(() => "/Applications/VSCodium.app/Contents/Resources/app/bin/codium"); finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}/Applications/Fleet.app/Contents/MacOS/Fleet"); - finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}/Library/Application Support/JetBrains/Toolbox"); - finder.SublimeText(() => "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"); - finder.Zed(() => File.Exists("/usr/local/bin/zed") ? "/usr/local/bin/zed" : "/Applications/Zed.app/Contents/MacOS/cli"); + finder.SublimeText(() => "/Applications/Sublime Text.app/Contents/SharedSupport/bin"); return finder.Founded; } @@ -95,21 +46,36 @@ namespace SourceGit.Native public void OpenInFileManager(string path, bool select) { if (Directory.Exists(path)) - Process.Start("open", $"\"{path}\""); + { + Process.Start("open", path); + } else if (File.Exists(path)) + { Process.Start("open", $"\"{path}\" -R"); + } } public void OpenTerminal(string workdir) { - var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var dir = string.IsNullOrEmpty(workdir) ? home : workdir; - Process.Start("open", $"-a {OS.ShellOrTerminal} \"{dir}\""); + var dir = string.IsNullOrEmpty(workdir) ? "~" : workdir; + var builder = new StringBuilder(); + builder.AppendLine("on run argv"); + builder.AppendLine(" tell application \"Terminal\""); + builder.AppendLine($" do script \"cd '{dir}'\""); + builder.AppendLine(" activate"); + builder.AppendLine(" end tell"); + builder.AppendLine("end run"); + + var tmp = Path.GetTempFileName(); + File.WriteAllText(tmp, builder.ToString()); + + var proc = Process.Start("/usr/bin/osascript", $"\"{tmp}\""); + proc.Exited += (o, e) => File.Delete(tmp); } public void OpenWithDefaultEditor(string file) { - Process.Start("open", $"\"{file}\""); + Process.Start("open", file); } } } diff --git a/src/Native/OS.cs b/src/Native/OS.cs index ad6f8104..259b6a22 100644 --- a/src/Native/OS.cs +++ b/src/Native/OS.cs @@ -1,24 +1,17 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; using Avalonia; -using Avalonia.Controls; namespace SourceGit.Native { - public static partial class OS + public static class OS { public interface IBackend { void SetupApp(AppBuilder builder); - void SetupWindow(Window window); string FindGitExecutable(); - string FindTerminal(Models.ShellOrTerminal shell); List FindExternalTools(); void OpenTerminal(string workdir); @@ -27,54 +20,8 @@ namespace SourceGit.Native void OpenWithDefaultEditor(string file); } - public static string DataDir - { - get; - private set; - } = string.Empty; - - public static string GitExecutable - { - get => _gitExecutable; - set - { - if (_gitExecutable != value) - { - _gitExecutable = value; - UpdateGitVersion(); - } - } - } - - public static string GitVersionString - { - get; - private set; - } = string.Empty; - - public static Version GitVersion - { - get; - private set; - } = new Version(0, 0, 0); - - public static string ShellOrTerminal - { - get; - set; - } = string.Empty; - - public static List ExternalTools - { - get; - set; - } = []; - - public static bool UseSystemWindowFrame - { - get => OperatingSystem.IsLinux() && _enableSystemWindowFrame; - set => _enableSystemWindowFrame = value; - } + public static string GitExecutable { get; set; } = string.Empty; + public static List ExternalTools { get; set; } = new List(); static OS() { @@ -94,6 +41,35 @@ namespace SourceGit.Native { throw new Exception("Platform unsupported!!!"); } + + ExternalTools = _backend.FindExternalTools(); + } + + public static Models.Shell GetShell() + { + if (OperatingSystem.IsWindows()) + { + return (_backend as Windows).Shell; + } + else + { + return Models.Shell.Default; + } + } + + public static bool SetShell(Models.Shell shell) + { + if (OperatingSystem.IsWindows()) + { + var windows = (_backend as Windows); + if (windows.Shell != shell) + { + windows.Shell = shell; + return true; + } + } + + return false; } public static void SetupApp(AppBuilder builder) @@ -101,57 +77,11 @@ namespace SourceGit.Native _backend.SetupApp(builder); } - public static void SetupDataDir() - { - if (OperatingSystem.IsWindows()) - { - var execFile = Process.GetCurrentProcess().MainModule!.FileName; - var portableDir = Path.Combine(Path.GetDirectoryName(execFile), "data"); - if (Directory.Exists(portableDir)) - { - DataDir = portableDir; - return; - } - } - - var osAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); - if (string.IsNullOrEmpty(osAppDataDir)) - DataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sourcegit"); - else - DataDir = Path.Combine(osAppDataDir, "SourceGit"); - - if (!Directory.Exists(DataDir)) - Directory.CreateDirectory(DataDir); - } - - public static void SetupExternalTools() - { - ExternalTools = _backend.FindExternalTools(); - } - - public static void SetupForWindow(Window window) - { - _backend.SetupWindow(window); - } - public static string FindGitExecutable() { return _backend.FindGitExecutable(); } - public static bool TestShellOrTerminal(Models.ShellOrTerminal shell) - { - return !string.IsNullOrEmpty(_backend.FindTerminal(shell)); - } - - public static void SetShellOrTerminal(Models.ShellOrTerminal shell) - { - if (shell == null) - ShellOrTerminal = string.Empty; - else - ShellOrTerminal = _backend.FindTerminal(shell); - } - public static void OpenInFileManager(string path, bool select = false) { _backend.OpenInFileManager(path, select); @@ -164,10 +94,7 @@ namespace SourceGit.Native public static void OpenTerminal(string workdir) { - if (string.IsNullOrEmpty(ShellOrTerminal)) - App.RaiseException(workdir, $"Terminal is not specified! Please confirm that the correct shell/terminal has been configured."); - else - _backend.OpenTerminal(workdir); + _backend.OpenTerminal(workdir); } public static void OpenWithDefaultEditor(string file) @@ -175,69 +102,6 @@ namespace SourceGit.Native _backend.OpenWithDefaultEditor(file); } - public static string GetAbsPath(string root, string sub) - { - var fullpath = Path.Combine(root, sub); - if (OperatingSystem.IsWindows()) - return fullpath.Replace('/', '\\'); - - return fullpath; - } - - private static void UpdateGitVersion() - { - if (string.IsNullOrEmpty(_gitExecutable) || !File.Exists(_gitExecutable)) - { - GitVersionString = string.Empty; - GitVersion = new Version(0, 0, 0); - return; - } - - var start = new ProcessStartInfo(); - start.FileName = _gitExecutable; - start.Arguments = "--version"; - start.UseShellExecute = false; - start.CreateNoWindow = true; - start.RedirectStandardOutput = true; - start.RedirectStandardError = true; - start.StandardOutputEncoding = Encoding.UTF8; - start.StandardErrorEncoding = Encoding.UTF8; - - var proc = new Process() { StartInfo = start }; - try - { - proc.Start(); - - var rs = proc.StandardOutput.ReadToEnd(); - proc.WaitForExit(); - if (proc.ExitCode == 0 && !string.IsNullOrWhiteSpace(rs)) - { - GitVersionString = rs.Trim(); - - var match = REG_GIT_VERSION().Match(GitVersionString); - 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); - GitVersion = new Version(major, minor, build); - GitVersionString = GitVersionString.Substring(11).Trim(); - } - } - } - catch - { - // Ignore errors - } - - proc.Close(); - } - - [GeneratedRegex(@"^git version[\s\w]*(\d+)\.(\d+)[\.\-](\d+).*$")] - private static partial Regex REG_GIT_VERSION(); - private static IBackend _backend = null; - private static string _gitExecutable = string.Empty; - private static bool _enableSystemWindowFrame = false; } } diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs index 07cf51fb..04fe5e8b 100644 --- a/src/Native/Windows.cs +++ b/src/Native/Windows.cs @@ -8,20 +8,23 @@ using System.Text; using Avalonia; using Avalonia.Controls; -using Avalonia.Platform; -using Avalonia.Threading; +using Avalonia.Media; namespace SourceGit.Native { [SupportedOSPlatform("windows")] internal class Windows : OS.IBackend { - internal struct RECT + [StructLayout(LayoutKind.Sequential)] + internal struct RTL_OSVERSIONINFOEX { - public int left; - public int top; - public int right; - public int bottom; + internal uint dwOSVersionInfoSize; + internal uint dwMajorVersion; + internal uint dwMinorVersion; + internal uint dwBuildNumber; + internal uint dwPlatformId; + [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] + internal string szCSDVersion; } [StructLayout(LayoutKind.Sequential)] @@ -33,12 +36,15 @@ namespace SourceGit.Native public int cyBottomHeight; } - [DllImport("dwmapi.dll")] - private static extern int DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins); - [DllImport("shlwapi.dll", CharSet = CharSet.Unicode, SetLastError = false)] private static extern bool PathFindOnPath([In, Out] StringBuilder pszFile, [In] string[] ppszOtherDirs); + [DllImport("ntdll")] + private static extern int RtlGetVersion(ref RTL_OSVERSIONINFOEX lpVersionInformation); + + [DllImport("dwmapi.dll")] + private static extern int DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS margins); + [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = false)] private static extern IntPtr ILCreateFromPathW(string pszPath); @@ -48,77 +54,28 @@ namespace SourceGit.Native [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = false)] private static extern int SHOpenFolderAndSelectItems(IntPtr pidlFolder, int cild, IntPtr apidl, int dwFlags); - [DllImport("user32.dll")] - private static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect); + public Models.Shell Shell + { + get; + set; + } = Models.Shell.Default; public void SetupApp(AppBuilder builder) { - // Fix drop shadow issue on Windows 10 - if (!OperatingSystem.IsWindowsVersionAtLeast(10, 22000, 0)) + builder.With(new FontManagerOptions() { - Window.WindowStateProperty.Changed.AddClassHandler((w, _) => FixWindowFrameOnWin10(w)); - Control.LoadedEvent.AddClassHandler((w, _) => FixWindowFrameOnWin10(w)); - } - } - - public void SetupWindow(Window window) - { - window.ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome; - window.ExtendClientAreaToDecorationsHint = true; - window.Classes.Add("fix_maximized_padding"); - - Win32Properties.AddWndProcHookCallback(window, (IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam, ref bool handled) => - { - // Custom WM_NCHITTEST - if (msg == 0x0084) - { - handled = true; - - if (window.WindowState == WindowState.FullScreen || window.WindowState == WindowState.Maximized) - return 1; // HTCLIENT - - var p = IntPtrToPixelPoint(lParam); - GetWindowRect(hWnd, out var rcWindow); - - var borderThickness = (int)(4 * window.RenderScaling); - int y = 1; - int x = 1; - if (p.X >= rcWindow.left && p.X < rcWindow.left + borderThickness) - x = 0; - else if (p.X < rcWindow.right && p.X >= rcWindow.right - borderThickness) - x = 2; - - if (p.Y >= rcWindow.top && p.Y < rcWindow.top + borderThickness) - y = 0; - else if (p.Y < rcWindow.bottom && p.Y >= rcWindow.bottom - borderThickness) - y = 2; - - var zone = y * 3 + x; - switch (zone) - { - case 0: - return 13; // HTTOPLEFT - case 1: - return 12; // HTTOP - case 2: - return 14; // HTTOPRIGHT - case 3: - return 10; // HTLEFT - case 4: - return 1; // HTCLIENT - case 5: - return 11; // HTRIGHT - case 6: - return 16; // HTBOTTOMLEFT - case 7: - return 15; // HTBOTTOM - default: - return 17; // HTBOTTOMRIGHT - } - } - - return IntPtr.Zero; + DefaultFamilyName = "Microsoft YaHei UI", + FontFallbacks = [new FontFallback { FontFamily = "Microsoft YaHei" }], }); + + // Fix drop shadow issue on Windows 10 + RTL_OSVERSIONINFOEX v = new RTL_OSVERSIONINFOEX(); + v.dwOSVersionInfoSize = (uint)Marshal.SizeOf(); + if (RtlGetVersion(ref v) == 0 && (v.dwMajorVersion < 10 || v.dwBuildNumber < 22000)) + { + Window.WindowStateProperty.Changed.AddClassHandler((w, e) => ExtendWindowFrame(w)); + Window.LoadedEvent.AddClassHandler((w, e) => ExtendWindowFrame(w)); + } } public string FindGitExecutable() @@ -127,64 +84,25 @@ namespace SourceGit.Native Microsoft.Win32.RegistryHive.LocalMachine, Microsoft.Win32.RegistryView.Registry64); - var git = reg.OpenSubKey(@"SOFTWARE\GitForWindows"); - if (git?.GetValue("InstallPath") is string installPath) - return Path.Combine(installPath, "bin", "git.exe"); + var git = reg.OpenSubKey("SOFTWARE\\GitForWindows"); + if (git != null) + { + return Path.Combine(git.GetValue("InstallPath") as string, "bin", "git.exe"); + } var builder = new StringBuilder("git.exe", 259); if (!PathFindOnPath(builder, null)) + { return null; + } var exePath = builder.ToString(); if (!string.IsNullOrEmpty(exePath)) - return exePath; - - return null; - } - - public string FindTerminal(Models.ShellOrTerminal shell) - { - switch (shell.Type) { - case "git-bash": - if (string.IsNullOrEmpty(OS.GitExecutable)) - break; - - var binDir = Path.GetDirectoryName(OS.GitExecutable)!; - var bash = Path.Combine(binDir, "bash.exe"); - if (!File.Exists(bash)) - break; - - return bash; - case "pwsh": - var localMachine = Microsoft.Win32.RegistryKey.OpenBaseKey( - Microsoft.Win32.RegistryHive.LocalMachine, - Microsoft.Win32.RegistryView.Registry64); - - var pwsh = localMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\pwsh.exe"); - if (pwsh != null) - { - var path = pwsh.GetValue(null) as string; - if (File.Exists(path)) - return path; - } - - var pwshFinder = new StringBuilder("powershell.exe", 512); - if (PathFindOnPath(pwshFinder, null)) - return pwshFinder.ToString(); - - break; - case "cmd": - return @"C:\Windows\System32\cmd.exe"; - case "wt": - var wtFinder = new StringBuilder("wt.exe", 512); - if (PathFindOnPath(wtFinder, null)) - return wtFinder.ToString(); - - break; + return exePath; } - return string.Empty; + return null; } public List FindExternalTools() @@ -192,60 +110,91 @@ namespace SourceGit.Native var finder = new Models.ExternalToolsFinder(); finder.VSCode(FindVSCode); finder.VSCodeInsiders(FindVSCodeInsiders); - finder.VSCodium(FindVSCodium); - finder.Fleet(() => $@"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\Programs\Fleet\Fleet.exe"); - finder.FindJetBrainsFromToolbox(() => $@"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\JetBrains\Toolbox"); + finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\Programs\\Fleet\\Fleet.exe"); finder.SublimeText(FindSublimeText); - finder.TryAdd("Visual Studio", "vs", FindVisualStudio, GenerateCommandlineArgsForVisualStudio); return finder.Founded; } public void OpenBrowser(string url) { - var info = new ProcessStartInfo("cmd", $"/c start \"\" \"{url}\""); + var info = new ProcessStartInfo("cmd", $"/c start {url}"); info.CreateNoWindow = true; Process.Start(info); } public void OpenTerminal(string workdir) { - if (!File.Exists(OS.ShellOrTerminal)) + if (string.IsNullOrEmpty(workdir) || !Path.Exists(workdir)) { - App.RaiseException(workdir, $"Terminal is not specified! Please confirm that the correct shell/terminal has been configured."); - return; + workdir = "."; } var startInfo = new ProcessStartInfo(); startInfo.WorkingDirectory = workdir; - startInfo.FileName = OS.ShellOrTerminal; - // Directly launching `Windows Terminal` need to specify the `-d` parameter - if (OS.ShellOrTerminal.EndsWith("wt.exe", StringComparison.OrdinalIgnoreCase)) - startInfo.Arguments = $"-d \"{workdir}\""; + switch (Shell) + { + case Models.Shell.Default: + var binDir = Path.GetDirectoryName(OS.GitExecutable); + var bash = Path.Combine(binDir, "bash.exe"); + if (!File.Exists(bash)) + { + App.RaiseException(workdir, $"Can NOT found bash.exe under '{binDir}'"); + return; + } + + startInfo.FileName = bash; + break; + case Models.Shell.PowerShell: + startInfo.FileName = ChoosePowerShell(); + startInfo.Arguments = startInfo.FileName.EndsWith("pswd.exe") ? $"-WorkingDirectory \"{workdir}\" -Nologo" : "-Nologo"; + break; + case Models.Shell.CommandPrompt: + startInfo.FileName = "cmd"; + break; + case Models.Shell.DefaultShellOfWindowsTerminal: + var wt = FindWindowsTerminalApp(); + if (!File.Exists(wt)) + { + App.RaiseException(workdir, $"Can NOT found wt.exe on your system!"); + return; + } + + startInfo.FileName = FindWindowsTerminalApp(); + startInfo.Arguments = $"-d \"{workdir}\""; + break; + default: + App.RaiseException(workdir, $"Bad shell configuration!"); + return; + } Process.Start(startInfo); } public void OpenInFileManager(string path, bool select) { - string fullpath; + var fullpath = string.Empty; if (File.Exists(path)) { fullpath = new FileInfo(path).FullName; + + // For security reason, we never execute a file. + // Instead, we open the folder and select it. select = true; } else { - fullpath = new DirectoryInfo(path!).FullName; - fullpath += Path.DirectorySeparatorChar; + fullpath = new DirectoryInfo(path).FullName; } if (select) { + // The fullpath here may be a file or a folder. OpenFolderAndSelectFile(fullpath); } else { + // The fullpath here is always a folder. Process.Start(new ProcessStartInfo(fullpath) { UseShellExecute = true, @@ -257,30 +206,65 @@ namespace SourceGit.Native public void OpenWithDefaultEditor(string file) { var info = new FileInfo(file); - var start = new ProcessStartInfo("cmd", $"/c start \"\" \"{info.FullName}\""); + var start = new ProcessStartInfo("cmd", $"/c start {info.FullName}"); start.CreateNoWindow = true; Process.Start(start); } - private void FixWindowFrameOnWin10(Window w) + private void ExtendWindowFrame(Window w) { - // Schedule the DWM frame extension to run in the next render frame - // to ensure proper timing with the window initialization sequence - Dispatcher.UIThread.InvokeAsync(() => - { - var platformHandle = w.TryGetPlatformHandle(); - if (platformHandle == null) - return; + var platformHandle = w.TryGetPlatformHandle(); + if (platformHandle == null) + return; - var margins = new MARGINS { cxLeftWidth = 1, cxRightWidth = 1, cyTopHeight = 1, cyBottomHeight = 1 }; - DwmExtendFrameIntoClientArea(platformHandle.Handle, ref margins); - }, DispatcherPriority.Render); + var margins = new MARGINS { cxLeftWidth = 1, cxRightWidth = 1, cyTopHeight = 1, cyBottomHeight = 1 }; + DwmExtendFrameIntoClientArea(platformHandle.Handle, ref margins); } - private PixelPoint IntPtrToPixelPoint(IntPtr param) + // There are two versions of PowerShell : pwsh.exe (preferred) and powershell.exe (system default) + private string ChoosePowerShell() { - var v = IntPtr.Size == 4 ? param.ToInt32() : (int)(param.ToInt64() & 0xFFFFFFFF); - return new PixelPoint((short)(v & 0xffff), (short)(v >> 16)); + if (!string.IsNullOrEmpty(_powershellPath)) + return _powershellPath; + + var localMachine = Microsoft.Win32.RegistryKey.OpenBaseKey( + Microsoft.Win32.RegistryHive.LocalMachine, + Microsoft.Win32.RegistryView.Registry64); + + var pwsh = localMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\pwsh.exe"); + if (pwsh != null) + { + var path = pwsh.GetValue(null) as string; + if (File.Exists(path)) + { + _powershellPath = path; + return _powershellPath; + } + } + + var finder = new StringBuilder("powershell.exe", 512); + if (PathFindOnPath(finder, null)) + { + _powershellPath = finder.ToString(); + return _powershellPath; + } + + return string.Empty; + } + + private string FindWindowsTerminalApp() + { + if (!string.IsNullOrEmpty(_wtPath)) + return _wtPath; + + var finder = new StringBuilder("wt.exe", 512); + if (PathFindOnPath(finder, null)) + { + _wtPath = finder.ToString(); + return _wtPath; + } + + return string.Empty; } #region EXTERNAL_EDITOR_FINDER @@ -293,7 +277,9 @@ namespace SourceGit.Native // VSCode (system) var systemVScode = localMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1"); if (systemVScode != null) + { return systemVScode.GetValue("DisplayIcon") as string; + } var currentUser = Microsoft.Win32.RegistryKey.OpenBaseKey( Microsoft.Win32.RegistryHive.CurrentUser, @@ -302,7 +288,9 @@ namespace SourceGit.Native // VSCode (user) var vscode = currentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1"); if (vscode != null) + { return vscode.GetValue("DisplayIcon") as string; + } return string.Empty; } @@ -316,7 +304,9 @@ namespace SourceGit.Native // VSCode - Insiders (system) var systemVScodeInsiders = localMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1"); if (systemVScodeInsiders != null) + { return systemVScodeInsiders.GetValue("DisplayIcon") as string; + } var currentUser = Microsoft.Win32.RegistryKey.OpenBaseKey( Microsoft.Win32.RegistryHive.CurrentUser, @@ -325,30 +315,9 @@ namespace SourceGit.Native // VSCode - Insiders (user) var vscodeInsiders = currentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{217B4C08-948D-4276-BFBB-BEE930AE5A2C}_is1"); if (vscodeInsiders != null) + { return vscodeInsiders.GetValue("DisplayIcon") as string; - - return string.Empty; - } - - private string FindVSCodium() - { - var localMachine = Microsoft.Win32.RegistryKey.OpenBaseKey( - Microsoft.Win32.RegistryHive.LocalMachine, - Microsoft.Win32.RegistryView.Registry64); - - // VSCodium (system) - var systemVSCodium = localMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{88DA3577-054F-4CA1-8122-7D820494CFFB}_is1"); - if (systemVSCodium != null) - return systemVSCodium.GetValue("DisplayIcon") as string; - - var currentUser = Microsoft.Win32.RegistryKey.OpenBaseKey( - Microsoft.Win32.RegistryHive.CurrentUser, - Microsoft.Win32.RegistryView.Registry64); - - // VSCodium (user) - var vscodium = currentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E1F05D1-C245-4562-81EE-28188DB6FD17}_is1"); - if (vscodium != null) - return vscodium.GetValue("DisplayIcon") as string; + } return string.Empty; } @@ -364,7 +333,7 @@ namespace SourceGit.Native if (sublime != null) { var icon = sublime.GetValue("DisplayIcon") as string; - return Path.Combine(Path.GetDirectoryName(icon)!, "subl.exe"); + return Path.Combine(Path.GetDirectoryName(icon), "subl.exe"); } // Sublime Text 3 @@ -372,26 +341,7 @@ namespace SourceGit.Native if (sublime3 != null) { var icon = sublime3.GetValue("DisplayIcon") as string; - return Path.Combine(Path.GetDirectoryName(icon)!, "subl.exe"); - } - - return string.Empty; - } - - private string FindVisualStudio() - { - var localMachine = Microsoft.Win32.RegistryKey.OpenBaseKey( - Microsoft.Win32.RegistryHive.LocalMachine, - Microsoft.Win32.RegistryView.Registry64); - - // Get default class for VisualStudio.Launcher.sln - the handler for *.sln files - if (localMachine.OpenSubKey(@"SOFTWARE\Classes\VisualStudio.Launcher.sln\CLSID") is Microsoft.Win32.RegistryKey launcher) - { - // Get actual path to the executable - if (launcher.GetValue(string.Empty) is string CLSID && - localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv && - devenv.GetValue(string.Empty) is string localServer32) - return localServer32!.Trim('\"'); + return Path.Combine(Path.GetDirectoryName(icon), "subl.exe"); } return string.Empty; @@ -412,33 +362,7 @@ namespace SourceGit.Native } } - private string GenerateCommandlineArgsForVisualStudio(string repo) - { - var sln = FindVSSolutionFile(new DirectoryInfo(repo), 4); - return string.IsNullOrEmpty(sln) ? $"\"{repo}\"" : $"\"{sln}\""; - } - - private string FindVSSolutionFile(DirectoryInfo dir, int leftDepth) - { - var files = dir.GetFiles(); - foreach (var f in files) - { - if (f.Name.EndsWith(".sln", StringComparison.OrdinalIgnoreCase)) - return f.FullName; - } - - if (leftDepth <= 0) - return null; - - var subDirs = dir.GetDirectories(); - foreach (var subDir in subDirs) - { - var first = FindVSSolutionFile(subDir, leftDepth - 1); - if (!string.IsNullOrEmpty(first)) - return first; - } - - return null; - } + private string _powershellPath = string.Empty; + private string _wtPath = string.Empty; } } diff --git a/src/Resources/Images/ExternalToolIcons/beyond_compare.png b/src/Resources/ExternalToolIcons/beyond_compare.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/beyond_compare.png rename to src/Resources/ExternalToolIcons/beyond_compare.png diff --git a/src/Resources/ExternalToolIcons/custom_diff.png b/src/Resources/ExternalToolIcons/custom_diff.png new file mode 100644 index 00000000..8d046a2f Binary files /dev/null and b/src/Resources/ExternalToolIcons/custom_diff.png differ diff --git a/src/Resources/Images/ExternalToolIcons/fleet.png b/src/Resources/ExternalToolIcons/fleet.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/fleet.png rename to src/Resources/ExternalToolIcons/fleet.png diff --git a/src/Resources/Images/ExternalToolIcons/kdiff3.png b/src/Resources/ExternalToolIcons/kdiff3.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/kdiff3.png rename to src/Resources/ExternalToolIcons/kdiff3.png diff --git a/src/Resources/Images/ExternalToolIcons/meld.png b/src/Resources/ExternalToolIcons/meld.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/meld.png rename to src/Resources/ExternalToolIcons/meld.png diff --git a/src/Resources/Images/ExternalToolIcons/sublime_text.png b/src/Resources/ExternalToolIcons/sublime_text.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/sublime_text.png rename to src/Resources/ExternalToolIcons/sublime_text.png diff --git a/src/Resources/Images/ExternalToolIcons/tortoise_merge.png b/src/Resources/ExternalToolIcons/tortoise_merge.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/tortoise_merge.png rename to src/Resources/ExternalToolIcons/tortoise_merge.png diff --git a/src/Resources/Images/ExternalToolIcons/vs.png b/src/Resources/ExternalToolIcons/vs.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/vs.png rename to src/Resources/ExternalToolIcons/vs.png diff --git a/src/Resources/Images/ExternalToolIcons/vscode.png b/src/Resources/ExternalToolIcons/vscode.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/vscode.png rename to src/Resources/ExternalToolIcons/vscode.png diff --git a/src/Resources/Images/ExternalToolIcons/vscode_insiders.png b/src/Resources/ExternalToolIcons/vscode_insiders.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/vscode_insiders.png rename to src/Resources/ExternalToolIcons/vscode_insiders.png diff --git a/src/Resources/Images/ExternalToolIcons/win_merge.png b/src/Resources/ExternalToolIcons/win_merge.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/win_merge.png rename to src/Resources/ExternalToolIcons/win_merge.png diff --git a/src/Resources/Images/ExternalToolIcons/xcode.png b/src/Resources/ExternalToolIcons/xcode.png similarity index 100% rename from src/Resources/Images/ExternalToolIcons/xcode.png rename to src/Resources/ExternalToolIcons/xcode.png diff --git a/src/Resources/Grammars/haxe.json b/src/Resources/Grammars/haxe.json deleted file mode 100644 index 3f78154d..00000000 --- a/src/Resources/Grammars/haxe.json +++ /dev/null @@ -1,2490 +0,0 @@ -{ - "information_for_contributors": [ - "This file has been copied from https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/haxe.tmLanguage", - "and converted to JSON using https://marketplace.visualstudio.com/items?itemName=pedro-w.tmlanguage", - "The original file was licensed under the MIT License", - "https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md" - ], - "fileTypes": [ - "hx", - "dump" - ], - "name": "Haxe", - "scopeName": "source.hx", - "uuid": "67c72f9f-862c-4e48-8951-dcc22c0bb4ea", - "patterns": [ - { - "include": "#all" - } - ], - "repository": { - "all": { - "patterns": [ - { - "include": "#global" - }, - { - "include": "#package" - }, - { - "include": "#import" - }, - { - "include": "#using" - }, - { - "match": "\\b(final)\\b(?=\\s+(class|interface|extern|private)\\b)", - "name": "storage.modifier.hx" - }, - { - "include": "#abstract" - }, - { - "include": "#class" - }, - { - "include": "#enum" - }, - { - "include": "#interface" - }, - { - "include": "#typedef" - }, - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "global": { - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#conditional-compilation" - } - ] - }, - "block": { - "begin": "\\{", - "beginCaptures": { - "0": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "end": "\\}", - "endCaptures": { - "0": { - "name": "punctuation.definition.block.end.hx" - } - }, - "patterns": [ - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "block-contents": { - "patterns": [ - { - "include": "#global" - }, - { - "include": "#regex" - }, - { - "include": "#array" - }, - { - "include": "#constants" - }, - { - "include": "#strings" - }, - { - "include": "#metadata" - }, - { - "include": "#method" - }, - { - "include": "#variable" - }, - { - "include": "#modifiers" - }, - { - "include": "#new-expr" - }, - { - "include": "#for-loop" - }, - { - "include": "#keywords" - }, - { - "include": "#arrow-function" - }, - { - "include": "#method-call" - }, - { - "include": "#enum-constructor-call" - }, - { - "include": "#punctuation-braces" - }, - { - "include": "#macro-reification" - }, - { - "include": "#operators" - }, - { - "include": "#operator-assignment" - }, - { - "include": "#punctuation-terminator" - }, - { - "include": "#punctuation-comma" - }, - { - "include": "#punctuation-accessor" - }, - { - "include": "#identifiers" - } - ] - }, - "identifiers": { - "patterns": [ - { - "include": "#constant-name" - }, - { - "include": "#type-name" - }, - { - "include": "#identifier-name" - } - ] - }, - "package": { - "begin": "package\\b", - "beginCaptures": { - "0": { - "name": "keyword.other.package.hx" - } - }, - "end": "$|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "patterns": [ - { - "include": "#type-path" - }, - { - "include": "#type-path-package-name" - } - ] - }, - "using": { - "begin": "using\\b", - "beginCaptures": { - "0": { - "name": "keyword.other.using.hx" - } - }, - "end": "$|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "patterns": [ - { - "include": "#type-path" - }, - { - "include": "#type-path-package-name" - } - ] - }, - "import": { - "begin": "import\\b", - "beginCaptures": { - "0": { - "name": "keyword.control.import.hx" - } - }, - "end": "$|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "patterns": [ - { - "include": "#type-path" - }, - { - "match": "\\b(as)\\b", - "name": "keyword.control.as.hx" - }, - { - "match": "\\b(in)\\b", - "name": "keyword.control.in.hx" - }, - { - "match": "\\*", - "name": "constant.language.import-all.hx" - }, - { - "match": "\\b([_A-Za-z]\\w*)\\b(?=\\s*(as|in|$|(;)))", - "name": "variable.other.hxt" - }, - { - "include": "#type-path-package-name" - } - ] - }, - "type-path": { - "patterns": [ - { - "include": "#global" - }, - { - "include": "#punctuation-accessor" - }, - { - "include": "#type-path-type-name" - } - ] - }, - "type-path-type-name": { - "match": "\\b(_*[A-Z]\\w*)\\b", - "name": "entity.name.type.hx" - }, - "type-path-package-name": { - "match": "\\b([_A-Za-z]\\w*)\\b", - "name": "support.package.hx" - }, - "abstract": { - "begin": "(?=abstract\\s+[A-Z])", - "end": "(?<=\\})|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "name": "meta.abstract.hx", - "patterns": [ - { - "include": "#abstract-name" - }, - { - "include": "#abstract-name-post" - }, - { - "include": "#abstract-block" - } - ] - }, - "abstract-name": { - "begin": "\\b(abstract)\\b", - "beginCaptures": { - "1": { - "name": "storage.type.class.hx" - } - }, - "end": "([_A-Za-z]\\w*)", - "endCaptures": { - "1": { - "name": "entity.name.type.class.hx" - } - }, - "patterns": [ - { - "include": "#global" - } - ] - }, - "abstract-name-post": { - "begin": "(?<=\\w)", - "end": "([\\{;])", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "patterns": [ - { - "include": "#global" - }, - { - "match": "\\b(from|to)\\b", - "name": "keyword.other.hx" - }, - { - "include": "#type" - }, - { - "match": "[\\(\\)]", - "name": "punctuation.definition.other.hx" - } - ] - }, - "abstract-block": { - "begin": "(?<=\\{)", - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.end.hx" - } - }, - "name": "meta.block.hx", - "patterns": [ - { - "include": "#method" - }, - { - "include": "#modifiers" - }, - { - "include": "#variable" - }, - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "class": { - "begin": "(?=class)", - "end": "(?<=\\})|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "name": "meta.class.hx", - "patterns": [ - { - "include": "#class-name" - }, - { - "include": "#class-name-post" - }, - { - "include": "#class-block" - } - ] - }, - "class-name": { - "begin": "\\b(class)\\b", - "beginCaptures": { - "1": { - "name": "storage.type.class.hx" - } - }, - "end": "([_A-Za-z]\\w*)", - "endCaptures": { - "1": { - "name": "entity.name.type.class.hx" - } - }, - "name": "meta.class.identifier.hx", - "patterns": [ - { - "include": "#global" - } - ] - }, - "class-name-post": { - "begin": "(?<=\\w)", - "end": "([\\{;])", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "patterns": [ - { - "include": "#modifiers-inheritance" - }, - { - "include": "#type" - } - ] - }, - "class-block": { - "begin": "(?<=\\{)", - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.end.hx" - } - }, - "name": "meta.block.hx", - "patterns": [ - { - "include": "#method" - }, - { - "include": "#modifiers" - }, - { - "include": "#variable" - }, - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "enum": { - "begin": "(?=enum\\s+[A-Z])", - "end": "(?<=\\})|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "name": "meta.enum.hx", - "patterns": [ - { - "include": "#enum-name" - }, - { - "include": "#enum-name-post" - }, - { - "include": "#enum-block" - } - ] - }, - "enum-name": { - "begin": "\\b(enum)\\b", - "beginCaptures": { - "1": { - "name": "storage.type.class.hx" - } - }, - "end": "([_A-Za-z]\\w*)", - "endCaptures": { - "1": { - "name": "entity.name.type.class.hx" - } - }, - "patterns": [ - { - "include": "#global" - } - ] - }, - "enum-name-post": { - "begin": "(?<=\\w)", - "end": "([\\{;])", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "patterns": [ - { - "include": "#type" - } - ] - }, - "enum-block": { - "begin": "(?<=\\{)", - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.end.hx" - } - }, - "name": "meta.block.hx", - "patterns": [ - { - "include": "#global" - }, - { - "include": "#metadata" - }, - { - "include": "#parameters" - }, - { - "include": "#identifiers" - } - ] - }, - "interface": { - "begin": "(?=interface)", - "end": "(?<=\\})|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "name": "meta.interface.hx", - "patterns": [ - { - "include": "#interface-name" - }, - { - "include": "#interface-name-post" - }, - { - "include": "#interface-block" - } - ] - }, - "interface-name": { - "begin": "\\b(interface)\\b", - "beginCaptures": { - "1": { - "name": "storage.type.class.hx" - } - }, - "end": "([_A-Za-z]\\w*)", - "endCaptures": { - "1": { - "name": "entity.name.type.class.hx" - } - }, - "patterns": [ - { - "include": "#global" - } - ] - }, - "interface-name-post": { - "begin": "(?<=\\w)", - "end": "([\\{;])", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "patterns": [ - { - "include": "#global" - }, - { - "include": "#modifiers-inheritance" - }, - { - "include": "#type" - } - ] - }, - "interface-block": { - "begin": "(?<=\\{)", - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.end.hx" - } - }, - "name": "meta.block.hx", - "patterns": [ - { - "include": "#method" - }, - { - "include": "#variable" - }, - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "typedef": { - "begin": "(?=typedef)", - "end": "(?<=\\})|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "name": "meta.typedef.hx", - "patterns": [ - { - "include": "#typedef-name" - }, - { - "include": "#typedef-name-post" - }, - { - "include": "#typedef-block" - } - ] - }, - "typedef-name": { - "begin": "\\b(typedef)\\b", - "beginCaptures": { - "1": { - "name": "storage.type.class.hx" - } - }, - "end": "([_A-Za-z]\\w*)", - "endCaptures": { - "1": { - "name": "entity.name.type.class.hx" - } - }, - "patterns": [ - { - "include": "#global" - } - ] - }, - "typedef-name-post": { - "begin": "(?<=\\w)", - "end": "(\\{)|(?=;)", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "patterns": [ - { - "include": "#global" - }, - { - "include": "#punctuation-brackets" - }, - { - "include": "#punctuation-separator" - }, - { - "include": "#operator-assignment" - }, - { - "include": "#type" - } - ] - }, - "typedef-block": { - "begin": "(?<=\\{)", - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.end.hx" - } - }, - "name": "meta.block.hx", - "patterns": [ - { - "include": "#global" - }, - { - "include": "#metadata" - }, - { - "include": "#method" - }, - { - "include": "#variable" - }, - { - "include": "#modifiers" - }, - { - "include": "#punctuation-comma" - }, - { - "include": "#operator-optional" - }, - { - "include": "#typedef-extension" - }, - { - "include": "#typedef-simple-field-type-hint" - }, - { - "include": "#identifier-name" - }, - { - "include": "#strings" - } - ] - }, - "typedef-extension": { - "begin": ">", - "end": ",|$", - "patterns": [ - { - "include": "#type" - } - ] - }, - "typedef-simple-field-type-hint": { - "begin": ":", - "beginCaptures": { - "0": { - "name": "keyword.operator.type.annotation.hx" - } - }, - "end": "(?=\\}|,|;)", - "patterns": [ - { - "include": "#type" - } - ] - }, - "regex": { - "begin": "(~/)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.string.begin.hx" - } - }, - "end": "(/)([gimsu]*)", - "endCaptures": { - "1": { - "name": "punctuation.definition.string.end.hx" - }, - "2": { - "name": "keyword.other.hx" - } - }, - "name": "string.regexp.hx", - "patterns": [ - { - "include": "#regexp" - } - ] - }, - "regex-character-class": { - "patterns": [ - { - "match": "\\\\[wWsSdDtrnvf]|\\.", - "name": "constant.other.character-class.regexp" - }, - { - "match": "\\\\([0-7]{3}|x\\h\\h|u\\h\\h\\h\\h)", - "name": "constant.character.numeric.regexp" - }, - { - "match": "\\\\c[A-Z]", - "name": "constant.character.control.regexp" - }, - { - "match": "\\\\.", - "name": "constant.character.escape.backslash.regexp" - } - ] - }, - "regexp": { - "patterns": [ - { - "match": "\\\\[bB]|\\^|\\$", - "name": "keyword.control.anchor.regexp" - }, - { - "match": "\\\\[1-9]\\d*", - "name": "keyword.other.back-reference.regexp" - }, - { - "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??", - "name": "keyword.operator.quantifier.regexp" - }, - { - "match": "\\|", - "name": "keyword.operator.or.regexp" - }, - { - "begin": "(\\()((\\?=)|(\\?!))", - "beginCaptures": { - "1": { - "name": "punctuation.definition.group.regexp" - }, - "2": { - "name": "punctuation.definition.group.assertion.regexp" - }, - "3": { - "name": "meta.assertion.look-ahead.regexp" - }, - "4": { - "name": "meta.assertion.negative-look-ahead.regexp" - } - }, - "end": "(\\))", - "endCaptures": { - "1": { - "name": "punctuation.definition.group.regexp" - } - }, - "name": "meta.group.assertion.regexp", - "patterns": [ - { - "include": "#regexp" - } - ] - }, - { - "begin": "\\((\\?:)?", - "beginCaptures": { - "0": { - "name": "punctuation.definition.group.regexp" - }, - "1": { - "name": "punctuation.definition.group.capture.regexp" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.group.regexp" - } - }, - "name": "meta.group.regexp", - "patterns": [ - { - "include": "#regexp" - } - ] - }, - { - "begin": "(\\[)(\\^)?", - "beginCaptures": { - "1": { - "name": "punctuation.definition.character-class.regexp" - }, - "2": { - "name": "keyword.operator.negation.regexp" - } - }, - "end": "(\\])", - "endCaptures": { - "1": { - "name": "punctuation.definition.character-class.regexp" - } - }, - "name": "constant.other.character-class.set.regexp", - "patterns": [ - { - "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))", - "captures": { - "1": { - "name": "constant.character.numeric.regexp" - }, - "2": { - "name": "constant.character.control.regexp" - }, - "3": { - "name": "constant.character.escape.backslash.regexp" - }, - "4": { - "name": "constant.character.numeric.regexp" - }, - "5": { - "name": "constant.character.control.regexp" - }, - "6": { - "name": "constant.character.escape.backslash.regexp" - } - }, - "name": "constant.other.character-class.range.regexp" - }, - { - "include": "#regex-character-class" - } - ] - }, - { - "include": "#regex-character-class" - } - ] - }, - "array": { - "begin": "\\[", - "beginCaptures": { - "0": { - "name": "punctuation.definition.array.begin.hx" - } - }, - "end": "\\]", - "endCaptures": { - "0": { - "name": "punctuation.definition.array.end.hx" - } - }, - "name": "meta.array.literal.hx", - "patterns": [ - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "constants": { - "patterns": [ - { - "match": "\\b(true|false|null)\\b", - "name": "constant.language.hx" - }, - { - "match": "\\b(?:0[xX][0-9a-fA-F][_0-9a-fA-F]*([iu][0-9][0-9_]*)?)\\b", - "captures": { - "0": { - "name": "constant.numeric.hex.hx" - }, - "1": { - "name": "constant.numeric.suffix.hx" - } - } - }, - { - "match": "\\b(?:0[bB][01][_01]*([iu][0-9][0-9_]*)?)\\b", - "captures": { - "0": { - "name": "constant.numeric.bin.hx" - }, - "1": { - "name": "constant.numeric.suffix.hx" - } - } - }, - { - "match": "(?x)\n(?])", - "end": "(\\{)|(;)", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - }, - "2": { - "name": "punctuation.terminator.hx" - } - }, - "patterns": [ - { - "include": "#parameters" - }, - { - "include": "#method-return-type-hint" - }, - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "method-block": { - "begin": "(?<=\\{)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "end": "(\\})", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.end.hx" - } - }, - "name": "meta.method.block.hx", - "patterns": [ - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "parameters": { - "begin": "\\(", - "beginCaptures": { - "0": { - "name": "punctuation.definition.parameters.begin.hx" - } - }, - "end": "\\s*(\\)(?!\\s*->))", - "endCaptures": { - "1": { - "name": "punctuation.definition.parameters.end.hx" - } - }, - "name": "meta.parameters.hx", - "patterns": [ - { - "include": "#parameter" - } - ] - }, - "parameter": { - "begin": "(?<=\\(|,)", - "end": "(?=\\)(?!\\s*->)|,)", - "patterns": [ - { - "include": "#parameter-name" - }, - { - "include": "#parameter-type-hint" - }, - { - "include": "#parameter-assign" - }, - { - "include": "#punctuation-comma" - }, - { - "include": "#global" - } - ] - }, - "parameter-name": { - "begin": "(?<=\\(|,)", - "end": "([_a-zA-Z]\\w*)", - "endCaptures": { - "1": { - "name": "variable.parameter.hx" - } - }, - "patterns": [ - { - "include": "#global" - }, - { - "include": "#metadata" - }, - { - "include": "#operator-optional" - } - ] - }, - "parameter-type-hint": { - "begin": ":", - "beginCaptures": { - "0": { - "name": "keyword.operator.type.annotation.hx" - } - }, - "end": "(?=\\)(?!\\s*->)|,|=)", - "patterns": [ - { - "include": "#type" - } - ] - }, - "parameter-assign": { - "begin": "=", - "beginCaptures": { - "0": { - "name": "keyword.operator.assignment.hx" - } - }, - "end": "(?=\\)|,)", - "patterns": [ - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "arrow-function": { - "begin": "(\\()(?=[^(]*?\\)\\s*->)", - "beginCaptures": { - "1": { - "name": "punctuation.definition.parameters.begin.hx" - } - }, - "end": "(\\))\\s*(->)", - "endCaptures": { - "1": { - "name": "punctuation.definition.parameters.end.hx" - }, - "2": { - "name": "storage.type.function.arrow.hx" - } - }, - "name": "meta.method.arrow.hx", - "patterns": [ - { - "include": "#arrow-function-parameter" - } - ] - }, - "arrow-function-parameter": { - "begin": "(?<=\\(|,)", - "end": "(?=\\)|,)", - "patterns": [ - { - "include": "#parameter-name" - }, - { - "include": "#arrow-function-parameter-type-hint" - }, - { - "include": "#parameter-assign" - }, - { - "include": "#punctuation-comma" - }, - { - "include": "#global" - } - ] - }, - "arrow-function-parameter-type-hint": { - "begin": ":", - "beginCaptures": { - "0": { - "name": "keyword.operator.type.annotation.hx" - } - }, - "end": "(?=\\)|,|=)", - "patterns": [ - { - "include": "#type" - } - ] - }, - "method-return-type-hint": { - "begin": "(?<=\\))\\s*(:)", - "beginCaptures": { - "1": { - "name": "keyword.operator.type.annotation.hx" - } - }, - "end": "(?=\\{|;|[a-z0-9])", - "patterns": [ - { - "include": "#type" - } - ] - }, - "operator-optional": { - "match": "(\\?)(?!\\s)", - "name": "keyword.operator.optional.hx" - }, - "variable": { - "begin": "(?=\\b(var|final)\\b)", - "end": "(?=$)|(;)", - "endCaptures": { - "1": { - "name": "punctuation.terminator.hx" - } - }, - "patterns": [ - { - "include": "#variable-name" - }, - { - "include": "#variable-name-next" - }, - { - "include": "#variable-assign" - }, - { - "include": "#variable-name-post" - } - ] - }, - "variable-name": { - "begin": "\\b(var|final)\\b", - "beginCaptures": { - "1": { - "name": "storage.type.variable.hx" - } - }, - "end": "(?=$)|([_a-zA-Z]\\w*)", - "endCaptures": { - "1": { - "name": "variable.other.hx" - } - }, - "patterns": [ - { - "include": "#operator-optional" - } - ] - }, - "variable-name-next": { - "begin": ",", - "beginCaptures": { - "0": { - "name": "punctuation.separator.comma.hx" - } - }, - "end": "([_a-zA-Z]\\w*)", - "endCaptures": { - "1": { - "name": "variable.other.hx" - } - }, - "patterns": [ - { - "include": "#global" - } - ] - }, - "variable-type-hint": { - "begin": ":", - "beginCaptures": { - "0": { - "name": "keyword.operator.type.annotation.hx" - } - }, - "end": "(?=$|;|,|=)", - "patterns": [ - { - "include": "#type" - } - ] - }, - "variable-assign": { - "begin": "=", - "beginCaptures": { - "0": { - "name": "keyword.operator.assignment.hx" - } - }, - "end": "(?=;|,)", - "patterns": [ - { - "include": "#block" - }, - { - "include": "#block-contents" - } - ] - }, - "variable-name-post": { - "begin": "(?<=\\w)", - "end": "(?=;)|(?==)", - "patterns": [ - { - "include": "#variable-accessors" - }, - { - "include": "#variable-type-hint" - }, - { - "include": "#block-contents" - } - ] - }, - "variable-accessors": { - "begin": "\\(", - "beginCaptures": { - "0": { - "name": "punctuation.definition.parameters.begin.hx" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.parameters.end.hx" - } - }, - "name": "meta.parameters.hx", - "patterns": [ - { - "include": "#global" - }, - { - "include": "#keywords-accessor" - }, - { - "include": "#accessor-method" - }, - { - "include": "#punctuation-comma" - } - ] - }, - "keywords-accessor": { - "match": "\\b(default|get|set|dynamic|never|null)\\b", - "name": "storage.type.property.hx" - }, - "accessor-method": { - "patterns": [ - { - "match": "\\b(get|set)_[_A-Za-z]\\w*\\b", - "name": "entity.name.function.hx" - } - ] - }, - "modifiers": { - "patterns": [ - { - "match": "\\b(enum)\\b", - "name": "storage.type.class" - }, - { - "match": "\\b(public|private|static|dynamic|inline|macro|extern|override|overload|abstract)\\b", - "name": "storage.modifier.hx" - }, - { - "match": "\\b(final)\\b(?=\\s+(public|private|static|dynamic|inline|macro|extern|override|overload|abstract|function))", - "name": "storage.modifier.hx" - } - ] - }, - "new-expr": { - "name": "new.expr.hx", - "begin": "(?", - "name": "keyword.operator.extractor.hx" - }, - { - "include": "#operator-assignment" - }, - { - "include": "#punctuation-comma" - }, - { - "include": "#keywords" - }, - { - "include": "#method-call" - }, - { - "include": "#identifiers" - } - ] - }, - { - "match": "\\b(if|else|return|do|while|for|break|continue|switch|case|default)\\b", - "name": "keyword.control.flow-control.hx" - }, - { - "match": "\\b(cast|untyped)\\b", - "name": "keyword.other.untyped.hx" - }, - { - "match": "\\btrace\\b", - "name": "keyword.other.trace.hx" - }, - { - "match": "\\$type\\b", - "name": "keyword.other.type.hx" - }, - { - "match": "\\__(global|this)__\\b", - "name": "keyword.other.untyped-property.hx" - }, - { - "match": "\\b(this|super)\\b", - "name": "variable.language.hx" - }, - { - "match": "\\bnew\\b", - "name": "keyword.operator.new.hx" - }, - { - "match": "\\b(abstract|class|enum|interface|typedef)\\b", - "name": "storage.type.hx" - }, - { - "match": "->", - "name": "storage.type.function.arrow.hx" - }, - { - "include": "#modifiers" - }, - { - "include": "#modifiers-inheritance" - } - ] - }, - "punctuation-braces": { - "begin": "\\(", - "beginCaptures": { - "0": { - "name": "meta.brace.round.hx" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "meta.brace.round.hx" - } - }, - "patterns": [ - { - "include": "#keywords" - }, - { - "include": "#block" - }, - { - "include": "#block-contents" - }, - { - "include": "#type-check" - } - ] - }, - "type-check": { - "begin": "(?>>|<<|>>)", - "name": "keyword.operator.bitwise.hx" - }, - { - "match": "(==|!=|<=|>=|<|>)", - "name": "keyword.operator.comparison.hx" - }, - { - "match": "(!)", - "name": "keyword.operator.logical.hx" - }, - { - "match": "(\\-\\-|\\+\\+)", - "name": "keyword.operator.increment-decrement.hx" - }, - { - "match": "(\\-|\\+|\\*|\\/|%)", - "name": "keyword.operator.arithmetic.hx" - }, - { - "match": "\\.\\.\\.", - "name": "keyword.operator.intiterator.hx" - }, - { - "match": "=>", - "name": "keyword.operator.arrow.hx" - }, - { - "match": "\\?\\?", - "name": "keyword.operator.nullcoalescing.hx" - }, - { - "match": "\\?\\.", - "name": "keyword.operator.safenavigation.hx" - }, - { - "match": "\\bis\\b(?!\\()", - "name": "keyword.other.hx" - }, - { - "begin": "\\?", - "beginCaptures": { - "0": { - "name": "keyword.operator.ternary.hx" - } - }, - "end": ":", - "endCaptures": { - "0": { - "name": "keyword.operator.ternary.hx" - } - }, - "patterns": [ - { - "include": "#block-contents" - } - ] - } - ] - }, - "punctuation-comma": { - "match": ",", - "name": "punctuation.separator.comma.hx" - }, - "punctuation-accessor": { - "match": "\\.", - "name": "punctuation.accessor.hx" - }, - "punctuation-terminator": { - "match": ";", - "name": "punctuation.terminator.hx" - }, - "constant-name": { - "match": "\\b([_A-Z][_A-Z0-9]*)\\b", - "name": "variable.other.hx" - }, - "type": { - "patterns": [ - { - "include": "#global" - }, - { - "include": "#macro-reification" - }, - { - "include": "#type-name" - }, - { - "include": "#type-parameters" - }, - { - "match": "->", - "name": "keyword.operator.type.function.hx" - }, - { - "match": "&", - "name": "keyword.operator.type.intersection.hx" - }, - { - "match": "\\?(?=\\s*[_A-Z])", - "name": "keyword.operator.optional" - }, - { - "match": "\\?(?!\\s*[_A-Z])", - "name": "punctuation.definition.tag" - }, - { - "begin": "(\\{)", - "beginCaptures": { - "0": { - "name": "punctuation.definition.block.begin.hx" - } - }, - "end": "(?<=\\})", - "patterns": [ - { - "include": "#typedef-block" - } - ] - }, - { - "include": "#function-type" - } - ] - }, - "function-type": { - "begin": "\\(", - "beginCaptures": { - "0": { - "name": "punctuation.definition.parameters.begin.hx" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.parameters.end.hx" - } - }, - "patterns": [ - { - "include": "#function-type-parameter" - } - ] - }, - "function-type-parameter": { - "begin": "(?<=\\(|,)", - "end": "(?=\\)|,)", - "patterns": [ - { - "include": "#global" - }, - { - "include": "#metadata" - }, - { - "include": "#operator-optional" - }, - { - "include": "#punctuation-comma" - }, - { - "include": "#function-type-parameter-name" - }, - { - "include": "#function-type-parameter-type-hint" - }, - { - "include": "#parameter-assign" - }, - { - "include": "#type" - }, - { - "include": "#global" - } - ] - }, - "function-type-parameter-name": { - "match": "([_a-zA-Z]\\w*)(?=\\s*:)", - "captures": { - "1": { - "name": "variable.parameter.hx" - } - } - }, - "function-type-parameter-type-hint": { - "begin": ":", - "beginCaptures": { - "0": { - "name": "keyword.operator.type.annotation.hx" - } - }, - "end": "(?=\\)|,|=)", - "patterns": [ - { - "include": "#type" - } - ] - }, - "type-name": { - "patterns": [ - { - "match": "\\b(Any|Array|ArrayAccess|Bool|Class|Date|DateTools|Dynamic|Enum|EnumValue|EReg|Float|IMap|Int|IntIterator|Iterable|Iterator|KeyValueIterator|KeyValueIterable|Lambda|List|ListIterator|ListNode|Map|Math|Null|Reflect|Single|Std|String|StringBuf|StringTools|Sys|Type|UInt|UnicodeString|ValueType|Void|Xml|XmlType)(?:(\\.)(_*[A-Z]\\w*[a-z]\\w*))*\\b", - "captures": { - "1": { - "name": "support.class.builtin.hx" - }, - "2": { - "name": "support.package.hx" - }, - "3": { - "name": "entity.name.type.hx" - } - } - }, - { - "match": "\\b(?)", - "endCaptures": { - "1": { - "name": "punctuation.definition.typeparameters.end.hx" - } - }, - "name": "meta.type-parameters.hx", - "patterns": [ - { - "include": "#type" - }, - { - "include": "#type-parameter-constraint-old" - }, - { - "include": "#type-parameter-constraint-new" - }, - { - "include": "#global" - }, - { - "include": "#regex" - }, - { - "include": "#array" - }, - { - "include": "#constants" - }, - { - "include": "#strings" - }, - { - "include": "#metadata" - }, - { - "include": "#punctuation-comma" - } - ] - }, - "type-parameter-constraint-old": { - "begin": "(:)\\s*(\\()", - "beginCaptures": { - "1": { - "name": "keyword.operator.type.annotation.hx" - }, - "2": { - "name": "punctuation.definition.constraint.begin.hx" - } - }, - "end": "\\)", - "endCaptures": { - "0": { - "name": "punctuation.definition.constraint.end.hx" - } - }, - "patterns": [ - { - "include": "#type" - }, - { - "include": "#punctuation-comma" - } - ] - }, - "type-parameter-constraint-new": { - "match": ":", - "name": "keyword.operator.type.annotation.hxt" - }, - "identifier-name": { - "match": "\\b([_A-Za-z]\\w*)\\b", - "name": "variable.other.hx" - } - } -} diff --git a/src/Resources/Grammars/hxml.json b/src/Resources/Grammars/hxml.json deleted file mode 100644 index 3be42577..00000000 --- a/src/Resources/Grammars/hxml.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "information_for_contributors": [ - "This file has been copied from https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/hxml.tmLanguage", - "and converted to JSON using https://marketplace.visualstudio.com/items?itemName=pedro-w.tmlanguage", - "The original file was licensed under the MIT License", - "https://github.com/vshaxe/haxe-TmLanguage/blob/ddad8b4c6d0781ac20be0481174ec1be772c5da5/LICENSE.md" - ], - "fileTypes": [ - "hxml" - ], - "foldingStartMarker": "--next", - "foldingStopMarker": "\\n\\n", - "keyEquivalent": "^@H", - "name": "Hxml", - "patterns": [ - { - "captures": { - "1": { - "name": "punctuation.definition.comment.hxml" - } - }, - "match": "(#).*$\\n?", - "name": "comment.line.number-sign.hxml" - }, - { - "begin": "(?" - }, - "directive": { - "name": "meta.tag.directive.jsp", - "begin": "(<)(%@)", - "end": "(%)(>)", - "beginCaptures": { - "1": { "name": "punctuation.definition.tag.jsp" }, - "2": { "name": "entity.name.tag.jsp" } - }, - "endCaptures": { - "1": { "name": "entity.name.tag.jsp" }, - "2": { "name": "punctuation.definition.tag.jsp" } - }, - "patterns": [ - { - "match": "\\b(attribute|include|page|tag|taglib|variable)\\b(?!\\s*=)", - "name": "keyword.control.directive.jsp" - }, - { "include": "text.html.basic#attribute" } - ] - }, - "scriptlet": { - "name": "meta.tag.scriptlet.jsp", - "contentName": "meta.embedded.block.java", - "begin": "(<)(%[\\s!=])", - "end": "(%)(>)", - "beginCaptures": { - "1": { "name": "punctuation.definition.tag.jsp" }, - "2": { "name": "entity.name.tag.jsp" } - }, - "endCaptures": { - "1": { "name": "entity.name.tag.jsp" }, - "2": { "name": "punctuation.definition.tag.jsp" } - }, - "patterns": [ - { - "match": "\\{(?=\\s*(%>|$))", - "comment": "consume trailing curly brackets for fragmented scriptlets" - }, - { "include": "source.java" } - ] - }, - "expression": { - "name": "string.template.expression.jsp", - "contentName": "meta.embedded.block.java", - "begin": "[$#]\\{", - "end": "\\}", - "beginCaptures": { - "0": { "name": "punctuation.definition.template-expression.begin.jsp" } - }, - "endCaptures": { - "0": { "name": "punctuation.definition.template-expression.end.jsp" } - }, - "patterns": [ - { "include": "#escape" }, - { "include": "source.java" } - ] - }, - "escape": { - "match": "\\\\.", - "name": "constant.character.escape.jsp" - } - } -} diff --git a/src/Resources/Grammars/kotlin.json b/src/Resources/Grammars/kotlin.json deleted file mode 100644 index 2857f717..00000000 --- a/src/Resources/Grammars/kotlin.json +++ /dev/null @@ -1,703 +0,0 @@ -{ - "information_for_contributors": [ - "This file has been copied from https://github.com/eclipse/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/org.eclipse.buildship.kotlindsl.provider/kotlin.tmLanguage.json", - "The original file was licensed under the Eclipse Public License, Version 1.0", - "https://github.com/eclipse-buildship/buildship/blob/6bb773e7692f913dec27105129ebe388de34e68b/README.md" - ], - "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", - "name": "Kotlin", - "scopeName": "source.kotlin", - "patterns": [ - { - "include": "#import" - }, - { - "include": "#package" - }, - { - "include": "#code" - } - ], - "fileTypes": [ - "kts" - ], - "repository": { - "import": { - "begin": "\\b(import)\\b\\s?([\\w+.]*\\w+)?\\s*", - "beginCaptures": { - "1": { - "name": "storage.type.import.kotlin" - }, - "2": { - "name": "storage.modifier.import.kotlin" - } - }, - "end": ";|$", - "name": "meta.import.kotlin", - "contentName": "entity.name.package.kotlin", - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#hard-keywords" - }, - { - "match": "\\*", - "name": "variable.language.wildcard.kotlin" - } - ] - }, - "package": { - "begin": "\\b(package)\\b\\s*", - "beginCaptures": { - "1": { - "name": "storage.type.package.kotlin" - } - }, - "end": ";|$", - "name": "meta.package.kotlin", - "contentName": "entity.name.package.kotlin", - "patterns": [ - { - "include": "#comments" - } - ] - }, - "code": { - "patterns": [ - { - "include": "#comments" - }, - { - "include": "#keywords" - }, - { - "include": "#annotation-simple" - }, - { - "include": "#annotation-site-list" - }, - { - "include": "#annotation-site" - }, - { - "include": "#class-declaration" - }, - { - "include": "#object-declaration" - }, - { - "include": "#type-alias" - }, - { - "include": "#function-declaration" - }, - { - "include": "#variable-declaration" - }, - { - "include": "#constant-declaration" - }, - { - "include": "#variable" - }, - { - "include": "#object" - }, - { - "include": "#type-constraint" - }, - { - "include": "#type-annotation" - }, - { - "include": "#function-call" - }, - { - "include": "#property.reference" - }, - { - "include": "#method-reference" - }, - { - "include": "#key" - }, - { - "include": "#string" - }, - { - "include": "#string-empty" - }, - { - "include": "#string-multiline" - }, - { - "include": "#character" - }, - { - "include": "#lambda-arrow" - }, - { - "include": "#operators" - }, - { - "include": "#self-reference" - }, - { - "include": "#decimal-literal" - }, - { - "include": "#hex-literal" - }, - { - "include": "#binary-literal" - }, - { - "include": "#boolean-literal" - }, - { - "include": "#null-literal" - }, - { - "match": ",", - "name": "punctuation.separator.delimiter.kotlin" - }, - { - "match": "\\.", - "name": "punctuation.separator.period.kotlin" - }, - { - "match": "\\?\\.", - "name": "punctuation.accessor.optional.kotlin" - } - ] - }, - "comments": { - "patterns": [ - { - "include": "#comment-line" - }, - { - "include": "#comment-block" - }, - { - "include": "#comment-javadoc" - } - ] - }, - "comment-line": { - "begin": "//", - "end": "$", - "name": "comment.line.double-slash.kotlin" - }, - "comment-block": { - "begin": "/\\*(?!\\*)", - "end": "\\*/", - "name": "comment.block.kotlin" - }, - "comment-javadoc": { - "patterns": [ - { - "begin": "/\\*\\*", - "end": "\\*/", - "name": "comment.block.javadoc.kotlin", - "patterns": [ - { - "match": "@(author|deprecated|return|see|serial|since|version)\\b", - "name": "keyword.other.documentation.javadoc.kotlin" - }, - { - "match": "(@param)\\s+(\\S+)", - "captures": { - "1": { - "name": "keyword.other.documentation.javadoc.kotlin" - }, - "2": { - "name": "variable.parameter.kotlin" - } - } - }, - { - "match": "(@(?:exception|throws))\\s+(\\S+)", - "captures": { - "1": { - "name": "keyword.other.documentation.javadoc.kotlin" - }, - "2": { - "name": "entity.name.type.class.kotlin" - } - } - }, - { - "match": "{(@link)\\s+(\\S+)?#([\\w$]+\\s*\\([^\\(\\)]*\\)).*}", - "captures": { - "1": { - "name": "keyword.other.documentation.javadoc.kotlin" - }, - "2": { - "name": "entity.name.type.class.kotlin" - }, - "3": { - "name": "variable.parameter.kotlin" - } - } - } - ] - } - ] - }, - "keywords": { - "patterns": [ - { - "include": "#prefix-modifiers" - }, - { - "include": "#postfix-modifiers" - }, - { - "include": "#soft-keywords" - }, - { - "include": "#hard-keywords" - }, - { - "include": "#control-keywords" - }, - { - "include": "#map-keywords" - } - ] - }, - "prefix-modifiers": { - "match": "\\b(abstract|final|enum|open|annotation|sealed|data|override|final|lateinit|private|protected|public|internal|inner|companion|noinline|crossinline|vararg|reified|tailrec|operator|infix|inline|external|const|suspend|value)\\b", - "name": "storage.modifier.other.kotlin" - }, - "postfix-modifiers": { - "match": "\\b(where|by|get|set)\\b", - "name": "storage.modifier.other.kotlin" - }, - "soft-keywords": { - "match": "\\b(catch|finally|field)\\b", - "name": "keyword.soft.kotlin" - }, - "hard-keywords": { - "match": "\\b(as|typeof|is|in)\\b", - "name": "keyword.hard.kotlin" - }, - "control-keywords": { - "match": "\\b(if|else|while|do|when|try|throw|break|continue|return|for)\\b", - "name": "keyword.control.kotlin" - }, - "map-keywords": { - "match": "\\b(to)\\b", - "name": "keyword.map.kotlin" - }, - "annotation-simple": { - "match": "(?<([^<>]|\\g)+>)?", - "captures": { - "1": { - "name": "storage.type.class.kotlin" - }, - "2": { - "name": "entity.name.type.class.kotlin" - }, - "3": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - } - } - }, - "object-declaration": { - "match": "\\b(object)\\s+(\\b\\w+\\b|`[^`]+`)", - "captures": { - "1": { - "name": "storage.type.object.kotlin" - }, - "2": { - "name": "entity.name.type.object.kotlin" - } - } - }, - "type-alias": { - "match": "\\b(typealias)\\s+(\\b\\w+\\b|`[^`]+`)\\s*(?<([^<>]|\\g)+>)?", - "captures": { - "1": { - "name": "storage.type.alias.kotlin" - }, - "2": { - "name": "entity.name.type.kotlin" - }, - "3": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - } - } - }, - "function-declaration": { - "begin": "\\b(fun)\\b\\s*(?<([^<>]|\\g)+>)?\\s*(?:(\\w+)\\.)?(\\b\\w+\\b|`[^`]+`)\\(", - "beginCaptures": { - "1": { - "name": "storage.type.function.kotlin" - }, - "2": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - }, - "4": { - "name": "entity.name.type.class.extension.kotlin" - }, - "5": { - "name": "entity.name.function.declaration.kotlin" - } - }, - "end": "\\)", - "endCaptures": { - "1": { - "name": "keyword.operator.assignment.type.kotlin" - } - }, - "patterns": [ - { - "include": "#parameter-declaration" - } - ] - }, - "parameter-declaration": { - "match": "\\b(\\w+)\\s*(:)\\s*(\\w+)(\\?)?(,)?", - "captures": { - "1": { - "name": "variable.parameter.kotlin" - }, - "2": { - "name": "keyword.operator.assignment.type.kotlin" - }, - "3": { - "name": "entity.name.type.kotlin" - }, - "4": { - "name": "keyword.operator.optional" - }, - "5": { - "name": "punctuation.separator.delimiter.kotlin" - } - } - }, - "variable-declaration": { - "match": "\\b(var)\\b\\s*(?<([^<>]|\\g)+>)?", - "captures": { - "1": { - "name": "storage.type.variable.kotlin" - }, - "2": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - } - } - }, - "constant-declaration": { - "match": "\\b(val)\\b\\s*(?<([^<>]|\\g)+>)?", - "captures": { - "1": { - "name": "storage.type.variable.readonly.kotlin" - }, - "2": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - } - } - }, - "variable" : { - "match": "\\b(\\w+)(?=\\s*[:=])", - "captures": { - "1": { - "name": "variable.other.definition.kotlin" - } - } - }, - "object" : { - "match": "\\b(\\w+)(?=\\.)", - "captures": { - "1": { - "name": "variable.other.object.kotlin" - } - } - }, - "type-parameter": { - "patterns": [ - { - "match": "(:)?\\s*(\\b\\w+\\b)(\\?)?", - "captures": { - "1": { - "name": "keyword.operator.assignment.kotlin" - }, - "2": { - "name": "entity.name.type.kotlin" - }, - "3": { - "name": "keyword.operator.optional" - } - } - }, - { - "match": "\\b(in|out)\\b", - "name": "storage.modifier.kotlin" - } - ] - }, - "type-annotation": { - "match": "(?|(?[<(]([^<>()\"']|\\g)+[)>]))+", - "captures": { - "0": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - } - } - }, - "function-call": { - "match": "(?:(\\?\\.)|(\\.))?(\\b\\w+\\b|`[^`]+`)\\s*(?<([^<>]|\\g)+>)?\\s*(?=[({])", - "captures": { - "1": { - "name": "punctuation.accessor.optional.kotlin" - }, - "2": { - "name": "punctuation.separator.period.kotlin" - }, - "3": { - "name": "entity.name.function.call.kotlin" - }, - "4": { - "patterns": [ - { - "include": "#type-parameter" - } - ] - } - } - }, - "property.reference": { - "match": "(?:(\\?\\.)|(\\.))(\\w+)\\b", - "captures": { - "1": { - "name": "punctuation.accessor.optional.kotlin" - }, - "2": { - "name": "punctuation.separator.period.kotlin" - }, - "3": { - "name": "variable.other.property.kotlin" - } - } - }, - "method-reference": { - "match": "\\??::(\\b\\w+\\b|`[^`]+`)", - "captures": { - "1": { - "name": "entity.name.function.reference.kotlin" - } - } - }, - "key": { - "match": "\\b(\\w=)\\s*(=)", - "captures": { - "1": { - "name": "variable.parameter.kotlin" - }, - "2": { - "name": "keyword.operator.assignment.kotlin" - } - } - }, - "string-empty": { - "match": "(?", - "name": "storage.type.function.arrow.kotlin" - }, - "operators": { - "patterns": [ - { - "match": "(===?|\\!==?|<=|>=|<|>)", - "name": "keyword.operator.comparison.kotlin" - }, - { - "match": "(\\?:)", - "name": "keyword.operator.elvis.kotlin" - }, - { - "match": "([+*/%-]=)", - "name": "keyword.operator.assignment.arithmetic.kotlin" - }, - { - "match": "(=)", - "name": "keyword.operator.assignment.kotlin" - }, - { - "match": "([+*/%-])", - "name": "keyword.operator.arithmetic.kotlin" - }, - { - "match": "(!|&&|\\|\\|)", - "name": "keyword.operator.logical.kotlin" - }, - { - "match": "(--|\\+\\+)", - "name": "keyword.operator.increment-decrement.kotlin" - }, - { - "match": "(\\.\\.)", - "name": "keyword.operator.range.kotlin" - } - ] - }, - "self-reference": { - "match": "\\b(this|super)(@\\w+)?\\b", - "name": "variable.language.this.kotlin" - } - } -} diff --git a/src/Resources/Grammars/toml.json b/src/Resources/Grammars/toml.json deleted file mode 100644 index 6be4678f..00000000 --- a/src/Resources/Grammars/toml.json +++ /dev/null @@ -1,346 +0,0 @@ -{ - "version": "1.0.0", - "scopeName": "source.toml", - "uuid": "8b4e5008-c50d-11ea-a91b-54ee75aeeb97", - "information_for_contributors": [ - "Originally was maintained by aster (galaster@foxmail.com). This notice is only kept here for the record, please don't send e-mails about bugs and other issues.", - "This file has been copied from https://github.com/kkiyama117/coc-toml/blob/main/toml.tmLanguage.json", - "The original file was licensed under the MIT License", - "https://github.com/kkiyama117/coc-toml/blob/main/LICENSE" - ], - "patterns": [ - { - "include": "#commentDirective" - }, - { - "include": "#comment" - }, - { - "include": "#table" - }, - { - "include": "#entryBegin" - }, - { - "include": "#value" - } - ], - "repository": { - "comment": { - "captures": { - "1": { - "name": "comment.line.number-sign.toml" - }, - "2": { - "name": "punctuation.definition.comment.toml" - } - }, - "comment": "Comments", - "match": "\\s*((#).*)$" - }, - "commentDirective": { - "captures": { - "1": { - "name": "meta.preprocessor.toml" - }, - "2": { - "name": "punctuation.definition.meta.preprocessor.toml" - } - }, - "comment": "Comments", - "match": "\\s*((#):.*)$" - }, - "table": { - "patterns": [ - { - "name": "meta.table.toml", - "match": "^\\s*(\\[)\\s*((?:(?:(?:[A-Za-z0-9_+-]+)|(?:\"[^\"]+\")|(?:'[^']+'))\\s*\\.?\\s*)+)\\s*(\\])", - "captures": { - "1": { - "name": "punctuation.definition.table.toml" - }, - "2": { - "patterns": [ - { - "match": "(?:[A-Za-z0-9_+-]+)|(?:\"[^\"]+\")|(?:'[^']+')", - "name": "support.type.property-name.table.toml" - }, - { - "match": "\\.", - "name": "punctuation.separator.dot.toml" - } - ] - }, - "3": { - "name": "punctuation.definition.table.toml" - } - } - }, - { - "name": "meta.array.table.toml", - "match": "^\\s*(\\[\\[)\\s*((?:(?:(?:[A-Za-z0-9_+-]+)|(?:\"[^\"]+\")|(?:'[^']+'))\\s*\\.?\\s*)+)\\s*(\\]\\])", - "captures": { - "1": { - "name": "punctuation.definition.array.table.toml" - }, - "2": { - "patterns": [ - { - "match": "(?:[A-Za-z0-9_+-]+)|(?:\"[^\"]+\")|(?:'[^']+')", - "name": "support.type.property-name.array.toml" - }, - { - "match": "\\.", - "name": "punctuation.separator.dot.toml" - } - ] - }, - "3": { - "name": "punctuation.definition.array.table.toml" - } - } - }, - { - "begin": "(\\{)", - "end": "(\\})", - "name": "meta.table.inline.toml", - "beginCaptures": { - "1": { - "name": "punctuation.definition.table.inline.toml" - } - }, - "endCaptures": { - "1": { - "name": "punctuation.definition.table.inline.toml" - } - }, - "patterns": [ - { - "include": "#comment" - }, - { - "match": ",", - "name": "punctuation.separator.table.inline.toml" - }, - { - "include": "#entryBegin" - }, - { - "include": "#value" - } - ] - } - ] - }, - "entryBegin": { - "name": "meta.entry.toml", - "match": "\\s*((?:(?:(?:[A-Za-z0-9_+-]+)|(?:\"[^\"]+\")|(?:'[^']+'))\\s*\\.?\\s*)+)\\s*(=)", - "captures": { - "1": { - "patterns": [ - { - "match": "(?:[A-Za-z0-9_+-]+)|(?:\"[^\"]+\")|(?:'[^']+')", - "name": "support.type.property-name.toml" - }, - { - "match": "\\.", - "name": "punctuation.separator.dot.toml" - } - ] - }, - "2": { - "name": "punctuation.eq.toml" - } - } - }, - "value": { - "patterns": [ - { - "name": "string.quoted.triple.basic.block.toml", - "begin": "\"\"\"", - "end": "\"\"\"", - "patterns": [ - { - "match": "\\\\([btnfr\"\\\\\\n/ ]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})", - "name": "constant.character.escape.toml" - }, - { - "match": "\\\\[^btnfr/\"\\\\\\n]", - "name": "invalid.illegal.escape.toml" - } - ] - }, - { - "name": "string.quoted.single.basic.line.toml", - "begin": "\"", - "end": "\"", - "patterns": [ - { - "match": "\\\\([btnfr\"\\\\\\n/ ]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})", - "name": "constant.character.escape.toml" - }, - { - "match": "\\\\[^btnfr/\"\\\\\\n]", - "name": "invalid.illegal.escape.toml" - } - ] - }, - { - "name": "string.quoted.triple.literal.block.toml", - "begin": "'''", - "end": "'''" - }, - { - "name": "string.quoted.single.literal.line.toml", - "begin": "'", - "end": "'" - }, - { - "captures": { - "1": { - "name": "constant.other.time.datetime.offset.toml" - } - }, - "match": "(? - M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z - M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z - M296 392h64v64h-64zM296 582v160h128V582h-64v-62h-64v62zm80 48v64h-32v-64h32zM360 328h64v64h-64zM296 264h64v64h-64zM360 456h64v64h-64zM360 200h64v64h-64zM855 289 639 73c-6-6-14-9-23-9H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V311c0-9-3-17-9-23zM790 326H602V138L790 326zm2 562H232V136h64v64h64v-64h174v216c0 23 19 42 42 42h216v494z - M851 755q0 23-16 39l-78 78q-16 16-39 16t-39-16l-168-168-168 168q-16 16-39 16t-39-16l-78-78q-16-16-16-39t16-39l168-168-168-168q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 168 168-168q16-16 39-16t39 16l78 78q16 16 16 39t-16 39l-168 168 168 168q16 16 16 39z - M71 1024V0h661L953 219V1024H71zm808-731-220-219H145V951h735V293zM439 512h-220V219h220V512zm-74-219H292v146h74v-146zm0 512h74v73h-220v-73H292v-146H218V585h147v219zm294-366h74V512H512v-73h74v-146H512V219h147v219zm74 439H512V585h220v293zm-74-219h-74v146h74v-146z - M128 384a43 43 0 0043-43V213a43 43 0 0143-43h128a43 43 0 000-85H213a128 128 0 00-128 128v128a43 43 0 0043 43zm213 469H213a43 43 0 01-43-43v-128a43 43 0 00-85 0v128a128 128 0 00128 128h128a43 43 0 000-85zm384-299a43 43 0 000-85h-49A171 171 0 00555 347V299a43 43 0 00-85 0v49A171 171 0 00347 469H299a43 43 0 000 85h49A171 171 0 00469 677V725a43 43 0 0085 0v-49A171 171 0 00677 555zm-213 43a85 85 0 1185-85 85 85 0 01-85 85zm384 43a43 43 0 00-43 43v128a43 43 0 01-43 43h-128a43 43 0 000 85h128a128 128 0 00128-128v-128a43 43 0 00-43-43zM811 85h-128a43 43 0 000 85h128a43 43 0 0143 43v128a43 43 0 0085 0V213a128 128 0 00-128-128z - M128 256h192a64 64 0 110 128H128a64 64 0 110-128zm576 192h192a64 64 0 010 128h-192a64 64 0 010-128zm-576 192h192a64 64 0 010 128H128a64 64 0 010-128zm576 0h192a64 64 0 010 128h-192a64 64 0 010-128zm0-384h192a64 64 0 010 128h-192a64 64 0 010-128zM128 448h192a64 64 0 110 128H128a64 64 0 110-128zm384-320a64 64 0 0164 64v640a64 64 0 01-128 0V192a64 64 0 0164-64z - M832 64H192c-18 0-32 14-32 32v832c0 18 14 32 32 32h640c18 0 32-14 32-32V96c0-18-14-32-32-32zM736 596 624 502 506 596V131h230v318z - M509 546 780 275 871 366 509 728 147 366 238 275zM509 728h-362v128h724v-128z - M757 226a143 143 0 00-55 276 96 96 0 01-88 59h-191a187 187 0 00-96 27V312a143 143 0 10-96 0v399a143 143 0 10103 2 96 96 0 0188-59h191a191 191 0 00187-151 143 143 0 00-43-279zM280 130a48 48 0 110 96 48 48 0 010-96zm0 764a48 48 0 110-96 48 48 0 010 96zM757 417a48 48 0 110-96 48 48 0 010 96z - M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z - M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z - M512 32C246 32 32 250 32 512s218 480 480 480 480-218 480-480S774 32 512 32zm269 381L496 698c-26 26-61 26-83 0L243 528c-26-26-26-61 0-83s61-26 83 0l128 128 240-240c26-26 61-26 83 0 26 19 26 54 3 80z - M747 467c29 0 56 4 82 12v-363c0-47-38-84-84-84H125c-47 0-84 38-84 84v707c0 47 38 84 84 84h375a287 287 0 01-43-152c0-160 129-289 289-289zm-531-250h438c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm0 179h263c19 0 34 15 34 34s-15 34-34 34H216c-19 0-34-15-34-34s15-34 34-34zm131 247h-131c-19 0-34-15-34-34s15-34 34-34h131c19 0 34 15 34 34s-15 34-34 34zM747 521c-130 0-236 106-236 236S617 992 747 992s236-106 236-236S877 521 747 521zm11 386v-65h-130c-12 0-22-10-22-22s10-22 22-22h260l-130 108zm108-192H606l130-108v65h130c12 0 22 10 22 22s-10 22-22 22z - M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z - M512 926c-229 0-414-186-414-414S283 98 512 98s414 186 414 414-186 414-414 414zm0-73c189 0 341-153 341-341S701 171 512 171 171 323 171 512s153 341 341 341zm-6-192L284 439l52-52 171 171 171-171L728 439l-222 222z - M512 57c251 0 455 204 455 455S763 967 512 967 57 763 57 512 261 57 512 57zm181 274c-11-11-29-11-40 0L512 472 371 331c-11-11-29-11-40 0-11 11-11 29 0 40L471 512 331 653c-11 11-11 29 0 40 11 11 29 11 40 0l141-141 141 141c11 11 29 11 40 0 11-11 11-29 0-40L552 512l141-141c11-11 11-29 0-40z - M591 907A85 85 0 01427 875h114a299 299 0 0050 32zM725 405c130 0 235 105 235 235s-105 235-235 235-235-105-235-235 105-235 235-235zM512 64a43 43 0 0143 43v24c126 17 229 107 264 225A298 298 0 00725 341l-4 0A235 235 0 00512 213l-5 0c-125 4-224 104-228 229l-0 6v167a211 211 0 01-26 101l-4 7-14 23h211a298 298 0 0050 85l-276-0a77 77 0 01-66-39c-13-22-14-50-2-73l2-4 22-36c10-17 16-37 17-57l0-7v-167C193 287 313 153 469 131V107a43 43 0 0139-43zm345 505L654 771a149 149 0 00202-202zM725 491a149 149 0 00-131 220l202-202A149 149 0 00725 491z - M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z - M1280 704c0 141-115 256-256 256H288C129 960 0 831 0 672c0-126 80-232 192-272A327 327 0 01192 384c0-177 143-320 320-320 119 0 222 64 277 160C820 204 857 192 896 192c106 0 192 86 192 192 0 24-5 48-13 69C1192 477 1280 580 1280 704zm-493-128H656V352c0-18-14-32-32-32h-96c-18 0-32 14-32 32v224h-131c-29 0-43 34-23 55l211 211c12 12 33 12 45 0l211-211c20-20 6-55-23-55z - M853 102H171C133 102 102 133 102 171v683C102 891 133 922 171 922h683C891 922 922 891 922 853V171C922 133 891 102 853 102zM390 600l-48 48L205 512l137-137 48 48L301 512l88 88zM465 819l-66-18L559 205l66 18L465 819zm218-171L634 600 723 512l-88-88 48-48L819 512 683 649z - M684 736 340 736l0-53 344 1-0 53zM552 565l-213-2 0-53 212 2-0 53zM684 392 340 392l0-53 344 1-0 53zM301 825c-45 0-78-9-100-27-22-18-33-43-33-75v-116c0-22-4-37-12-45-7-9-20-13-40-13v-61c19 0 32-4 40-12 8-9 12-24 12-46v-116c0-32 11-57 33-75 22-18 56-27 100-27h24v61h-24a35 35 0 00-27 12 41 41 0 00-11 29v116c0 35-10 60-31 75a66 66 0 01-31 14c11 2 22 6 31 14 20 17 31 42 31 75v116c0 12 4 22 11 29 7 8 16 12 27 12h24v61h-24zM701 764h24c10 0 19-4 27-12a41 41 0 0011-29v-116c0-33 10-58 31-75 9-7 19-12 31-14a66 66 0 01-31-14c-20-15-31-40-31-75v-116a41 41 0 00-11-29 35 35 0 00-27-12h-24v-61h24c45 0 78 9 100 27 22 18 33 43 33 75v116c0 22 4 37 11 46 8 8 21 12 40 12v61c-19 0-33 4-40 13-7 8-11 23-11 45v116c0 32-11 57-33 75-22 18-55 27-100 27h-24v-61z - M128 854h768v86H128zM390 797c13 13 29 19 48 19s35-6 45-19l291-288c26-22 26-64 0-90L435 83l-61 61L426 192l-272 269c-22 22-22 64 0 90l237 246zm93-544 211 211-32 32H240l243-243zM707 694c0 48 38 86 86 86 48 0 86-38 86-86 0-22-10-45-26-61L794 576l-61 61c-13 13-26 35-26 58z - M0 512M1024 512M512 0M512 1024M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688 - M796 561a5 5 0 014 7l-39 90a5 5 0 004 7h100a5 5 0 014 8l-178 247a5 5 0 01-9-4l32-148a5 5 0 00-5-6h-89a5 5 0 01-4-7l86-191a5 5 0 014-3h88zM731 122a73 73 0 0173 73v318a54 54 0 00-8-1H731V195H244v634h408l-16 73H244a73 73 0 01-73-73V195a73 73 0 0173-73h488zm-219 366v73h-195v-73h195zm146-146v73H317v-73h341z - M645 448l64 64 220-221L704 64l-64 64 115 115H128v90h628zM375 576l-64-64-220 224L314 960l64-64-116-115H896v-90H262z - M608 0q48 0 88 23t63 63 23 87v70h55q35 0 67 14t57 38 38 57 14 67V831q0 34-14 66t-38 57-57 38-67 13H426q-34 0-66-13t-57-38-38-57-14-66v-70h-56q-34 0-66-14t-57-38-38-57-13-67V174q0-47 23-87T109 23 196 0h412m175 244H426q-46 0-86 22T278 328t-26 85v348H608q47 0 86-22t63-62 25-85l1-348m-269 318q18 0 31 13t13 31-13 31-31 13-31-13-13-31 13-31 31-13m0-212q13 0 22 9t11 22v125q0 14-9 23t-22 10-23-7-11-22l-1-126q0-13 10-23t23-10z - M896 811l-128 0c-23 0-43-19-43-43 0-23 19-43 43-43l107 0c13 0 21-9 21-21L896 107c0-13-9-21-21-21L448 85c-13 0-21 9-21 21l0 21c0 23-19 43-43 43-23 0-43-19-43-43L341 85c0-47 38-85 85-85l469 0c47 0 85 38 85 85l0 640C981 772 943 811 896 811zM683 299l0 640c0 47-38 85-85 85L128 1024c-47 0-85-38-85-85L43 299c0-47 38-85 85-85l469 0C644 213 683 252 683 299zM576 299 149 299c-13 0-21 9-21 21l0 597c0 13 9 21 21 21l427 0c13 0 21-9 21-21L597 320C597 307 589 299 576 299z - M280 145l243 341 0-0 45 63-0 0 79 110a143 143 0 11-36 75l-88-123-92 126c1 4 1 9 1 13l0 5a143 143 0 11-36-95l82-113L221 188l60-43zm473 541a70 70 0 100 140 70 70 0 000-140zm-463 0a70 70 0 100 140 70 70 0 000-140zM772 145l59 43-232 319-45-63L772 145z - M128 183C128 154 154 128 183 128h521c30 0 55 26 55 55v38c0 17-17 34-34 34s-34-17-34-34v-26H196v495h26c17 0 34 17 34 34s-17 34-34 34h-38c-30 0-55-26-55-55V183zM380 896h-34c-26 0-47-21-47-47v-90h68V828h64V896H380c4 0 0 0 0 0zM759 828V896h90c26 0 47-21 47-47v-90h-68V828h-68zM828 435H896V346c0-26-21-47-47-47h-90v68H828v68zM435 299v68H367V439H299V346C299 320 320 299 346 299h90zM367 649H299v-107h68v107zM546 367V299h107v68h-107zM828 546H896v107h-68v-107zM649 828V896h-107v-68h107zM730 508v188c0 17-17 34-34 34h-188c-17 0-34-17-34-34s17-34 34-34h102l-124-124c-13-13-13-34 0-47 13-13 34-13 47 0l124 124V512c0-17 17-34 34-34 21-4 38 9 38 30z - M889 0H135c-32 0-59 26-59 59v906c0 32 26 59 59 59h753c32 0 59-26 59-59v-906c1-33-26-59-58-59zm-165 177c31 0 56 25 56 56s-25 56-56 56-56-25-56-56 25-56 56-56zm-212 0c31 0 56 25 56 56S543 288 512 288s-56-25-56-56S481 177 512 177zm-212 0c31 0 56 25 56 56s-25 56-56 56-56-25-56-56 25-56 56-56zm209 606H285c-25 0-44-20-44-44 0-25 20-44 44-44h224c25 0 44 20 44 44 0 24-20 44-44 44zm230-212H285c-25 0-44-20-44-44 0-25 20-44 44-44h453c25 0 44 20 44 44 1 24-20 44-44 44z - M854 307 611 73c-6-6-14-9-22-9H296c-4 0-8 4-8 8v56c0 4 4 8 8 8h277l219 211V824c0 4 4 8 8 8h56c4 0 8-4 8-8V330c0-9-4-17-10-23zM553 201c-6-6-14-9-23-9H192c-18 0-32 14-32 32v704c0 18 14 32 32 32h512c18 0 32-14 32-32V397c0-9-3-17-9-23L553 201zM568 753c0 4-3 7-8 7h-225c-4 0-8-3-8-7v-42c0-4 3-7 8-7h225c4 0 8 3 8 7v42zm0-220c0 4-3 7-8 7H476v85c0 4-3 7-7 7h-42c-4 0-7-3-7-7V540h-85c-4 0-8-3-8-7v-42c0-4 3-7 8-7H420v-85c0-4 3-7 7-7h42c4 0 7 3 7 7V484h85c4 0 8 3 8 7v42z - M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z - M768 800V685L512 480 256 685V800l256-205L768 800zM512 339 768 544V429L512 224 256 429V544l256-205z - M509 546l271-271 91 91-348 349-1-1-13 13-363-361 91-91z - M652 157a113 113 0 11156 161L731 395 572 236l80-80 1 1zM334 792v0H175v-159l358-358 159 159-358 358zM62 850h900v113H62v-113z - M469 235V107h85v128h-85zm-162-94 85 85-60 60-85-85 60-60zm469 60-85 85-60-60 85-85 60 60zm-549 183A85 85 0 01302 341H722a85 85 0 0174 42l131 225A85 85 0 01939 652V832a85 85 0 01-85 85H171a85 85 0 01-85-85v-180a85 85 0 0112-43l131-225zM722 427H302l-100 171h255l10 29a59 59 0 002 5c2 4 5 9 9 14 8 9 18 17 34 17 16 0 26-7 34-17a72 72 0 0011-18l0-0 10-29h255l-100-171zM853 683H624a155 155 0 01-12 17C593 722 560 747 512 747c-48 0-81-25-99-47a155 155 0 01-12-17H171v149h683v-149z - M576 832C576 867 547 896 512 896 477 896 448 867 448 832 448 797 477 768 512 768 547 768 576 797 576 832ZM512 256C477 256 448 285 448 320L448 640C448 675 477 704 512 704 547 704 576 675 576 640L576 320C576 285 547 256 512 256ZM1024 896C1024 967 967 1024 896 1024L128 1024C57 1024 0 967 0 896 0 875 5 855 14 837L14 837 398 69 398 69C420 28 462 0 512 0 562 0 604 28 626 69L1008 835C1018 853 1024 874 1024 896ZM960 896C960 885 957 875 952 865L952 864 951 863 569 98C557 77 536 64 512 64 488 64 466 77 455 99L452 105 92 825 93 825 71 867C66 876 64 886 64 896 64 931 93 960 128 960L896 960C931 960 960 931 960 896Z - M928 128l-416 0-32-64-352 0-64 128 896 0zM904 704l75 0 45-448-1024 0 64 640 484 0c-105-38-180-138-180-256 0-150 122-272 272-272s272 122 272 272c0 22-3 43-8 64zM1003 914l-198-175c17-29 27-63 27-99 0-106-86-192-192-192s-192 86-192 192 86 192 192 192c36 0 70-10 99-27l175 198c23 27 62 28 87 3l6-6c25-25 23-64-3-87zM640 764c-68 0-124-56-124-124s56-124 124-124 124 56 124 124-56 124-124 124z - M0 512M1024 512M512 0M512 1024M520 168C291 168 95 311 16 512c79 201 275 344 504 344 229 0 425-143 504-344-79-201-275-344-504-344zm0 573c-126 0-229-103-229-229s103-229 229-229c126 0 229 103 229 229s-103 229-229 229zm0-367c-76 0-137 62-137 137s62 137 137 137S657 588 657 512s-62-137-137-137z - M734 128c-33-19-74-8-93 25l-41 70c-28-6-58-9-90-9-294 0-445 298-445 298s82 149 231 236l-31 54c-19 33-8 74 25 93 33 19 74 8 93-25L759 222C778 189 767 147 734 128zM305 512c0-115 93-208 207-208 14 0 27 1 40 4l-37 64c-1 0-2 0-2 0-77 0-140 63-140 140 0 26 7 51 20 71l-37 64C324 611 305 564 305 512zM771 301 700 423c13 27 20 57 20 89 0 110-84 200-192 208l-51 89c12 1 24 2 36 2 292 0 446-298 446-298S895 388 771 301z - M826 498 538 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L826 526c8-7 8-21 0-28zm-320 0L218 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L506 526c4-4 6-9 6-14 0-5-2-10-6-14z - M1024 896v128H0V704h128v192h768V704h128v192zM576 555 811 320 896 405l-384 384-384-384L213 320 448 555V0h128v555z - M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z - M683 85l213 213v598a42 42 0 01-42 42H170A43 43 0 01128 896V128C128 104 147 85 170 85H683zm-213 384H341v85h128v128h85v-128h128v-85h-128V341h-85v128z - M949 727l-217-231a33 33 0 00-48 0 33 33 0 000 48l157 172H389a35 35 0 00-35 35c0 19 16 34 35 34h452l-160 179a34 34 0 005 54c14 10 33 7 45-5l219-237a33 33 0 000-49zM719 196h131c-24-91-95-160-185-185v131c0 27 25 54 54 54zM129 846l1-747s-7-37 36-33h359v52s-7 76 32 133a191 191 0 00146 84h91v126h66v-191H719a126 126 0 01-127-127V0H155c-51 0-91 40-91 91v767c0 51 40 91 91 91h193v-66H155c0-0-26 4-26-36z - M416 832H128V128h384v192C512 355 541 384 576 384L768 384v32c0 19 13 32 32 32S832 435 832 416v-64c0-6 0-19-6-25l-256-256c-6-6-19-6-25-6H128A64 64 0 0064 128v704C64 867 93 896 129 896h288c19 0 32-13 32-32S435 832 416 832zM576 172 722 320H576V172zM736 512C614 512 512 614 512 736S614 960 736 960s224-102 224-224S858 512 736 512zM576 736C576 646 646 576 736 576c32 0 58 6 83 26l-218 218c-19-26-26-51-26-83zm160 160c-32 0-64-13-96-32l224-224c19 26 32 58 32 96 0 90-70 160-160 160z - M896 320c0-19-6-32-19-45l-192-192c-13-13-26-19-45-19H192c-38 0-64 26-64 64v768c0 38 26 64 64 64h640c38 0 64-26 64-64V320zm-256 384H384c-19 0-32-13-32-32s13-32 32-32h256c19 0 32 13 32 32s-13 32-32 32zm166-384H640V128l192 192h-26z - M599 425 599 657 425 832 425 425 192 192 832 192Z - M505 74c-145 3-239 68-239 68-12 8-15 25-7 37 9 13 25 15 38 6 0 0 184-136 448 2 12 7 29 3 36-10 8-13 3-29-12-37-71-38-139-56-199-63-23-3-44-3-65-3m17 111c-254-3-376 201-376 201-8 12-5 29 7 37 12 8 29 4 39-10 0 0 103-178 329-175 226 3 325 173 325 173 8 12 24 17 37 9 14-8 17-24 9-37 0 0-117-195-370-199m-31 106c-72 5-140 31-192 74C197 449 132 603 204 811c5 14 20 21 34 17 14-5 21-20 16-34-66-191-7-316 79-388 84-69 233-85 343-17 54 34 96 93 118 151 22 58 20 114 3 141-18 28-54 38-86 30-32-8-58-31-59-80-1-73-58-118-118-125-57-7-123 24-140 92-32 125 49 302 238 361 14 4 29-3 34-17 4-14-3-29-18-34-163-51-225-206-202-297 10-41 46-55 84-52 37 4 69 26 69 73 2 70 48 117 100 131 52 13 112-3 144-52 33-50 28-120 3-188-26-68-73-136-140-178a356 356 0 00-213-52m15 104v0c-76 3-152 42-195 125-56 106-31 215 7 293 38 79 90 131 90 131 10 11 27 11 38 0s11-26 0-38c0 0-46-47-79-116s-54-157-8-244c48-90 133-111 208-90 76 22 140 88 138 186-2 15 9 28 24 29 15 1 27-10 29-27 3-122-79-210-176-239a246 246 0 00-75-9m9 213c-15 0-26 13-26 27 0 0 1 63 36 124 36 61 112 119 244 107 15-1 26-13 25-28-1-15-14-26-30-25-116 11-165-33-193-81-28-47-29-98-29-98a27 27 0 00-27-27z - m211 611a142 142 0 00-90-4v-190a142 142 0 0090-4v198zm0 262v150h-90v-146a142 142 0 0090-4zm0-723a142 142 0 00-90-4v-146h90zm-51 246a115 115 0 11115-115 115 115 0 01-115 115zm0 461a115 115 0 11115-115 115 115 0 01-115 115zm256-691h563v90h-563zm0 461h563v90h-563zm0-282h422v90h-422zm0 474h422v90h-422z - M853 267H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v555c0 41 34 75 75 75h683c41 0 75-34 75-75V341c0-41-34-75-75-75zm-683-43h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H853c6 0 11 4 11 11v75h-704V235c0-6 4-11 11-11zm683 576H171c-6 0-11-4-11-11V480h704V789c0 6-4 11-11 11z - M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z - M922 450c-6-9-15-13-26-13h-11V341c0-41-34-75-75-75H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v597c0 6 2 13 6 19 6 9 15 13 26 13h640c13 0 26-9 30-21l128-363c4-11 2-21-4-30zM171 224h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H811c6 0 11 4 11 11v96H256c-13 0-26 9-30 21l-66 186V235c0-6 4-11 11-11zm574 576H173l105-299h572l-105 299z - M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z - M939 94v710L512 998 85 805V94h-64A21 21 0 010 73v-0C0 61 10 51 21 51h981c12 0 21 10 21 21v0c0 12-10 21-21 21h-64zm-536 588L512 624l109 58c6 3 13 4 20 3a32 32 0 0026-37l-21-122 88-87c5-5 8-11 9-18a32 32 0 00-27-37l-122-18-54-111a32 32 0 00-57 0l-54 111-122 18c-7 1-13 4-18 9a33 33 0 001 46l88 87-21 122c-1 7-0 14 3 20a32 32 0 0043 14z - M236 542a32 32 0 109 63l86-12a180 180 0 0022 78l-71 47a32 32 0 1035 53l75-50a176 176 0 00166 40L326 529zM512 16C238 16 16 238 16 512s222 496 496 496 496-222 496-496S786 16 512 16zm0 896c-221 0-400-179-400-400a398 398 0 0186-247l561 561A398 398 0 01512 912zm314-154L690 622a179 179 0 004-29l85 12a32 32 0 109-63l-94-13v-49l94-13a32 32 0 10-9-63l-87 12a180 180 0 00-20-62l71-47A32 32 0 10708 252l-75 50a181 181 0 00-252 10l-115-115A398 398 0 01512 112c221 0 400 179 400 400a398 398 0 01-86 247z - M884 159l-18-18a43 43 0 00-38-12l-235 43a166 166 0 00-101 60L400 349a128 128 0 00-148 47l-120 171a21 21 0 005 29l17 12a128 128 0 00178-32l27-38 124 124-38 27a128 128 0 00-32 178l12 17a21 21 0 0029 5l171-120a128 128 0 0047-148l117-92A166 166 0 00853 431l43-235a43 43 0 00-12-38zm-177 249a64 64 0 110-90 64 64 0 010 90zm-373 312a21 21 0 010 30l-139 139a21 21 0 01-30 0l-30-30a21 21 0 010-30l139-139a21 21 0 0130 0z - M525 0C235 0 0 235 0 525c0 232 150 429 359 498 26 5 36-11 36-25 0-12-1-54-1-97-146 31-176-63-176-63-23-61-58-76-58-76-48-32 3-32 3-32 53 3 81 54 81 54 47 80 123 57 153 43 4-34 18-57 33-70-116-12-239-57-239-259 0-57 21-104 54-141-5-13-23-67 5-139 0 0 44-14 144 54 42-11 87-17 131-17s90 6 131 17C756 203 801 217 801 217c29 72 10 126 5 139 34 37 54 83 54 141 0 202-123 246-240 259 19 17 36 48 36 97 0 70-1 127-1 144 0 14 10 30 36 25 209-70 359-266 359-498C1050 235 814 0 525 0z - M590 74 859 342V876c0 38-31 68-68 68H233c-38 0-68-31-68-68V142c0-38 31-68 68-68h357zm-12 28H233a40 40 0 00-40 38L193 142v734a40 40 0 0038 40L233 916h558a40 40 0 0040-38L831 876V354L578 102zM855 371h-215c-46 0-83-36-84-82l0-2V74h28v213c0 30 24 54 54 55l2 0h215v28zM57 489m28 0 853 0q28 0 28 28l0 284q0 28-28 28l-853 0q-28 0-28-28l0-284q0-28 28-28ZM157 717c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C184 610 172 603 156 603c-29 0-54 21-54 57 0 37 24 56 54 56zM245 711v-108h-34v108h34zm69 0v-86H341V603H262v22h28V711h24zM393 711v-108h-34v108h34zm66 6c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C485 610 474 603 458 603c-29 0-54 21-54 57 0 37 24 56 54 56zm88-6v-36c0-13-2-28-3-40h1l10 24 25 52H603v-108h-23v36c0 13 2 28 3 40h-1l-10-24L548 603H523v108h23zM677 717c30 0 51-22 51-57 0-36-21-56-51-56-30 0-51 20-51 56 0 36 21 57 51 57zm3-23c-16 0-26-12-26-32 0-19 10-31 26-31 16 0 26 11 26 31S696 694 680 694zm93 17v-38h13l21 38H836l-25-43c12-5 19-15 19-31 0-26-20-34-44-34H745v108h27zm16-51H774v-34h15c16 0 25 4 25 16s-9 18-25 18zM922 711v-22h-43v-23h35v-22h-35V625h41V603H853v108h68z - M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z - M0 512M1024 512M512 0M512 1024M955 323q0 23-16 39l-414 414-78 78q-16 16-39 16t-39-16l-78-78-207-207q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 169 375-375q16-16 39-16t39 16l78 78q16 16 16 39z - M416 64H768v64h-64v704h64v64H448v-64h64V512H416a224 224 0 1 1 0-448zM576 832h64V128H576v704zM416 128H512v320H416a160 160 0 0 1 0-320z - M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z - M832 64h128v278l-128-146V64zm64 448L512 73 128 512H0L448 0h128l448 512h-128zm0 83V1024H640V704c0-35-29-64-64-64h-128a64 64 0 00-64 64v320H128V595l384-424 384 424z - M512 0C229 0 0 229 0 512c0 283 229 512 512 512s512-229 512-512c0-283-229-512-512-512zm0 958C266 958 66 758 66 512S266 66 512 66 958 266 958 512 758 958 512 958zM192 416h96a32 32 0 0032-32v-32a32 32 0 00-32-32H192a32 32 0 00-32 32v32a32 32 0 0032 32zM384 416h96a32 32 0 0032-32v-32a32 32 0 00-32-32h-96a32 32 0 00-32 32v32a32 32 0 0032 32zM576 416h96a32 32 0 0032-32v-32a32 32 0 00-32-32h-96a32 32 0 00-32 32v32a32 32 0 0032 32zM832 320h-64a32 32 0 00-32 32v128h-160a32 32 0 00-32 32v32a32 32 0 0032 32h256a32 32 0 0032-32v-192a32 32 0 00-32-32zM320 544v-32a32 32 0 00-32-32H192a32 32 0 00-32 32v32a32 32 0 0032 32h96a32 32 0 0032-32zM384 576h96a32 32 0 0032-32v-32a32 32 0 00-32-32h-96a32 32 0 00-32 32v32a32 32 0 0032 32zM800 640H256a32 32 0 00-32 32v32a32 32 0 0032 32h544a32 32 0 0032-32v-32a32 32 0 00-32-32z - M973 358a51 51 0 0151 51v563a51 51 0 01-51 51H51a51 51 0 01-51-51V410a51 51 0 0151-51h256a51 51 0 110 102H102v461h819V461h-205a51 51 0 110-102h256zM51 102a51 51 0 110-102h256c141 0 256 115 256 256v388l66-66a51 51 0 1172 72l-154 154a51 51 0 01-72 0l-154-154a51 51 0 1172-72L461 644V256c0-85-69-154-154-154H51z - M512 0C229 0 0 229 0 512s229 512 512 512 512-229 512-512S795 0 512 0zM512 928c-230 0-416-186-416-416S282 96 512 96s416 186 416 416S742 928 512 928zM538 343c47 0 83-38 83-78 0-32-21-61-62-61-55 0-82 45-82 77C475 320 498 343 538 343zM533 729c-8 0-11-10-3-40l43-166c16-61 11-100-22-100-39 0-131 40-211 108l16 27c25-17 68-35 78-35 8 0 7 10 0 36l-38 158c-23 89 1 110 34 110 33 0 118-30 196-110l-19-25C575 717 543 729 533 729z - M412 66C326 132 271 233 271 347c0 17 1 34 4 50-41-48-98-79-162-83a444 444 0 00-46 196c0 207 142 382 337 439h2c19 0 34 15 34 33 0 11-6 21-14 26l1 14C183 973 0 763 0 511 0 272 166 70 393 7A35 35 0 01414 0c19 0 34 15 34 33a33 33 0 01-36 33zm200 893c86-66 141-168 141-282 0-17-1-34-4-50 41 48 98 79 162 83a444 444 0 0046-196c0-207-142-382-337-439h-2a33 33 0 01-34-33c0-11 6-21 14-26L596 0C841 51 1024 261 1024 513c0 239-166 441-393 504A35 35 0 01610 1024a33 33 0 01-34-33 33 33 0 0136-33zM512 704a192 192 0 110-384 192 192 0 010 384z - M512 64A447 447 0 0064 512c0 248 200 448 448 448s448-200 448-448S760 64 512 64zM218 295h31c54 0 105 19 145 55 13 12 13 31 3 43a35 35 0 01-22 10 36 36 0 01-21-7 155 155 0 00-103-39h-31a32 32 0 01-31-31c0-18 13-31 30-31zm31 433h-31a32 32 0 01-31-31c0-16 13-31 31-31h31A154 154 0 00403 512 217 217 0 01620 295h75l-93-67a33 33 0 01-7-43 33 33 0 0143-7l205 148-205 148a29 29 0 01-18 6 32 32 0 01-31-31c0-10 4-19 13-25l93-67H620a154 154 0 00-154 154c0 122-97 220-217 220zm390 118a29 29 0 01-18 6 32 32 0 01-31-31c0-10 4-19 13-25l93-67h-75c-52 0-103-19-143-54-12-12-13-31-1-43a30 30 0 0142-3 151 151 0 00102 39h75L602 599a33 33 0 01-7-43 33 33 0 0143-7l205 148-203 151z - M922 39H102A65 65 0 0039 106v609a65 65 0 0063 68h94v168a34 34 0 0019 31 30 30 0 0012 3 30 30 0 0022-10l182-192H922a65 65 0 0063-68V106A65 65 0 00922 39zM288 378h479a34 34 0 010 68H288a34 34 0 010-68zm0-135h479a34 34 0 010 68H288a34 34 0 010-68zm0 270h310a34 34 0 010 68H288a34 34 0 010-68z - M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zM139 832V192c0-6 4-11 11-11h331v661H149c-6 0-11-4-11-11zm747 0c0 6-4 11-11 11H544v-661H875c6 0 11 4 11 11v640z - M40 9 15 23 15 31 9 28 9 20 34 5 24 0 0 14 0 34 25 48 25 28 49 14zM26 29 26 48 49 34 49 15z - M892 251c-5-11-18-18-30-18H162c-12 0-23 7-30 18-5 11-5 26 2 35l179 265v320c0 56 44 102 99 102h200c55 0 99-46 99-102v-320l179-266c9-11 9-24 4-34zm-345 540c0 18-14 35-34 35-18 0-34-14-34-35v-157c0-18 14-34 34-34 18 0 34 14 34 34v157zM512 205c18 0 34-14 34-35V87c0-20-16-35-34-35s-34 14-34 35v84c1 20 16 34 34 34zM272 179c5 18 23 30 40 24 17-6 28-24 23-42l-25-51c-5-18-23-30-40-24s-28 24-23 42L272 179zM777 127c5-18-6-36-23-42-17-6-35 5-40 24l-25 51c-5 18 6 37 23 42 17 6 35-5 40-24l25-52z - M416 192m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 448m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 704m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM96 320l128-192 128 192h-256zM96 640l128 192 128-192h-256zM190 320h64v320H190z - M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l132 0 0-128 64 0 0 128 132 0 0 64-132 0 0 128-64 0 0-128-132 0Z - M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l328 0 0 64-328 0Z - M 968 418 l -95 94 c -59 59 -146 71 -218 37 L 874 331 a 64 64 0 0 0 0 -90 L 783 150 a 64 64 0 0 0 -90 0 L 475 368 c -34 -71 -22 -159 37 -218 l 94 -94 c 75 -75 196 -75 271 0 l 90 90 c 75 75 75 196 0 271 z M 332 693 a 64 64 0 0 1 0 -90 l 271 -271 c 25 -25 65 -25 90 0 s 25 65 0 90 L 422 693 a 64 64 0 0 1 -90 0 z M 151 783 l 90 90 a 64 64 0 0 0 90 0 l 218 -218 c 34 71 22 159 -37 218 l -86 94 a 192 192 0 0 1 -271 0 l -98 -98 a 192 192 0 0 1 0 -271 l 94 -86 c 59 -59 146 -71 218 -37 L 151 693 a 64 64 0 0 0 0 90 z - M0 33h1024v160H0zM0 432h1024v160H0zM0 831h1024v160H0z - M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z - M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z - M832 464h-68V240a128 128 0 00-128-128h-248a128 128 0 00-128 128v224H192c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32v-384c0-18-14-32-32-32zm-292 237v53a8 8 0 01-8 8h-40a8 8 0 01-8-8v-53a48 48 0 1156 0zm152-237H332V240a56 56 0 0156-56h248a56 56 0 0156 56v224z - M908 366h-25V248a18 18 0 00-0-2 20 20 0 00-5-13L681 7 681 7a19 19 0 00-4-3c-0-0-1-1-1-1a29 29 0 00-4-2L671 1a24 24 0 00-5-1H181a40 40 0 00-40 40v326h-25c-32 0-57 26-57 57v298c0 32 26 57 57 57h25v204c0 22 18 40 40 40H843a40 40 0 0040-40v-204h25c32 0 57-26 57-57V424a57 57 0 00-57-57zM181 40h465v205c0 11 9 20 20 20h177v101H181V40zm413 527c0 89-54 143-134 143-81 0-128-61-128-138 0-82 52-143 132-143 84 0 129 63 129 138zm-440 139V433h62v220h108v52h-170zm690 267H181v-193H843l0 193zm18-280a305 305 0 01-91 15c-50 0-86-12-111-37-25-23-39-59-38-99 0-90 66-142 155-142 35 0 62 7 76 13l-13 49c-15-6-33-12-63-12-51 0-90 29-90 88 0 56 35 89 86 89 14 0 25-2 30-4v-57h-42v-48h101v143zM397 570c0 53 25 91 66 91 42 0 65-40 65-92 0-49-23-91-66-91-42 0-66 40-66 93z - M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z - M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z - M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z - M0 512M1024 512M512 0M512 1024M813 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM211 448C165 448 128 485 128 531c0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM512 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83C595 485 558 448 512 448z - M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299Z - M64 363l0 204 265 0L329 460c0-11 6-18 14-20C349 437 355 437 362 441c93 60 226 149 226 149 33 22 34 60 0 82 0 0-133 89-226 149-14 9-32-3-32-18l-1-110L64 693l0 117c0 41 34 75 75 75l746 0c41 0 75-34 75-74L960 364c0-0 0-1 0-1L64 363zM64 214l0 75 650 0-33-80c-16-38-62-69-103-69l-440 0C97 139 64 173 64 214z - M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z - M841 627A43 43 0 00811 555h-299v85h196l-183 183A43 43 0 00555 896h299v-85h-196l183-183zM299 170H213v512H85l171 171 171-171H299zM725 128h-85c-18 0-34 11-40 28l-117 313h91L606 384h154l32 85h91l-117-313A43 43 0 00725 128zm-88 171 32-85h26l32 85h-90z - M512 0a512 512 0 01512 512 57 57 0 01-114 0 398 398 0 10-398 398 57 57 0 010 114A512 512 0 01512 0zm367 600 121 120a57 57 0 01-80 81l-40-40V967a57 57 0 01-50 57l-7 0a57 57 0 01-57-57v-205l-40 40a57 57 0 01-75 5l-5-5a57 57 0 01-0-80l120-121a80 80 0 01113-0zM512 272a57 57 0 0157 57V499h114a57 57 0 0156 50L740 556a57 57 0 01-57 57H512a57 57 0 01-57-57v-228a57 57 0 0150-57L512 272z - M640 96c-158 0-288 130-288 288 0 17 3 31 5 46L105 681 96 691V928h224v-96h96v-96h96v-95c38 18 82 31 128 31 158 0 288-130 288-288s-130-288-288-288zm0 64c123 0 224 101 224 224s-101 224-224 224a235 235 0 01-109-28l-8-4H448v96h-96v96H256v96H160v-146l253-254 12-11-3-17C419 417 416 400 416 384c0-123 101-224 224-224zm64 96a64 64 0 100 128 64 64 0 100-128z - M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h150a32 32 0 100-64z - m186 532 287 0 0 287c0 11 9 20 20 20s20-9 20-20l0-287 287 0c11 0 20-9 20-20s-9-20-20-20l-287 0 0-287c0-11-9-20-20-20s-20 9-20 20l0 287-287 0c-11 0-20 9-20 20s9 20 20 20z - M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z - M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z - M563 555c0 28-23 51-51 51-28 0-51-23-51-51L461 113c0-28 23-51 51-51s51 23 51 51L563 555 563 555zM85 535c0-153 81-287 201-362 24-15 55-8 70 16C371 214 363 245 340 260 248 318 187 419 187 535c0 180 146 325 325 325 180-0 325-146 325-325 0-119-64-223-160-280-24-14-32-46-18-70 14-24 46-32 70-18 125 74 210 211 210 367 0 236-191 427-427 427C276 963 85 772 85 535 - M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z - M467 556c0-0 0-1 0-1C467 555 467 556 467 556zM467 556c0-0 0-0 0-0C467 556 467 556 467 556zM467 556c-0 0-0 0-0 0C467 557 467 557 467 556zM468 549C468 532 468 541 468 549L468 549zM468 549c0 1-0 1-0 2C468 551 468 550 468 549zM468 552c-0 1-0 2-0 3C467 554 468 553 468 552zM736 549C736 532 736 541 736 549L736 549zM289 378l0 179 89 0c-1 80-89 89-89 89l45 45c0 0 129-15 134-134L467 378 289 378zM959 244l0 536c0 99-80 179-179 179L244 959c-99 0-179-80-179-179L65 244c0-99 80-179 179-179l536 0C879 65 959 145 959 244zM869 289c0-74-60-134-134-134L289 155c-74 0-134 60-134 134l0 447c0 74 60 134 134 134l447 0c74 0 134-60 134-134L869 289zM557 557l89 0c-1 80-89 89-89 89l45 45c0 0 129-15 134-134L735 378 557 378 557 557z - m224 154a166 166 0 00-166 166v192a166 166 0 00166 166h64v-76h-64a90 90 0 01-90-90v-192a90 90 0 0190-90h320a90 90 0 0190 90v192a90 90 0 01-90 90h-128v77h128a166 166 0 00166-167v-192a166 166 0 00-166-166h-320zm166 390a90 90 0 0190-90h128v-76h-128a166 166 0 00-166 166v192a166 166 0 00166 166h320a166 166 0 00166-166v-192a166 166 0 00-166-166h-64v77h64a90 90 0 0190 90v192a90 90 0 01-90 90h-320a90 90 0 01-90-90v-192z - M512 128M706 302a289 289 0 00-173 44 27 27 0 1029 46 234 234 0 01125-36c23 0 45 3 66 9 93 28 161 114 161 215C914 704 813 805 687 805H337C211 805 110 704 110 580c0-96 61-178 147-210C282 263 379 183 495 183a245 245 0 01210 119z - M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z - M115 386l19 33c17 29 44 50 76 60l116 33c34 10 58 41 58 77v80c0 22 12 42 32 52s32 30 32 52v78c0 31 30 54 60 45 32-9 57-35 65-68l6-22c8-34 30-63 61-80l16-9c30-17 48-49 48-83v-17c0-25-10-50-28-68l-8-8c-18-18-42-28-68-28H514c-22 0-44-6-64-17l-69-39c-9-5-15-13-18-22-6-19 2-40 20-49l12-6c13-7 29-8 43-3l46 15c16 5 34-1 44-15 9-14 8-33-2-46l-27-33c-20-24-20-59 1-83l31-37c18-21 20-50 7-73l-5-8c-7-0-14-1-21-1-186 0-343 122-396 290zM928 512c0-74-19-143-53-203L824 330c-31 13-48 48-37 80l34 101c7 21 24 37 45 42l58 15c2-18 4-36 4-55zM0 512a512 512 0 111024 0 512 512 0 11-1024 0z - M1024 64v704h-128v128h-128v128h-768v-704h128v-128h128v-128zM64 960h640v-576h-640zM320 128v64h576v512h64v-576zM192 256v64h576v512h64v-576zM432 688L576 832H480L384 736 288 832H192l144-144L192 544h96L384 640l96-96H576z - M853 256h-43v512h43c47 0 85-38 85-85v-341c0-47-38-85-85-85zM725 768V171h128V85h-341v85H640v85H171c-47 0-85 38-85 85v341c0 47 38 85 85 85h469V853h-128v85h341v-85H725v-86zm-469-171v-171h384v171H256z - M960 146v91C960 318 759 384 512 384S64 318 64 238V146C64 66 265 0 512 0s448 66 448 146zM960 352v206C960 638 759 704 512 704S64 638 64 558V352c96 66 272 97 448 97S864 418 960 352zm0 320v206C960 958 759 1024 512 1024S64 958 64 878V672c96 66 272 97 448 97S864 738 960 672z - M883 567l-128-128c-17-17-43-17-60 0l-128 128c-17 17-17 43 0 60 17 17 43 17 60 0l55-55V683c0 21-21 43-43 43H418c-13-38-43-64-77-77V375c51-17 85-64 85-119 0-73-60-128-128-128-73 0-128 55-128 128 0 55 34 102 85 119v269c-51 17-85 64-85 119 0 73 55 128 128 128 55 0 102-34 119-85H640c73 0 128-55 128-128v-111l55 55c9 9 17 13 30 13 13 0 21-4 30-13 17-13 17-43 0-55zM299 213c26 0 43 17 43 43 0 21-21 43-43 43-26 0-43-21-43-43 0-26 17-43 43-43zm0 597c-26 0-43-21-43-43 0-26 17-43 43-43s43 17 43 43c0 21-17 43-43 43zM725 384c-73 0-128-60-128-128 0-73 55-128 128-128s128 55 128 128c0 68-55 128-128 128zm0-171c-26 0-43 17-43 43s17 43 43 43 43-17 43-43-17-43-43-43z - M293 122v244h439V146l171 175V829a73 73 0 01-73 73h-98V536H293v366H195a73 73 0 01-73-73V195a73 73 0 0173-73h98zm366 512v268H366V634h293zm-49 49h-195v73h195v-73zm49-561v171H366V122h293z - M0 551V472c0-11 9-19 19-19h984c11 0 19 9 19 19v79c0 11-9 19-19 19H19c-11 0-19-9-19-19zM114 154v240c0 11-9 19-19 19H19C9 413 0 404 0 394V79C0 35 35 0 79 0h315c11 0 19 9 19 19v75c0 11-9 19-19 19H154c-21 0-39 18-39 39zm795 0c0-22-17-39-39-39h-240c-11 0-19-9-19-19V19c0-11 9-19 19-19h315c43 0 79 35 79 79v315c0 11-9 19-19 19h-75c-11 0-19-9-19-19l-1-240zm0 716v-240c0-11 9-19 19-19h75c11 0 19 9 19 19v315c0 43-35 79-79 79h-315c-11 0-19-9-19-19v-75c0-11 9-19 19-19H870c21-1 39-18 39-40zm-795 0c0 21 18 39 39 39h240c11 0 19 9 19 19v75c0 11-9 19-19 19H79C35 1023 0 988 0 945v-315c0-11 9-19 19-19h75c11 0 19 9 19 19V870z - M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z - M928 500a21 21 0 00-19-20L858 472a11 11 0 01-9-9c-1-6-2-13-3-19a11 11 0 015-12l46-25a21 21 0 0010-26l-8-22a21 21 0 00-24-13l-51 10a11 11 0 01-12-6c-3-6-6-11-10-17a11 11 0 011-13l34-39a21 21 0 001-28l-15-18a20 20 0 00-27-4l-45 27a11 11 0 01-13-1c-5-4-10-9-15-12a11 11 0 01-3-12l19-49a21 21 0 00-9-26l-20-12a21 21 0 00-27 6L650 193a9 9 0 01-11 3c-1-1-12-5-20-7a11 11 0 01-7-10l1-52a21 21 0 00-17-22l-23-4a21 21 0 00-24 14L532 164a11 11 0 01-11 7h-20a11 11 0 01-11-7l-17-49a21 21 0 00-24-15l-23 4a21 21 0 00-17 22l1 52a11 11 0 01-8 11c-5 2-15 6-19 7c-4 1-8 0-12-4l-33-40A21 21 0 00313 146l-20 12A21 21 0 00285 184l19 49a11 11 0 01-3 12c-5 4-10 8-15 12a11 11 0 01-13 1L228 231a21 21 0 00-27 4L186 253a21 21 0 001 28L221 320a11 11 0 011 13c-3 5-7 11-10 17a11 11 0 01-12 6l-51-10a21 21 0 00-24 13l-8 22a21 21 0 0010 26l46 25a11 11 0 015 12l0 3c-1 6-2 11-3 16a11 11 0 01-9 9l-51 8A21 21 0 0096 500v23A21 21 0 00114 544l51 8a11 11 0 019 9c1 6 2 13 3 19a11 11 0 01-5 12l-46 25a21 21 0 00-10 26l8 22a21 21 0 0024 13l51-10a11 11 0 0112 6c3 6 6 11 10 17a11 11 0 01-1 13l-34 39a21 21 0 00-1 28l15 18a20 20 0 0027 4l45-27a11 11 0 0113 1c5 4 10 9 15 12a11 11 0 013 12l-19 49a21 21 0 009 26l20 12a21 21 0 0027-6L374 832c3-3 7-5 10-4c7 3 12 5 20 7a11 11 0 018 10l-1 52a21 21 0 0017 22l23 4a21 21 0 0024-14l17-50a11 11 0 0111-7h20a11 11 0 0111 7l17 49a21 21 0 0020 15a19 19 0 004 0l23-4a21 21 0 0017-22l-1-52a11 11 0 018-10c8-3 13-5 18-7l1 0c6-2 9 0 11 3l34 41A21 21 0 00710 878l20-12a21 21 0 009-26l-18-49a11 11 0 013-12c5-4 10-8 15-12a11 11 0 0113-1l45 27a21 21 0 0027-4l15-18a21 21 0 00-1-28l-34-39a11 11 0 01-1-13c3-5 7-11 10-17a11 11 0 0112-6l51 10a21 21 0 0024-13l8-22a21 21 0 00-10-26l-46-25a11 11 0 01-5-12l0-3c1-6 2-11 3-16a11 11 0 019-9l51-8a21 21 0 0018-21v-23zm-565 188a32 32 0 01-51 5a270 270 0 011-363a32 32 0 0151 6l91 161a32 32 0 010 31zM512 782a270 270 0 01-57-6a32 32 0 01-20-47l92-160a32 32 0 0127-16h184a32 32 0 0130 41c-35 109-137 188-257 188zm15-328L436 294a32 32 0 0121-47a268 268 0 0155-6c120 0 222 79 257 188a32 32 0 01-30 41h-184a32 32 0 01-28-16z - M900 287c40 69 60 144 60 225s-20 156-60 225c-40 69-94 123-163 163-69 40-144 60-225 60s-156-20-225-60c-69-40-123-94-163-163C84 668 64 593 64 512s20-156 60-225 94-123 163-163c69-40 144-60 225-60s156 20 225 60 123 94 163 163zM762 512c0-9-3-16-9-22L578 315l-44-44c-6-6-13-9-22-9s-16 3-22 9l-44 44-176 176c-6 6-9 13-9 22s3 16 9 22l44 44c6 6 13 9 22 9s16-3 22-9l92-92v269c0 9 3 16 9 22 6 6 13 9 22 9h62c8 0 16-3 22-9 6-6 9-13 9-22V486l92 92c6 6 13 9 22 9 8 0 16-3 22-9l44-44c6-6 9-13 9-22z - M512 939C465 939 427 900 427 853 427 806 465 768 512 768 559 768 597 806 597 853 597 900 559 939 512 939M555 85 555 555 747 363 807 423 512 719 217 423 277 363 469 555 469 85 555 85Z - M961 320 512 577 63 320 512 62l449 258zM512 628 185 442 63 512 512 770 961 512l-123-70L512 628zM512 821 185 634 63 704 512 962l449-258L839 634 512 821z - M363 491h64v107h107v64h-107v107h-64v-107h-107v-64h107v-107zm149-235 256 128-256 128-64-32v-11H427l-171-85 256-128zm256 384-256 128-64-32v-53h64l0 0 0-0h43v-21l128-64 85 43zm0-128-213 107v-43h-107v-53l64 32 171-85 85 43zm-512 0 85-43v85l-85-43z - M447 561a26 26 0 0126 26v171H421v-171a26 26 0 0126-26zm-98 65a26 26 0 0126 26v104H323v-104a26 26 0 0126-26zm0 0M561 268a32 32 0 0132 30v457h-65V299a32 32 0 0132-32zm0 0M675 384a26 26 0 0126 26v348H649v-350a26 26 0 0126-24zm0 0M801 223v579H223V223h579M805 171H219A49 49 0 00171 219v585A49 49 0 00219 853h585A49 49 0 00853 805V219A49 49 0 00805 171z - M576 160H448c-18 0-32-14-32-32s14-32 32-32h128c18 0 32 14 32 32s-14 32-32 32zm243 186 36-36c13-13 13-33 0-45s-33-13-45 0l-33 33C708 233 614 192 512 192c-212 0-384 172-384 384s172 384 384 384 384-172 384-384c0-86-29-166-77-230zM544 894V864c0-18-14-32-32-32s-32 14-32 32v30C329 879 209 759 194 608H224c18 0 32-14 32-32s-14-32-32-32h-30C209 393 329 273 480 258V288c0 18 14 32 32 32s32-14 32-32v-30C695 273 815 393 830 544H800c-18 0-32 14-32 32s14 32 32 32h30C815 759 695 879 544 894zm108-471-160 128c-14 11-16 31-5 45 6 8 16 12 25 12 7 0 14-2 20-7l160-128c14-11 16-31 5-45-11-14-31-16-45-5z - M558 545 790 403c24-15 31-47 16-71-15-24-46-31-70-17L507 457 277 315c-24-15-56-7-71 17-15 24-7 56 17 71l232 143V819c0 28 23 51 51 51 28 0 51-23 51-51V545h0zM507 0l443 256v512L507 1024 63 768v-512L507 0z - M770 320a41 41 0 00-56-14l-252 153L207 306a41 41 0 10-43 70l255 153 2 296a41 41 0 0082 0l-2-295 255-155a41 41 0 0014-56zM481 935a42 42 0 01-42 0L105 741a42 42 0 01-21-36v-386a42 42 0 0121-36L439 89a42 42 0 0142 0l335 193a42 42 0 0121 36v87h84v-87a126 126 0 00-63-109L523 17a126 126 0 00-126 0L63 210a126 126 0 00-63 109v386a126 126 0 0063 109l335 193a126 126 0 00126 0l94-54-42-72zM1029 700h-126v-125a42 42 0 00-84 0v126h-126a42 42 0 000 84h126v126a42 42 0 1084 0v-126h126a42 42 0 000-84z - M416 587c21 0 37 17 37 37v299A37 37 0 01416 960h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299zm448 0c21 0 37 17 37 37v299A37 37 0 01864 960h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299zM758 91l183 189a37 37 0 010 52l-182 188a37 37 0 01-53 1l-183-189a37 37 0 010-52l182-188a37 37 0 0153-1zM416 139c21 0 37 17 37 37v299A37 37 0 01416 512h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299z - M653 435l-26 119H725c9 0 13 4 13 13v47c0 9-4 13-13 13h-107l-21 115c0 9-4 13-13 13h-47c-9 0-13-4-13-13l21-111H427l-21 115c0 9-4 13-13 13H346c-9 0-13-4-13-13l21-107h-85c-4-9-9-21-13-34v-38c0-9 4-13 13-13h98l26-119H294c-9 0-13-4-13-13V375c0-9 4-13 13-13h115l13-81c0-9 4-13 13-13h43c9 0 13 4 13 13L469 363h119l13-81c0-9 4-13 13-13h47c9 0 13 4 13 13l-13 77h85c9 0 13 4 13 13v47c0 9-4 13-13 13h-98v4zM512 0C230 0 0 230 0 512c0 145 60 282 166 375L90 1024H512c282 0 512-230 512-512S794 0 512 0zm-73 559h124l26-119h-128l-21 119z - M875 128h-725A107 107 0 0043 235v555A107 107 0 00149 896h725a107 107 0 00107-107v-555A107 107 0 00875 128zm-115 640h-183v-58l25-3c15 0 19-8 14-24l-22-61H419l-28 82 39 2V768h-166v-58l18-3c18-2 22-11 26-24l125-363-40-4V256h168l160 448 39 3zM506 340l-72 218h145l-71-218h-2z - M177 156c-22 5-33 17-36 37c-10 57-33 258-13 278l445 445c23 23 61 23 84 0l246-246c23-23 23-61 0-84l-445-445C437 120 231 145 177 156zM331 344c-26 26-69 26-95 0c-26-26-26-69 0-95s69-26 95 0C357 276 357 318 331 344z - M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z - M996 452 572 28A96 96 0 00504 0H96C43 0 0 43 0 96v408a96 96 0 0028 68l424 424c37 37 98 37 136 0l408-408c37-37 37-98 0-136zM224 320c-53 0-96-43-96-96s43-96 96-96 96 43 96 96-43 96-96 96zm1028 268L844 996c-37 37-98 37-136 0l-1-1L1055 647c34-34 53-79 53-127s-19-93-53-127L663 0h97a96 96 0 0168 28l424 424c37 37 37 98 0 136z - M765 118 629 239l-16 137-186 160 54 59 183-168 144 4 136-129 47-43-175-12L827 67zM489 404c-66 0-124 55-124 125s54 121 124 121c66 0 120-55 120-121H489l23-121c-8-4-16-4-23-4zM695 525c0 114-93 207-206 207s-206-94-206-207 93-207 206-207c16 0 27 0 43 4l43-207c-27-4-54-8-85-8-229 0-416 188-416 419s187 419 416 419c225 0 408-180 416-403v-12l-210-4z - M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z - M170 831 513 489 855 831 960 726 512 278 64 726 170 831zM512 278h448v-128h-896v128h448z - M897 673v13c0 51-42 93-93 93h-10c-1 0-2 0-2 0H220c-23 0-42 19-42 42v13c0 23 19 42 42 42h552c14 0 26 12 26 26 0 14-12 26-26 26H220c-51 0-93-42-93-93v-13c0-51 42-93 93-93h20c1-0 2-0 2-0h562c23 0 42-19 42-42v-13c0-11-5-22-13-29-8-7-17-11-28-10H660c-14 0-26-12-26-26 0-14 12-26 26-26h144c24-1 47 7 65 24 18 17 29 42 29 67zM479 98c-112 0-203 91-203 203 0 44 14 85 38 118l132 208c15 24 50 24 66 0l133-209c23-33 37-73 37-117 0-112-91-203-203-203zm0 327c-68 0-122-55-122-122s55-122 122-122 122 55 122 122-55 122-122 122z - M912 800a48 48 0 1 1 0 96h-416a48 48 0 1 1 0-96h416z m-704-704A112 112 0 0 1 256 309.184V480h80a48 48 0 0 1 0 96H256v224h81.664a48 48 0 1 1 0 96H256a96 96 0 0 1-96-96V309.248A112 112 0 0 1 208 96z m704 384a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z m0-320a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z - M30 0 30 30 0 15z - M0 0 0 30 30 15z - M762 1024C876 818 895 504 448 514V768L64 384l384-384v248c535-14 595 472 314 776z - M832 464H332V240c0-31 25-56 56-56h248c31 0 56 25 56 56v68c0 4 4 8 8 8h56c4 0 8-4 8-8v-68c0-71-57-128-128-128H388c-71 0-128 57-128 128v224h-68c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32V496c0-18-14-32-32-32zM540 701v53c0 4-4 8-8 8h-40c-4 0-8-4-8-8v-53c-12-9-20-23-20-39 0-27 22-48 48-48s48 22 48 48c0 16-8 30-20 39z - M170 831l343-342L855 831l105-105-448-448L64 726 170 831z - M667 607c-3-2-7-14-0-38 73-77 118-187 118-290C784 115 668 0 508 0 348 0 236 114 236 278c0 104 45 215 119 292 7 24-2 33-8 35C274 631 0 725 0 854L0 1024l1024 0 0-192C989 714 730 627 667 607L667 607z - M880 128A722 722 0 01555 13a77 77 0 00-85 0 719 719 0 01-325 115c-40 4-71 38-71 80v369c0 246 329 446 439 446 110 0 439-200 439-446V207c0-41-31-76-71-80zM465 692a36 36 0 01-53 0L305 579a42 42 0 010-57 36 36 0 0153 0l80 85L678 353a36 36 0 0153 0 42 42 0 01-0 57L465 692z - M812 864h-29V654c0-21-11-40-28-52l-133-88 134-89c18-12 28-31 28-52V164h28c18 0 32-14 32-32s-14-32-32-32H212c-18 0-32 14-32 32s14 32 32 32h30v210c0 21 11 40 28 52l133 88-134 89c-18 12-28 31-28 52V864H212c-18 0-32 14-32 32s14 32 32 32h600c18 0 32-14 32-32s-14-32-32-32zM441 566c18-12 28-31 28-52s-11-40-28-52L306 373V164h414v209l-136 90c-18 12-28 31-28 52 0 21 11 40 28 52l135 89V695c-9-7-20-13-32-19-30-15-93-41-176-41-63 0-125 14-175 38-12 6-22 12-31 18v-36l136-90z - M0 512M1024 512M512 0M512 1024M762 412v100h-500v-100h-150v200h800v-200h-150z - M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z - M1024 565V459H0V565H1024ZM512 0M512 1024 + M0 0M1024 1024 M960 544H64a32 32 0 1 1 0-64h896a32 32 0 1 1 0 64 M153 154h768v768h-768v-768zm64 64v640h640v-640h-640z M256 128l0 192L64 320l0 576 704 0 0-192 192 0L960 128 256 128zM704 832 128 832 128 384l576 0L704 832zM896 640l-128 0L768 320 320 320 320 192l576 0L896 640z - M248 221a77 77 0 00-30-21c-18-7-40-10-68-5a224 224 0 00-45 13c-5 2-10 5-15 8l-3 2v68l11-9c10-8 21-14 34-19 13-5 26-7 39-7 12 0 21 3 28 10 6 6 9 16 9 29l-62 9c-14 2-26 6-36 11a80 80 0 00-25 20c-7 8-12 17-15 27-6 21-6 44 1 65a70 70 0 0041 43c10 4 21 6 34 6a80 80 0 0063-28v22h64V298c0-16-2-31-6-44a91 91 0 00-18-33zm-41 121v15c0 8-1 15-4 22a48 48 0 01-24 29 44 44 0 01-33 2 29 29 0 01-10-6 25 25 0 01-6-9 30 30 0 01-2-12c0-5 1-9 2-14a21 21 0 015-9 28 28 0 0110-7 83 83 0 0120-5l42-6zm323-68a144 144 0 00-16-42 87 87 0 00-28-29 75 75 0 00-41-11 73 73 0 00-44 14c-6 5-12 11-17 17V64H326v398h59v-18c8 10 18 17 30 21 6 2 13 3 21 3 16 0 31-4 43-11 12-7 23-18 31-31a147 147 0 0019-46 248 248 0 006-57c0-17-2-33-5-49zm-55 49c0 15-1 28-4 39-2 11-6 20-10 27a41 41 0 01-15 15 37 37 0 01-36 1 44 44 0 01-13-12 59 59 0 01-9-18A76 76 0 01384 352v-33c0-10 1-20 4-29 2-8 6-15 10-22a43 43 0 0115-13 37 37 0 0119-5 35 35 0 0132 18c4 6 7 14 9 23 2 9 3 20 3 31zM154 634a58 58 0 0120-15c14-6 35-7 49-1 7 3 13 6 20 12l21 17V572l-6-4a124 124 0 00-58-14c-20 0-38 4-54 11-16 7-30 17-41 30-12 13-20 29-26 46-6 17-9 36-9 57 0 18 3 36 8 52 6 16 14 30 24 42 10 12 23 21 38 28 15 7 32 10 50 10 15 0 28-2 39-5 11-3 21-8 30-14l5-4v-57l-13 6a26 26 0 01-5 2c-3 1-6 2-8 3-2 1-15 6-15 6-4 2-9 3-14 4a63 63 0 01-38-4 53 53 0 01-20-14 70 70 0 01-13-24 111 111 0 01-5-34c0-13 2-26 5-36 3-10 8-19 14-26zM896 384h-256V320h288c21 1 32 12 32 32v384c0 18-12 32-32 32H504l132 133-45 45-185-185c-16-21-16-25 0-45l185-185L637 576l-128 128H896V384z - M128 691H6V38h838v160h-64V102H70v525H128zM973 806H154V250h819v557zm-755-64h691V314H218v429zM365 877h448v64h-448z - M853 267H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v555c0 41 34 75 75 75h683c41 0 75-34 75-75V341c0-41-34-75-75-75zm-683-43h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H853c6 0 11 4 11 11v75h-704V235c0-6 4-11 11-11zm683 576H171c-6 0-11-4-11-11V480h704V789c0 6-4 11-11 11z - M896 96 614 96c-58 0-128-19-179-51C422 38 390 19 358 19L262 19 128 19c-70 0-128 58-128 128l0 736c0 70 58 128 128 128l768 0c70 0 128-58 128-128L1024 224C1024 154 966 96 896 96zM704 685 544 685l0 160c0 19-13 32-32 32s-32-13-32-32l0-160L320 685c-19 0-32-13-32-32 0-19 13-32 32-32l160 0L480 461c0-19 13-32 32-32s32 13 32 32l0 160L704 621c19 0 32 13 32 32C736 666 723 685 704 685zM890 326 102 326 102 250c0-32 32-64 64-64l659 0c38 0 64 32 64 64L890 326z - M1182 527a91 91 0 00-88-117H92a91 91 0 00-88 117l137 441A80 80 0 00217 1024h752a80 80 0 0076-56zM133 295a31 31 0 0031 31h858a31 31 0 0031-31A93 93 0 00959 203H226a93 93 0 00-94 92zM359 123h467a31 31 0 0031-31A92 92 0 00765 0H421a92 92 0 00-92 92 31 31 0 0031 31z + M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z + M1024 750v110c0 50-41 91-91 91h-841A92 92 0 010 859v-110C0 699 41 658 91 658h841c50 0 91 41 91 91z + M0 4 0 20 16 20 0 4M4 0 20 0 20 16 4 0z + M851 755q0 23-16 39l-78 78q-16 16-39 16t-39-16l-168-168-168 168q-16 16-39 16t-39-16l-78-78q-16-16-16-39t16-39l168-168-168-168q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 168 168-168q16-16 39-16t39 16l78 78q16 16 16 39t-16 39l-168 168 168 168q16 16 16 39z + M30 0 30 30 0 15z + M0 0 0 30 30 15z + M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z + M512 945c-238 0-433-195-433-433S274 79 512 79c238 0 433 195 433 433S750 945 512 945M512 0C228 0 0 228 0 512s228 512 512 512 512-228 512-512-228-512-512-512zM752 477H364l128-128a38 38 0 000-55 38 38 0 00-55 0l-185 183a55 55 0 00-16 39c0 16 6 30 16 39l185 185a39 39 0 0028 12 34 34 0 0028-14 38 38 0 000-55l-128-128h386c22 0 41-18 41-39a39 39 0 00-39-39 + M576 832C576 867 547 896 512 896 477 896 448 867 448 832 448 797 477 768 512 768 547 768 576 797 576 832ZM512 256C477 256 448 285 448 320L448 640C448 675 477 704 512 704 547 704 576 675 576 640L576 320C576 285 547 256 512 256ZM1024 896C1024 967 967 1024 896 1024L128 1024C57 1024 0 967 0 896 0 875 5 855 14 837L14 837 398 69 398 69C420 28 462 0 512 0 562 0 604 28 626 69L1008 835C1018 853 1024 874 1024 896ZM960 896C960 885 957 875 952 865L952 864 951 863 569 98C557 77 536 64 512 64 488 64 466 77 455 99L452 105 92 825 93 825 71 867C66 876 64 886 64 896 64 931 93 960 128 960L896 960C931 960 960 931 960 896Z + M608 0q48 0 88 23t63 63 23 87v70h55q35 0 67 14t57 38 38 57 14 67V831q0 34-14 66t-38 57-57 38-67 13H426q-34 0-66-13t-57-38-38-57-14-66v-70h-56q-34 0-66-14t-57-38-38-57-13-67V174q0-47 23-87T109 23 196 0h412m175 244H426q-46 0-86 22T278 328t-26 85v348H608q47 0 86-22t63-62 25-85l1-348m-269 318q18 0 31 13t13 31-13 31-31 13-31-13-13-31 13-31 31-13m0-212q13 0 22 9t11 22v125q0 14-9 23t-22 10-23-7-11-22l-1-126q0-13 10-23t23-10z + m186 532 287 0 0 287c0 11 9 20 20 20s20-9 20-20l0-287 287 0c11 0 20-9 20-20s-9-20-20-20l-287 0 0-287c0-11-9-20-20-20s-20 9-20 20l0 287-287 0c-11 0-20 9-20 20s9 20 20 20z + M716.3 383.1c0 38.4-6.5 76-19.4 111.8l-10.7 29.7 229.6 229.5c44.5 44.6 44.5 117.1 0 161.6a113.6 113.6 0 01-80.8 33.5a113.6 113.6 0 01-80.8-33.5L529 694l-32 13a331.6 331.6 0 01-111.9 19.4A333.5 333.5 0 0150 383.1c0-39 6.8-77.2 20-113.6L285 482l194-195-214-210A331 331 0 01383.1 50A333.5 333.5 0 01716.3 383.1zM231.6 31.6l-22.9 9.9a22.2 22.2 0 00-5.9 4.2a19.5 19.5 0 000 27.5l215 215.2L288.4 417.8 77.8 207.1a26 26 0 00-17.2-7.1a22.8 22.8 0 00-21.5 15a400.5 400.5 0 00-7.5 16.6A381.6 381.6 0 000 384c0 211.7 172.2 384 384 384c44.3 0 87.6-7.5 129-22.3L743.1 975.8A163.5 163.5 0 00859.5 1024c43.9 0 85.3-17.1 116.4-48.2a164.8 164.8 0 000-233L745.5 513C760.5 471.5 768 428 768 384C768 172 596 0 384 0c-53 0-104 10.5-152.5 31.5z + M928 500a21 21 0 00-19-20L858 472a11 11 0 01-9-9c-1-6-2-13-3-19a11 11 0 015-12l46-25a21 21 0 0010-26l-8-22a21 21 0 00-24-13l-51 10a11 11 0 01-12-6c-3-6-6-11-10-17a11 11 0 011-13l34-39a21 21 0 001-28l-15-18a20 20 0 00-27-4l-45 27a11 11 0 01-13-1c-5-4-10-9-15-12a11 11 0 01-3-12l19-49a21 21 0 00-9-26l-20-12a21 21 0 00-27 6L650 193a9 9 0 01-11 3c-1-1-12-5-20-7a11 11 0 01-7-10l1-52a21 21 0 00-17-22l-23-4a21 21 0 00-24 14L532 164a11 11 0 01-11 7h-20a11 11 0 01-11-7l-17-49a21 21 0 00-24-15l-23 4a21 21 0 00-17 22l1 52a11 11 0 01-8 11c-5 2-15 6-19 7c-4 1-8 0-12-4l-33-40A21 21 0 00313 146l-20 12A21 21 0 00285 184l19 49a11 11 0 01-3 12c-5 4-10 8-15 12a11 11 0 01-13 1L228 231a21 21 0 00-27 4L186 253a21 21 0 001 28L221 320a11 11 0 011 13c-3 5-7 11-10 17a11 11 0 01-12 6l-51-10a21 21 0 00-24 13l-8 22a21 21 0 0010 26l46 25a11 11 0 015 12l0 3c-1 6-2 11-3 16a11 11 0 01-9 9l-51 8A21 21 0 0096 500v23A21 21 0 00114 544l51 8a11 11 0 019 9c1 6 2 13 3 19a11 11 0 01-5 12l-46 25a21 21 0 00-10 26l8 22a21 21 0 0024 13l51-10a11 11 0 0112 6c3 6 6 11 10 17a11 11 0 01-1 13l-34 39a21 21 0 00-1 28l15 18a20 20 0 0027 4l45-27a11 11 0 0113 1c5 4 10 9 15 12a11 11 0 013 12l-19 49a21 21 0 009 26l20 12a21 21 0 0027-6L374 832c3-3 7-5 10-4c7 3 12 5 20 7a11 11 0 018 10l-1 52a21 21 0 0017 22l23 4a21 21 0 0024-14l17-50a11 11 0 0111-7h20a11 11 0 0111 7l17 49a21 21 0 0020 15a19 19 0 004 0l23-4a21 21 0 0017-22l-1-52a11 11 0 018-10c8-3 13-5 18-7l1 0c6-2 9 0 11 3l34 41A21 21 0 00710 878l20-12a21 21 0 009-26l-18-49a11 11 0 013-12c5-4 10-8 15-12a11 11 0 0113-1l45 27a21 21 0 0027-4l15-18a21 21 0 00-1-28l-34-39a11 11 0 01-1-13c3-5 7-11 10-17a11 11 0 0112-6l51 10a21 21 0 0024-13l8-22a21 21 0 00-10-26l-46-25a11 11 0 01-5-12l0-3c1-6 2-11 3-16a11 11 0 019-9l51-8a21 21 0 0018-21v-23zm-565 188a32 32 0 01-51 5a270 270 0 011-363a32 32 0 0151 6l91 161a32 32 0 010 31zM512 782a270 270 0 01-57-6a32 32 0 01-20-47l92-160a32 32 0 0127-16h184a32 32 0 0130 41c-35 109-137 188-257 188zm15-328L436 294a32 32 0 0121-47a268 268 0 0155-6c120 0 222 79 257 188a32 32 0 01-30 41h-184a32 32 0 01-28-16z + M512 0C229 0 0 229 0 512s229 512 512 512 512-229 512-512S795 0 512 0zM512 928c-230 0-416-186-416-416S282 96 512 96s416 186 416 416S742 928 512 928zM538 343c47 0 83-38 83-78 0-32-21-61-62-61-55 0-82 45-82 77C475 320 498 343 538 343zM533 729c-8 0-11-10-3-40l43-166c16-61 11-100-22-100-39 0-131 40-211 108l16 27c25-17 68-35 78-35 8 0 7 10 0 36l-38 158c-23 89 1 110 34 110 33 0 118-30 196-110l-19-25C575 717 543 729 533 729z + M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z + M512 57c251 0 455 204 455 455S763 967 512 967 57 763 57 512 261 57 512 57zm181 274c-11-11-29-11-40 0L512 472 371 331c-11-11-29-11-40 0-11 11-11 29 0 40L471 512 331 653c-11 11-11 29 0 40 11 11 29 11 40 0l141-141 141 141c11 11 29 11 40 0 11-11 11-29 0-40L552 512l141-141c11-11 11-29 0-40z + M899 870l-53-306H864c14 0 26-12 26-26V346c0-14-12-26-26-26H618V138c0-14-12-26-26-26H432c-14 0-26 12-26 26v182H160c-14 0-26 12-26 26v192c0 14 12 26 26 26h18l-53 306c0 2 0 3 0 4c0 14 12 26 26 26h723c2 0 3 0 4 0c14-2 24-16 21-30zM204 390h272V182h72v208h272v104H204V390zm468 440V674c0-4-4-8-8-8h-48c-4 0-8 4-8 8v156H416V674c0-4-4-8-8-8h-48c-4 0-8 4-8 8v156H203l45-260H776l45 260H672z + M960 146v91C960 318 759 384 512 384S64 318 64 238V146C64 66 265 0 512 0s448 66 448 146zM960 352v206C960 638 759 704 512 704S64 638 64 558V352c96 66 272 97 448 97S864 418 960 352zm0 320v206C960 958 759 1024 512 1024S64 958 64 878V672c96 66 272 97 448 97S864 738 960 672z + M800 928l-512 0 0-704 224 0 0 292 113-86 111 86 0-292 128 0 0 640c0 35-29 64-64 64zM625 388l-81 64 0-260 160 0 0 260-79-64zM192 160l0 32c0 18 14 32 32 32l32 0 0 704-32 0c-35 0-64-29-64-64l0-704c0-35 29-64 64-64l576 0c24 0 44 13 55 32l-631 0c-18 0-32 14-32 32z + M64 864h896V288h-396a64 64 0 01-57-35L460 160H64v704zm-64 32V128a32 32 0 0132-32h448a32 32 0 0129 18L564 224H992a32 32 0 0132 32v640a32 32 0 01-32 32H32a32 32 0 01-32-32z + M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z + M960 784h-48v-48a48 48 0 10-96 0v48h-48a48 48 0 100 96h48v48a48 48 0 1096 0v-48h48a48 48 0 100-96zM0 816a48 48 0 0048 48h630A96 96 0 01672 832a96 96 0 0196-96 96 96 0 11192 0c25 0 47 10 64 25V304H0v512zm976-656H384L288 64H48a48 48 0 00-48 48v144h1024v-48a48 48 0 00-48-48z + M448 64l128 128h448v768H0V64z + M832 960l192-512H192L0 960zM128 384L0 960V128h288l128 128h416v128z + M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z + M683 85l213 213v598a42 42 0 01-42 42H170A43 43 0 01128 896V128C128 104 147 85 170 85H683zm-213 384H341v85h128v128h85v-128h128v-85h-128V341h-85v128z + M896 320c0-19-6-32-19-45l-192-192c-13-13-26-19-45-19H192c-38 0-64 26-64 64v768c0 38 26 64 64 64h640c38 0 64-26 64-64V320zm-256 384H384c-19 0-32-13-32-32s13-32 32-32h256c19 0 32 13 32 32s-13 32-32 32zm166-384H640V128l192 192h-26z + M416 832H128V128h384v192C512 355 541 384 576 384L768 384v32c0 19 13 32 32 32S832 435 832 416v-64c0-6 0-19-6-25l-256-256c-6-6-19-6-25-6H128A64 64 0 0064 128v704C64 867 93 896 129 896h288c19 0 32-13 32-32S435 832 416 832zM576 172 722 320H576V172zM736 512C614 512 512 614 512 736S614 960 736 960s224-102 224-224S858 512 736 512zM576 736C576 646 646 576 736 576c32 0 58 6 83 26l-218 218c-19-26-26-51-26-83zm160 160c-32 0-64-13-96-32l224-224c19 26 32 58 32 96 0 90-70 160-160 160z + M71 1024V0h661L953 219V1024H71zm808-731-220-219H145V951h735V293zM439 512h-220V219h220V512zm-74-219H292v146h74v-146zm0 512h74v73h-220v-73H292v-146H218V585h147v219zm294-366h74V512H512v-73h74v-146H512V219h147v219zm74 439H512V585h220v293zm-74-219h-74v146h74v-146z + M1024 896v128H0V704h128v192h768V704h128v192zM576 555 811 320 896 405l-384 384-384-384L213 320 448 555V0h128v555z + M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z + M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z + M961 320 512 577 63 320 512 62l449 258zM512 628 185 442 63 512 512 770 961 512l-123-70L512 628zM512 821 185 634 63 704 512 962l449-258L839 634 512 821z + M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z + M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z + M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z + M652 157a113 113 0 11156 161L731 395 572 236l80-80 1 1zM334 792v0H175v-159l358-358 159 159-358 358zM62 850h900v113H62v-113z + M853 256h-43v512h43c47 0 85-38 85-85v-341c0-47-38-85-85-85zM725 768V171h128V85h-341v85H640v85H171c-47 0-85 38-85 85v341c0 47 38 85 85 85h469V853h-128v85h341v-85H725v-86zm-469-171v-171h384v171H256z + M762 1024C876 818 895 504 448 514V768L64 384l384-384v248c535-14 595 472 314 776z + M854 307 611 73c-6-6-14-9-22-9H296c-4 0-8 4-8 8v56c0 4 4 8 8 8h277l219 211V824c0 4 4 8 8 8h56c4 0 8-4 8-8V330c0-9-4-17-10-23zM553 201c-6-6-14-9-23-9H192c-18 0-32 14-32 32v704c0 18 14 32 32 32h512c18 0 32-14 32-32V397c0-9-3-17-9-23L553 201zM568 753c0 4-3 7-8 7h-225c-4 0-8-3-8-7v-42c0-4 3-7 8-7h225c4 0 8 3 8 7v42zm0-220c0 4-3 7-8 7H476v85c0 4-3 7-7 7h-42c-4 0-7-3-7-7V540h-85c-4 0-8-3-8-7v-42c0-4 3-7 8-7H420v-85c0-4 3-7 7-7h42c4 0 7 3 7 7V484h85c4 0 8 3 8 7v42z + M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z + M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688 + M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z + M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z + M826 498 538 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L826 526c8-7 8-21 0-28zm-320 0L218 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L506 526c4-4 6-9 6-14 0-5-2-10-6-14z + M512 939C465 939 427 900 427 853 427 806 465 768 512 768 559 768 597 806 597 853 597 900 559 939 512 939M555 85 555 555 747 363 807 423 512 719 217 423 277 363 469 555 469 85 555 85Z + M883 567l-128-128c-17-17-43-17-60 0l-128 128c-17 17-17 43 0 60 17 17 43 17 60 0l55-55V683c0 21-21 43-43 43H418c-13-38-43-64-77-77V375c51-17 85-64 85-119 0-73-60-128-128-128-73 0-128 55-128 128 0 55 34 102 85 119v269c-51 17-85 64-85 119 0 73 55 128 128 128 55 0 102-34 119-85H640c73 0 128-55 128-128v-111l55 55c9 9 17 13 30 13 13 0 21-4 30-13 17-13 17-43 0-55zM299 213c26 0 43 17 43 43 0 21-21 43-43 43-26 0-43-21-43-43 0-26 17-43 43-43zm0 597c-26 0-43-21-43-43 0-26 17-43 43-43s43 17 43 43c0 21-17 43-43 43zM725 384c-73 0-128-60-128-128 0-73 55-128 128-128s128 55 128 128c0 68-55 128-128 128zm0-171c-26 0-43 17-43 43s17 43 43 43 43-17 43-43-17-43-43-43z + M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z + M0 586l404 119 498-410-386 441-2 251 155-205 279 83L1170 37z + M128 256h192a64 64 0 110 128H128a64 64 0 110-128zm576 192h192a64 64 0 010 128h-192a64 64 0 010-128zm-576 192h192a64 64 0 010 128H128a64 64 0 010-128zm576 0h192a64 64 0 010 128h-192a64 64 0 010-128zm0-384h192a64 64 0 010 128h-192a64 64 0 010-128zM128 448h192a64 64 0 110 128H128a64 64 0 110-128zm384-320a64 64 0 0164 64v640a64 64 0 01-128 0V192a64 64 0 0164-64z + M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z + M715 254h-405l-58 57h520zm-492 86v201h578V340zm405 143h-29v-29H425v29h-29v-57h231v57zm-405 295h578V559H223zm174-133h231v57h-29v-29H425v29h-29v-57z + M869 145a145 145 0 10-289 0c0 56 33 107 83 131c-5 96-77 128-201 175c-52 20-110 42-160 74V276A144 144 0 00242 0a145 145 0 00-145 145c0 58 35 108 84 131v461a144 144 0 00-84 131a145 145 0 10289 0a144 144 0 00-84-131c5-95 77-128 201-175c122-46 274-103 280-287a145 145 0 0085-132zM242 61a83 83 0 110 167a83 83 0 010-167zm0 891a84 84 0 110-167a84 84 0 010 167zM724 228a84 84 0 110-167a84 84 0 010 167z + M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z + M902 479v-1c0-133-112-242-250-242c-106 0-196 64-232 154c-28-20-62-32-100-32c-76 0-140 49-160 116c-52 37-86 97-86 165c0 112 90 202 202 202h503c112 0 202-90 202-202c0-65-31-123-79-160z + M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z + M177 156c-22 5-33 17-36 37c-10 57-33 258-13 278l445 445c23 23 61 23 84 0l246-246c23-23 23-61 0-84l-445-445C437 120 231 145 177 156zM331 344c-26 26-69 26-95 0c-26-26-26-69 0-95s69-26 95 0C357 276 357 318 331 344z + M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z + M557.7 545.3 789.9 402.7c24-15 31.3-46.5 16.4-70.5c-14.8-23.8-46-31.2-70-16.7L506.5 456.6 277.1 315.4c-24.1-14.8-55.6-7.3-70.5 16.8c-14.8 24.1-7.3 55.6 16.8 70.5l231.8 142.6V819.1c0 28.3 22.9 51.2 51.2 51.2c28.3 0 51.2-22.9 51.2-51.2V545.3h.1zM506.5 0l443.4 256v511.9L506.5 1023.9 63.1 767.9v-511.9L506.5 0z + M170 470l0 84 86 0 0-84-86 0zM86 598l0-172 852 0 0 172-852 0zM256 298l0-84-86 0 0 84 86 0zM86 170l852 0 0 172-852 0 0-172zM170 726l0 84 86 0 0-84-86 0zM86 854l0-172 852 0 0 172-852 0z + M812 864h-29V654c0-21-11-40-28-52l-133-88 134-89c18-12 28-31 28-52V164h28c18 0 32-14 32-32s-14-32-32-32H212c-18 0-32 14-32 32s14 32 32 32h30v210c0 21 11 40 28 52l133 88-134 89c-18 12-28 31-28 52V864H212c-18 0-32 14-32 32s14 32 32 32h600c18 0 32-14 32-32s-14-32-32-32zM441 566c18-12 28-31 28-52s-11-40-28-52L306 373V164h414v209l-136 90c-18 12-28 31-28 52 0 21 11 40 28 52l135 89V695c-9-7-20-13-32-19-30-15-93-41-176-41-63 0-125 14-175 38-12 6-22 12-31 18v-36l136-90z + M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z + M888.8 0H135.2c-32.3 0-58.9 26.1-58.9 58.9v906.2c0 32.3 26.1 58.9 58.9 58.9h753.2c32.3 0 58.9-26.1 58.9-58.9v-906.2c.5-32.8-26.1-58.9-58.4-58.9zm-164.9 176.6c30.7 0 55.8 25.1 55.8 55.8s-25.1 55.8-55.8 55.8s-55.8-25.1-55.8-55.8s24.6-55.8 55.8-55.8zm-212 0c30.7 0 55.8 25.1 55.8 55.8S542.7 288.3 512 288.3s-55.8-25.1-55.8-55.8S481.3 176.6 512 176.6zm-212 0c30.7 0 55.8 25.1 55.8 55.8s-25.1 55.8-55.8 55.8s-55.8-25.1-55.8-55.8s25.1-55.8 55.8-55.8zm208.9 606.2H285.2c-24.6 0-44-20-44-44c0-24.6 20-44 44-44h223.7c24.6 0 44 20 44 44c0 24.1-19.5 44-44 44zm229.9-212H285.2c-24.6 0-44-20-44-44c0-24.6 20-44 44-44h453.1c24.6 0 44 20 44 44c.5 24.1-19.5 44-43.5 44z + M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z + M0 33h1024v160H0zM0 432h1024v160H0zM0 831h1024v160H0z + M912 800a48 48 0 1 1 0 96h-416a48 48 0 1 1 0-96h416z m-704-704A112 112 0 0 1 256 309.184V480h80a48 48 0 0 1 0 96H256v224h81.664a48 48 0 1 1 0 96H256a96 96 0 0 1-96-96V309.248A112 112 0 0 1 208 96z m704 384a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z m0-320a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z + M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z + M509 546l271-271 91 91-348 349-1-1-13 13-363-361 91-91z + M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z + M170 831l343-342L855 831l105-105-448-448L64 726 170 831z + M768 800V685L512 480 256 685V800l256-205L768 800zM512 339 768 544V429L512 224 256 429V544l256-205z + M599 425 599 657 425 832 425 425 192 192 832 192Z + M280 145l243 341 0-0 45 63-0 0 79 110a143 143 0 11-36 75l-88-123-92 126c1 4 1 9 1 13l0 5a143 143 0 11-36-95l82-113L221 188l60-43zm473 541a70 70 0 100 140 70 70 0 000-140zm-463 0a70 70 0 100 140 70 70 0 000-140zM772 145l59 43-232 319-45-63L772 145z + M896 811l-128 0c-23 0-43-19-43-43 0-23 19-43 43-43l107 0c13 0 21-9 21-21L896 107c0-13-9-21-21-21L448 85c-13 0-21 9-21 21l0 21c0 23-19 43-43 43-23 0-43-19-43-43L341 85c0-47 38-85 85-85l469 0c47 0 85 38 85 85l0 640C981 772 943 811 896 811zM683 299l0 640c0 47-38 85-85 85L128 1024c-47 0-85-38-85-85L43 299c0-47 38-85 85-85l469 0C644 213 683 252 683 299zM576 299 149 299c-13 0-21 9-21 21l0 597c0 13 9 21 21 21l427 0c13 0 21-9 21-21L597 320C597 307 589 299 576 299z + M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h150a32 32 0 100-64z + M293 122v244h439V146l171 175V829a73 73 0 01-73 73h-98V536H293v366H195a73 73 0 01-73-73V195a73 73 0 0173-73h98zm366 512v268H366V634h293zm-49 49h-195v73h195v-73zm49-561v171H366V122h293z + M520 168C291 168 95 311 16 512c79 201 275 344 504 344 229 0 425-143 504-344-79-201-275-344-504-344zm0 573c-126 0-229-103-229-229s103-229 229-229c126 0 229 103 229 229s-103 229-229 229zm0-367c-76 0-137 62-137 137s62 137 137 137S657 588 657 512s-62-137-137-137z + M734 128c-33-19-74-8-93 25l-41 70c-28-6-58-9-90-9-294 0-445 298-445 298s82 149 231 236l-31 54c-19 33-8 74 25 93 33 19 74 8 93-25L759 222C778 189 767 147 734 128zM305 512c0-115 93-208 207-208 14 0 27 1 40 4l-37 64c-1 0-2 0-2 0-77 0-140 63-140 140 0 26 7 51 20 71l-37 64C324 611 305 564 305 512zM771 301 700 423c13 27 20 57 20 89 0 110-84 200-192 208l-51 89c12 1 24 2 36 2 292 0 446-298 446-298S895 388 771 301z + M469 235V107h85v128h-85zm-162-94 85 85-60 60-85-85 60-60zm469 60-85 85-60-60 85-85 60 60zm-549 183A85 85 0 01302 341H722a85 85 0 0174 42l131 225A85 85 0 01939 652V832a85 85 0 01-85 85H171a85 85 0 01-85-85v-180a85 85 0 0112-43l131-225zM722 427H302l-100 171h255l10 29a59 59 0 002 5c2 4 5 9 9 14 8 9 18 17 34 17 16 0 26-7 34-17a72 72 0 0011-18l0-0 10-29h255l-100-171zM853 683H624a155 155 0 01-12 17C593 722 560 747 512 747c-48 0-81-25-99-47a155 155 0 01-12-17H171v149h683v-149z + M447 561a26 26 0 0126 26v171H421v-171a26 26 0 0126-26zm-98 65a26 26 0 0126 26v104H323v-104a26 26 0 0126-26zm0 0M561 268a32 32 0 0132 30v457h-65V299a32 32 0 0132-32zm0 0M675 384a26 26 0 0126 26v348H649v-350a26 26 0 0126-24zm0 0M801 223v579H223V223h579M805 171H219A49 49 0 00171 219v585A49 49 0 00219 853h585A49 49 0 00853 805V219A49 49 0 00805 171z + M512 0C229.216 0 0 229.216 0 512c0 282.752 229.216 512 512 512s512-229.248 512-512c0-282.784-229.216-512-512-512z m0 957.92C266.112 957.92 66.08 757.888 66.08 512S266.112 66.08 512 66.08 957.92 266.112 957.92 512 757.888 957.92 512 957.92zM192 416h96a32 32 0 0 0 32-32v-32a32 32 0 0 0-32-32H192a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32zM384 416h96a32 32 0 0 0 32-32v-32a32 32 0 0 0-32-32h-96a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32zM576 416h96a32 32 0 0 0 32-32v-32a32 32 0 0 0-32-32h-96a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32zM832 320h-64a32 32 0 0 0-32 32v128h-160a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32v-192a32 32 0 0 0-32-32zM320 544v-32a32 32 0 0 0-32-32H192a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32h96a32 32 0 0 0 32-32zM384 576h96a32 32 0 0 0 32-32v-32a32 32 0 0 0-32-32h-96a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32zM800 640H256a32 32 0 0 0-32 32v32a32 32 0 0 0 32 32h544a32 32 0 0 0 32-32v-32a32 32 0 0 0-32-32z + M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zM139 832V192c0-6 4-11 11-11h331v661H149c-6 0-11-4-11-11zm747 0c0 6-4 11-11 11H544v-661H875c6 0 11 4 11 11v640z + M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zm-725 64h725c6 0 11 4 11 11v288h-747V192c0-6 4-11 11-11zm725 661H149c-6 0-11-4-11-11V544h747V832c0 6-4 11-11 11z + M875 128h-725A107 107 0 0043 235v555A107 107 0 00149 896h725a107 107 0 00107-107v-555A107 107 0 00875 128zm-115 640h-183v-58l25-3c15 0 19-8 14-24l-22-61H419l-28 82 39 2V768h-166v-58l18-3c18-2 22-11 26-24l125-363-40-4V256h168l160 448 39 3zM506 340l-72 218h145l-71-218h-2z + M900 287c40 69 60 144 60 225s-20 156-60 225c-40 69-94 123-163 163-69 40-144 60-225 60s-156-20-225-60c-69-40-123-94-163-163C84 668 64 593 64 512s20-156 60-225 94-123 163-163c69-40 144-60 225-60s156 20 225 60 123 94 163 163zM762 512c0-9-3-16-9-22L578 315l-44-44c-6-6-13-9-22-9s-16 3-22 9l-44 44-176 176c-6 6-9 13-9 22s3 16 9 22l44 44c6 6 13 9 22 9s16-3 22-9l92-92v269c0 9 3 16 9 22 6 6 13 9 22 9h62c8 0 16-3 22-9 6-6 9-13 9-22V486l92 92c6 6 13 9 22 9 8 0 16-3 22-9l44-44c6-6 9-13 9-22z + M765 555C747 661 661 747 555 765L555 683 469 683 469 765C363 747 277 661 259 555L341 555 341 469 259 469C277 363 363 277 469 259L469 341 555 341 555 259C661 277 747 363 765 469L683 469 683 555 765 555M851 469C832 315 709 192 555 173L555 85 469 85 469 173C315 192 192 315 173 469L85 469 85 555 173 555C192 709 315 832 469 851L469 939 555 939 555 851C709 832 832 709 851 555L939 555 939 469 851 469M512 427C559 427 597 465 597 512 597 559 559 597 512 597 465 597 427 559 427 512 427 465 465 427 512 427L512 427Z + M973 358a51 51 0 0151 51v563a51 51 0 01-51 51H51a51 51 0 01-51-51V410a51 51 0 0151-51h256a51 51 0 110 102H102v461h819V461h-205a51 51 0 110-102h256zM51 102a51 51 0 110-102h256c141 0 256 115 256 256v388l66-66a51 51 0 1172 72l-154 154a51 51 0 01-72 0l-154-154a51 51 0 1172-72L461 644V256c0-85-69-154-154-154H51z + M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/CL.png b/src/Resources/Images/ExternalToolIcons/JetBrains/CL.png deleted file mode 100644 index 9d9cf6bd..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/CL.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/DB.png b/src/Resources/Images/ExternalToolIcons/JetBrains/DB.png deleted file mode 100644 index c7326287..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/DB.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/DL.png b/src/Resources/Images/ExternalToolIcons/JetBrains/DL.png deleted file mode 100644 index 2715c1dd..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/DL.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/DS.png b/src/Resources/Images/ExternalToolIcons/JetBrains/DS.png deleted file mode 100644 index 417f8337..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/DS.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/GO.png b/src/Resources/Images/ExternalToolIcons/JetBrains/GO.png deleted file mode 100644 index 744938fc..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/GO.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/JB.png b/src/Resources/Images/ExternalToolIcons/JetBrains/JB.png deleted file mode 100644 index e9a3d1c0..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/JB.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/PC.png b/src/Resources/Images/ExternalToolIcons/JetBrains/PC.png deleted file mode 100644 index 38ae8274..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/PC.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/PS.png b/src/Resources/Images/ExternalToolIcons/JetBrains/PS.png deleted file mode 100644 index e5e2ceaf..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/PS.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/PY.png b/src/Resources/Images/ExternalToolIcons/JetBrains/PY.png deleted file mode 100644 index 38ae8274..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/PY.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/QA.png b/src/Resources/Images/ExternalToolIcons/JetBrains/QA.png deleted file mode 100644 index 499b2eff..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/QA.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/QD.png b/src/Resources/Images/ExternalToolIcons/JetBrains/QD.png deleted file mode 100644 index 225f3652..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/QD.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/RD.png b/src/Resources/Images/ExternalToolIcons/JetBrains/RD.png deleted file mode 100644 index a2fa3d33..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/RD.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/RM.png b/src/Resources/Images/ExternalToolIcons/JetBrains/RM.png deleted file mode 100644 index 1adfa654..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/RM.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/RR.png b/src/Resources/Images/ExternalToolIcons/JetBrains/RR.png deleted file mode 100644 index ee27634a..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/RR.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/WRS.png b/src/Resources/Images/ExternalToolIcons/JetBrains/WRS.png deleted file mode 100644 index 2d8f9c36..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/WRS.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/WS.png b/src/Resources/Images/ExternalToolIcons/JetBrains/WS.png deleted file mode 100644 index 09dda1fc..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/JetBrains/WS.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/codium.png b/src/Resources/Images/ExternalToolIcons/codium.png deleted file mode 100644 index 10abb719..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/codium.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/git.png b/src/Resources/Images/ExternalToolIcons/git.png deleted file mode 100644 index a05a1322..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/git.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/p4merge.png b/src/Resources/Images/ExternalToolIcons/p4merge.png deleted file mode 100644 index 010d8f6f..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/p4merge.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/plastic_merge.png b/src/Resources/Images/ExternalToolIcons/plastic_merge.png deleted file mode 100644 index 0d82fc86..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/plastic_merge.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/rider.png b/src/Resources/Images/ExternalToolIcons/rider.png deleted file mode 100644 index 6ab3b8cb..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/rider.png and /dev/null differ diff --git a/src/Resources/Images/ExternalToolIcons/zed.png b/src/Resources/Images/ExternalToolIcons/zed.png deleted file mode 100644 index 07c4c50f..00000000 Binary files a/src/Resources/Images/ExternalToolIcons/zed.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/custom.png b/src/Resources/Images/ShellIcons/custom.png deleted file mode 100644 index 0175688f..00000000 Binary files a/src/Resources/Images/ShellIcons/custom.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/deepin-terminal.png b/src/Resources/Images/ShellIcons/deepin-terminal.png deleted file mode 100644 index 78eef1b4..00000000 Binary files a/src/Resources/Images/ShellIcons/deepin-terminal.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/foot.png b/src/Resources/Images/ShellIcons/foot.png deleted file mode 100644 index c5dbd0a5..00000000 Binary files a/src/Resources/Images/ShellIcons/foot.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/ghostty.png b/src/Resources/Images/ShellIcons/ghostty.png deleted file mode 100644 index e394a517..00000000 Binary files a/src/Resources/Images/ShellIcons/ghostty.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/gnome-terminal.png b/src/Resources/Images/ShellIcons/gnome-terminal.png deleted file mode 100644 index f9edd2e3..00000000 Binary files a/src/Resources/Images/ShellIcons/gnome-terminal.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/iterm2.png b/src/Resources/Images/ShellIcons/iterm2.png deleted file mode 100644 index 16fbd3bd..00000000 Binary files a/src/Resources/Images/ShellIcons/iterm2.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/kitty.png b/src/Resources/Images/ShellIcons/kitty.png deleted file mode 100644 index 465c2863..00000000 Binary files a/src/Resources/Images/ShellIcons/kitty.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/konsole.png b/src/Resources/Images/ShellIcons/konsole.png deleted file mode 100644 index e1dbcd49..00000000 Binary files a/src/Resources/Images/ShellIcons/konsole.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/lxterminal.png b/src/Resources/Images/ShellIcons/lxterminal.png deleted file mode 100644 index 99f62683..00000000 Binary files a/src/Resources/Images/ShellIcons/lxterminal.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/mac-terminal.png b/src/Resources/Images/ShellIcons/mac-terminal.png deleted file mode 100644 index 569af756..00000000 Binary files a/src/Resources/Images/ShellIcons/mac-terminal.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/mate-terminal.png b/src/Resources/Images/ShellIcons/mate-terminal.png deleted file mode 100644 index d48cedfa..00000000 Binary files a/src/Resources/Images/ShellIcons/mate-terminal.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/ptyxis.png b/src/Resources/Images/ShellIcons/ptyxis.png deleted file mode 100644 index 9202f6e1..00000000 Binary files a/src/Resources/Images/ShellIcons/ptyxis.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/warp.png b/src/Resources/Images/ShellIcons/warp.png deleted file mode 100644 index 7d604d8e..00000000 Binary files a/src/Resources/Images/ShellIcons/warp.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/wezterm.png b/src/Resources/Images/ShellIcons/wezterm.png deleted file mode 100644 index ed7a659f..00000000 Binary files a/src/Resources/Images/ShellIcons/wezterm.png and /dev/null differ diff --git a/src/Resources/Images/ShellIcons/xfce4-terminal.png b/src/Resources/Images/ShellIcons/xfce4-terminal.png deleted file mode 100644 index 9eda3d00..00000000 Binary files a/src/Resources/Images/ShellIcons/xfce4-terminal.png and /dev/null differ diff --git a/src/Resources/Images/github.png b/src/Resources/Images/github.png deleted file mode 100644 index d3c211da..00000000 Binary files a/src/Resources/Images/github.png and /dev/null differ diff --git a/src/Resources/Images/unreal.png b/src/Resources/Images/unreal.png deleted file mode 100644 index 01ceeb31..00000000 Binary files a/src/Resources/Images/unreal.png and /dev/null differ diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml deleted file mode 100644 index 032e5ce7..00000000 --- a/src/Resources/Locales/de_DE.axaml +++ /dev/null @@ -1,778 +0,0 @@ - - - - - - Info - Über SourceGit - Open Source & freier Git GUI Client - Worktree hinzufügen - Ordner: - Pfad für diesen Worktree. Relativer Pfad wird unterstützt. - Branch Name: - Optional. Standard ist der Zielordnername. - Branch verfolgen: - Remote-Branch verfolgen - Was auschecken: - Neuen Branch erstellen - Existierender Branch - OpenAI Assistent - Neu generieren - Verwende OpenAI, um Commit-Nachrichten zu generieren - Als Commit-Nachricht verwenden - Patch - Patch-Datei: - Wähle die anzuwendende .patch-Datei - Ignoriere Leerzeichenänderungen - Patch anwenden - Leerzeichen: - Stash anwenden - Nach dem Anwenden löschen - Änderungen des Index wiederherstellen - Stash: - Archivieren... - Speichere Archiv in: - Wähle Archivpfad aus - Revision: - Archiv erstellen - SourceGit Askpass - ALS UNVERÄNDERT ANGENOMMENE DATEIEN - KEINE ALS UNVERÄNDERT ANGENOMMENEN DATEIEN - ENTFERNEN - Aktualisieren - BINÄRE DATEI NICHT UNTERSTÜTZT!!! - Bisect - Abbrechen - Schlecht - Bisecting. Ist der aktuelle HEAD gut oder fehlerhaft? - Gut - Überspringen - Bisecting. Aktuellen Commit als gut oder schlecht markieren und einen anderen auschecken. - Blame - BLAME WIRD BEI DIESER DATEI NICHT UNTERSTÜTZT!!! - Auschecken von ${0}$... - Mit ${0}$ vergleichen - Mit Worktree vergleichen - Branch-Namen kopieren - Benutzerdefinierte Aktion - Lösche ${0}$... - Lösche alle ausgewählten {0} Branches - Fast-Forward zu ${0}$ - Fetche ${0}$ in ${1}$ hinein... - Git Flow - Abschließen ${0}$ - Merge ${0}$ in ${1}$ hinein... - Merge ausgewählte {0} Branches in aktuellen hinein - Pull ${0}$ - Pull ${0}$ in ${1}$ hinein... - Push ${0}$ - Rebase ${0}$ auf ${1}$... - Benenne ${0}$ um... - Setze verfolgten Branch... - Branch Vergleich - Ungültiger upstream! - Bytes - ABBRECHEN - Auf Vorgänger-Revision zurücksetzen - Auf diese Revision zurücksetzen - Generiere Commit-Nachricht - ANZEIGE MODUS ÄNDERN - Zeige als Datei- und Ordnerliste - Zeige als Pfadliste - Zeige als Dateisystembaum - Branch auschecken - Commit auschecken - Commit: - Warnung: Beim Auschecken eines Commits wird dein HEAD losgelöst (detached) sein! - Lokale Änderungen: - Verwerfen - Stashen & wieder anwenden - Alle Submodule updaten - Branch: - Cherry Pick - Quelle an Commit-Nachricht anhängen - Commit(s): - Alle Änderungen committen - Hautplinie: - Normalerweise ist es nicht möglich einen Merge zu cherry-picken, da unklar ist welche Seite des Merges die Hauptlinie ist. Diese Option ermöglicht es die Änderungen relativ zum ausgewählten Vorgänger zu wiederholen. - Stashes löschen - Du versuchst alle Stashes zu löschen. Möchtest du wirklich fortfahren? - Remote Repository klonen - Extra Parameter: - Zusätzliche Argumente für das Klonen des Repositories. Optional. - Lokaler Name: - Repository-Name. Optional. - Übergeordneter Ordner: - Submodule initialisieren und aktualisieren - Repository URL: - SCHLIESSEN - Editor - Commit auschecken - Diesen Commit cherry-picken - Mehrere cherry-picken - Mit HEAD vergleichen - Mit Worktree vergleichen - Author - Committer - Information - SHA - Betreff - Benutzerdefinierte Aktion - Interactives Rebase von ${0}$ auf diesen Commit - Merge in ${0}$ hinein - Merge ... - Rebase von ${0}$ auf diesen Commit - Reset ${0}$ auf diesen Commit - Commit rückgängig machen - Umformulieren - Als Patch speichern... - Squash in den Vorgänger - Squash Nachfolger Commits bis hier - ÄNDERUNGEN - Änderungen durchsuchen... - DATEIEN - LFS DATEI - Dateien durchsuchen... - Submodule - INFORMATION - AUTOR - GEÄNDERT - NACHFOLGER - COMMITTER - Prüfe Refs, die diesen Commit enthalten - COMMIT ENTHALTEN IN - Zeigt nur die ersten 100 Änderungen. Alle Änderungen im ÄNDERUNGEN Tab. - COMMIT-NACHRICHT - VORGÄNGER - REFS - SHA - Im Browser öffnen - Details - Betreff - Commit-Nachricht - Repository Einstellungen - COMMIT TEMPLATE - Template Inhalt: - Template Name: - BENUTZERDEFINIERTE AKTION - Argumente: - ${REPO} - Repository Pfad; ${SHA} - SHA-Wert des selektierten Commits - Ausführbare Datei: - Name: - Geltungsbereich: - Branch - Commit - Repository - Auf Beenden der Aktion warten - Email Adresse - Email Adresse - GIT - Remotes automatisch fetchen - Minute(n) - Standard Remote - Bevorzugter Merge Modus - TICKETSYSTEM - Beispiel Azure DevOps Rule hinzufügen - Beispiel für Gitee Issue Regel einfügen - Beispiel für Gitee Pull Request Regel einfügen - Beispiel für Github-Regel hinzufügen - Beispiel für Gitlab Issue Regel einfügen - Beispiel für Gitlab Merge Request einfügen - Beispiel für Jira-Regel hinzufügen - Neue Regel - Ticketnummer Regex-Ausdruck: - Name: - Ergebnis-URL: - Verwende bitte $1, $2 um auf Regex-Gruppenwerte zuzugreifen. - OPEN AI - Bevorzugter Service: - Der ausgewählte 'Bevorzugte Service' wird nur in diesem Repository gesetzt und verwendet. Wenn keiner gesetzt ist und mehrere Servies verfügbar sind wird ein Kontextmenü zur Auswahl angezeigt. - HTTP Proxy - HTTP Proxy für dieses Repository - Benutzername - Benutzername für dieses Repository - Arbeitsplätze - Farbe - Name - Zuletzt geöffnete Tabs beim Starten wiederherstellen - WEITER - Leerer Commit erkannt! Möchtest du trotzdem fortfahren (--allow-empty)? - ALLES STAGEN & COMMITTEN - Leerer Commit erkannt! Möchtest du trotzdem fortfahren (--allow-empty) oder alle Änderungen stagen und dann committen? - Konventionelle Commit-Hilfe - Breaking Change: - Geschlossenes Ticket: - Änderungen im Detail: - Gültigkeitsbereich: - Kurzbeschreibung: - Typ der Änderung: - Kopieren - Kopiere gesamten Text - Ganzen Pfad kopieren - Pfad kopieren - Branch erstellen... - Basierend auf: - Erstellten Branch auschecken - Lokale Änderungen: - Verwerfen - Stashen & wieder anwenden - Neuer Branch-Name: - Branch-Namen eingeben. - Leerzeichen werden durch Bindestriche ersetzt. - Lokalen Branch erstellen - Tag erstellen... - Neuer Tag auf: - Mit GPG signieren - Anmerkung: - Optional. - Tag-Name: - Empfohlenes Format: v1.0.0-alpha - Nach Erstellung auf alle Remotes pushen - Erstelle neuen Tag - Art: - Mit Anmerkung - Ohne Anmerkung - Halte Strg gedrückt, um direkt auszuführen - Ausschneiden - Branch löschen - Branch: - Du löscht gerade einen Remote-Branch!!! - Auch Remote-Branch ${0}$ löschen - Mehrere Branches löschen - Du versuchst mehrere Branches auf einmal zu löschen. Kontrolliere noch einmal vor dem Fortfahren! - Remote löschen - Remote: - Pfad: - Ziel: - Alle Nachfolger werden aus der Liste entfernt. - Dadurch wird es nur aus der Liste entfernt, nicht von der Festplatte! - Bestätige löschen von Gruppe - Bestätige löschen von Repository - Lösche Submodul - Submodul Pfad: - Tag löschen - Tag: - Von Remote Repositories löschen - BINÄRER VERGLEICH - NEU - ALT - Kopieren - Dateimodus geändert - Erste Differenz - Ignoriere Leerzeichenänderungen - Letzte Differenz - LFS OBJEKT ÄNDERUNG - Nächste Änderung - KEINE ÄNDERUNG ODER NUR ZEILEN-ENDE ÄNDERUNGEN - Vorherige Änderung - Als Patch speichern - Zeige versteckte Symbole - Nebeneinander - SUBMODUL - NEU - Seiten wechseln - Syntax Hervorhebung - Zeilenumbruch - Aktiviere Block-Navigation - Öffne in Merge Tool - Alle Zeilen anzeigen - Weniger Zeilen anzeigen - Mehr Zeilen anzeigen - WÄHLE EINE DATEI AUS UM ÄNDERUNGEN ANZUZEIGEN - Öffne in Merge Tool - Änderungen verwerfen - Alle Änderungen in der Arbeitskopie. - Änderungen: - Ignorierte Dateien inkludieren - Insgesamt {0} Änderungen werden verworfen - Du kannst das nicht rückgängig machen!!! - Lesezeichen: - Neuer Name: - Ziel: - Ausgewählte Gruppe bearbeiten - Ausgewähltes Repository bearbeiten - Führe benutzerdefinierte Aktion aus - Name der Aktion: - Fetch - Alle Remotes fetchen - Aktiviere '--force' Option - Ohne Tags fetchen - Remote: - Remote-Änderungen fetchen - Als unverändert annehmen - Verwerfen... - Verwerfe {0} Dateien... - Verwerfe Änderungen in ausgewählten Zeilen - Öffne externes Merge Tool - Löse mit ${0}$ - Als Patch speichern... - Stagen - {0} Dateien stagen - Änderungen in ausgewählten Zeilen stagen - Stash... - {0} Dateien stashen... - Unstage - {0} Dateien unstagen - Änderungen in ausgewählten Zeilen unstagen - "Meine" verwenden (checkout --ours) - "Ihre" verwenden (checkout --theirs) - Datei Historie - ÄNDERUNGEN - INHALT - Git-Flow - Development-Branch: - Feature: - Feature-Prefix: - FLOW - Finish Feature - FLOW - Finish Hotfix - FLOW - Finish Release - Ziel: - Hotfix: - Hotfix-Prefix: - Git-Flow initialisieren - Branch behalten - Production-Branch: - Release: - Release-Prefix: - Feature starten... - FLOW - Feature starten - Hotfix starten... - FLOW - Hotfix starten - Name eingeben - Release starten... - FLOW - Release starten - Versions-Tag-Prefix: - Git LFS - Verfolgungsmuster hinzufügen... - Muster ist ein Dateiname - Eigenes Muster: - Verfolgungsmuster zu Git LFS hinzufügen - Fetch - Führt `git lfs fetch` aus um Git LFS Objekte herunterzuladen. Das aktualisiert nicht die Arbeitskopie. - LFS Objekte fetchen - Installiere Git LFS Hooks - Sperren anzeigen - Keine gesperrten Dateien - Sperre - Zeige nur meine Sperren - LFS Sperren - Entsperren - Erzwinge entsperren - Prune - Führt `git lfs prune` aus um alte LFS Dateien von lokalem Speicher zu löschen - Pull - Führt `git lfs pull` aus um alle Git LFS Dasteien für aktuellen Ref & Checkout herunterzuladen - LFS Objekte pullen - Push - Pushe große Dateien in der Warteschlange zum Git LFS Endpunkt - LFS Objekte pushen - Remote: - Verfolge alle '{0}' Dateien - Verfolge alle *{0} Dateien - Verlauf - AUTOR - AUTOR ZEITPUNKT - GRAPH & COMMIT-NACHRICHT - SHA - COMMIT ZEITPUNKT - {0} COMMITS AUSGEWÄHLT - Halte 'Strg' oder 'Umschalt', um mehrere Commits auszuwählen. - Halte ⌘ oder ⇧, um mehrere Commits auszuwählen - TIPPS: - Tastaturkürzel Referenz - GLOBAL - Aktuelles Popup schließen - Klone neues Repository - Aktuellen Tab schließen - Zum nächsten Tab wechseln - Zum vorherigen Tab wechseln - Neuen Tab erstellen - Einstellungen öffnen - REPOSITORY - Gestagte Änderungen committen - Gestagte Änderungen committen und pushen - Alle Änderungen stagen und committen - Neuen Branch basierend auf ausgewählten Commit erstellen - Ausgewählte Änderungen verwerfen - Fetch, wird direkt ausgeführt - Dashboard Modus (Standard) - Commit-Suchmodus - Pull, wird direkt ausgeführt - Push, wird direkt ausgeführt - Erzwinge Neuladen des Repositorys - Ausgewählte Änderungen stagen/unstagen - Wechsle zu 'Änderungen' - Wechsle zu 'Verlauf' - Wechsle zu 'Stashes' - TEXTEDITOR - Suchpanel schließen - Suche nächste Übereinstimmung - Suche vorherige Übereinstimmung - Öffne Suchpanel - Verwerfen - Stagen - Unstagen - Initialisiere Repository - Pfad: - Cherry-Pick wird durchgeführt. - Verarbeite commit - Merge request wird durchgeführt. - Verarbeite - Rebase wird durchgeführt. - Angehalten bei - Revert wird durchgeführt. - Reverte commit - Interaktiver Rebase - Auf: - Ziel Branch: - Link kopieren - In Browser öffnen - FEHLER - INFO - Branch mergen - Ziel-Branch: - Merge Option: - Quelle: - Merge (mehrere) - Alle Änderungen committen - Strategie: - Ziele: - Bewege Repository Knoten - Wähle Vorgänger-Knoten für: - Name: - Git wurde NICHT konfiguriert. Gehe bitte zuerst in die [Einstellungen] und konfiguriere Git. - App-Daten Ordner öffnen - Öffne mit... - Optional. - Neue Seite erstellen - Lesezeichen - Tab schließen - Andere Tabs schließen - Rechte Tabs schließen - Kopiere Repository-Pfad - Repositories - Einfügen - Vor {0} Tagen - Vor 1 Stunde - Vor {0} Stunden - Gerade eben - Letzter Monat - Leztes Jahr - Vor {0} Minuten - Vor {0} Monaten - Vor {0} Jahren - Gestern - Einstellungen - OPEN AI - Analysierung des Diff Befehl - API Schlüssel - Generiere Nachricht Befehl - Modell - Name - Server - Streaming aktivieren - DARSTELLUNG - Standardschriftart - Editor Tab Breite - Schriftgröße - Standard - Texteditor - Monospace-Schriftart - Verwende die Monospace-Schriftart nur im Texteditor - Design - Design-Anpassungen - Fixe Tab-Breite in Titelleiste - Verwende nativen Fensterrahmen - DIFF/MERGE TOOL - Installationspfad - Installationspfad zum Diff/Merge Tool - Tool - ALLGEMEIN - Beim Starten nach Updates suchen - Datumsformat - Sprache - Commit-Historie - Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt - Zeige Nachfolger in den Commit Details - Zeige Tags im Commit Graph - Längenvorgabe für Commit-Nachrichten - GIT - Aktiviere Auto-CRLF - Klon Standardordner - Benutzer Email - Globale Git Benutzer Email - Aktivere --prune beim fetchen - Aktiviere --ignore-cr-at-eol beim Unterschied - Diese App setzt Git (>= 2.25.1) voraus - Installationspfad - Aktiviere HTTP SSL Verifizierung - Benutzername - Globaler Git Benutzername - Git Version - GPG SIGNIERUNG - Commit-Signierung - GPG Format - GPG Installationspfad - Installationspfad zum GPG Programm - Tag-Signierung - Benutzer Signierungsschlüssel - GPG Benutzer Signierungsschlüssel - EINBINDUNGEN - SHELL/TERMINAL - Pfad - Shell/Terminal - Remote löschen - Ziel: - Worktrees löschen - Worktree Informationen in `$GIT_COMMON_DIR/worktrees` löschen - Pull - Remote-Branch: - Lokaler Branch: - Lokale Änderungen: - Verwerfen - Stashen & wieder anwenden - Remote: - Pull (Fetch & Merge) - Rebase anstatt Merge verwenden - Push - Sicherstellen, dass Submodule gepusht wurden - Erzwinge Push - Lokaler Branch: - Remote: - Push - Remote-Branch: - Remote-Branch verfolgen - Alle Tags pushen - Tag zum Remote pushen - Zu allen Remotes pushen - Remote: - Tag: - Schließen - Aktuellen Branch rebasen - Lokale Änderungen stashen & wieder anwenden - Auf: - Rebase: - Remote hinzufügen - Remote bearbeiten - Name: - Remote Name - Repository URL: - Remote Git Repository URL - URL kopieren - Löschen... - Bearbeiten... - Fetch - Im Browser öffnen - Prune - Bestätige das entfernen des Worktrees - Aktiviere `--force` Option - Ziel: - Branch umbenennen - Neuer Name: - Eindeutiger Name für diesen Branch - Branch: - ABBRECHEN - Änderungen automatisch von Remote fetchen... - Sortieren - Nach Commit Datum - Nach Name - Aufräumen (GC & Prune) - Führt `git gc` auf diesem Repository aus. - Filter aufheben - Repository Einstellungen - WEITER - Benutzerdefinierte Aktionen - Keine benutzerdefinierten Aktionen - Alle Änderungen verwerfen - Aktiviere '--reflog' Option - Öffne im Datei-Browser - Suche Branches/Tags/Submodule - Sichtbarkeit im Graphen - Aufheben - Im Graph ausblenden - Im Graph filtern - Aktiviere '--first-parent' Option - LAYOUT - Horizontal - Vertikal - COMMIT SORTIERUNG - Commit Zeitpunkt - Topologie - LOKALE BRANCHES - Zum HEAD wechseln - Erstelle Branch - BENACHRICHTIGUNGEN LÖSCHEN - Nur aktuellen Branch im Graphen hervorheben - Öffne in {0} - Öffne in externen Tools - Aktualisiern - REMOTES - REMOTE HINZUFÜGEN - Commit suchen - Autor - Committer - Inhalt - Dateiname - Commit-Nachricht - SHA - Aktueller Branch - Zeige Tags als Baum - ÜBERSPRINGEN - Statistiken - SUBMODULE - SUBMODUL HINZUFÜGEN - SUBMODUL AKTUALISIEREN - TAGS - NEUER TAG - Nach Erstellungsdatum - Nach Namen - Sortiere - Öffne im Terminal - Verwende relative Zeitangaben in Verlauf - Logs ansehen - Öffne '{0}' im Browser - WORKTREES - WORKTREE HINZUFÜGEN - PRUNE - Git Repository URL - Aktuellen Branch auf Revision zurücksetzen - Rücksetzmodus: - Verschiebe zu: - Aktueller Branch: - Zeige im Datei-Explorer - Commit rückgängig machen - Commit: - Commit Änderungen rückgängig machen - Commit Nachricht umformulieren - Verwende 'Shift+Enter' um eine neue Zeile einzufügen. 'Enter' ist das Kürzel für den OK Button - Bitte warten... - SPEICHERN - Speichern als... - Patch wurde erfolgreich gespeichert! - Durchsuche Repositories - Hauptverzeichnis: - Suche nach Updates... - Neue Version ist verfügbar: - Suche nach Updates fehlgeschlagen! - Download - Diese Version überspringen - Software Update - Es sind momentan kein Updates verfügbar. - Setze verfolgten Branch - Branch: - Upstream Verfolgung aufheben - Upstream: - SHA kopieren - Zum Commit wechseln - Squash Commits - In: - SSH privater Schlüssel: - Pfad zum privaten SSH Schlüssel - START - Stash - Automatisch wiederherstellen nach dem Stashen - Die Arbeitsdateien bleiben unverändert, aber ein Stash wird gespeichert. - Inklusive nicht-verfolgter Dateien - Behalte gestagte Dateien - Name: - Optional. Name dieses Stashes - Nur gestagte Änderungen - Gestagte und unstagte Änderungen der ausgewähleten Datei(en) werden gestasht!!! - Lokale Änderungen stashen - Anwenden - Entfernen - Als Path speichern... - Stash entfernen - Entfernen: - Stashes - ÄNDERUNGEN - STASHES - Statistiken - COMMITS - COMMITTER - ÜBERSICHT - MONAT - WOCHE - AUTOREN: - COMMITS: - SUBMODULE - Submodul hinzufügen - Relativen Pfad kopieren - Untergeordnete Submodule fetchen - Öffne Submodul Repository - Relativer Pfad: - Relativer Ordner um dieses Submodul zu speichern. - Submodul löschen - OK - Tag-Namen kopieren - Tag-Nachricht kopieren - Lösche ${0}$... - Merge ${0}$ in ${1}$ hinein... - Pushe ${0}$... - Submodule aktualisieren - Alle Submodule - Initialisiere wenn nötig - Rekursiv - Submodul: - Verwende `--remote` Option - URL: - Logs - ALLES LÖSCHEN - Kopieren - Löschen - Warnung - Willkommensseite - Erstelle Gruppe - Erstelle Untergruppe - Klone Repository - Lösche - DRAG & DROP VON ORDNER UNTERSTÜTZT. BENUTZERDEFINIERTE GRUPPIERUNG UNTERSTÜTZT. - Bearbeiten - Bewege in eine andere Gruppe - Öffne alle Repositories - Öffne Repository - Öffne Terminal - Klon Standardordner erneut nach Repositories durchsuchen - Suche Repositories... - Sortieren - Änderungen - Git Ignore - Ignoriere alle *{0} Dateien - Ignoriere *{0} Datein im selben Ordner - Ignoriere Dateien im selben Ordner - Ignoriere nur diese Datei - Amend - Du kannst diese Datei jetzt stagen. - COMMIT - COMMIT & PUSH - Template/Historie - Klick-Ereignis auslösen - Commit (Bearbeitung) - Alle Änderungen stagen und committen - Du hast {0} Datei(en) gestaged, aber nur {1} werden angezeigt ({2} sind herausgefiltert). Willst du trotzdem fortfahren? - KONFLIKTE ERKANNT - EXTERNES MERGE-TOOL ÖFFNEN - ALLE KONFLIKTE IN EXTERNEM MERGE-TOOL ÖFFNEN - DATEI KONFLIKTE GELÖST - MEINE VERSION VERWENDEN - DEREN VERSION VERWENDEN - NICHT-VERFOLGTE DATEIEN INKLUDIEREN - KEINE BISHERIGEN COMMIT-NACHRICHTEN - KEINE COMMIT TEMPLATES - Rechtsklick auf selektierte Dateien und wähle die Konfliktlösungen aus. - SignOff - GESTAGED - UNSTAGEN - ALLES UNSTAGEN - UNSTAGED - STAGEN - ALLES STAGEN - ALS UNVERÄNDERT ANGENOMMENE ANZEIGEN - Template: ${0}$ - ARBEITSPLATZ: - Arbeitsplätze konfigurieren... - WORKTREE - Pfad kopieren - Sperren - Entfernen - Entsperren - diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index ee035551..9752f0d6 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -1,415 +1,218 @@ About - About SourceGit + • Build with + Copyright © 2024 sourcegit-scm. + • TextEditor from + • Monospace fonts come from + • Source code can be found at Opensource & Free Git GUI Client - Add Worktree - Location: - Path for this worktree. Relative path is supported. - Branch Name: - Optional. Default is the destination folder name. - Track Branch: - Tracking remote branch - What to Checkout: - Create New Branch - Existing Branch - AI Assistant - RE-GENERATE - Use AI to generate commit message - APPLY AS COMMIT MESSAGE Patch - Patch File: + Error + Raise errors and refuses to apply the patch + Error All + Similar to 'error', but shows more + Patch File : Select .patch file to apply Ignore whitespace changes + No Warn + Turns off the trailing whitespace warning Apply Patch - Whitespace: - Apply Stash - Delete after applying - Reinstate the index's changes - Stash: - Archive... - Save Archive To: + Warn + Outputs warnings for a few such errors, but applies + Whitespace : + Archive ... + Save Archive To : Select archive file path - Revision: + Revision : Archive - SourceGit Askpass FILES ASSUME UNCHANGED NO FILES ASSUMED AS UNCHANGED REMOVE - Load Image... - Refresh BINARY FILE NOT SUPPORTED!!! - Bisect - Abort - Bad - Bisecting. Is current HEAD good or bad? - Good - Skip - Bisecting. Mark current commit as good or bad and checkout another one. Blame BLAME ON THIS FILE IS NOT SUPPORTED!!! - Checkout ${0}$... - Compare with ${0}$ - Compare with Worktree + Checkout${0}$ Copy Branch Name - Custom Action - Delete ${0}$... - Delete selected {0} branches - Fast-Forward to ${0}$ - Fetch ${0}$ into ${1}$... - Git Flow - Finish ${0}$ - Merge ${0}$ into ${1}$... - Merge selected {0} branches into current - Pull ${0}$ - Pull ${0}$ into ${1}$... - Push ${0}$ - Rebase ${0}$ on ${1}$... - Rename ${0}$... - Reset ${0}$ to ${1}$... - Set Tracking Branch... - Branch Compare - Invalid upstream! + Delete${0}$ + Discard all changes + Fast-Forward to${0}$ + Git Flow - Finish${0}$ + Merge${0}$into${1}$ + Pull${0}$ + Pull${0}$into${1}$ + Push${0}$ + Rebase${0}$on${1}$ + Rename${0}$ + Tracking ... + Unset Upstream Bytes CANCEL - Reset to Parent Revision - Reset to This Revision - Generate commit message CHANGE DISPLAY MODE - Show as File and Dir List - Show as Path List - Show as Filesystem Tree + Show as Grid + Show as List + Show as Tree Checkout Branch - Checkout Commit - Commit: - Warning: By doing a commit checkout, your Head will be detached - Local Changes: - Discard - Stash & Reapply - Update all submodules - Branch: - Checkout & Fast-Forward - Fast-Forward to: - Cherry Pick - Append source to commit message - Commit(s): + Target : + Cherry-Pick This Commit + Commit : Commit all changes - Mainline: - Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option allows cherry-pick to replay the change relative to the specified parent. + Cherry Pick Clear Stashes You are trying to clear all stashes. Are you sure to continue? Clone Remote Repository - Extra Parameters: + Extra Parameters : Additional arguments to clone repository. Optional. - Local Name: + Local Name : Repository name. Optional. - Parent Folder: - Initialize & update submodules - Repository URL: + Parent Folder : + Repository URL : CLOSE - Editor - Checkout Commit - Cherry-Pick Commit - Cherry-Pick ... - Compare with HEAD - Compare with Worktree - Author - Committer - Information - SHA - Subject - Custom Action - Interactively Rebase ${0}$ on Here - Merge to ${0}$ - Merge ... - Rebase ${0}$ on Here - Reset ${0}$ to Here + Cherry-Pick This Commit + Copy SHA + Rebase${0}$to Here + Reset${0}$to Here Revert Commit Reword - Save as Patch... - Squash into Parent - Squash Children into Here + Save as Patch ... + Squash Into Parent CHANGES - changed file(s) - Search Changes... + Search Files ... FILES LFS File - Search Files... Submodule + Tag + Tree INFORMATION AUTHOR CHANGED - CHILDREN COMMITTER - Check refs that contains this commit - COMMIT IS CONTAINED BY - Shows only the first 100 changes. See all changes on the CHANGES tab. MESSAGE PARENTS REFS SHA - Open in Browser - Description - SUBJECT - Enter commit subject Repository Configure - COMMIT TEMPLATE - Template Content: - Template Name: - CUSTOM ACTION - Arguments: - ${REPO} - Repository's path; ${BRANCH} - Selected branch; ${SHA} - Selected commit's SHA - Executable File: - Name: - Scope: - Branch - Commit - Repository - Wait for action exit Email Address Email address - GIT - Fetch remotes automatically - Minute(s) - Default Remote - Preferred Merge Mode - ISSUE TRACKER - Add Sample Azure DevOps Rule - Add Sample Gitee Issue Rule - Add Sample Gitee Pull Request Rule - Add Sample Github Rule - Add Sample GitLab Issue Rule - Add Sample GitLab Merge Request Rule - Add Sample Jira Rule - New Rule - Issue Regex Expression: - Rule Name: - Result URL: - Please use $1, $2 to access regex groups values. - AI - Preferred Service: - If the 'Preferred Service' is set, SourceGit will only use it in this repository. Otherwise, if there is more than one service available, a context menu to choose one of them will be shown. HTTP Proxy HTTP proxy used by this repository User Name User name for this repository - Workspaces - Color - Name - Restore tabs on startup - CONTINUE - Empty commit detected! Do you want to continue (--allow-empty)? - STAGE ALL & COMMIT - Empty commit detected! Do you want to continue (--allow-empty) or stage all then commit? - Conventional Commit Helper - Breaking Change: - Closed Issue: - Detail Changes: - Scope: - Short Description: - Type of Change: Copy - Copy All Text - Copy Full Path Copy Path - Create Branch... - Based On: - Check out the created branch - Local Changes: + Create Branch + Based On : + Check out after created + Local Changes : Discard Stash & Reapply - New Branch Name: + New Branch Name : Enter branch name. - Spaces will be replaced with dashes. Create Local Branch - Overwrite existing branch - Create Tag... - New Tag At: - GPG signing - Tag Message: + Create Tag + New Tag At : + Tag Message : Optional. - Tag Name: - Recommended format: v1.0.0-alpha - Push to all remotes after created - Create New Tag - Kind: - annotated - lightweight - Hold Ctrl to start directly + Tag Name : + Recommended format ：v1.0.0-alpha Cut - De-initialize Submodule - Force de-init even if it contains local changes. - Submodule: Delete Branch - Branch: - You are about to delete a remote branch!!! - Also delete remote branch ${0}$ - Delete Multiple Branches - You are trying to delete multiple branches at one time. Be sure to double-check before taking action! + Branch : Delete Remote - Remote: - Path: - Target: - All children will be removed from list. - This will only remove it from list, not from disk! + Remote : + Target : Confirm Deleting Group Confirm Deleting Repository Delete Submodule - Submodule Path: + Submodule Path ： Delete Tag - Tag: + Tag : Delete from remote repositories BINARY DIFF NEW OLD Copy File Mode Changed - First Difference - Ignore All Whitespace Changes - Last Difference LFS OBJECT CHANGE Next Difference NO CHANGES OR ONLY EOL CHANGES Previous Difference - Save as Patch - Show hidden symbols Side-By-Side Diff - SUBMODULE - DELETED - NEW - Swap Syntax Highlighting - Line Word Wrap - Enable Block-Navigation - Open in Merge Tool - Show All Lines - Decrease Number of Visible Lines - Increase Number of Visible Lines + Open In Merge Tool SELECT FILE TO VIEW CHANGES - Open in Merge Tool + Open In Merge Tool Discard Changes All local changes in working copy. - Changes: - Include ignored files - {0} changes will be discarded + Changes : + Total {0} changes will be discard You can't undo this action!!! - Bookmark: - New Name: - Target: + Bookmark : + New Name : + Target : Edit Selected Group Edit Selected Repository - Run Custom Action - Action Name: + Fast-Forward (without checkout) Fetch Fetch all remotes - Force override local refs - Fetch without tags - Remote: + Prune remote dead branches + Remote : Fetch Remote Changes Assume unchanged Discard... Discard {0} files... Discard Changes in Selected Line(s) Open External Merge Tool - Resolve Using ${0}$ - Save as Patch... - Stage - Stage {0} files + Save As Patch... + Stage... + Stage {0} files... Stage Changes in Selected Line(s) Stash... Stash {0} files... Unstage Unstage {0} files Unstage Changes in Selected Line(s) - Use Mine (checkout --ours) Use Theirs (checkout --theirs) + Use Mine (checkout --ours) File History - CHANGE - CONTENT + FILTER Git-Flow - Development Branch: - Feature: - Feature Prefix: + Development Branch : + Feature : + Feature Prefix : FLOW - Finish Feature FLOW - Finish Hotfix FLOW - Finish Release - Target: - Push to remote(s) after performing finish - Squash during merge - Hotfix: - Hotfix Prefix: + Target : + Hotfix : + Hotfix Prefix : Initialize Git-Flow Keep branch - Production Branch: - Release: - Release Prefix: - Start Feature... + Production Branch : + Release : + Release Prefix : + Start Feature ... FLOW - Start Feature - Start Hotfix... + Start Hotfix ... FLOW - Start Hotfix Enter name - Start Release... + Start Release ... FLOW - Start Release - Version Tag Prefix: - Git LFS - Add Track Pattern... - Pattern is file name - Custom Pattern: - Add Track Pattern to Git LFS - Fetch - Run `git lfs fetch` to download Git LFS objects. This does not update the working copy. - Fetch LFS Objects - Install Git LFS hooks - Show Locks - No Locked Files - Lock - Show only my locks - LFS Locks - Unlock - Force Unlock - Prune - Run `git lfs prune` to delete old LFS files from local storage - Pull - Run `git lfs pull` to download all Git LFS files for current ref & checkout - Pull LFS Objects - Push - Push queued large files to the Git LFS endpoint - Push LFS Objects - Remote: - Track files named '{0}' - Track all *{0} files - HISTORY - AUTHOR - AUTHOR TIME - GRAPH & SUBJECT - SHA - COMMIT TIME + Version Tag Prefix : + Histories + Switch Horizontal/Vertical Layout + Switch Curve/Polyline Graph Mode + SEARCH SHA/SUBJECT/AUTHOR. PRESS ENTER TO SEARCH, ESC TO QUIT + CLEAR SELECTED {0} COMMITS - Hold 'Ctrl' or 'Shift' to select multiple commits. - Hold ⌘ or ⇧ to select multiple commits. - TIPS: - Keyboard Shortcuts Reference + HotKeys GLOBAL Cancel current popup - Clone new repository Close current page Go to next page - Go to previous page Create new page - Open Preferences dialog - Switch active workspace - Switch active page REPOSITORY - Commit staged changes - Commit and push staged changes - Stage all changes and commit - Creates a new branch based on selected commit - Discard selected changes - Fetch, starts directly - Dashboard mode (Default) - Commit search mode - Pull, starts directly - Push, starts directly - Force to reload this repository Stage/Unstage selected changes + Toggle commit search Switch to 'Changes' Switch to 'Histories' Switch to 'Stashes' @@ -417,46 +220,29 @@ Close search panel Find next match Find previous match - Open with external diff/merge tool Open search panel - Discard - Stage - Unstage Initialize Repository - Path: - Cherry-Pick in progress. - Processing commit - Merge in progress. - Merging - Rebase in progress. - Stopped at - Revert in progress. - Reverting commit - Interactive Rebase - On: - Target Branch: - Copy Link - Open in Browser + Path : + Invalid repository detected. Run `git init` under this path? + Cherry-Pick in progress. Press 'Abort' to restore original HEAD. + Merge request in progress. Press 'Abort' to restore original HEAD. + Rebase in progress. Press 'Abort' to restore original HEAD. + Revert in progress. Press 'Abort' to restore original HEAD. + Source Git ERROR NOTICE - Workspaces - Pages + Open Main Menu Merge Branch - Into: - Merge Option: - Source: - Merge (Multiple) - Commit all changes - Strategy: - Targets: - Move Repository Node - Select parent node for: - Name: - Git has NOT been configured. Please to go [Preferences] and configure it first. - Open Data Storage Directory - Open with... + Into : + Merge Option : + Source Branch : + Name : + Git has NOT been configured. Please to go [Preference] and configure it first. + NOTICE + SELECT FOLDER + Open With ... Optional. - Create New Page + Create New Page (Ctrl+T) Bookmark Close Tab Close Other Tabs @@ -464,342 +250,197 @@ Copy Repository Path Repositories Paste - {0} days ago - 1 hour ago - {0} hours ago - Just now - Last month - Last year - {0} minutes ago - {0} months ago - {0} years ago - Yesterday - Preferences - AI - Analyze Diff Prompt - API Key - Generate Subject Prompt - Model - Name - Server - Enable Streaming - APPEARANCE - Default Font - Editor Tab Width - Font Size - Default - Editor - Monospace Font - Use monospace font only in text editor - Theme - Theme Overrides - Use fixed tab width in titlebar - Use native window frame - DIFF/MERGE TOOL - Install Path - Input path for diff/merge tool - Tool - GENERAL - Check for updates on startup - Date Format - Language - History Commits - Show author time instead of commit time in graph - Show children in the commit details - Show tags in commit graph - Subject Guide Length - GIT - Enable Auto CRLF - Default Clone Dir - User Email - Global git user email - Enable --prune on fetch - Enable --ignore-cr-at-eol in diff - Git (>= 2.25.1) is required by this app - Install Path - Enable HTTP SSL Verify - User Name - Global git user name - Git version - GPG SIGNING - Commit GPG signing - GPG Format - Program Install Path - Input path for installed gpg program - Tag GPG signing - User Signing Key - User's gpg signing key - INTEGRATION - SHELL/TERMINAL - Path - Shell/Terminal - Prune Remote - Target: - Prune Worktrees - Prune worktree information in `$GIT_COMMON_DIR/worktrees` + Preference + APPEARANCE + Default FontFamily + Default Font Size + Monospace FontFamily + Theme + GENERAL + Avatar Server + Check for updates on startup + Language + History Commits + Restore windows + Use fixed tab width in titlebar + GIT + Fetch remotes automatically + Enable Auto CRLF + Default Clone Dir + User Email + Global git user email + Install Path + Shell + User Name + Global git user name + Git version + GPG SIGNING + Commit GPG signing + Install Path + Input path for installed gpg program + User Signing Key + User's gpg signing key + EXTERNAL MERGE TOOL + Diff Command + Merge Command + Install Path + Input path for merge tool + Merger Pull - Remote Branch: - Into: - Local Changes: - Discard - Stash & Reapply - Update all submodules - Remote: + Stash & reapply local changes + Branch : + Into : + Remote : Pull (Fetch & Merge) Use rebase instead of merge Push - Make sure submodules have been pushed Force push - Local Branch: - Remote: + Local Branch : + Remote : Push Changes To Remote - Remote Branch: - Set as tracking branch + Remote Branch : Push all tags Push Tag To Remote - Push to all remotes - Remote: - Tag: - Quit + Remote : + Tag : Rebase Current Branch Stash & reapply local changes - On: - Rebase: + On : + Rebase : + Refresh Add Remote Edit Remote - Name: + Name : Remote name - Repository URL: + Repository URL : Remote git repository URL Copy URL - Delete... - Edit... - Fetch - Open In Browser + Delete ... + Edit ... + Fetch ... Prune - Confirm to Remove Worktree - Enable `--force` Option - Target: + Target : Rename Branch - New Name: + New Name : Unique name for this branch - Branch: + Branch : ABORT - Auto fetching changes from remotes... - Sort - By Committer Date - By Name Cleanup(GC & Prune) - Run `git gc` command for this repository. - Clear all - Clear + Run `gc` command and do `lfs prune` if LFS is installed. Configure this repository CONTINUE - Custom Actions - No Custom Actions - Discard all changes - Enable '--reflog' Option - Open in File Browser - Search Branches/Tags/Submodules - Visibility in Graph - Unset - Hide in commit graph - Filter in commit graph - Enable '--first-parent' Option - LAYOUT - Horizontal - Vertical - COMMITS ORDER - Commit Date - Topologically + Open In File Browser LOCAL BRANCHES - Navigate to HEAD + Navigate To HEAD Create Branch - CLEAR NOTIFICATIONS - Only highlight current branch in graph - Open in {0} - Open in External Tools + Open In {0} + Open In External Tools Refresh REMOTES - Add Remote - Search Commit - Author - Committer - Content - File - Message - SHA - Current Branch - Show Submodules as Tree - Show Tags as Tree - SKIP + ADD REMOTE + RESOLVE + Search Commit (Ctrl+F) + Search Author/Committer/Message/SHA Statistics SUBMODULES - Add Submodule - Update Submodule + ADD SUBMODULE + UPDATE SUBMODULE TAGS - New Tag - By Creator Date - By Name - Sort - Open in Terminal - Use relative time in histories - View Logs - Visit '{0}' in Browser - WORKTREES - Add Worktree - Prune + NEW TAG + Open In Terminal + WORKSPACE Git Repository URL Reset Current Branch To Revision - Reset Mode: - Move To: - Current Branch: - Reset Branch (Without Checkout) - Move To: - Branch: + Reset Mode : + Move To : + Current Branch : Reveal in File Explorer Revert Commit - Commit: + Commit : Commit revert changes Reword Commit Message - Use 'Shift+Enter' to input a new line. 'Enter' is the hotkey of OK button - Running. Please wait... + Message : + On : + Running. Please wait ... SAVE - Save As... + Save As ... Patch has been saved successfully! - Scan Repositories - Root Dir: - Check for Updates... + Check for Updates ... New version of this software is available: Check for updates failed! Download Skip This Version Software Update There are currently no updates available. - Set Tracking Branch - Branch: - Unset upstream - Upstream: - Copy SHA - Go to - Squash Commits - Into: - SSH Private Key: + Squash HEAD Into Parent + HEAD : + Reword : + To : + SSH Private Key : Private SSH key store path START Stash - Auto-restore after stashing - Your working files remain unchanged, but a stash is saved. Include untracked files - Keep staged files - Message: + Message : Optional. Name of this stash - Only staged changes - Both staged and unstaged changes of selected file(s) will be stashed!!! Stash Local Changes Apply Drop - Save as Patch... + Pop Drop Stash - Drop: - STASHES + Drop : + Stashes CHANGES STASHES Statistics COMMITS COMMITTER - OVERVIEW MONTH WEEK - AUTHORS: + YEAR COMMITS: + COMMITTERS: SUBMODULES Add Submodule Copy Relative Path - De-initialize Submodule Fetch nested submodules Open Submodule Repository - Relative Path: + Relative Path : Relative folder to store this module. Delete Submodule - STATUS - modified - not initialized - revision changed - unmerged - URL OK Copy Tag Name - Copy Tag Message - Delete ${0}$... - Merge ${0}$ into ${1}$... - Push ${0}$... - Update Submodules - All submodules - Initialize as needed - Recursively - Submodule: - Use --remote option - URL: - Logs - CLEAR ALL - Copy - Delete + Delete${0}$ + Push${0}$ + URL : Warning - Welcome Page Create Group Create Sub-Group Clone Repository Delete DRAG & DROP FOLDER SUPPORTED. CUSTOM GROUPING SUPPORTED. Edit - Move to Another Group - Open All Repositories Open Repository Open Terminal - Rescan Repositories in Default Clone Dir - Search Repositories... + Search Repositories ... Sort - LOCAL CHANGES - Git Ignore - Ignore all *{0} files - Ignore *{0} files in the same folder - Ignore files in the same folder - Ignore this file only + Changes Amend - You can stage this file now. COMMIT COMMIT & PUSH - Template/Histories - Trigger click event - Commit (Edit) - Stage all changes and commit - You have staged {0} file(s) but only {1} file(s) displayed ({2} files are filtered out). Do you want to continue? + Enter commit message + CTRL + Enter CONFLICTS DETECTED - OPEN EXTERNAL MERGETOOL - OPEN ALL CONFLICTS IN EXTERNAL MERGETOOL - FILE CONFLICTS ARE RESOLVED - USE MINE - USE THEIRS + RECENT INPUT MESSAGES INCLUDE UNTRACKED FILES + MESSAGE HISTORIES NO RECENT INPUT MESSAGES - NO COMMIT TEMPLATES - Reset Author - Right-click the selected file(s), and make your choice to resolve conflicts. - SignOff STAGED UNSTAGE UNSTAGE ALL UNSTAGED STAGE STAGE ALL - VIEW ASSUME UNCHANGED - Template: ${0}$ - WORKSPACE: - Configure Workspaces... - WORKTREE - Copy Path - Lock - Remove - Unlock + VIEW ASSUME UNCHANGED + Right-click the selected file(s), and make your choice to resolve conflicts. diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml deleted file mode 100644 index 4f1a4452..00000000 --- a/src/Resources/Locales/es_ES.axaml +++ /dev/null @@ -1,809 +0,0 @@ - - - - - - Acerca de - Acerca de SourceGit - Cliente Git GUI de código abierto y gratuito - Agregar Worktree - Ubicación: - Ruta para este worktree. Se admite ruta relativa. - Nombre de la Rama: - Opcional. Por defecto es el nombre de la carpeta de destino. - Rama de Seguimiento: - Seguimiento de rama remota - Qué Checkout: - Crear Nueva Rama - Rama Existente - Asistente OpenAI - RE-GENERAR - Usar OpenAI para generar mensaje de commit - APLICAR CÓMO MENSAJE DE COMMIT - Aplicar Parche - Archivo del Parche: - Seleccionar archivo .patch para aplicar - Ignorar cambios de espacios en blanco - Aplicar Parche - Espacios en Blanco: - Aplicar Stash - Borrar después de aplicar - Restaurar los cambios del índice - Stash: - Archivar... - Guardar Archivo en: - Seleccionar ruta del archivo - Revisión: - Archivar - SourceGit Askpass - ARCHIVOS ASUMIDOS COMO SIN CAMBIOS - NO HAY ARCHIVOS ASUMIDOS COMO SIN CAMBIOS - REMOVER - Cargar Imagen... - Refrescar - ¡ARCHIVO BINARIO NO SOPORTADO! - Bisect - Abortar - Malo - Bisecting. ¿Es el HEAD actual bueno o malo? - Bueno - Saltar - Bisecting. Marcar el commit actual cómo bueno o malo y revisar otro. - Blame - ¡BLAME EN ESTE ARCHIVO NO SOPORTADO! - Checkout ${0}$... - Comparar con ${0}$ - Comparar con Worktree - Copiar Nombre de Rama - Acción personalizada - Eliminar ${0}$... - Eliminar {0} ramas seleccionadas - Fast-Forward a ${0}$ - Fetch ${0}$ en ${1}$... - Git Flow - Finalizar ${0}$ - Merge ${0}$ en ${1}$... - Hacer merge de las ramas {0} seleccionadas hacia la rama actual - Pull ${0}$ - Pull ${0}$ en ${1}$... - Push ${0}$ - Rebase ${0}$ en ${1}$... - Renombrar ${0}$... - Resetear ${0}$ a ${1}$... - Establecer Rama de Seguimiento... - Comparar Ramas - ¡Upstream inválido! - Bytes - CANCELAR - Resetear a Revisión Padre - Resetear a Esta Revisión - Generar mensaje de commit - CAMBIAR MODO DE VISUALIZACIÓN - Mostrar como Lista de Archivos y Directorios - Mostrar como Lista de Rutas - Mostrar como Árbol de Sistema de Archivos - Checkout Rama - Checkout Commit - Commit: - Advertencia: Al hacer un checkout de commit, tu Head se separará - Cambios Locales: - Descartar - Stash & Reaplicar - Actualizar todos los submódulos - Rama: - Checkout & Fast-Forward - Fast-Forward a: - Cherry Pick - Añadir fuente al mensaje de commit - Commit(s): - Commit todos los cambios - Mainline: - Normalmente no puedes cherry-pick un merge porque no sabes qué lado del merge debe considerarse la línea principal. Esta opción permite que cherry-pick reproduzca el cambio en relación con el padre especificado. - Limpiar Stashes - Estás intentando limpiar todos los stashes. ¿Estás seguro de continuar? - Clonar Repositorio Remoto - Parámetros Adicionales: - Argumentos adicionales para clonar el repositorio. Opcional. - Nombre Local: - Nombre del repositorio. Opcional. - Carpeta Padre: - Inicializar y actualizar submódulos - URL del Repositorio: - CERRAR - Editor - Checkout Commit - Cherry-Pick Este Commit - Cherry-Pick ... - Comparar con HEAD - Comparar con Worktree - Autor - Committer - Información - SHA - Asunto - Acción personalizada - Rebase Interactivo ${0}$ hasta Aquí - Merge a ${0}$ - Merge ... - Rebase ${0}$ hasta Aquí - Reset ${0}$ hasta Aquí - Revertir Commit - Reescribir - Guardar como Parche... - Squash en Parent - Squash Commits Hijos hasta Aquí - CAMBIOS - archivo(s) modificado(s) - Buscar Cambios... - ARCHIVOS - Archivo LFS - Buscar Archivos... - Submódulo - INFORMACIÓN - AUTOR - CAMBIADO - HIJOS - COMMITTER - Ver refs que contienen este commit - COMMIT ESTÁ CONTENIDO EN - Muestra solo los primeros 100 cambios. Ver todos los cambios en la pestaña CAMBIOS. - MENSAJE - PADRES - REFS - SHA - Abrir en Navegador - Descripción - ASUNTO - Introducir asunto del commit - Configurar Repositorio - PLANTILLA DE COMMIT - Contenido de la Plantilla: - Nombre de la Plantilla: - ACCIÓN PERSONALIZADA - Argumentos: - ${REPO} - Ruta del repositorio; ${SHA} - SHA del commit seleccionado - Archivo Ejecutable: - Nombre: - Alcance: - Rama - Commit - Repositorio - Esperar la acción de salida - Dirección de Email - Dirección de email - GIT - Fetch remotos automáticamente - Minuto(s) - Remoto por Defecto - Modo preferido de Merge - SEGUIMIENTO DE INCIDENCIAS - Añadir Regla de Ejemplo para Azure DevOps - Añadir Regla de Ejemplo para Incidencias de Gitee - Añadir Regla de Ejemplo para Pull Requests de Gitee - Añadir Regla de Ejemplo para Github - Añadir Regla de Ejemplo para Incidencias de GitLab - Añadir Regla de Ejemplo para Merge Requests de GitLab - Añadir Regla de Ejemplo para Jira - Nueva Regla - Expresión Regex para Incidencias: - Nombre de la Regla: - URL Resultante: - Por favor, use $1, $2 para acceder a los valores de los grupos regex. - OPEN AI - Servicio Preferido: - Si el 'Servicio Preferido' está establecido, SourceGit sólo lo usará en este repositorio. De lo contrario, si hay más de un servicio disponible, se mostrará un menú de contexto para elegir uno. - Proxy HTTP - Proxy HTTP utilizado por este repositorio - Nombre de Usuario - Nombre de usuario para este repositorio - Espacios de Trabajo - Color - Nombre - Restaurar pestañas al iniciar - CONTINUAR - ¡Commit vacío detectado! ¿Quieres continuar (--allow-empty)? - HACER STAGE A TODO & COMMIT - ¡Commit vacío detectado! ¿Quieres continuar (--allow-empty) o hacer stage a todo y después commit? - Asistente de Commit Convencional - Cambio Importante: - Incidencia Cerrada: - Detalles del Cambio: - Alcance: - Descripción Corta: - Tipo de Cambio: - Copiar - Copiar Todo el Texto - Copiar Ruta Completa - Copiar Ruta - Crear Rama... - Basado En: - Checkout de la rama creada - Cambios Locales: - Descartar - Stash & Reaplicar - Nombre de la Nueva Rama: - Introduzca el nombre de la rama. - Los espacios serán reemplazados con guiones. - Crear Rama Local - Sobrescribir la rama existente - Crear Etiqueta... - Nueva Etiqueta En: - Firma GPG - Mensaje de la Etiqueta: - Opcional. - Nombre de la Etiqueta: - Formato recomendado: v1.0.0-alpha - Push a todos los remotos después de crear - Crear Nueva Etiqueta - Tipo: - anotada - ligera - Mantenga Ctrl para iniciar directamente - Cortar - Desinicializar Submódulo - Forzar desinicialización incluso si contiene cambios locales. - Submódulo: - Eliminar Rama - Rama: - ¡Estás a punto de eliminar una rama remota! - También eliminar la rama remota ${0}$ - Eliminar Múltiples Ramas - Estás intentando eliminar múltiples ramas a la vez. ¡Asegúrate de revisar antes de tomar acción! - Eliminar Remoto - Remoto: - Ruta: - Destino: - Todos los hijos serán removidos de la lista. - ¡Esto solo lo removera de la lista, no del disco! - Confirmar Eliminación de Grupo - Confirmar Eliminación de Repositorio - Eliminar Submódulo - Ruta del Submódulo: - Eliminar Etiqueta - Etiqueta: - Eliminar de los repositorios remotos - DIFERENCIA BINARIA - NUEVO - ANTIGUO - Copiar - Modo de Archivo Cambiado - Primera Diferencia - Ignorar Cambio de Espacios en Blanco - Última Diferencia - CAMBIO DE OBJETO LFS - Siguiente Diferencia - SIN CAMBIOS O SOLO CAMBIOS DE EOL - Diferencia Anterior - Guardar como Parche - Mostrar símbolos ocultos - Diferencia Lado a Lado - SUBMÓDULO - BORRADO - NUEVO - Intercambiar - Resaltado de Sintaxis - Ajuste de Línea - Habilitar navegación en bloque - Abrir en Herramienta de Merge - Mostrar Todas las Líneas - Disminuir Número de Líneas Visibles - Aumentar Número de Líneas Visibles - SELECCIONA ARCHIVO PARA VER CAMBIOS - Abrir en Herramienta de Merge - Descartar Cambios - Todos los cambios locales en la copia de trabajo. - Cambios: - Incluir archivos ignorados - Total {0} cambios serán descartados - ¡No puedes deshacer esta acción! - Marcador: - Nuevo Nombre: - Destino: - Editar Grupo Seleccionado - Editar Repositorio Seleccionado - Ejecutar Acción Personalizada - Nombre de la Acción: - Fetch - Fetch todos los remotos - Utilizar opción '--force' - Fetch sin etiquetas - Remoto: - Fetch Cambios Remotos - Asumir sin cambios - Descartar... - Descartar {0} archivos... - Descartar Cambios en Línea(s) Seleccionada(s) - Abrir Herramienta de Merge Externa - Resolver usando ${0}$ - Guardar como Parche... - Stage - Stage {0} archivos - Stage Cambios en Línea(s) Seleccionada(s) - Stash... - Stash {0} archivos... - Unstage - Unstage {0} archivos - Unstage Cambios en Línea(s) Seleccionada(s) - Usar Míos (checkout --ours) - Usar Suyos (checkout --theirs) - Historial de Archivos - CAMBIO - CONTENIDO - Git-Flow - Rama de Desarrollo: - Feature: - Prefijo de Feature: - FLOW - Finalizar Feature - FLOW - Finalizar Hotfix - FLOW - Finalizar Release - Destino: - Push al/los remoto(s) después de Finalizar - Squash durante el merge - Hotfix: - Prefijo de Hotfix: - Inicializar Git-Flow - Mantener rama - Rama de Producción: - Release: - Prefijo de Release: - Iniciar Feature... - FLOW - Iniciar Feature - Iniciar Hotfix... - FLOW - Iniciar Hotfix - Introducir nombre - Iniciar Release... - FLOW - Iniciar Release - Prefijo de Etiqueta de Versión: - Git LFS - Añadir Patrón de Seguimiento... - El patrón es el nombre del archivo - Patrón Personalizado: - Añadir Patrón de Seguimiento a Git LFS - Fetch - Ejecuta `git lfs fetch` para descargar objetos Git LFS. Esto no actualiza la copia de trabajo. - Fetch Objetos LFS - Instalar hooks de Git LFS - Mostrar Bloqueos - No hay archivos bloqueados - Bloquear - Mostrar solo mis bloqueos - Bloqueos LFS - Desbloquear - Forzar Desbloqueo - Prune - Ejecuta `git lfs prune` para eliminar archivos LFS antiguos del almacenamiento local - Pull - Ejecuta `git lfs pull` para descargar todos los archivos Git LFS para la referencia actual y hacer checkout - Pull Objetos LFS - Push - Push archivos grandes en cola al endpoint de Git LFS - Push Objetos LFS - Remoto: - Seguir archivos llamados '{0}' - Seguir todos los archivos *{0} - Historias - AUTOR - HORA DEL AUTOR - GRÁFICO & ASUNTO - SHA - FECHA DE COMMIT - {0} COMMITS SELECCIONADOS - Mantén 'Ctrl' o 'Shift' para seleccionar múltiples commits. - Mantén ⌘ o ⇧ para seleccionar múltiples commits. - CONSEJOS: - Referencia de Atajos de Teclado - GLOBAL - Cancelar popup actual - Clonar repositorio nuevo - Cerrar página actual - Ir a la siguiente página - Ir a la página anterior - Crear nueva página - Abrir diálogo de preferencias - Cambiar espacio de trabajo activo - Cambiar página activa - REPOSITORIO - Commit cambios staged - Commit y push cambios staged - Stage todos los cambios y commit - Crea una nueva rama basada en el commit seleccionado - Descartar cambios seleccionados - Fetch, empieza directamente - Modo Dashboard (Por Defecto) - Modo de búsqueda de commits - Pull, empieza directamente - Push, empieza directamente - Forzar a recargar este repositorio - Stage/Unstage cambios seleccionados - Cambiar a 'Cambios' - Cambiar a 'Historias' - Cambiar a 'Stashes' - EDITOR DE TEXTO - Cerrar panel de búsqueda - Buscar siguiente coincidencia - Buscar coincidencia anterior - Abrir con herramienta diff/merge externa - Abrir panel de búsqueda - Descartar - Stage - Unstage - Inicializar Repositorio - Ruta: - Cherry-Pick en progreso. - Procesando commit - Merge en progreso. - Haciendo merge - Rebase en progreso. - Pausado en - Revert en progreso. - Haciendo revert del commit - Rebase Interactivo - En: - Rama Objetivo: - Copiar Enlace - Abrir en el Navegador - ERROR - AVISO - Espacios de trabajo - Páginas - Merge Rama - En: - Opción de Merge: - Rama Fuente: - Merge (Multiplo) - Commit todos los cambios - Estrategia: - Destino: - Mover Nodo del Repositorio - Seleccionar nodo padre para: - Nombre: - Git NO ha sido configurado. Por favor, ve a [Preferencias] y configúralo primero. - Abrir Directorio de Datos de la App - Abrir Con... - Opcional. - Crear Nueva Página - Marcador - Cerrar Pestaña - Cerrar Otras Pestañas - Cerrar Pestañas a la Derecha - Copiar Ruta del Repositorio - Repositorios - Pegar - Hace {0} días - Hace 1 hora - Hace {0} horas - Justo ahora - Último mes - Último año - Hace {0} minutos - Hace {0} meses - Hace {0} años - Ayer - Preferencias - OPEN AI - Analizar Diff Prompt - Clave API - Generar Subject Prompt - Modelo - Nombre - Servidor - Activar Transmisión - APARIENCIA - Fuente por defecto - Ancho de la Pestaña del Editor - Tamaño de fuente - Por defecto - Editor - Fuente Monospace - Usar solo fuente monospace en el editor de texto - Tema - Sobreescritura de temas - Usar ancho de pestaña fijo en la barra de título - Usar marco de ventana nativo - HERRAMIENTA DIFF/MERGE - Ruta de instalación - Introducir ruta para la herramienta diff/merge - Herramienta - GENERAL - Buscar actualizaciones al iniciar - Formato de Fecha - Idioma - Commits en el historial - Mostrar hora del autor en lugar de la hora del commit en el gráfico - Mostrar hijos en los detalles de commit - Mostrar etiquetas en el gráfico de commit - Longitud de la guía del asunto - GIT - Habilitar Auto CRLF - Directorio de clonado por defecto - Email de usuario - Email global del usuario git - Habilitar --prune para fetch - Habilitar --ignore-cr-at-eol en diff - Se requiere Git (>= 2.25.1) para esta aplicación - Ruta de instalación - Habilitar verificación HTTP SSL - Nombre de usuario - Nombre global del usuario git - Versión de Git - FIRMA GPG - Firma GPG en commit - Formato GPG - Ruta de instalación del programa - Introducir ruta para el programa gpg instalado - Firma GPG en etiqueta - Clave de firma del usuario - Clave de firma gpg del usuario - INTEGRACIÓN - SHELL/TERMINAL - Ruta - Shell/Terminal - Podar Remoto - Destino: - Podar Worktrees - Podar información de worktree en `$GIT_COMMON_DIR/worktrees` - Pull - Rama Remota: - En: - Cambios Locales: - Descartar - Stash & Reaplicar - Actualizar todos los submódulos - Remoto: - Pull (Fetch & Merge) - Usar rebase en lugar de merge - Push - Asegurarse de que los submódulos se hayan hecho push - Forzar push - Rama Local: - Remoto: - Push Cambios al Remoto - Rama Remota: - Establecer como rama de seguimiento - Push todas las etiquetas - Push Etiqueta al Remoto - Push a todos los remotos - Remoto: - Etiqueta: - Salir - Rebase Rama Actual - Stash & reaplicar cambios locales - En: - Rebase: - Añadir Remoto - Editar Remoto - Nombre: - Nombre remoto - URL del Repositorio: - URL del repositorio git remoto - Copiar URL - Borrar... - Editar... - Fetch - Abrir En Navegador - Podar (Prune) - Confirmar para Eliminar Worktree - Utilizar Opción `--force` - Destino: - Renombrar Rama - Nuevo Nombre: - Nombre único para esta rama - Rama: - ABORTAR - Auto fetching cambios desde remotos... - Ordenar - Por Fecha de Committer - Por Nombre - Limpiar (GC & Prune) - Ejecutar comando `git gc` para este repositorio. - Limpiar todo - Limpiar - Configurar este repositorio - CONTINUAR - Acciones Personalizadas - No hay ninguna Acción Personalizada - Descartar todos los cambios - Habilitar Opción '--reflog' - Abrir en el Explorador - Buscar Ramas/Etiquetas/Submódulos - Visibilidad en el Gráfico - Desestablecer - Ocultar en el Gráfico de Commits - Filtrar en el Gráfico de Commits - Habilitar Opción '--first-parent' - DISPOSICIÓN - Horizontal - Vertical - ORDEN DE COMMITS - Fecha de Commit - Topológicamente - RAMAS LOCALES - Navegar a HEAD - Crear Rama - LIMPIAR NOTIFICACIONES - Resaltar solo la rama actual en el gráfico - Abrir en {0} - Abrir en Herramientas Externas - Refrescar - REMOTOS - AÑADIR REMOTO - Buscar Commit - Autor - Committer - Contenido - Archivo - Mensaje - SHA - Rama Actual - Mostrar Submódulos como Árbol - Mostrar Etiquetas como Árbol - OMITIR - Estadísticas - SUBMÓDULOS - AÑADIR SUBMÓDULO - ACTUALIZAR SUBMÓDULO - ETIQUETAS - NUEVA ETIQUETA - Por Fecha de Creación - Por Nombre - Ordenar - Abrir en Terminal - Usar tiempo relativo en las historias - Ver Logs - Visitar '{0}' en el Navegador - WORKTREES - AÑADIR WORKTREE - PRUNE - URL del Repositorio Git - Resetear Rama Actual a Revisión - Modo de Reset: - Mover a: - Rama Actual: - Resetear Rama (Sin hacer Checkout) - Mover A: - Rama: - Revelar en el Explorador de Archivos - Revertir Commit - Commit: - Commit revertir cambios - Reescribir Mensaje de Commit - Usa 'Shift+Enter' para introducir una nueva línea. 'Enter' es el atajo del botón OK - Ejecutando. Por favor espera... - GUARDAR - Guardar Como... - ¡El parche se ha guardado exitosamente! - Escanear Repositorios - Directorio Raíz: - Buscar Actualizaciones... - Nueva versión de este software disponible: - ¡Error al buscar actualizaciones! - Descargar - Omitir Esta Versión - Actualización de Software - Actualmente no hay actualizaciones disponibles. - Establecer Rama de Seguimiento - Rama: - Desestablecer upstream - Upstream: - Copiar SHA - Ir a - Squash Commits - En: - Clave Privada SSH: - Ruta de almacenamiento de la clave privada SSH - INICIAR - Stash - Restaurar automáticamente después del stashing - Tus archivos de trabajo permanecen sin cambios, pero se guarda un stash. - Incluir archivos no rastreados - Mantener archivos staged - Mensaje: - Opcional. Nombre de este stash - Solo cambios staged - ¡Tanto los cambios staged como los no staged de los archivos seleccionados serán stashed! - Stash Cambios Locales - Aplicar - Eliminar - Guardar como Parche... - Eliminar Stash - Eliminar: - Stashes - CAMBIOS - STASHES - Estadísticas - COMMITS - COMMITTER - GENERAL - MES - SEMANA - AUTORES: - COMMITS: - SUBMÓDULOS - Añadir Submódulo - Copiar Ruta Relativa - Desinicializar Submódulo - Fetch submódulos anidados - Abrir Repositorio del Submódulo - Ruta Relativa: - Carpeta relativa para almacenar este módulo. - Eliminar Submódulo - ESTADO - modificado - no inicializado - revisión cambiada - unmerged - URL - OK - Copiar Nombre de la Etiqueta - Copiar Mensaje de la Etiqueta - Eliminar ${0}$... - Merge ${0}$ en ${1}$... - Push ${0}$... - Actualizar Submódulos - Todos los submódulos - Inicializar según sea necesario - Recursivamente - Submódulo: - Usar opción --remote - URL: - Logs - LIMPIAR TODO - Copiar - Borrar - Advertencia - Página de Bienvenida - Crear Grupo - Crear Sub-Grupo - Clonar Repositorio - Eliminar - SOPORTA ARRASTRAR Y SOLTAR CARPETAS. SOPORTA AGRUPACIÓN PERSONALIZADA. - Editar - Mover a Otro Grupo - Abrir Todos Los Repositorios - Abrir Repositorio - Abrir Terminal - Reescanear Repositorios en el Directorio de Clonado por Defecto - Buscar Repositorios... - Ordenar - Cambios - Git Ignore - Ignorar todos los archivos *{0} - Ignorar archivos *{0} en la misma carpeta - Ignorar archivos en la misma carpeta - Ignorar solo este archivo - Enmendar - Puedes hacer stage a este archivo ahora. - COMMIT - COMMIT & PUSH - Plantilla/Historias - Activar evento de clic - Commit (Editar) - Hacer stage a todos los cambios y commit - Tienes {0} archivo(s) en stage, pero solo {1} archivo(s) mostrado(s) ({2} archivo(s) están filtrados). ¿Quieres continuar? - CONFLICTOS DETECTADOS - ABRIR HERRAMIENTA DE MERGE EXTERNA - ABRIR TODOS LOS CONFLICTOS EN HERRAMIENTA DE MERGE EXTERNA - LOS CONFLICTOS DE ARCHIVOS ESTÁN RESUELTOS - USAR MÍOS - USAR SUYOS - INCLUIR ARCHIVOS NO RASTREADOS - NO HAY MENSAJES DE ENTRADA RECIENTES - NO HAY PLANTILLAS DE COMMIT - Restablecer Autor - Haz clic derecho en el(los) archivo(s) seleccionado(s) y elige tu opción para resolver conflictos. - Firmar - STAGED - UNSTAGE - UNSTAGE TODO - UNSTAGED - STAGE - STAGE TODO - VER ASSUME UNCHANGED - Plantilla: ${0}$ - ESPACIO DE TRABAJO: - Configura Espacios de Trabajo... - WORKTREE - Copiar Ruta - Bloquear - Eliminar - Desbloquear - diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml deleted file mode 100644 index 635d74c2..00000000 --- a/src/Resources/Locales/fr_FR.axaml +++ /dev/null @@ -1,745 +0,0 @@ - - - - - - À propos - À propos de SourceGit - Client Git Open Source et Gratuit - Ajouter un Worktree - Emplacement : - Chemin vers ce worktree. Relatif supporté. - Nom de branche: - Optionnel. Nom du dossier de destination par défaut. - Suivre la branche : - Suivi de la branche distante - Que récupérer : - Créer une nouvelle branche - Branche existante - Assistant IA - RE-GÉNÉRER - Utiliser l'IA pour générer un message de commit - APPLIQUER COMME MESSAGE DE COMMIT - Appliquer - Fichier de patch : - Selectionner le fichier .patch à appliquer - Ignorer les changements d'espaces blancs - Appliquer le patch - Espaces blancs : - Appliquer le Stash - Supprimer après application - Rétablir les changements de l'index - Stash: - Archiver... - Enregistrer l'archive sous : - Sélectionnez le chemin du fichier d'archive - Révision : - Archiver - SourceGit Askpass - FICHIERS PRÉSUMÉS INCHANGÉS - PAS DE FICHIERS PRÉSUMÉS INCHANGÉS - SUPPRIMER - Rafraîchir - FICHIER BINAIRE NON SUPPORTÉ !!! - Blâme - LE BLÂME SUR CE FICHIER N'EST PAS SUPPORTÉ!!! - Récupérer ${0}$... - Comparer avec ${0}$ - Comparer avec le worktree - Copier le nom de la branche - Action personnalisée - Supprimer ${0}$... - Supprimer {0} branches sélectionnées - Fast-Forward vers ${0}$ - Fetch ${0}$ vers ${1}$... - Git Flow - Terminer ${0}$ - Fusionner ${0}$ dans ${1}$... - Fusionner les {0} branches sélectionnées dans celle en cours - Tirer ${0}$ - Tirer ${0}$ dans ${1}$... - Pousser ${0}$ - Rebaser ${0}$ sur ${1}$... - Renommer ${0}$... - Définir la branche de suivi... - Comparer les branches - Branche en amont invalide! - Octets - ANNULER - Réinitialiser à la révision parente - Réinitialiser à cette révision - Générer un message de commit - CHANGER LE MODE D'AFFICHAGE - Afficher comme liste de dossiers/fichiers - Afficher comme liste de chemins - Afficher comme arborescence - Récupérer la branche - Récupérer ce commit - Commit : - Avertissement: une récupération vers un commit aboutiera vers un HEAD détaché - Changements locaux : - Annuler - Mettre en stash et réappliquer - Branche : - Cherry-Pick de ce commit - Ajouter la source au message de commit - Commit : - Commit tous les changements - Ligne principale : - Habituellement, on ne peut pas cherry-pick un commit car on ne sait pas quel côté devrait être considéré comme principal. Cette option permet de rejouer les changements relatifs au parent spécifié. - Supprimer les stashes - Vous essayez de supprimer tous les stashes. Êtes-vous sûr de vouloir continuer ? - Cloner repository distant - Paramètres supplémentaires : - Arguments additionnels au clônage. Optionnel. - Nom local : - Nom de dépôt. Optionnel. - Dossier parent : - Initialiser et mettre à jour les sous-modules - URL du dépôt : - FERMER - Éditeur - Récupérer ce commit - Cherry-Pick ce commit - Cherry-Pick ... - Comparer avec HEAD - Comparer avec le worktree - Informations - SHA - Action personnalisée - Rebase interactif de ${0}$ ici - Fusionner dans ${0}$ - Fusionner ... - Rebaser ${0}$ ici - Réinitialiser ${0}$ ici - Annuler le commit - Reformuler - Enregistrer en tant que patch... - Squash dans le parent - Squash les commits enfants ici - CHANGEMENTS - Rechercher les changements... - FICHIERS - Fichier LFS - Rechercher des fichiers... - Sous-module - INFORMATIONS - AUTEUR - CHANGÉ - ENFANTS - COMMITTER - Vérifier les références contenant ce commit - LE COMMIT EST CONTENU PAR - Afficher seulement les 100 premiers changements. Voir tous les changements dans l'onglet CHANGEMENTS. - MESSAGE - PARENTS - REFS - SHA - Ouvrir dans le navigateur - Description - Entrez le message du commit - Configurer le dépôt - MODÈLE DE COMMIT - Contenu de modèle: - Nom de modèle: - ACTION PERSONNALISÉE - Arguments : - ${REPO} - Chemin du repository; ${SHA} - SHA du commit sélectionné - Fichier exécutable : - Nom : - Portée : - Branche - Commit - Repository - Attendre la fin de l'action - Adresse e-mail - Adresse e-mail - GIT - Fetch les dépôts distants automatiquement - minute(s) - Dépôt par défaut - SUIVI DES PROBLÈMES - Ajouter une règle d'exemple Azure DevOps - Ajouter une règle d'exemple Gitee - Ajouter une règle d'exemple pour Pull Request Gitee - Ajouter une règle d'exemple Github - Ajouter une règle d'exemple pour Incidents GitLab - Ajouter une règle d'exemple pour Merge Request GitLab - Ajouter une règle d'exemple Jira - Nouvelle règle - Issue Regex Expression: - Nom de règle : - URL résultant: - Veuillez utiliser $1, $2 pour accéder aux valeurs des groupes regex. - IA - Service préféré: - Si le 'Service préféré' est défini, SourceGit l'utilisera seulement dans ce repository. Sinon, si plus d'un service est disponible, un menu contextuel permettant de choisir l'un d'eux sera affiché. - Proxy HTTP - Proxy HTTP utilisé par ce dépôt - Nom d'utilisateur - Nom d'utilisateur pour ce dépôt - Espaces de travail - Couleur - Nom - Restaurer les onglets au démarrage - Assistant Commits Conventionnels - Changement Radical : - Incident Clos : - Détail des Modifications : - Portée : - Courte Description : - Type de Changement : - Copier - Copier tout le texte - Copier le chemin complet - Copier le chemin - Créer une branche... - Basé sur : - Récupérer la branche créée - Changements locaux : - Rejeter - Stash & Réappliquer - Nom de la nouvelle branche : - Entrez le nom de la branche. - Les espaces seront remplacés par des tirets. - Créer une branche locale - Créer un tag... - Nouveau tag à : - Signature GPG - Message du tag : - Optionnel. - Nom du tag : - Format recommandé : v1.0.0-alpha - Pousser sur tous les dépôts distants après création - Créer un nouveau tag - Type : - annoté - léger - Maintenir Ctrl pour commencer directement - Couper - Supprimer la branche - Branche : - Vous êtes sur le point de supprimer une branche distante !!! - Supprimer également la branche distante ${0}$ - Supprimer plusieurs branches - Vous essayez de supprimer plusieurs branches à la fois. Assurez-vous de revérifier avant de procéder ! - Supprimer Remote - Remote : - Chemin: - Cible : - Tous les enfants seront retirés de la liste. - Cela le supprimera uniquement de la liste, pas du disque ! - Confirmer la suppression du groupe - Confirmer la suppression du dépôt - Supprimer le sous-module - Chemin du sous-module : - Supprimer le tag - Tag : - Supprimer des dépôts distants - DIFF BINAIRE - NOUVEAU - ANCIEN - Copier - Mode de fichier changé - Première différence - Ignorer les changements d'espaces - Dernière différence - CHANGEMENT D'OBJET LFS - Différence suivante - PAS DE CHANGEMENT OU SEULEMENT EN FIN DE LIGNE - Différence précédente - Enregistrer en tant que patch - Afficher les caractères invisibles - Diff côte-à-côte - SOUS-MODULE - NOUVEAU - Permuter - Coloration syntaxique - Retour à la ligne - Activer la navigation par blocs - Ouvrir dans l'outil de fusion - Voir toutes les lignes - Réduit le nombre de ligne visibles - Augmente le nombre de ligne visibles - SÉLECTIONNEZ UN FICHIER POUR VOIR LES CHANGEMENTS - Ouvrir dans l'outil de fusion - Rejeter les changements - Tous les changements dans la copie de travail. - Changements : - Inclure les fichiers ignorés - {0} changements seront rejetés - Vous ne pouvez pas annuler cette action !!! - Signet : - Nouveau nom : - Cible : - Éditer le groupe sélectionné - Éditer le dépôt sélectionné - Lancer action personnalisée - Nom de l'action : - Fetch - Fetch toutes les branches distantes - Outrepasser les vérifications de refs - Fetch sans les tags - Remote : - Récupérer les changements distants - Présumer inchangé - Rejeter... - Rejeter {0} fichiers... - Rejeter les changements dans les lignes sélectionnées - Ouvrir l'outil de fusion externe - Résoudre en utilisant ${0}$ - Enregistrer en tant que patch... - Indexer - Indexer {0} fichiers - Indexer les changements dans les lignes sélectionnées - Stash... - Stash {0} fichiers... - Désindexer - Désindexer {0} fichiers - Désindexer les changements dans les lignes sélectionnées - Utiliser les miennes (checkout --ours) - Utiliser les leurs (checkout --theirs) - Historique du fichier - MODIFICATION - CONTENU - Git-Flow - Branche de développement : - Feature: - Feature Prefix: - FLOW - Terminer Feature - FLOW - Terminer Hotfix - FLOW - Terminer Release - Cible: - Hotfix: - Hotfix Prefix: - Initialiser Git-Flow - Garder la branche - Branche de production : - Release : - Release Prefix : - Commencer Feature... - FLOW - Commencer Feature - Commencer Hotfix... - FLOW - Commencer Hotfix - Saisir le nom - Commencer Release... - FLOW - Commencer Release - Préfixe Tag de Version : - Git LFS - Ajouter un pattern de suivi... - Le pattern est un nom de fichier - Pattern personnalisé : - Ajouter un pattern de suivi à Git LFS - Fetch - Lancer `git lfs fetch` pour télécharger les objets Git LFS. Cela ne met pas à jour la copie de travail. - Fetch les objets LFS - Installer les hooks Git LFS - Afficher les verrous - Pas de fichiers verrouillés - Verrouiller - Afficher seulement mes verrous - Verrous LFS - Déverouiller - Forcer le déverouillage - Elaguer - Lancer `git lfs prune` pour supprimer les anciens fichier LFS du stockage local - Pull - Lancer `git lfs pull` pour télécharger tous les fichier Git LFS de la référence actuelle & récupérer - Pull les objets LFS - Pousser - Transférer les fichiers volumineux en file d'attente vers le point de terminaison Git LFS - Pousser les objets LFS - Dépôt : - Suivre les fichiers appelés '{0}' - Suivre tous les fichiers *{0} - Historique - AUTEUR - HEURE DE L'AUTEUR - GRAPHE & SUJET - SHA - HEURE DE COMMIT - {0} COMMITS SÉLECTIONNÉS - Maintenir 'Ctrl' ou 'Shift' enfoncée pour sélectionner plusieurs commits. - Maintenir ⌘ ou ⇧ enfoncée pour sélectionner plusieurs commits. - CONSEILS: - Référence des raccourcis clavier - GLOBAL - Annuler le popup en cours - Cloner un nouveau dépôt - Fermer la page en cours - Aller à la page suivante - Aller à la page précédente - Créer une nouvelle page - Ouvrir le dialogue des préférences - DÉPÔT - Commit les changements de l'index - Commit et pousser les changements de l'index - Ajouter tous les changements et commit - Créer une nouvelle branche basée sur le commit actuel - Rejeter les changements sélectionnés - Fetch, démarre directement - Mode tableau de bord (Défaut) - Recherche de commit - Pull, démarre directement - Push, démarre directement - Forcer le rechargement du dépôt - Ajouter/Retirer les changements sélectionnés de l'index - Basculer vers 'Changements' - Basculer vers 'Historique' - Basculer vers 'Stashes' - ÉDITEUR DE TEXTE - Fermer le panneau de recherche - Trouver la prochaine correspondance - Trouver la correspondance précédente - Ouvrir le panneau de recherche - Rejeter - Indexer - Retirer de l'index - Initialiser le repository - Chemin : - Cherry-Pick en cours. - Traitement du commit - Merge request en cours. - Fusionnement - Rebase en cours. - Arrêté à - Annulation en cours. - Annulation du commit - Rebase interactif - Sur : - Branche cible : - Copier le lien - Ouvrir dans le navigateur - ERREUR - NOTICE - Merger la branche - Dans : - Option de merge: - Source: - Fusionner (Plusieurs) - Commit tous les changement - Stratégie: - Cibles: - Déplacer le noeud du repository - Sélectionnier le noeud parent pour : - Nom : - Git n'a PAS été configuré. Veuillez d'abord le faire dans le menu Préférence. - Ouvrir le dossier AppData - Ouvrir avec... - Optionnel. - Créer un nouvel onglet - Bookmark - Fermer l'onglet - Fermer les autres onglets - Fermer les onglets à droite - Copier le chemin vers le dépôt - Dépôts - Coller - il y a {0} jours - il y a 1 heure - il y a {0} heures - A l'instant - Le mois dernier - L'an dernier - il y a {0} minutes - il y a {0} mois - il y a {0} ans - Hier - Préférences - IA - Analyser Diff Prompt - Clé d'API - Générer le sujet de Prompt - Modèle - Nom - Serveur - Activer le streaming - APPARENCE - Police par défaut - Largeur de tab dans l'éditeur - Taille de police - Défaut - Éditeur - Police monospace - N'utiliser que des polices monospace pour l'éditeur de texte - Thème - Dérogations de thème - Utiliser des onglets de taille fixe dans la barre de titre - Utiliser un cadre de fenêtre natif - OUTIL DIFF/MERGE - Chemin d'installation - Saisir le chemin d'installation de l'outil diff/merge - Outil - GÉNÉRAL - Vérifier les mises à jour au démarrage - Format de date - Language - Historique de commits - Afficher l'heure de l'auteur au lieu de l'heure de validation dans le graphique - Afficher les enfants dans les détails du commit - Afficher les tags dans le graphique des commits - Guide de longueur du sujet - GIT - Activer auto CRLF - Répertoire de clônage par défaut - E-mail utilsateur - E-mail utilsateur global - Activer --prune pour fetch - Cette application requière Git (>= 2.25.1) - Chemin d'installation - Activer la vérification HTTP SSL - Nom d'utilisateur - Nom d'utilisateur global - Version de Git - SIGNATURE GPG - Signature GPG de commit - Format GPG - Chemin d'installation du programme - Saisir le chemin d'installation vers le programme GPG - Signature GPG de tag - Clé de signature de l'utilisateur - Clé de signature GPG de l'utilisateur - INTEGRATION - SHELL/TERMINAL - Chemin - Shell/Terminal - Élaguer une branche distant - Cible : - Élaguer les Worktrees - Élaguer les information de worktree dans `$GIT_COMMON_DIR/worktrees` - Pull - Branche distante : - Dans : - Changements locaux : - Rejeter - Stash & Réappliquer - Dépôt distant : - Pull (Fetch & Merge) - Utiliser rebase au lieu de merge - Pousser - Assurez-vous que les submodules ont été poussés - Poussage forcé - Branche locale : - Dépôt distant : - Pousser les changements vers le dépôt distant - Branche distante : - Définir comme branche de suivi - Pousser tous les tags - Pousser les tags vers le dépôt distant - Pousser tous les dépôts distants - Dépôt distant : - Tag : - Quitter - Rebase la branche actuelle - Stash & réappliquer changements locaux - Sur : - Rebase : - Ajouter dépôt distant - Modifier dépôt distant - Nom : - Nom du dépôt distant - URL du repository : - URL du dépôt distant - Copier l'URL - Supprimer... - Editer... - Fetch - Ouvrir dans le navigateur - Elaguer - Confirmer la suppression du Worktree - Activer l'option `--force` - Cible : - la branche - Nouveau nom : - Nom unique pour cette branche - Branche : - ABORT - Fetch automatique des changements depuis les dépôts... - Nettoyage(GC & Elaguage) - Lancer `git gc` pour ce repository. - Tout effacer - Configurer ce repository - CONTINUER - Actions personnalisées - Pas d'actions personnalisées - Rejeter tous les changements - Activer l'option '--reflog' - Ouvrir dans l'explorateur de fichiers - Rechercher Branches/Tags/Submodules - Visibilité dans le graphique - Réinitialiser - Cacher dans le graphique des commits - Filtrer dans le graphique des commits - Activer l'option '--first-parent' - DISPOSITION - Horizontal - Vertical - ORDRE DES COMMITS - Date du commit - Topologiquement - BRANCHES LOCALES - Naviguer vers le HEAD - Créer une branche - EFFACER LES NOTIFICATIONS - Mettre la branche courante en surbrillance dans le graph - Ouvrir dans {0} - Ouvrir dans un outil externe - Rafraîchir - DEPOTS DISTANTS - AJOUTER DEPOT DISTANT - Rechercher un commit - Auteur - Committer - Fichier - Message - SHA - Branche actuelle - Voir les Tags en tant qu'arbre - PASSER - Statistiques - SUBMODULES - AJOUTER SUBMODULE - METTRE A JOUR SUBMODULE - TAGS - NOUVEAU TAG - Par date de créateur - Par nom - Trier - Ouvrir dans un terminal - Utiliser le temps relatif dans les historiques - WORKTREES - AJOUTER WORKTREE - ELAGUER - URL du repository Git - Reset branche actuelle à la révision - Reset Mode: - Déplacer vers : - Branche actuelle : - Ouvrir dans l'explorateur de fichier - Annuler le Commit - Commit : - Commit les changements de l'annulation - Reformuler le message de commit - Utiliser 'Maj+Entrée' pour insérer une nouvelle ligne. 'Entrée' est la touche pour valider - En exécution. Veuillez patienter... - SAUVEGARDER - Sauvegarder en tant que... - Le patch a été sauvegardé ! - Analyser les repositories - Dossier racine : - Rechercher des mises à jour... - Une nouvelle version du logiciel est disponible : - La vérification de mise à jour à échouée ! - Télécharger - Passer cette version - Mise à jour du logiciel - Il n'y a pas de mise à jour pour le moment. - Définir la branche suivie - Branche: - Retirer la branche amont - En amont: - Copier le SHA - Aller à - Squash les commits - Dans : - Clé privée SSH : - Chemin du magasin de clés privées SSH - START - Stash - Auto-restauration après le stash - Vos fichiers de travail restent inchangés, mais une sauvegarde est enregistrée. - Inclure les fichiers non-suivis - Garder les fichiers indexés - Message : - Optionnel. Nom de ce stash - Seulement les changements indexés - Les modifications indexées et non-indexées des fichiers sélectionnés seront stockées!!! - Stash les changements locaux - Appliquer - Effacer - Sauver comme Patch... - Effacer le Stash - Effacer : - Stashes - CHANGEMENTS - STASHES - Statistiques - COMMITS - COMMITTER - APERCU - MOIS - SEMAINE - AUTEURS : - COMMITS: - SOUS-MODULES - Ajouter un sous-module - Copier le chemin relatif - Fetch les sous-modules imbriqués - Ouvrir le dépôt de sous-module - Relative Path: - Relative folder to store this module. - Supprimer le sous-module - OK - Copier le nom du Tag - Copier le message du tag - Supprimer ${0}$... - Fusionner ${0}$ dans ${1}$... - Pousser ${0}$... - Actualiser les sous-modules - Tous les sous-modules - Initialiser au besoin - Récursivement - Sous-module : - Utiliser l'option --remote - URL : - Avertissement - Page d'accueil - Créer un groupe - Créer un sous-groupe - Cloner un dépôt - Supprimer - GLISSER / DEPOSER DE DOSSIER SUPPORTÉ. GROUPAGE PERSONNALISÉ SUPPORTÉ. - Éditer - Déplacer vers un autre groupe - Ouvrir tous les dépôts - Ouvrir un dépôt - Ouvrir le terminal - Réanalyser les repositories dans le dossier de clonage par défaut - Chercher des dépôts... - Trier - Changements - Git Ignore - Ignorer tous les *{0} fichiers - Ignorer *{0} fichiers dans le même dossier - Ignorer les fichiers dans le même dossier - N'ignorer que ce fichier - Amender - Vous pouvez indexer ce fichier. - COMMIT - COMMIT & POUSSER - Modèles/Historiques - Trigger click event - Commit (Modifier) - Indexer tous les changements et commit - CONFLITS DÉTECTÉS - LES CONFLITS DE FICHIER SONT RÉSOLUS - INCLURE LES FICHIERS NON-SUIVIS - PAS DE MESSAGE D'ENTRÉE RÉCENT - PAS DE MODÈLES DE COMMIT - Faites un clique droit sur les fichiers sélectionnés et faites vos choix pour la résoluion des conflits. - SignOff - INDEXÉ - RETIRER DE L'INDEX - RETIRER TOUT DE L'INDEX - NON INDEXÉ - INDEXER - INDEXER TOUT - VOIR LES FICHIERS PRÉSUMÉS INCHANGÉS - Modèle: ${0}$ - ESPACE DE TRAVAIL : - Configurer les espaces de travail... - WORKTREE - Copier le chemin - Verrouiller - Supprimer - Déverrouiller - diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml deleted file mode 100644 index 3aef0043..00000000 --- a/src/Resources/Locales/it_IT.axaml +++ /dev/null @@ -1,788 +0,0 @@ - - - - - - Informazioni - Informazioni su SourceGit - Client GUI Git open source e gratuito - Aggiungi Worktree - Posizione: - Percorso per questo worktree. Supportato il percorso relativo. - Nome Branch: - Facoltativo. Predefinito è il nome della cartella di destinazione. - Traccia Branch: - Traccia branch remoto - Di cosa fare il checkout: - Crea nuovo branch - Branch esistente - Assistente AI - RIGENERA - Usa AI per generare il messaggio di commit - APPLICA COME MESSAGGIO DI COMMIT - Applica - File Patch: - Seleziona file .patch da applicare - Ignora modifiche agli spazi - Applica Patch - Spazi: - Applica lo stash - Rimuovi dopo aver applicato - Ripristina le modifiche all'indice - Stash: - Archivia... - Salva Archivio In: - Seleziona il percorso del file archivio - Revisione: - Archivia - Richiedi Password SourceGit - FILE ASSUNTI COME INVARIATI - NESSUN FILE ASSUNTO COME INVARIATO - RIMUOVI - Aggiorna - FILE BINARIO NON SUPPORTATO!!! - Biseca - Annulla - Cattiva - Bisecando. La HEAD corrente è buona o cattiva? - Buona - Salta - Bisecando. Marca il commit corrente come buono o cattivo e fai checkout di un altro. - Attribuisci - L'ATTRIBUZIONE SU QUESTO FILE NON È SUPPORTATA!!! - Checkout ${0}$... - Confronta con ${0}$ - Confronta con Worktree - Copia Nome Branch - Azione personalizzata - Elimina ${0}$... - Elimina i {0} branch selezionati - Avanzamento Veloce a ${0}$ - Recupera ${0}$ in ${1}$... - Git Flow - Completa ${0}$ - Unisci ${0}$ in ${1}$... - Unisci i {0} branch selezionati in quello corrente - Scarica ${0}$ - Scarica ${0}$ in ${1}$... - Invia ${0}$ - Riallinea ${0}$ su ${1}$... - Rinomina ${0}$... - Imposta Branch di Tracciamento... - Confronto Branch - Upstream non valido - Byte - ANNULLA - Ripristina la Revisione Padre - Ripristina Questa Revisione - Genera messaggio di commit - CAMBIA MODALITÀ DI VISUALIZZAZIONE - Mostra come elenco di file e cartelle - Mostra come elenco di percorsi - Mostra come albero del filesystem - Checkout Branch - Checkout Commit - Commit: - Avviso: Effettuando un checkout del commit, la tua HEAD sarà separata - Modifiche Locali: - Scarta - Stasha e Ripristina - Aggiorna tutti i sottomoduli - Branch: - Cherry Pick - Aggiungi sorgente al messaggio di commit - Commit(s): - Conferma tutte le modifiche - Mainline: - Di solito non è possibile fare cherry-pick sdi una unione perché non si sa quale lato deve essere considerato il mainline. Questa opzione consente di riprodurre la modifica relativa al genitore specificato. - Cancella Stash - Stai per cancellare tutti gli stash. Sei sicuro di voler continuare? - Clona Repository Remoto - Parametri Extra: - Argomenti addizionali per clonare il repository. Facoltativo. - Nome Locale: - Nome del repository. Facoltativo. - Cartella Principale: - Inizializza e aggiorna i sottomoduli - URL del Repository: - CHIUDI - Editor - Checkout Commit - Cherry-Pick Questo Commit - Cherry-Pick... - Confronta con HEAD - Confronta con Worktree - Autore - Committer - Informazioni - SHA - Oggetto - Azione Personalizzata - Riallinea Interattivamente ${0}$ fino a Qui - Unisci a ${0}$ - Unisci ... - Riallinea ${0}$ fino a Qui - Ripristina ${0}$ fino a Qui - Annulla Commit - Modifica - Salva come Patch... - Compatta nel Genitore - Compatta Commit Figli fino a Qui - MODIFICHE - Cerca Modifiche... - FILE - File LFS - Cerca File... - Sottomodulo - INFORMAZIONI - AUTORE - MODIFICATO - FIGLI - CHI HA COMMITTATO - Controlla i riferimenti che contengono questo commit - IL COMMIT È CONTENUTO DA - Mostra solo le prime 100 modifiche. Vedi tutte le modifiche nella scheda MODIFICHE. - MESSAGGIO - GENITORI - RIFERIMENTI - SHA - Apri nel Browser - Descrizione - OGGETTO - Inserisci l'oggetto del commit - Configura Repository - TEMPLATE DI COMMIT - Contenuto Template: - Nome Template: - AZIONE PERSONALIZZATA - Argomenti: - ${REPO} - Percorso del repository; ${SHA} - SHA del commit selezionato - File Eseguibile: - Nome: - Ambito: - Branch - Commit - Repository - Attendi la fine dell'azione - Indirizzo Email - Indirizzo email - GIT - Recupera automaticamente i remoti - Minuto/i - Remoto Predefinito - Modalità di Merge Preferita - TRACCIAMENTO ISSUE - Aggiungi una regola di esempio per Azure DevOps - Aggiungi una regola di esempio per un Issue Gitee - Aggiungi una regola di esempio per un Pull Request Gitee - Aggiungi una regola di esempio per GitHub - Aggiungi una regola di esempio per Issue GitLab - Aggiungi una regola di esempio per una Merge Request GitLab - Aggiungi una regola di esempio per Jira - Nuova Regola - Espressione Regex Issue: - Nome Regola: - URL Risultato: - Utilizza $1, $2 per accedere ai valori dei gruppi regex. - AI - Servizio preferito: - Se il 'Servizio Preferito' é impostato, SourceGit utilizzerà solo quello per questo repository. Altrimenti, se ci sono più servizi disponibili, verrà mostrato un menu contestuale per sceglierne uno. - Proxy HTTP - Proxy HTTP usato da questo repository - Nome Utente - Nome utente per questo repository - Spazi di Lavoro - Colore - Nome - Ripristina schede all'avvio - CONTINUA - Trovato un commit vuoto! Vuoi procedere (--allow-empty)? - STAGE DI TUTTO E COMMITTA - Trovato un commit vuoto! Vuoi procedere (--allow-empty) o fare lo stage di tutto e committare? - Guida Commit Convenzionali - Modifica Sostanziale: - Issue Chiusa: - Dettaglio Modifiche: - Ambito: - Descrizione Breve: - Tipo di Modifica: - Copia - Copia Tutto il Testo - Copia Intero Percorso - Copia Percorso - Crea Branch... - Basato Su: - Checkout del Branch Creato - Modifiche Locali: - Scarta - Stasha e Ripristina - Nome Nuovo Branch: - Inserisci il nome del branch. - Gli spazi verranno rimpiazzati con dei trattini. - Crea Branch Locale - Crea Tag... - Nuovo Tag Su: - Firma con GPG - Messaggio Tag: - Facoltativo. - Nome Tag: - Formato consigliato: v1.0.0-alpha - Invia a tutti i remoti dopo la creazione - Crea Nuovo Tag - Tipo: - annotato - leggero - Tieni premuto Ctrl per avviare direttamente - Taglia - Elimina Branch - Branch: - Stai per eliminare un branch remoto!!! - Elimina anche il branch remoto ${0}$ - Elimina Branch Multipli - Stai per eliminare più branch contemporaneamente. Controlla attentamente prima di procedere! - Elimina Remoto - Remoto: - Percorso: - Destinazione: - Tutti i figli verranno rimossi dalla lista. - Lo rimuoverà solamente dalla lista, non dal disco! - Conferma Eliminazione Gruppo - Conferma Eliminazione Repository - Elimina Sottomodulo - Percorso Sottomodulo: - Elimina Tag - Tag: - Elimina dai repository remoti - DIFF BINARIO - NUOVO - VECCHIO - Copia - Modalità File Modificata - Prima differenza - Ignora Modifiche agli Spazi - Ultima differenza - MODIFICA OGGETTO LFS - Differenza Successiva - NESSUNA MODIFICA O SOLO CAMBIAMENTI DI FINE LINEA - Differenza Precedente - Salva come Patch - Mostra Simboli Nascosti - Diff Affiancato - SOTTOMODULO - NUOVO - Scambia - Evidenziazione Sintassi - Avvolgimento delle Parole - Abilita la navigazione a blocchi - Apri nello Strumento di Merge - Mostra Tutte le Righe - Diminuisci Numero di Righe Visibili - Aumenta Numero di Righe Visibili - SELEZIONA UN FILE PER VISUALIZZARE LE MODIFICHE - Apri nello Strumento di Merge - Scarta Modifiche - Tutte le modifiche locali nella copia di lavoro. - Modifiche: - Includi file ignorati - Un totale di {0} modifiche saranno scartate - Questa azione non può essere annullata!!! - Segnalibro: - Nuovo Nome: - Destinazione: - Modifica Gruppo Selezionato - Modifica Repository Selezionato - Esegui Azione Personalizzata - Nome Azione: - Recupera - Recupera da tutti i remoti - Forza la sovrascrittura dei riferimenti locali - Recupera senza tag - Remoto: - Recupera Modifiche Remote - Presumi invariato - Scarta... - Scarta {0} file... - Scarta Modifiche nelle Righe Selezionate - Apri Strumento di Merge Esterno - Risolvi Usando ${0}$ - Salva come Patch... - Stage - Stage di {0} file - Stage delle Modifiche nelle Righe Selezionate - Stasha... - Stasha {0} file... - Rimuovi da Stage - Rimuovi da Stage {0} file - Rimuovi le Righe Selezionate da Stage - Usa Il Mio (checkout --ours) - Usa Il Loro (checkout --theirs) - Cronologia File - MODIFICA - CONTENUTO - Git-Flow - Branch di Sviluppo: - Feature: - Prefisso Feature: - FLOW - Completa Feature - FLOW - Completa Hotfix - FLOW - Completa Rilascio - Target: - Invia al remote dopo aver finito - Esegui squash durante il merge - Hotfix: - Prefisso Hotfix: - Inizializza Git-Flow - Mantieni branch - Branch di Produzione: - Rilascio: - Prefisso Rilascio: - Inizia Feature... - FLOW - Inizia Feature - Inizia Hotfix... - FLOW - Inizia Hotfix - Inserisci nome - Inizia Rilascio... - FLOW - Inizia Rilascio - Prefisso Tag Versione: - Git LFS - Aggiungi Modello di Tracciamento... - Il modello è un nome file - Modello Personalizzato: - Aggiungi Modello di Tracciamento a Git LFS - Recupera - Esegui `git lfs fetch` per scaricare gli oggetti Git LFS. Questo non aggiorna la copia di lavoro. - Recupera Oggetti LFS - Installa hook di Git LFS - Mostra Blocchi - Nessun File Bloccato - Blocca - Mostra solo i miei blocchi - Blocchi LFS - Sblocca - Forza Sblocco - Elimina - Esegui `git lfs prune` per eliminare vecchi file LFS dallo storage locale - Scarica - Esegui `git lfs pull` per scaricare tutti i file LFS per il ref corrente e fare il checkout - Scarica Oggetti LFS - Invia - Invia grandi file in coda al punto finale di Git LFS - Invia Oggetti LFS - Remoto: - Traccia file con nome '{0}' - Traccia tutti i file *{0} - STORICO - AUTORE - ORA AUTORE - GRAFICO E OGGETTO - SHA - ORA COMMIT - {0} COMMIT SELEZIONATI - Tieni premuto 'Ctrl' o 'Shift' per selezionare più commit. - Tieni premuto ⌘ o ⇧ per selezionare più commit. - SUGGERIMENTI: - Riferimento Scorciatoie da Tastiera - GLOBALE - Annulla il popup corrente - Clona una nuova repository - Chiudi la pagina corrente - Vai alla pagina successiva - Vai alla pagina precedente - Crea una nuova pagina - Apri la finestra delle preferenze - REPOSITORY - Committa le modifiche in tsage - Committa e invia le modifiche in stage - Fai lo stage di tutte le modifiche e committa - Crea un nuovo branch dal commit selezionato - Scarta le modifiche selezionate - Recupera, avvia direttamente - Modalità Dashboard (Predefinita) - Modalità ricerca commit - Scarica, avvia direttamente - Invia, avvia direttamente - Forza l'aggiornamento di questo repository - Aggiungi/Rimuovi da stage le modifiche selezionate - Passa a 'Modifiche' - Passa a 'Storico' - Passa a 'Stashes' - EDITOR TESTO - Chiudi il pannello di ricerca - Trova il prossimo risultato - Trova il risultato precedente - Apri con uno strumento di diff/merge esterno - Apri il pannello di ricerca - Scarta - Aggiungi in stage - Rimuovi - Inizializza Repository - Percorso: - Cherry-Pick in corso. - Elaborando il commit - Unione in corso. - Unendo - Riallineamento in corso. - Interrotto a - Ripristino in corso. - Ripristinando il commit - Riallinea Interattivamente - Su: - Branch di destinazione: - Copia il Link - Apri nel Browser - ERRORE - AVVISO - Unisci Branch - In: - Opzione di Unione: - Sorgente: - Unione (multipla) - Commit di tutte le modifiche - Strategia: - Obiettivi: - Sposta Nodo Repository - Seleziona nodo padre per: - Nome: - Git NON è configurato. Prima vai su [Preferenze] per configurarlo. - Apri Cartella Dati App - Apri con... - Opzionale. - Crea Nuova Pagina - Segnalibro - Chiudi Tab - Chiudi Altri Tab - Chiudi i Tab a Destra - Copia Percorso Repository - Repository - Incolla - {0} giorni fa - 1 ora fa - {0} ore fa - Proprio ora - Il mese scorso - L'anno scorso - {0} minuti fa - {0} mesi fa - {0} anni fa - Ieri - Preferenze - AI - Analizza il Prompt Differenza - Chiave API - Genera Prompt Oggetto - Modello - Nome - Server - Abilita streaming - ASPETTO - Font Predefinito - Larghezza della Tab Editor - Dimensione Font - Dimensione Font Predefinita - Dimensione Font Editor - Font Monospaziato - Usa solo font monospaziato nell'editor - Tema - Sostituzioni Tema - Usa larghezza fissa per i tab nella barra del titolo - Usa cornice finestra nativa - STRUMENTO DI DIFFERENZA/UNIONE - Percorso Installazione - Inserisci il percorso per lo strumento di differenza/unione - Strumento - GENERALE - Controlla aggiornamenti all'avvio - Formato data - Lingua - Numero massimo di commit nella cronologia - Mostra nel grafico l'orario dell'autore anziché quello del commit - Mostra i figli nei dettagli del commit - Mostra i tag nel grafico dei commit - Lunghezza Guida Oggetto - GIT - Abilita Auto CRLF - Cartella predefinita per cloni - Email Utente - Email utente Git globale - Abilita --prune durante il fetch - Abilita --ignore-cr-at-eol nel diff - Questa applicazione richiede Git (>= 2.25.1) - Percorso Installazione - Abilita la verifica HTTP SSL - Nome Utente - Nome utente Git globale - Versione di Git - FIRMA GPG - Firma GPG per commit - Formato GPG - Percorso Programma Installato - Inserisci il percorso per il programma GPG installato - Firma GPG per tag - Chiave Firma Utente - Chiave GPG dell'utente per la firma - INTEGRAZIONE - SHELL/TERMINALE - Percorso - Shell/Terminale - Potatura Remota - Destinazione: - Potatura Worktrees - Potatura delle informazioni di worktree in `$GIT_COMMON_DIR/worktrees` - Scarica - Branch Remoto: - In: - Modifiche Locali: - Scarta - Stasha e Riapplica - Remoto: - Scarica (Recupera e Unisci) - Riallineare anziché unire - Invia - Assicurati che i sottomoduli siano stati inviati - Forza l'invio - Branch Locale: - Remoto: - Invia modifiche al remoto - Branch Remoto: - Imposta come branch di tracking - Invia tutti i tag - Invia Tag al Remoto - Invia a tutti i remoti - Remoto: - Tag: - Esci - Riallinea Branch Corrente - Stasha e Riapplica modifiche locali - Su: - Riallinea: - Aggiungi Remoto - Modifica Remoto - Nome: - Nome del remoto - URL del Repository: - URL del repository Git remoto - Copia URL - Elimina... - Modifica... - Recupera - Apri nel Browser - Pota - Conferma Rimozione Worktree - Abilita opzione `--force` - Destinazione: - Rinomina Branch - Nuovo Nome: - Nome univoco per questo branch - Branch: - ANNULLA - Recupero automatico delle modifiche dai remoti... - Ordina - Per data del committer - Per nome - Pulizia (GC e Potatura) - Esegui il comando `git gc` per questo repository. - Cancella tutto - Configura questo repository - CONTINUA - Azioni Personalizzate - Nessuna Azione Personalizzata - Scarta tutte le modifiche - Abilita opzione '--reflog' - Apri nell'Esplora File - Cerca Branch/Tag/Sottomodulo - Visibilità nel grafico - Non impostato - Nascondi nel grafico dei commit - Filtra nel grafico dei commit - Abilita opzione '--first-parent' - LAYOUT - Orizzontale - Verticale - Ordine dei commit - Per data del commit - Topologicamente - BRANCH LOCALI - Vai a HEAD - Crea Branch - CANCELLA LE NOTIFICHE - Evidenzia nel grafico solo il branch corrente - Apri in {0} - Apri in Strumenti Esterni - Aggiorna - REMOTI - AGGIUNGI REMOTO - Cerca Commit - Autore - Committer - Contenuto - File - Messaggio - SHA - Branch Corrente - Mostra i Sottomoduli Come Albero - Mostra Tag come Albero - SALTA - Statistiche - SOTTOMODULI - AGGIUNGI SOTTOMODULI - AGGIORNA SOTTOMODULI - TAG - NUOVO TAG - Per data di creazione - Per nome - Ordina - Apri nel Terminale - Usa tempo relativo nello storico - Visualizza i Log - Visita '{0}' nel Browser - WORKTREE - AGGIUNGI WORKTREE - POTATURA - URL del Repository Git - Reset Branch Corrente alla Revisione - Modalità Reset: - Sposta a: - Branch Corrente: - Mostra nell'Esplora File - Ripristina Commit - Commit: - Commit delle modifiche di ripristino - Modifica Messaggio di Commit - Usa 'Shift+Enter' per inserire una nuova riga. 'Enter' è il tasto rapido per il pulsante OK - In esecuzione. Attendere... - SALVA - Salva come... - La patch è stata salvata con successo! - Scansiona Repository - Cartella Principale: - Controlla Aggiornamenti... - È disponibile una nuova versione del software: - Errore durante il controllo degli aggiornamenti! - Scarica - Salta questa versione - Aggiornamento Software - Non ci sono aggiornamenti disponibili. - Imposta il Branch - Branch: - Rimuovi upstream - Upstream: - Copia SHA - Vai a - Compatta Commit - In: - Chiave Privata SSH: - Percorso per la chiave SSH privata - AVVIA - Stasha - Auto-ripristino dopo lo stash - I tuoi file di lavoro rimangono inalterati, ma viene salvato uno stash. - Includi file non tracciati - Mantieni file in stage - Messaggio: - Opzionale. Nome di questo stash - Solo modifiche in stage - Sia le modifiche in stage che quelle non in stage dei file selezionati saranno stashate!!! - Stasha Modifiche Locali - Applica - Elimina - Salva come Patch... - Elimina Stash - Elimina: - STASH - MODIFICHE - STASH - Statistiche - COMMIT - COMMITTER - PANORAMICA - MESE - SETTIMANA - AUTORI: - COMMIT: - SOTTOMODULI - Aggiungi Sottomodulo - Copia Percorso Relativo - Recupera sottomoduli annidati - Apri Repository del Sottomodulo - Percorso Relativo: - Cartella relativa per memorizzare questo modulo. - Elimina Sottomodulo - STATO - modificato - non inizializzato - revisione cambiata - non unito - URL - OK - Copia Nome Tag - Copia Messaggio Tag - Elimina ${0}$... - Unisci ${0}$ in ${1}$... - Invia ${0}$... - Aggiorna Sottomoduli - Tutti i sottomoduli - Inizializza se necessario - Ricorsivamente - Sottomodulo: - Usa opzione --remote - URL: - Log - CANCELLA TUTTO - Copia - Elimina - Avviso - Pagina di Benvenuto - Crea Gruppo - Crea Sottogruppo - Clona Repository - Elimina - TRASCINA E RILASCIA CARTELLA SUPPORTATO. RAGGRUPPAMENTI PERSONALIZZATI SUPPORTATI. - Modifica - Sposta in un Altro Gruppo - Apri Tutti i Repository - Apri Repository - Apri Terminale - Riscansiona Repository nella Cartella Clone Predefinita - Cerca Repository... - Ordina - MODIFICHE LOCALI - Git Ignore - Ignora tutti i file *{0} - Ignora i file *{0} nella stessa cartella - Ignora i file nella stessa cartella - Ignora solo questo file - Modifica - Puoi aggiungere in stage questo file ora. - COMMIT - COMMIT E INVIA - Template/Storico - Attiva evento click - Commit (Modifica) - Stage di tutte le modifiche e fai il commit - Hai stageato {0} file ma solo {1} file mostrati ({2} file sono stati filtrati). Vuoi procedere? - CONFLITTI RILEVATI - APRI STRUMENTO DI MERGE ESTERNO - APRI TUTTI I CONFLITTI NELLO STRUMENTO DI MERGE ESTERNO - CONFLITTI NEI FILE RISOLTI - USO IL MIO - USO IL LORO - INCLUDI FILE NON TRACCIATI - NESSUN MESSAGGIO RECENTE INSERITO - NESSUN TEMPLATE DI COMMIT - Clicca con il tasto destro sul(i) file selezionato, quindi scegli come risolvere i conflitti. - SignOff - IN STAGE - RIMUOVI DA STAGE - RIMUOVI TUTTO DA STAGE - NON IN STAGE - FAI LO STAGE - FAI LO STAGE DI TUTTO - VISUALIZZA COME NON MODIFICATO - Template: ${0}$ - WORKSPACE: - Configura Workspaces... - WORKTREE - Copia Percorso - Blocca - Rimuovi - Sblocca - diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml deleted file mode 100644 index 918a6b4d..00000000 --- a/src/Resources/Locales/ja_JP.axaml +++ /dev/null @@ -1,743 +0,0 @@ - - - - - - 概要 - SourceGitについて - オープンソース & フリーなGit GUIクライアント - ワークツリーを追加 - 場所: - ワークツリーのパスを入力してください。相対パスも使用することができます。 - ブランチの名前: - 任意。デフォルトでは宛先フォルダ名が使用されます。 - 追跡するブランチ: - 追跡中のリモートブランチ - チェックアウトする内容: - 新しいブランチを作成 - 既存のブランチ - OpenAI アシスタント - 再生成 - OpenAIを使用してコミットメッセージを生成 - コミットメッセージとして適用 - 適用 - パッチファイル: - 適用する .patchファイルを選択 - 空白文字の変更を無視 - パッチを適用 - 空白文字: - スタッシュを適用 - 適用後に削除 - インデックスの変更を復元 - スタッシュ: - アーカイブ... - アーカイブの保存先: - アーカイブファイルのパスを選択 - リビジョン: - アーカイブ - SourceGit Askpass - 変更されていないとみなされるファイル - 変更されていないとみなされるファイルはありません - 削除 - 更新 - バイナリファイルはサポートされていません!!! - Blame - BLAMEではこのファイルはサポートされていません!!! - ${0}$ をチェックアウトする... - ワークツリーと比較 - ブランチ名をコピー - カスタムアクション - ${0}$を削除... - 選択中の{0}個のブランチを削除 - ${0}$ へ早送りする - ${0}$ から ${1}$ へフェッチする - Git Flow - Finish ${0}$ - ${0}$ を ${1}$ にマージする... - 選択中の{0}個のブランチを現在のブランチにマージする - ${0}$ をプルする - ${0}$ を ${1}$ にプルする... - ${0}$ をプッシュする - ${0}$ を ${1}$ でリベースする... - ${0}$ をリネームする... - トラッキングブランチを設定... - ブランチの比較 - 無効な上流ブランチ! - バイト - キャンセル - 親リビジョンにリセット - このリビジョンにリセット - コミットメッセージを生成 - 変更表示の切り替え - ファイルとディレクトリのリストを表示 - パスのリストを表示 - ファイルシステムのツリーを表示 - ブランチをチェックアウト - コミットをチェックアウト - コミット: - 警告: コミットをチェックアウトするとHEADが切断されます - ローカルの変更: - 破棄 - スタッシュして再適用 - ブランチ: - チェリーピック - ソースをコミットメッセージに追加 - コミット(複数可): - すべての変更をコミット - メインライン: - 通常、マージをチェリーピックすることはできません。どちらのマージ元をメインラインとして扱うべきかが分からないためです。このオプションを使用すると、指定した親に対して変更を再適用する形でチェリーピックを実行できます。 - スタッシュをクリア - すべてのスタッシュをクリアします。続行しますか？ - リモートリポジトリをクローン - 追加の引数: - リポジトリをクローンする際の追加パラメータ(任意)。 - ローカル名: - リポジトリの名前(任意)。 - 親フォルダ: - サブモジュールを初期化して更新 - リポジトリのURL: - 閉じる - エディタ - コミットをチェックアウト - このコミットをチェリーピック - チェリーピック... - HEADと比較 - ワークツリーと比較 - 情報 - SHA - カスタムアクション - ${0}$ ブランチをここにインタラクティブリベース - ${0}$ にマージ - マージ... - ${0}$ をここにリベース - ${0}$ ブランチをここにリセット - コミットを戻す - 書き直す - パッチとして保存... - 親にスカッシュ - 子コミットをここにスカッシュ - 変更 - 変更を検索... - ファイル - LFSファイル - ファイルを検索... - サブモジュール - コミットの情報 - 著者 - 変更 - 子 - コミッター - このコミットを含む参照を確認 - コミットが含まれるか確認 - 最初の100件の変更のみが表示されています。すべての変更は'変更'タブで確認できます。 - メッセージ - 親 - 参照 - SHA - ブラウザで開く - 説明 - コミットのタイトルを入力 - リポジトリの設定 - コミットテンプレート - テンプレート内容: - テンプレート名: - カスタムアクション - 引数: - ${REPO} - リポジトリのパス; ${BRANCH} - 選択中のブランチ; ${SHA} - 選択中のコミットのSHA - 実行ファイル: - 名前: - スコープ: - ブランチ - コミット - リポジトリ - アクションの終了を待機 - Eメールアドレス - Eメールアドレス - GIT - 自動的にリモートからフェッチ 間隔: - 分(s) - リモートの初期値 - ISSUEトラッカー - サンプルのAzure DevOpsルールを追加 - サンプルのGitee Issueルールを追加 - サンプルのGiteeプルリクエストルールを追加 - サンプルのGithubルールを追加 - サンプルのGitLab Issueルールを追加 - サンプルのGitLabマージリクエストルールを追加 - サンプルのJiraルールを追加 - 新しいルール - Issueの正規表現: - ルール名: - リザルトURL: - 正規表現のグループ値に$1, $2を使用してください。 - AI - 優先するサービス: - 優先するサービスが設定されている場合、SourceGitはこのリポジトリでのみそれを使用します。そうでない場合で複数サービスが利用できる場合は、そのうちの1つを選択するためのコンテキストメニューが表示されます。 - HTTP プロキシ - このリポジトリで使用するHTTPプロキシ - ユーザー名 - このリポジトリにおけるユーザー名 - ワークスペース - 色 - 名前 - 起動時にタブを復元 - Conventional Commitヘルパー - 破壊的変更: - 閉じたIssue: - 詳細な変更: - スコープ: - 短い説明: - 変更の種類: - コピー - すべてのテキストをコピー - 絶対パスをコピー - パスをコピー - ブランチを作成... - 派生元: - 作成したブランチにチェックアウト - ローカルの変更: - 破棄 - スタッシュして再適用 - 新しいブランチの名前: - ブランチの名前を入力 - スペースはダッシュに置き換えられます。 - ローカルブランチを作成 - タグを作成... - 付与されるコミット: - GPG署名を使用 - タグメッセージ: - 任意。 - タグの名前: - 推奨フォーマット: v1.0.0-alpha - 作成後にすべてのリモートにプッシュ - 新しいタグを作成 - 種類: - 注釈付き - 軽量 - Ctrlキーを押しながらクリックで実行 - 切り取り - ブランチを削除 - ブランチ: - リモートブランチを削除しようとしています!!! - もしリモートブランチを削除する場合、${0}$も削除します。 - 複数のブランチを削除 - 一度に複数のブランチを削除しようとしています！ 操作を行う前に再度確認してください! - リモートを削除 - リモート: - パス: - 対象: - すべての子ノードがリストから削除されます。 - これはリストからのみ削除され、ディスクには保存されません! - グループを削除 - リポジトリを削除 - サブモジュールを削除 - サブモジュールのパス: - タグを削除 - タグ: - リモートリポジトリから削除 - バイナリの差分 - NEW - OLD - コピー - ファイルモードが変更されました - 先頭の差分 - 空白の変更を無視 - 最後の差分 - LFSオブジェクトの変更 - 次の差分 - 変更がない、もしくはEOLの変更のみ - 前の差分 - パッチとして保存 - 隠されたシンボルを表示 - 差分の分割表示 - サブモジュール - 新規 - スワップ - シンタックスハイライト - 行の折り返し - ブロックナビゲーションを有効化 - マージツールで開く - すべての行を表示 - 表示する行数を減らす - 表示する行数を増やす - ファイルを選択すると、変更内容が表示されます - マージツールで開く - 変更を破棄 - ワーキングディレクトリのすべての変更を破棄 - 変更: - 無視したファイルを含める - {0}個の変更を破棄します。 - この操作を元に戻すことはできません!!! - ブックマーク: - 新しい名前: - 対象: - 選択中のグループを編集 - 選択中のリポジトリを編集 - カスタムアクションを実行 - アクション名: - フェッチ - すべてのリモートをフェッチ - ローカル参照を強制的に上書き - タグなしでフェッチ - リモート: - リモートの変更をフェッチ - 変更されていないとみなされる - 破棄... - {0}個のファイルを破棄... - 選択された行の変更を破棄 - 外部マージツールで開く - ${0}$ を使用して解決 - パッチとして保存... - ステージ - {0}個のファイルをステージ... - 選択された行の変更をステージ - スタッシュ... - {0}個のファイルをスタッシュ... - アンステージ - {0}個のファイルをアンステージ... - 選択された行の変更をアンステージ - 自分の変更を使用 (checkout --ours) - 相手の変更を使用 (checkout --theirs) - ファイルの履歴 - 変更 - コンテンツ - Git-Flow - 開発ブランチ: - Feature: - Feature プレフィックス: - FLOW - Finish Feature - FLOW - Finish Hotfix - FLOW - Finish Release - 対象: - Hotfix: - Hotfix プレフィックス: - Git-Flowを初期化 - ブランチを保持 - プロダクション ブランチ: - Release: - Release プレフィックス: - Start Feature... - FLOW - Start Feature - Start Hotfix... - FLOW - Start Hotfix - 名前を入力 - Start Release... - FLOW - Start Release - Versionタグ プレフィックス: - Git LFS - トラックパターンを追加... - パターンをファイル名として扱う - カスタム パターン: - Git LFSにトラックパターンを追加 - フェッチ - `git lfs fetch`を実行して、Git LFSオブジェクトをダウンロードします。ワーキングコピーは更新されません。 - LFSオブジェクトをフェッチ - Git LFSフックをインストール - ロックを表示 - ロックされているファイルはありません - ロック - 私のロックのみ表示 - LFSロック - ロック解除 - 強制的にロック解除 - 削除 - `git lfs prune`を実行して、ローカルの保存領域から古いLFSファイルを削除します。 - プル - `git lfs pull`を実行して、現在の参照とチェックアウトのすべてのGit LFSファイルをダウンロードします。 - LFSオブジェクトをプル - プッシュ - キュー内の大容量ファイルをGit LFSエンドポイントにプッシュします。 - LFSオブジェクトをプッシュ - リモート: - {0}という名前のファイルをトラック - すべての*{0}ファイルをトラック - 履歴 - 著者 - 著者時間 - グラフ & コミットのタイトル - SHA - 日時 - {0} コミットを選択しました - 'Ctrl'キーまたは'Shift'キーを押すと、複数のコミットを選択できます。 - ⌘ または ⇧ キーを押して複数のコミットを選択します。 - TIPS: - キーボードショートカットを確認 - 総合 - 現在のポップアップをキャンセル - 新しくリポジトリをクローン - 現在のページを閉じる - 次のページに移動 - 前のページに移動 - 新しいページを作成 - 設定ダイアログを開く - リポジトリ - ステージ済みの変更をコミット - ステージ済みの変更をコミットしてプッシュ - 全ての変更をステージしてコミット - 選択中のコミットから新たなブランチを作成 - 選択した変更を破棄 - 直接フェッチを実行 - ダッシュボードモード (初期値) - コミット検索モード - 直接プルを実行 - 直接プッシュを実行 - 現在のリポジトリを強制的に再読み込み - 選択中の変更をステージ/アンステージ - '変更'に切り替える - '履歴'に切り替える - 'スタッシュ'に切り替える - テキストエディタ - 検索パネルを閉じる - 次のマッチを検索 - 前のマッチを検索 - 検索パネルを開く - 破棄 - ステージ - アンステージ - リポジトリの初期化 - パス: - チェリーピックが進行中です。'中止'を押すと元のHEADが復元されます。 - コミットを処理中 - マージリクエストが進行中です。'中止'を押すと元のHEADが復元されます。 - マージ中 - リベースが進行中です。'中止'を押すと元のHEADが復元されます。 - 停止しました - 元に戻す処理が進行中です。'中止'を押すと元のHEADが復元されます。 - コミットを元に戻しています - インタラクティブ リベース - On: - 対象のブランチ: - リンクをコピー - ブラウザで開く - エラー - 通知 - ブランチのマージ - 宛先: - マージオプション: - ソースブランチ: - マージ (複数) - すべての変更をコミット - マージ戦略: - 対象: - リポジトリノードの移動 - 親ノードを選択: - 名前: - Gitが設定されていません。まず[設定]に移動して設定を行ってください。 - アプリケーションデータのディレクトリを開く - 外部ツールで開く... - 任意。 - 新しいページを開く - ブックマーク - タブを閉じる - 他のタブを閉じる - 右のタブを閉じる - リポジトリパスをコピー - リポジトリ - 貼り付け - {0} 日前 - 1 時間前 - {0} 時間前 - たった今 - 先月 - 昨年 - {0} 分前 - {0} ヶ月前 - {0} 年前 - 昨日 - 設定 - AI - 差分分析プロンプト - APIキー - タイトル生成プロンプト - モデル - 名前 - サーバー - ストリーミングを有効化 - 外観 - デフォルトのフォント - エディタのタブ幅 - フォントサイズ - デフォルト - エディタ - 等幅フォント - テキストエディタでは等幅フォントのみを使用する - テーマ - テーマの上書き - タイトルバーの固定タブ幅を使用 - ネイティブウィンドウフレームを使用 - 差分/マージ ツール - インストール パス - 差分/マージ ツールのパスを入力 - ツール - 総合 - 起動時にアップデートを確認 - 日時のフォーマット - 言語 - コミット履歴 - グラフにコミット時間の代わりに著者の時間を表示する - コミット詳細に子コミットを表示 - コミットグラフにタグを表示 - コミットタイトル枠の大きさ - GIT - 自動CRLFを有効化 - デフォルトのクローンディレクトリ - ユーザー Eメールアドレス - グローバルgitのEメールアドレス - フェッチ時に--pruneを有効化 - Git (>= 2.25.1) はこのアプリで必要です - インストール パス - HTTP SSL 検証を有効にする - ユーザー名 - グローバルのgitユーザー名 - Gitバージョン - GPG 署名 - コミットにGPG署名を行う - GPGフォーマット - プログラムのインストールパス - インストールされたgpgプログラムのパスを入力 - タグにGPG署名を行う - ユーザー署名キー - ユーザーのGPG署名キー - 統合 - シェル/ターミナル - パス - シェル/ターミナル - リモートを削除 - 対象: - 作業ツリーを削除 - `$GIT_DIR/worktrees` の作業ツリー情報を削除 - プル - ブランチ: - 宛先: - ローカルの変更: - 破棄 - スタッシュして再適用 - リモート: - プル (フェッチ & マージ) - マージの代わりにリベースを使用 - プッシュ - サブモジュールがプッシュされていることを確認 - 強制的にプッシュ - ローカル ブランチ: - リモート: - 変更をリモートにプッシュ - リモート ブランチ: - 追跡ブランチとして設定 - すべてのタグをプッシュ - リモートにタグをプッシュ - すべてのリモートにプッシュ - リモート: - タグ: - 終了 - 現在のブランチをリベース - ローカルの変更をスタッシュして再適用 - On: - リベース: - リモートを追加 - リモートを編集 - 名前: - リモートの名前 - リポジトリのURL: - リモートのgitリポジトリのURL - URLをコピー - 削除... - 編集... - フェッチ - ブラウザで開く - 削除 - ワークツリーの削除を確認 - `--force` オプションを有効化 - 対象: - ブランチの名前を編集 - 新しい名前: - このブランチにつける一意な名前 - ブランチ: - 中止 - リモートから変更を自動取得中... - クリーンアップ(GC & Prune) - このリポジトリに対して`git gc`コマンドを実行します。 - すべてのフィルターをクリア - リポジトリの設定 - 続ける - カスタムアクション - カスタムアクションがありません - すべての変更を破棄 - `--reflog` オプションを有効化 - ファイルブラウザーで開く - ブランチ/タグ/サブモジュールを検索 - 解除 - コミットグラフで非表示 - コミットグラフでフィルター - `--first-parent` オプションを有効化 - レイアウト - 水平 - 垂直 - コミットの並び順 - 日時 - トポロジカルソート - ローカル ブランチ - HEADに移動 - ブランチを作成 - 通知をクリア - グラフで現在のブランチを強調表示 - {0} で開く - 外部ツールで開く - 更新 - リモート - リモートを追加 - コミットを検索 - 著者 - コミッター - ファイル - メッセージ - SHA - 現在のブランチ - タグをツリーとして表示 - スキップ - 統計 - サブモジュール - サブモジュールを追加 - サブモジュールを更新 - タグ - 新しいタグを作成 - 作成者日時 - 名前 - ソート - ターミナルで開く - 履歴に相対時間を使用 - ワークツリー - ワークツリーを追加 - 削除 - GitリポジトリのURL - 現在のブランチをリビジョンにリセット - リセットモード: - 移動先: - 現在のブランチ: - ファイルエクスプローラーで表示 - コミットを戻す - コミット: - コミットの変更を戻す - コミットメッセージを書き直す - 改行には'Shift+Enter'キーを使用します。 'Enter"はOKボタンのホットキーとして機能します。 - 実行中です。しばらくお待ちください... - 保存 - 名前を付けて保存... - パッチが正常に保存されました！ - リポジトリをスキャン - ルートディレクトリ: - 更新を確認 - 新しいバージョンのソフトウェアが利用可能です: - 更新の確認に失敗しました！ - ダウンロード - このバージョンをスキップ - ソフトウェアの更新 - 利用可能なアップデートはありません - トラッキングブランチを設定 - ブランチ: - 上流ブランチを解除 - 上流ブランチ: - SHAをコピー - Go to - スカッシュコミット - 宛先: - SSH プライベートキー: - プライベートSSHキーストアのパス - スタート - スタッシュ - スタッシュ後に自動で復元 - 作業ファイルは変更されず、スタッシュが保存されます。 - 追跡されていないファイルを含める - ステージされたファイルを保持 - メッセージ: - オプション. このスタッシュの名前を入力 - ステージされた変更のみ - 選択したファイルの、ステージされた変更とステージされていない変更の両方がスタッシュされます!!! - ローカルの変更をスタッシュ - 適用 - 破棄 - パッチとして保存 - スタッシュを破棄 - 破棄: - スタッシュ - 変更 - スタッシュ - 統計 - コミット - コミッター - 概要 - 月間 - 週間 - 著者: - コミット: - サブモジュール - サブモジュールを追加 - 相対パスをコピー - ネストされたサブモジュールを取得する - サブモジュールのリポジトリを開く - 相対パス: - このモジュールを保存するフォルダの相対パス - サブモジュールを削除 - OK - タグ名をコピー - タグメッセージをコピー - ${0}$ を削除... - ${0}$ を ${1}$ にマージ... - ${0}$ をプッシュ... - サブモジュールを更新 - すべてのサブモジュール - 必要に応じて初期化 - 再帰的に更新 - サブモジュール: - --remoteオプションを使用 - URL: - 警告 - ようこそ - グループを作成 - サブグループを作成 - リポジトリをクローンする - 削除 - ドラッグ & ドロップでフォルダを追加できます. グループを作成したり、変更したりできます。 - 編集 - 別のグループに移動 - すべてのリポジトリを開く - リポジトリを開く - ターミナルを開く - デフォルトのクローンディレクトリ内のリポジトリを再スキャン - リポジトリを検索... - ソート - 変更 - Git Ignore - すべての*{0}ファイルを無視 - 同じフォルダ内の*{0}ファイルを無視 - 同じフォルダ内のファイルを無視 - このファイルのみを無視 - Amend - このファイルを今すぐステージできます。 - コミット - コミットしてプッシュ - メッセージのテンプレート/履歴 - クリックイベントをトリガー - コミット (Edit) - すべての変更をステージしてコミット - 競合が検出されました - ファイルの競合は解決されました - 追跡されていないファイルを含める - 最近の入力メッセージはありません - コミットテンプレートはありません - 選択したファイルを右クリックし、競合を解決する操作を選択してください。 - サインオフ - ステージしたファイル - ステージを取り消し - すべてステージを取り消し - 未ステージのファイル - ステージへ移動 - すべてステージへ移動 - 変更されていないとみなしたものを表示 - テンプレート: ${0}$ - ワークスペース: - ワークスペースを設定... - ワークツリー - パスをコピー - ロック - 削除 - ロック解除 - diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml deleted file mode 100644 index f448a908..00000000 --- a/src/Resources/Locales/pt_BR.axaml +++ /dev/null @@ -1,679 +0,0 @@ - - - - - - Sobre - Sobre o SourceGit - Cliente Git GUI Livre e de Código Aberto - Adicionar Worktree - Localização: - Caminho para este worktree. Caminho relativo é suportado. - Nome do Branch: - Opcional. O padrão é o nome da pasta de destino. - Rastrear Branch: - Rastreando branch remoto - O que Checar: - Criar Novo Branch - Branch Existente - Assietente IA - Utilizar IA para gerar mensagem de commit - Patch - Arquivo de Patch: - Selecione o arquivo .patch para aplicar - Ignorar mudanças de espaço em branco - Aplicar Patch - Espaço em Branco: - Arquivar... - Salvar Arquivo Como: - Selecione o caminho do arquivo de arquivo - Revisão: - Arquivar - SourceGit Askpass - ARQUIVOS CONSIDERADOS SEM ALTERAÇÕES - NENHUM ARQUIVO CONSIDERADO SEM ALTERAÇÕES - REMOVER - Atualizar - ARQUIVO BINÁRIO NÃO SUPORTADO!!! - Blame - BLAME NESTE ARQUIVO NÃO É SUPORTADO!!! - Checkout ${0}$... - Comparar com ${0}$ - Comparar com Worktree - Copiar Nome do Branch - Excluir ${0}$... - Excluir {0} branches selecionados - Fast-Forward para ${0}$ - Buscar ${0}$ em ${1}$... - Git Flow - Finalizar ${0}$ - Mesclar ${0}$ em ${1}$... - Puxar ${0}$ - Puxar ${0}$ para ${1}$... - Subir ${0}$ - Rebase ${0}$ em ${1}$... - Renomear ${0}$... - Definir Branch de Rastreamento... - Comparação de Branches - Bytes - CANCELAR - Resetar para Revisão Pai - Resetar para Esta Revisão - Gerar mensagem de commit - ALTERAR MODO DE EXIBIÇÃO - Exibir como Lista de Arquivos e Diretórios - Exibir como Lista de Caminhos - Exibir como Árvore de Sistema de Arquivos - Checkout Branch - Checkout Commit - Commit: - Aviso: Ao fazer o checkout de um commit, seu Head ficará desanexado - Alterações Locais: - Descartar - Stash & Reaplicar - Branch: - Cherry-Pick - Adicionar origem à mensagem de commit - Commit(s): - Commitar todas as alterações - Mainline: - Geralmente você não pode fazer cherry-pick de um merge commit porque você não sabe qual lado do merge deve ser considerado na mainline. Esta opção permite ao cherry-pick reaplicar a mudança relativa ao parent especificado. - Limpar Stashes - Você está tentando limpar todas as stashes. Tem certeza que deseja continuar? - Clonar Repositório Remoto - Parâmetros Extras: - Argumentos adicionais para clonar o repositório. Opcional. - Nome Local: - Nome do repositório. Opcional. - Pasta Pai: - URL do Repositório: - FECHAR - Editor - Checar Commit - Cherry-Pick este commit - Cherry-Pick ... - Comparar com HEAD - Comparar com Worktree - Informações - SHA - Ação customizada - Rebase Interativo ${0}$ até Aqui - Rebase ${0}$ até Aqui - Resetar ${0}$ até Aqui - Reverter Commit - Modificar Mensagem - Salvar como Patch... - Mesclar ao Commit Pai - Mesclar commits filhos para este - ALTERAÇÕES - Buscar Alterações... - ARQUIVOS - Arquivo LFS - Submódulo - INFORMAÇÃO - AUTOR - ALTERADO - COMMITTER - Verificar referências que contenham este commit - COMMIT EXISTE EM - Mostra apenas as primeiras 100 alterações. Veja todas as alterações na aba ALTERAÇÕES. - MENSAGEM - PAIS - REFERÊNCIAS - SHA - Abrir no navegador - Descrição - Insira o assunto do commit - Configurar Repositório - TEMPLATE DE COMMIT - Conteúdo do Template: - Nome do Template: - AÇÃO CUSTOMIZADA - Argumentos: - ${REPO} - Caminho do repositório; ${SHA} - SHA do commit selecionado - Caminho do executável: - Nome: - Escopo: - Commit - Repositório - Endereço de email - Endereço de email - GIT - Buscar remotos automaticamente - Minuto(s) - Remoto padrão - RASTREADOR DE PROBLEMAS - Adicionar Regra de Exemplo do Azure DevOps - Adicionar Regra de Exemplo do Github - Adicionar Regra de Exemplo do GitLab - Adicionar regra de exemplo de Merge Request do GitLab - Adicionar Regra de Exemplo do Jira - Nova Regra - Expressão Regex de Issue: - Nome da Regra: - URL de Resultado: - Por favor, use $1, $2 para acessar os valores de grupos do regex. - IA - Serviço desejado: - Se o 'Serviço desejado' for definido, SourceGit usará ele neste Repositório. Senão, caso haja mais de um serviço disponível, será exibido um menu para seleção. - Proxy HTTP - Proxy HTTP usado por este repositório - Nome de Usuário - Nome de usuário para este repositório - Workspaces - Cor - Nome - Restaurar abas ao inicializar - Assistente de Conventional Commit - Breaking Change: - Ticket encerrado: - Detalhes: - Escopo: - Breve resumo: - Tipo de mudança: - Copiar - Copiar todo o texto - Copiar Caminho - Criar Branch... - Baseado Em: - Checar o branch criado - Alterações Locais: - Descartar - Guardar & Reaplicar - Nome do Novo Branch: - Insira o nome do branch. - Criar Branch Local - Criar Tag... - Nova Tag Em: - Assinatura GPG - Mensagem da Tag: - Opcional. - Nome da Tag: - Formato recomendado: v1.0.0-alpha - Enviar para todos os remotos após criação - Criar Nova Tag - Tipo: - anotada - leve - Pressione Ctrl para iniciar diretamente - Recortar - Excluir Branch - Branch: - Você está prestes a excluir uma branch remota!!! - Também excluir branch remoto ${0}$ - Excluir Múltiplos Branches - Você está tentando excluir vários branches de uma vez. Certifique-se de verificar antes de agir! - Excluir Remoto - Remoto: - Alvo: - Confirmar Exclusão do Grupo - Confirmar Exclusão do Repositório - Excluir Submódulo - Caminho do Submódulo: - Excluir Tag - Tag: - Excluir dos repositórios remotos - DIFERENÇA BINÁRIA - NOVO - ANTIGO - Copiar - Modo de Arquivo Alterado - Ignorar mudanças de espaço em branco - MUDANÇA DE OBJETO LFS - Próxima Diferença - SEM MUDANÇAS OU APENAS MUDANÇAS DE EOL - Diferença Anterior - Salvar como um Patch - Exibir símbolos ocultos - Diferença Lado a Lado - SUBMÓDULO - NOVO - Trocar - Realce de Sintaxe - Quebra de Linha - Abrir na Ferramenta de Mesclagem - Exibir todas as linhas - Diminuir Número de Linhas Visíveis - Aumentar Número de Linhas Visíveis - SELECIONE O ARQUIVO PARA VISUALIZAR AS MUDANÇAS - Abrir na Ferramenta de Mesclagem - Descartar Alterações - Todas as alterações locais na cópia de trabalho. - Alterações: - Incluir arquivos ignorados - Um total de {0} alterações será descartado - Você não pode desfazer esta ação!!! - Favorito: - Novo Nome: - Alvo: - Editar Grupo Selecionado - Editar Repositório Selecionado - Executar ação customizada - Nome da ação: - Buscar - Buscar todos os remotos - Buscar sem tags - Remoto: - Buscar Alterações Remotas - Assumir não alterado - Descartar... - Descartar {0} arquivos... - Descartar Alterações nas Linhas Selecionadas - Abrir Ferramenta de Mesclagem Externa - Salvar Como Patch... - Preparar - Preparar {0} arquivos - Preparar Alterações nas Linhas Selecionadas - Stash... - Stash {0} arquivos... - Desfazer Preparação - Desfazer Preparação de {0} arquivos - Desfazer Preparação nas Linhas Selecionadas - Usar Meu (checkout --ours) - Usar Deles (checkout --theirs) - Histórico de Arquivos - MUDANÇA - CONTEUDO - Git-Flow - Branch de Desenvolvimento: - Feature: - Prefixo da Feature: - FLOW - Concluir Feature - FLOW - Concluir Hotfix - FLOW - Concluir Release - Alvo: - Hotfix: - Prefixo do Hotfix: - Inicializar Git-Flow - Manter branch - Branch de Produção: - Release: - Prefixo da Release: - Iniciar Feature... - FLOW - Iniciar Feature - Iniciar Hotfix... - FLOW - Iniciar Hotfix - Digite o nome - Iniciar Release... - FLOW - Iniciar Release - Prefixo da Tag de Versão: - Git LFS - Adicionar Padrão de Rastreamento... - Padrão é nome do arquivo - Padrão Personalizado: - Adicionar Padrão de Rastreamento ao Git LFS - Buscar - Execute `git lfs fetch` para baixar objetos Git LFS. Isso não atualiza a cópia de trabalho. - Buscar Objetos LFS - Instalar hooks do Git LFS - Exibir bloqueios - Sem Arquivos Bloqueados - Bloquear - Exibir apenas meus bloqueios - Bloqueios LFS - Desbloquear - Forçar Desbloqueio - Prune - Execute `git lfs prune` para excluir arquivos LFS antigos do armazenamento local - Puxar - Execute `git lfs pull` para baixar todos os arquivos Git LFS para a referência atual e checkout - Puxar Objetos LFS - Enviar - Envie arquivos grandes enfileirados para o endpoint Git LFS - Enviar Objetos LFS - Remoto: - Rastrear arquivos nomeados '{0}' - Rastrear todos os arquivos *{0} - Históricos - AUTOR - DATA DO AUTOR - GRÁFICO & ASSUNTO - SHA - HORA DO COMMIT - SELECIONADO {0} COMMITS - Segure 'Ctrl' ou 'Shift' para selecionar múltiplos commits. - Segure ⌘ ou ⇧ para selecionar múltiplos commits. - DICAS: - Referência de Atalhos de Teclado - GLOBAL - Cancelar popup atual - Fechar página atual - Ir para a próxima página - Ir para a página anterior - Criar nova página - Abrir diálogo de preferências - REPOSITÓRIO - Commitar mudanças preparadas - Commitar e enviar mudanças preparadas - Preparar todas as mudanças e commitar - Cria um novo branch partindo do commit selecionado - Descartar mudanças selecionadas - Buscar, imediatamente - Modo de Dashboard (Padrão) - Modo de busca de commits - Puxar, imediatamente - Enviar, imediatamente - Forçar recarregamento deste repositório - Preparar/Despreparar mudanças selecionadas - Alternar para 'Mudanças' - Alternar para 'Históricos' - Alternar para 'Stashes' - EDITOR DE TEXTO - Fechar painel de busca - Encontrar próxima correspondência - Encontrar correspondência anterior - Abrir painel de busca - Descartar - Preparar - Despreparar - Inicializar Repositório - Caminho: - Cherry-Pick em andamento. - Merge em andamento. - Rebase em andamento. - Revert em andamento. - Rebase Interativo - Em: - Ramo Alvo: - Copiar link - Abrir no navegador - ERRO - AVISO - Mesclar Ramo - Para: - Opção de Mesclagem: - Mover nó do repositório - Selecionar nó pai para: - Nome: - O Git NÃO foi configurado. Por favor, vá para [Preferências] e configure primeiro. - Abrir Pasta de Dados do Aplicativo - Abrir Com... - Opcional. - Criar Nova Página - Adicionar aos Favoritos - Fechar Aba - Fechar Outras Abas - Fechar Abas à Direita - Copiar Caminho do Repositório - Repositórios - Colar - {0} dias atrás - 1 hora atrás - {0} horas atrás - Agora mesmo - Mês passado - Ano passado - {0} minutos atrás - {0} meses atrás - {0} anos atrás - Ontem - Preferências - INTELIGÊNCIA ARTIFICIAL - Prompt para Analisar Diff - Chave da API - Prompt para Gerar Título - Modelo - Nome - Servidor - APARÊNCIA - Fonte Padrão - Tamanho da Fonte - Padrão - Editor - Fonte Monoespaçada - Usar fonte monoespaçada apenas no editor de texto - Tema - Substituições de Tema - Usar largura fixa de aba na barra de título - Usar moldura de janela nativa - FERRAMENTA DE DIFF/MERGE - Caminho de Instalação - Insira o caminho para a ferramenta de diff/merge - Ferramenta - GERAL - Verificar atualizações na inicialização - Idioma - Commits do Histórico - Exibir data do autor em vez da data do commit no gráfico - Comprimento do Guia de Assunto - GIT - Habilitar Auto CRLF - Diretório de Clone Padrão - Email do Usuário - Email global do usuário git - Habilita --prune ao buscar - Git (>= 2.25.1) é necessário para este aplicativo - Caminho de Instalação - Nome do Usuário - Nome global do usuário git - Versão do Git - ASSINATURA GPG - Assinatura GPG de commit - Formato GPG - Caminho de Instalação do Programa - Insira o caminho para o programa gpg instalado - Assinatura GPG de tag - Chave de Assinatura do Usuário - Chave de assinatura gpg do usuário - INTEGRAÇÃO - SHELL/TERMINAL - Caminho - Shell/Terminal - Prunar Remoto - Alvo: - Podar Worktrees - Podar informações de worktree em `$GIT_COMMON_DIR/worktrees` - Puxar - Branch Remoto: - Para: - Alterações Locais: - Descartar - Guardar & Reaplicar - Remoto: - Puxar (Buscar & Mesclar) - Usar rebase em vez de merge - Empurrar - Certifica de que submodules foram enviadas - Forçar push - Branch Local: - Remoto: - Empurrar Alterações para o Remoto - Branch Remoto: - Definir como branch de rastreamento - Empurrar todas as tags - Empurrar Tag para o Remoto - Empurrar para todos os remotos - Remoto: - Tag: - Sair - Rebase da Branch Atual - Guardar & reaplicar alterações locais - Em: - Rebase: - Adicionar Remoto - Editar Remoto - Nome: - Nome do remoto - URL do Repositório: - URL do repositório git remoto - Copiar URL - Excluir... - Editar... - Buscar - Abrir no Navegador - Podar - Confirmar Remoção de Worktree - Habilitar Opção `--force` - Alvo: - Renomear Branch - Novo Nome: - Nome único para este branch - Branch: - ABORTAR - Buscando automaticamente mudanças dos remotos... - Limpar (GC & Podar) - Execute o comando `git gc` para este repositório. - Limpar tudo - Configurar este repositório - CONTINUAR - Ações customizada - Nenhuma ação customizada - Descartar todas as alterações - Habilitar opção '--reflog' - Abrir no Navegador de Arquivos - Pesquisar Branches/Tags/Submódulos - Desfazer - Esconder no gráfico de commit - Incluir no gráfico de commit - Habilitar opção '--first-parent' - Data do Commit - Topologicamente - BRANCHES LOCAIS - Navegar para HEAD - Criar Branch - Abrir em {0} - Abrir em Ferramentas Externas - Atualizar - REMOTOS - ADICIONAR REMOTO - Pesquisar Commit - Autor - Committer - Arquivo - Mensagem - SHA - Branch Atual - Exibir Tags como Árvore - Estatísticas - SUBMÓDULOS - ADICIONAR SUBMÓDULO - ATUALIZAR SUBMÓDULO - TAGS - NOVA TAG - Abrir no Terminal - WORKTREES - ADICIONAR WORKTREE - PODAR - URL do Repositório Git - Resetar Branch Atual para Revisão - Modo de Reset: - Mover Para: - Branch Atual: - Revelar no Explorador de Arquivos - Reverter Commit - Commit: - Commitar alterações de reversão - Reescrever Mensagem do Commit - Use 'Shift+Enter' para inserir uma nova linha. 'Enter' é a tecla de atalho do botão OK - Executando. Por favor, aguarde... - SALVAR - Salvar Como... - Patch salvo com sucesso! - Escanear Repositórios - Diretório Raiz: - Verificar atualizações... - Nova versão deste software disponível: - Falha ao verificar atualizações! - Baixar - Ignorar esta versão - Atualização de Software - Não há atualizações disponíveis no momento. - Copiar SHA - Squash Commits - Squash commits em: - Chave SSH Privada: - Caminho para a chave SSH privada - INICIAR - Stash - Incluir arquivos não rastreados - Manter arquivos em stage - Mensagem: - Opcional. Nome deste stash - Apenas mudanças em stage - Tanto mudanças em stage e fora de stage dos arquivos selecionados serão enviadas para stash!!! - Guardar Alterações Locais - Aplicar - Descartar - Descartar Stash - Descartar: - Stashes - ALTERAÇÕES - STASHES - Estatísticas - COMMITS - COMMITTER - VISÃO GERAL - MÊS - SEMANA - AUTORES: - COMMITS: - SUBMÓDULOS - Adicionar Submódulo - Copiar Caminho Relativo - Buscar submódulos aninhados - Abrir Repositório do Submódulo - Caminho Relativo: - Pasta relativa para armazenar este módulo. - Excluir Submódulo - OK - Copiar Nome da Tag - Copiar mensage da Tag - Excluir ${0}$... - Mesclar ${0}$ em ${1}$... - Enviar ${0}$... - Atualizar Submódulos - Todos os submódulos - Inicializar conforme necessário - Recursivamente - Submódulo: - Usar opção --remote - URL: - Aviso - Página de Boas-vindas - Criar Grupo Raíz - Criar Subgrupo - Clonar Repositório - Excluir - ARRASTAR E SOLTAR PASTAS SUPORTADO. AGRUPAMENTO PERSONALIZADO SUPORTADO. - Editar - Mover para Outro Grupo - Abrir Todos os Repositórios - Abrir Repositório - Abrir Terminal - Reescanear Repositórios no Diretório de Clone Padrão - Buscar Repositórios... - Ordenar - Alterações - Git Ignore - Ignorar todos os arquivos *{0} - Ignorar arquivos *{0} na mesma pasta - Ignorar arquivos na mesma pasta - Ignorar apenas este arquivo - Corrigir - Você pode stagear este arquivo agora. - COMMIT - COMMITAR E ENVIAR - Modelo/Históricos - Acionar evento de clique - Preparar todas as mudanças e commitar - CONFLITOS DETECTADOS - CONFLITOS DE ARQUIVO RESOLVIDOS - INCLUIR ARQUIVOS NÃO RASTREADOS - SEM MENSAGENS DE ENTRADA RECENTES - SEM MODELOS DE COMMIT - Clique com o botão direito nos arquivos selecionados e escolha como resolver conflitos. - STAGED - UNSTAGE - UNSTAGE TODOS - UNSTAGED - STAGE - STAGE TODOS - VER SUPOR NÃO ALTERADO - Template: ${0}$ - Workspaces: - Configurar workspaces... - WORKTREE - Copiar Caminho - Bloquear - Remover - Desbloquear - diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml deleted file mode 100644 index a625df98..00000000 --- a/src/Resources/Locales/ru_RU.axaml +++ /dev/null @@ -1,807 +0,0 @@ - - - - - - О программе - О SourceGit - Бесплатный графический клиент Git с исходным кодом - Добавить рабочий каталог - Расположение: - Путь к рабочему каталогу (поддерживается относительный путь) - Имя ветки: - Имя целевого каталога по умолчанию. (необязательно) - Отслеживание ветки: - Отслеживание внешней ветки - Переключиться на: - Создать новую ветку - Ветку из списка - Помощник OpenAI - ПЕРЕСОЗДАТЬ - Использовать OpenAI для создания сообщения о ревизии - ПРИМЕНИТЬ КАК СООБЩЕНИЕ РЕВИЗИИ - Исправить - Файл заплатки: - Выберите файл .patch для применения - Игнорировать изменения пробелов - Применить заплатку - Пробел: - Отложить - Удалить после применения - Восстановить изменения индекса - Отложенный: - Архивировать... - Сохранить архив в: - Выберите путь к архивному файлу - Ревизия: - Архив - Спросить разрешения SourceGit - НЕОТСЛЕЖИВАЕМЫЕ ФАЙЛЫ - СПИСОК ПУСТ - УДАЛИТЬ - Загрузить картинку... - Обновить - ДВОИЧНЫЙ ФАЙЛ НЕ ПОДДЕРЖИВАЕТСЯ!!! - Раздвоить - О - Плохая - Раздвоение. Текущая ГОЛОВА (HEAD) хорошая или плохая? - Хорошая - Пропустить - Раздвоение. Сделать текущую ревизию хорошей или плохой и переключиться на другой. - Расследование - РАССЛЕДОВАНИЕ В ЭТОМ ФАЙЛЕ НЕ ПОДДЕРЖИВАЕТСЯ!!! - Переключиться на ${0}$... - Сравнить с ${0}$ - Сравнить с рабочим каталогом - Копировать имя ветки - Изменить действие - Удалить ${0}$... - Удалить выбранные {0} ветки - Перемотать вперёд к ${0}$ - Извлечь ${0}$ в ${1}$... - Git-процесс - Завершение ${0}$ - Влить ${0}$ в ${1}$... - Влить {0} выделенных веток в текущую - Загрузить ${0}$ - Загрузить ${0}$ в ${1}$... - Выложить ${0}$ - Переместить ${0}$ на ${1}$... - Переименовать ${0}$... - Сбросить ${0}$ к ${1}$... - Отслеживать ветку... - Сравнение веток - Недопустимая основная ветка! - Байты - ОТМЕНА - Сбросить родительскую ревизию - Сбросить эту ревизию - Произвести сообщение о ревизии - ИЗМЕНИТЬ РЕЖИМ ОТОБРАЖЕНИЯ - Показывать в виде списка файлов и каталогов - Показывать в виде списка путей - Показывать в виде дерева файловой системы - Переключить ветку - Переключение ревизии - Ревизия: - Предупреждение: После переключения ревизии ваша Голова (HEAD) будет отсоединена - Локальные изменения: - Отклонить - Отложить и примненить повторно - Обновить все подкаталоги - Ветка: - Частичный выбор - Добавить источник для ревизии сообщения - Ревизия(и): - Ревизия всех изменений. - Основной: - Обычно вы не можете выделить слияние, потому что не знаете, какую сторону слияния следует считать основной. Эта опция позволяет отобразить изменения относительно указанного родительского элемента. - Очистить отложенные - Вы пытаетесь очистить все отложенные. Вы уверены, что хотите продолжить? - Клонировать внешний репозиторий - Расширенные параметры: - Дополнительные аргументы для клонирования репозитория. (необязательно). - Локальное имя: - Имя репозитория. (необязательно). - Родительский каталог: - Создать и обновить подмодуль - Адрес репозитория: - ЗАКРЫТЬ - Редактор - Переключиться на эту ревизию - Применить эту ревизию (cherry-pick) - Применить несколько ревизий ... - Сравнить c ГОЛОВОЙ (HEAD) - Сравнить с рабочим каталогом - Автор - Ревизор - Информацию - SHA - Субъект - Пользовательское действие - Интерактивное перемещение (rebase -i) ${0}$ сюда - Влить в ${0}$ - Влить ... - Переместить ${0}$ сюда - Сбросить ${0}$ сюда - Отменить ревизию - Изменить комментарий - Сохранить как заплатки... - Объединить с предыдущей ревизией - Объединить все следующие ревизии с этим - ИЗМЕНЕНИЯ - изменённый(х) файл(ов) - Найти изменения.... - ФАЙЛЫ - Файл LFS - Поиск файлов... - Подмодуль - ИНФОРМАЦИЯ - АВТОР - ИЗМЕНЁННЫЙ - ДОЧЕРНИЙ - РЕВИЗОР (ИСПОЛНИТЕЛЬ) - Найти все ветки с этой ревизией - ВЕТКИ С ЭТОЙ РЕВИЗИЕЙ - Отображаются только первые 100 изменений. Смотрите все изменения на вкладке ИЗМЕНЕНИЯ. - СООБЩЕНИЕ - РОДИТЕЛИ - ССЫЛКИ - SHA - Открыть в браузере - Описание - СУБЪЕКТ - Введите тему ревизии - Настройка репозитория - ШАБЛОН РЕВИЗИИ - Cодержание: - Название: - ПОЛЬЗОВАТЕЛЬСКОЕ ДЕЙСТВИЕ - Аргументы: - ${REPO} - Путь к репозиторию; ${SHA} - SHA ревизий - Исполняемый файл: - Имя: - Диапазон: - Ветка - Ревизия - Репозиторий - Ждать для выполения выхода - Адрес электронной почты - Адрес электронной почты - GIT - Автозагрузка изменений - Минут(а/ы) - Внешний репозиторий по умолчанию - Предпочтительный режим слияния - ОТСЛЕЖИВАНИЕ ПРОБЛЕМ - Добавить пример правила Azure DevOps - Добавить пример правила для тем в Gitea - Добавить пример правила запроса скачивания из Gitea - Добавить пример правила для Git - Добавить пример правила выдачи GitLab - Добавить пример правила запроса на слияние в GitLab - Добавить пример правила Jira - Новое правило - Проблема с регулярным выражением: - Имя правила: - Адрес результата: - Пожалуйста, используйте $1, $2 для доступа к значениям групп регулярных выражений. - ОТКРЫТЬ ИИ - Предпочтительный сервис: - Если «Предпочтительный сервис» установлен, SourceGit будет использовать только этот репозиторий. В противном случае, если доступно более одной услуги, будет отображено контекстное меню для выбора одной из них. - HTTP-прокси - HTTP-прокси для репозитория - Имя пользователя - Имя пользователя репозитория - Рабочие пространства - Цвет - Имя - Восстанавливать вкладки при запуске - ПРОДОЛЖИТЬ - Обнаружена пустая ревизия! Вы хотите продолжить (--allow-empty)? - Сформировать всё и зафиксировать ревизию - Обнаружена пустая ревизия! Вы хотите продолжить (--allow-empty) или отложить всё, затем зафиксировать ревизию? - Общепринятый помощник по ревизии - Кардинальные изменения: - Закрытая тема: - Детали изменений: - Область: - Короткое описание: - Тип изменения: - Копировать - Копировать весь текст - Копировать полный путь - Копировать путь - Создать ветку... - Основан на: - Переключиться на созданную ветку - Локальные изменения: - Отклонить - Отложить и применить повторно - Имя новой ветки: - Введите имя ветки. - Пробелы будут заменены на тире. - Создать локальную ветку - Перезаписать существующую ветку - Создать метку... - Новая метка у: - GPG подпись - Сообщение с меткой: - Необязательно. - Имя метки: - Рекомендуемый формат: v1.0.0-alpha - Выложить на все внешние репозитории после создания - Создать новую метку - Вид: - С примечаниями - Простой - Удерживайте Ctrl, чтобы сразу начать - Вырезать - Удалить подмодуль - Принудительно удалить даже если содержит локальные изменения. - Подмодуль: - Удалить ветку - Ветка: - Вы собираетесь удалить внешнюю ветку!!! - Также удалите внешнюю ветку ${0}$ - Удаление нескольких веток - Вы пытаетесь удалить несколько веток одновременно. Обязательно перепроверьте, прежде чем предпринимать какие-либо действия! - Удалить внешний репозиторий - Внешний репозиторий: - Путь: - Цель: - Все дочерние элементы будут удалены из списка. - Будет удалён из списка. На диске останется. - Подтвердите удаление группы - Подтвердите удаление репозитория - Удалить подмодуль - Путь подмодуля: - Удалить метку - Метка: - Удалить из внешнего репозитория - СРАВНЕНИЕ БИНАРНИКОВ - НОВЫЙ - СТАРЫЙ - Копировать - Режим файла изменён - Первое сравнение - Игнорировать изменения пробелов - Последнее сравнение - ИЗМЕНЕНИЕ ОБЪЕКТА LFS - Следующее сравнение - НИКАКИХ ИЗМЕНЕНИЙ ИЛИ МЕНЯЕТСЯ ТОЛЬКО EOL - Предыдущее сравнение - Сохранить как заплатку - Показывать скрытые символы - Сравнение рядом - ПОДМОДУЛЬ - УДАЛЁН - НОВЫЙ - Обмен - Подсветка синтаксиса - Перенос слов в строке - Разрешить навигацию по блокам - Открыть в инструменте слияния - Показывать все строки - Уменьшить количество видимых строк - Увеличить количество видимых строк - ВЫБЕРИТЕ ФАЙЛ ДЛЯ ПРОСМОТРА ИЗМЕНЕНИЙ - Открыть в инструменте слияния - Отклонить изменения - Все локальные изменения в рабочей копии. - Изменения: - Включить игнорируемые файлы - {0} изменений будут отменены - Вы не можете отменить это действие!!! - Закладка: - Новое имя: - Цель: - Редактировать выбранную группу - Редактировать выбранный репозиторий - Выполнить пользовательское действие - Имя действия: - Извлечь - Извлечь все внешние репозитории - Разрешить опцию (--force) - Извлечь без меток - Внешний репозиторий: - Извлечь внешние изменения - Не отслеживать - Отклонить... - Отклонить {0} файлов... - Отменить изменения в выбранной(ых) строке(ах) - Открыть расширенный инструмент слияния - Взять версию ${0}$ - Сохранить как файл заплатки... - Сформировать - Сформированные {0} файлы - Сформированные изменения в выбранной(ых) строке(ах) - Отложить... - Отложить {0} файлов... - Расформировать - Несформированные {0} файлы - Несформированные изменения в выбранной(ых) строке(ах) - Использовать мой (checkout --ours) - Использовать их (checkout --theirs) - История файлов - ИЗМЕНИТЬ - СОДЕРЖИМОЕ - Git-процесс - Ветка разработчика: - Свойство: - Свойство префикса: - ПРОЦЕСС - Свойства завершения - ПРОЦЕСС - Закончить исправление - ПРОЦЕСС - Завершить выпуск - Цель: - Выложить на удалённый(ые) после завершения - Втиснуть при слиянии - Исправление: - Префикс исправлений: - Создать Git-процесс - Держать ветку - Производственная ветка: - Выпуск: - Префикс выпуска: - Свойство запуска... - ПРОЦЕСС - Свойство запуска - Запуск исправлений... - ПРОЦЕСС - Запуск исправлений - Ввести имя - Запуск выпуска... - ПРОЦЕСС - Запуск выпуска - Префикс метки версии: - Git LFS (хранилище больших файлов) - Добавить шаблон отслеживания... - Шаблон — это имя файла - Изменить шаблон: - Добавить шаблон отслеживания в LFS Git - Извлечь - Запустить (git lfs fetch), чтобы загрузить объекты LFS Git. При этом рабочая копия не обновляется. - Извлечь объекты LFS - Установить перехват LFS Git - Показывать блокировки - Нет заблокированных файлов - Блокировка - Показывать только мои блокировки - Блокировки LFS - Разблокировать - Принудительно разблокировать - Обрезать - Запустить (git lfs prune), чтобы удалить старые файлы LFS из локального хранилища - Загрузить - Запустить (git lfs pull), чтобы загрузить все файлы LFS Git для текущей ссылки и проверить - Загрузить объекты LFS - Выложить - Отправляйте большие файлы, помещенные в очередь, в конечную точку LFS Git - Выложить объекты LFS - Внешнее хранилище: - Отслеживать файлы с именем «{0}» - Отслеживать все *{0} файлов - Истории - АВТОР - ВРЕМЯ АВТОРА - ГРАФ И СУБЪЕКТ - SHA - ВРЕМЯ РЕВИЗИИ - ВЫБРАННЫЕ {0} РЕВИЗИИ - Удерживайте Ctrl или Shift, чтобы выбрать несколько ревизий. - Удерживайте ⌘ или ⇧, чтобы выбрать несколько ревизий. - ПОДСКАЗКИ: - Ссылка на сочетания клавиш - ОБЩЕЕ - Закрыть окно - Клонировать репозиторий - Закрыть вкладку - Перейти на следующую вкладку - Перейти на предыдущую вкладку - Создать новую вкладку - Открыть диалоговое окно настроек - Переключить активное рабочее место - Переключить активную страницу - РЕПОЗИТОРИЙ - Зафиксировать сформированные изменения - Зафиксировать и выложить сформированные изменения - Сформировать все изменения и зафиксировать - Создать новую ветку на основе выбранной ветки - Отклонить выбранные изменения - Извлечение, запускается сразу - Режим доски (по умолчанию) - Режим поиска ревизий - Загрузить, запускается сразу - Выложить, запускается сразу - Принудительно перезагрузить репозиторий - Сформированные/Несформированные выбранные изменения - Переключить на «Изменения» - Переключить на «Истории» - Переключить на «Отложенные» - ТЕКСТОВЫЙ РЕДАКТОР - Закрыть панель поиска - Найти следующее совпадение - Найти предыдущее совпадение - Открыть с внешним инструментом сравнения/слияние - Открыть панель поиска - Отклонить - Сформировать - Расформировать - Создать репозиторий - Путь: - Выполняется частичный перенос ревизий (cherry-pick). - Обрабтка ревизии. - Выполняется слияние. - Выполяется. - Выполняется перенос. - Остановлен на - Выполняется отмена ревизии. - Выполняется отмена - Интерактивное перемещение - На: - Целевая ветка: - Копировать ссылку - Открыть в браузере - ОШИБКА - УВЕДОМЛЕНИЕ - Рабочие места - Страницы - Влить ветку - В: - Опции слияния: - Источник: - Влить несколько веток - Зафиксировать все изменения - Стратегия: - Цели: - Переместить репозиторий в другую группу - Выбрать группу для: - Имя: - Git НЕ был настроен. Пожалуйста, перейдите в [Настройки] и сначала настройте его. - Открыть приложение каталогов данных - Окрыть с... - Необязательно. - Создать новую страницу - Закладка - Закрыть вкладку - Закрыть другие вкладки - Закрыть вкладки справа - Копировать путь репозитория - Репозитории - Вставить - {0} дней назад - 1 час назад - {0} часов назад - Сейчас - Последний месяц - В прошлом году - {0} минут назад - {0} месяцев назад - {0} лет назад - Вчера - Параметры - ОТКРЫТЬ ИИ - Запрос на анализ сравнения - Ключ API - Создать запрос на тему - Модель - Имя: - Сервер - Разрешить потоковую передачу - ВИД - Шрифт по умолчанию - Редактировать ширину вкладки - Размер шрифта - По умолчанию - Редактор - Моноширный шрифт - В текстовом редакторе используется только моноширный шрифт - Тема - Переопределение темы - Использовать фиксированную ширину табуляции в строке заголовка. - Использовать системное окно - ИНСТРУМЕНТ СРАВНЕНИЙ/СЛИЯНИЯ - Путь установки - Введите путь для инструмента сравнения/слияния - Инструмент - ОСНОВНЫЕ - Проверить обновления при старте - Формат даты - Язык - Максимальная длина истории - Показывать время автора вместо времени ревизии на графике - Показать наследника в деталях комментария - Показывать метки на графике - Длина темы ревизии - GIT - Включить автозавершение CRLF - Каталог клонирования по умолчанию - Электроная почта пользователя - Общая электроная почта пользователя git - Разрешить (--prune) при скачивании - Разрешить (--ignore-cr-at-eol) в сравнении - Для работы программы требуется версия Git (>= 2.25.1) - Путь установки - Разрешить верификацию HTTP SSL - Имя пользователя - Общее имя пользователя git - Версия Git - GPG ПОДПИСЬ - GPG подпись ревизии - Формат GPG - Путь установки программы - Введите путь для установленной программы GPG - GPG подпись метки - Ключ подписи пользователя - Ключ GPG подписи пользователя - ВНЕДРЕНИЕ - ОБОЛОЧКА/ТЕРМИНАЛ - Путь - Оболочка/Терминал - Удалить внешний репозиторий - Цель: - Удалить рабочий каталог - Информация об обрезке рабочего каталога в «$GIT_COMMON_DIR/worktrees» - Загрузить - Ветка внешнего репозитория: - В: - Локальные изменения: - Отклонить - Отложить и применить повторно - Обновить все подмодули - Внешний репозиторий: - Загрузить (Получить и слить) - Использовать перемещение вместо слияния - Выложить - Убедитесь, что подмодули были вставлены - Принудительно выложить - Локальная ветка: - Внешний репозиторий: - Выложить изменения на внешний репозиторий - Ветка внешнего репозитория: - Отслеживать ветку - Выложить все метки - Выложить метку на внешний репозиторий - Выложить на все внешние репозитории - Внешний репозиторий: - Метка: - Выйти - Перемещение текущей ветки - Отложить и применить повторно локальные изменения - На: - Переместить: - Добавить внешний репозиторий - Редактировать внешний репозиторий - Имя: - Имя внешнего репозитория - Адрес: - Адрес внешнего репозитория git - Копировать адрес - Удалить... - Редактировать... - Извлечь - Открыть в браузере - Удалить - Подтвердить удаление рабочего каталога - Включить опцию (--force) - Цель: - Переименовать ветку - Новое имя: - Уникальное имя для данной ветки - Ветка: - Отказ - Автоматическое извлечение изменений с внешних репозиторий... - Сортировать - По дате ревизора (исполнителя) - По имени - Очистить (Сбор мусора и удаление) - Запустить команду (git gc) для данного репозитория. - Очистить всё - Очистить - Настройка репозитория - ПРОДОЛЖИТЬ - Изменить действия - Не изменять действия - Отклонить все изменения. - Разрешить опцию --reflog - Открыть в файловом менеджере - Поиск веток, меток и подмодулей - Видимость на графике - Не установлен (по умолчанию) - Скрыть в графе ревизии - Фильтр в графе ревизии - Включить опцию (--first-parent) - РАСПОЛОЖЕНИЕ - Горизонтально - Вертикально - ЗАПРОС РЕВИЗИЙ - Дата ревизии - Топологически - ЛОКАЛЬНЫЕ ВЕТКИ - Навигация по ГОЛОВЕ (HEAD) - Создать ветку - ОЧИСТКА УВЕДОМЛЕНИЙ - Выделять только текущую ветку на графике - Открыть в {0} - Открыть в расширенном инструменте - Обновить - ВНЕШНИЕ РЕПОЗИТОРИИ - ДОБАВИТЬ ВНЕШНИЙ РЕПОЗИТОРИЙ - Поиск ревизии - Автор - Ревизор - Содержимое - Файл - Сообщение - SHA - Текущая ветка - Показывать подмодули как дерево - Показывать метки как катлог - ПРОПУСТИТЬ - Статистикa - ПОДМОДУЛИ - ДОБАВИТЬ ПОДМОДУЛЬ - ОБНОВИТЬ ПОДМОДУЛЬ - МЕТКИ - НОВАЯ МЕТКА - По дате создания - По имени - Сортировать - Открыть в терминале - Использовать относительное время в историях - Просмотр журналов - Посетить '{0}' в браузере - РАБОЧИЕ КАТАЛОГИ - ДОБАВИТЬ РАБОЧИЙ КАТАЛОГ - ОБРЕЗАТЬ - Адрес репозитория Git - Сбросить текущую ветку до версии - Режим сброса: - Переместить в: - Текущая ветка: - Сброс ветки (без переключения) - Переместить в: - Ветка: - Открыть в файловом менеджере - Отменить ревизию - Ревизия: - Отмена ревизии - Изменить комментарий ревизии - Используйте «Shift+Enter» для ввода новой строки. «Enter» - это горячая клавиша кнопки «OK» - Запуск. Подождите пожалуйста... - СОХРАНИТЬ - Сохранить как... - Заплатка успешно сохранена! - Сканирование репозиторий - Корневой каталог: - Проверка для обновления... - Доступна новая версия программного обеспечения: - Не удалось проверить наличие обновлений! - Загрузка - Пропустить эту версию - Обновление ПО - В настоящее время обновления недоступны. - Отслеживать ветку - Ветка: - Снять основную ветку - Основная ветка: - Копировать SHA - Перейти - Втиснуть ревизии - В: - Приватный ключ SSH: - Путь хранения приватного ключа SSH - ЗАПУСК - Отложить - Автоматически восстанавливать после откладывания - Ваши рабочие файлы остаются неизменными, но отложенные сохранятся. - Включить неотслеживаемые файлы - Хранить отложенные файлы - Сообщение: - Имя тайника (необязательно) - Только сформированные изменения - Сформированные так и несформированные изменения выбранных файлов будут сохранены!!! - Отложить локальные изменения - Принять - Отбросить - Сохранить как заплатку... - Отбросить тайник - Отбросить: - Отложенные - ИЗМЕНЕНИЯ - ОТЛОЖЕННЫЕ - Статистика - РЕВИЗИИ - РЕВИЗОРЫ (ИСПОЛНИТЕЛИ) - ОБЗОР - МЕСЯЦ - НЕДЕЛЯ - АВТОРЫ: - РЕВИЗИИ: - ПОДМОДУЛИ - Добавить подмодули - Копировать относительный путь - Удалить подмодуль - Извлечение вложенных подмодулей - Открыть подмодуль репозитория - Каталог: - Относительный путь для хранения подмодуля. - Удалить подмодуль - СОСТОЯНИЕ - изменён - не создан - ревизия изменена - не слита - URL-адрес - ОК - Копировать имя метки - Копировать сообщение с метки - Удалить ${0}$... - Влить ${0}$ в ${1}$... - Выложить ${0}$... - Обновление подмодулей - Все подмодули - Создавать по необходимости - Рекурсивно - Подмодуль: - Использовать опцию (--remote) - Сетевой адрес: - Журналы - ОЧИСТИТЬ ВСЁ - Копировать - Удалить - Предупреждение - Приветствие - Создать группу - Создать подгруппу - Клонировать репозиторий - Удалить - ПОДДЕРЖИВАЕТСЯ: ПЕРЕТАСКИВАНИЕ КАТАЛОГОВ, ПОЛЬЗОВАТЕЛЬСКАЯ ГРУППИРОВКА. - Редактировать - Перейти в другую группу - Открыть все репозитории - Открыть репозиторий - Открыть терминал - Повторное сканирование репозиториев в каталоге клонирования по умолчанию - Поиск репозиториев... - Сортировка - Изменения - Игнорировать Git - Игнорировать все *{0} файлы - Игнорировать *{0} файлы в том же каталоге - Игнорировать файлы в том же каталоге - Игнорировать только эти файлы - Изменить - Теперь вы можете сформировать этот файл. - ЗАФИКСИРОВАТЬ - ЗАФИКСИРОВАТЬ и ОТПРАВИТЬ - Шаблон/Истории - Запустить событие щелчка - Зафиксировать (Редактировать) - Сформировать все изменения и зафиксировать - Вы сформировали {0} файл(ов), но отображается только {1} файл(ов) ({2} файл(ов) отфильтровано). Вы хотите продолжить? - ОБНАРУЖЕНЫ КОНФЛИКТЫ - ОТКРЫТЬ ВНЕШНИЙ ИНСТРУМЕНТ СЛИЯНИЯ - ОТКРЫТЬ ВСЕ КОНФЛИКТЫ ВО ВНЕШНЕМ ИНСТРУМЕНТЕ СЛИЯНИЯ - КОНФЛИКТЫ ФАЙЛОВ РАЗРЕШЕНЫ - ИСПОЛЬЗОВАТЬ МОИ - ИСПОЛЬЗОВАТЬ ИХ - ВКЛЮЧИТЬ НЕОТСЛЕЖИВАЕМЫЕ ФАЙЛЫ - НЕТ ПОСЛЕДНИХ ВХОДНЫХ СООБЩЕНИЙ - НЕТ ШАБЛОНОВ РЕВИЗИИ - Сбросить автора - Щёлкните правой кнопкой мыши выбранный файл(ы) и разрешите конфликты. - Завершение работы - СФОРМИРОВАННЫЕ - РАСФОРМИРОВАТЬ - РАСФОРМИРОВАТЬ ВСЁ - НЕСФОРМИРОВАННЫЕ - СФОРМИРОВАТЬ - СФОРМИРОВАТЬ ВСЁ - ОТКРЫТЬ СПИСОК НЕОТСЛЕЖИВАЕМЫХ ФАЙЛОВ - Шаблон: ${0}$ - РАБОЧЕЕ ПРОСТРАНСТВО: - Настройка рабочего пространства... - РАБОЧИЙ КАТАЛОГ - Копировать путь - Заблокировать - Удалить - Разблокировать - diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml deleted file mode 100644 index abe53252..00000000 --- a/src/Resources/Locales/ta_IN.axaml +++ /dev/null @@ -1,744 +0,0 @@ - - - - - - பற்றி - மூலஅறிவிலி பற்றி - திறந்தமூல & கட்டற்ற அறிவிலி இடைமுக வாடிக்கயாளர் - பணிமரத்தைச் சேர் - இடம்: - இந்த பணிமரத்திற்கான பாதை. தொடர்புடைய பாதை ஆதரிக்கப்படுகிறது. - கிளை பெயர்: - விருப்பத்தேர்வு. இயல்புநிலை இலக்கு கோப்புறை பெயர். - கிளை கண்காணி: - தொலை கிளையைக் கண்காணித்தல் - என்ன சரிபார்க்க வேண்டும்: - புதிய கிளையை உருவாக்கு - ஏற்கனவே உள்ள கிளை - செநு உதவியாளர் - மறு-உருவாக்கு - உறுதிமொழி செய்தியை உருவாக்க செநுவைப் பயன்படுத்து - உறுதிமொழி செய்தி என இடு - ஒட்டு - ஒட்டு கோப்பு: - .ஒட்டு இடுவதற்கு கோப்பைத் தேர்ந்தெடு - வெள்ளைவெளி மாற்றங்களைப் புறக்கணி - ஒட்டு இடு - வெள்ளைவெளி: - பதுக்கிவைத்ததை இடு - பயன்படுத்திய பின் நீக்கு - குறியீட்டின் மாற்றங்களை மீண்டும் நிறுவு - பதுக்கிவை: - காப்பகம்... - இதற்கு காப்பகத்தை சேமி: - காப்பகக் கோப்பு பாதையைத் தேர்ந்தெடு - திருத்தம்: - காப்பகம் - மூலஅறிவிலி கடவுகேள் - கோப்புகள் மாற்றப்படவில்லை எனக் கருதப்படுகிறது - எந்த கோப்புகளும் மாற்றப்படவில்லை எனக் கருதப்படுகிறது - நீக்கு - புதுப்பி - இருமம் கோப்பு ஆதரிக்கப்படவில்லை!!! - குற்றச்சாட்டு - இந்த கோப்பில் குற்றம் சாட்ட ஆதரிக்கப்படவில்லை!!! - ${0}$ சரிபார்... - பணிமரத்துடன் ஒப்பிடுக - கிளை பெயரை நகலெடு - தனிப்பயன் செயல் - ${0}$ ஐ நீக்கு... - தேர்ந்தெடுக்கப்பட்ட {0} கிளைகளை நீக்கு - ${0}$ இதற்கு வேகமாக முன்னோக்கிச் செல் - ${0}$ ஐ ${1}$இல் பெறு... - அறிவிலி ஓட்டம் - முடி ${0}$ - ${0}$ ஐ ${1}$இல் இணை... - தேர்ந்தெடுக்கப்பட்ட {0} கிளைகளை தற்பொதையதில் இணை - இழு ${0}$ - இழு ${0}$ஐ ${1}$-க்குள்... - தள்ளு ${0}$ - மறுதளம் ${0}$ இதன்மேல் ${1}$... - மறுபெயரிடு ${0}$... - கண்காணிப்பு கிளையை அமை... - கிளை ஒப்பிடு - தவறான மேல்ஓடை! - எண்மங்கள் - விடு - பெற்றோர் திருத்தத்திற்கு மீட்டமை - இந்த திருத்தத்திற்கு மீட்டமை - உறுதிமொழி செய்தி உருவாக்கு - காட்சி பயன்முறையை மாற்று - கோப்பு மற்றும் கோப்புறை பட்டியலாக காட்டு - பாதை பட்டியலாகக் காட்டு - கோப்பு முறைமை மரமாகக் காட்டு - கிளை சரிபார் - உறுதிமொழி சரிபார் - உறுதிமொழி: - முன்னறிவிப்பு: ஒரு உறுதிமொழி சரிபார்பதன் மூலம், உங்கள் தலை பிரிக்கப்படும் - உள்ளக மாற்றங்கள்: - நிராகரி - பதுக்கிவை & மீண்டும் இடு - கிளை: - கனி பறி - உறுதிமொழி செய்திக்கு மூலத்தைச் சேர் - உறுதிமொழி(கள்): - அனைத்து மாற்றங்களையும் உறுதிமொழி - முதன்மைகோடு: - பொதுவாக நீங்கள் ஒரு ஒன்றிணையை கனி-பறிக்க முடியாது, ஏனெனில் இணைப்பின் எந்தப் பக்கத்தை முதன்மையாகக் கருத வேண்டும் என்பது உங்களுக்குத் தெரியாது. இந்த விருப்பம் குறிப்பிட்ட பெற்றோருடன் தொடர்புடைய மாற்றத்தை மீண்டும் இயக்க கனி-பறி அனுமதிக்கிறது. - பதுக்கிவைத்தையும் அழி - நீங்கள் அனைத்து பதுக்கிவைத்தையும் அழிக்க முயற்சிக்கிறீர்கள் தொடர விரும்புகிறீர்களா? - நகலி தொலை களஞ்சியம் - கூடுதல் அளவுருக்கள்: - நகலி களஞ்சியத்திற்கான கூடுதல் வாதங்கள். விருப்பத்தேர்வு. - உள்ளக பெயர்: - களஞ்சியப் பெயர். விருப்பத்தேர்வு. - பெற்றோர் கோப்புறை: - துவக்கு & துணை தொகுதிகளைப் புதுப்பி - களஞ்சிய முகவரி: - மூடு - திருத்தி - உறுதிமொழி சரிபார் - கனி-பறி உறுதிமொழி - கனி-பறி ... - தலையுடன் ஒப்பிடுக - பணிமரத்துடன் ஒப்பிடுக - தகவலை - பாகொவ-வை - தனிப்பயன் செயல் - இங்கே ${0}$ ஐ ஊடாடும் வகையில் மறுதளம் - ${0}$ இதற்கு ஒன்றிணை - ஒன்றிணை ... - இங்கே ${0}$ ஐ மறுதளம் - ${0}$ ஐ இங்கே மீட்டமை - உறுதிமொழி திரும்பபெறு - வேறுமொழி - ஒட்டாக சேமி... - பெற்றோர்களில் நொறுக்கு - நொறுக்கு குழந்தைகள் இங்கே சேர் - மாற்றங்கள் - மாற்றங்களைத் தேடு... - கோப்புகள் - பெகோஅ கோப்பு - கோப்புகளைத் தேடு... - துணைத்தொகுதி - தகவல் - ஆசிரியர் - மாற்றப்பட்டது - குழந்தைகள் - உறுதிமொழியாளர் - இந்த உறுதிமொழிடைக் கொண்ட குறிப்புகளைச் சரிபார் - உறுதிமொழி இதில் உள்ளது - முதல் 100 மாற்றங்களை மட்டும் காட்டுகிறது மாற்றங்கள் தாவலில் அனைத்து மாற்றங்களையும் காண்க. - செய்தி - பெற்றோர்கள் - குறிகள் - பாகொவ - உலாவியில் திற - விளக்கம் - உறுதிமொழி பொருளை உள்ளிடவும் - களஞ்சியம் உள்ளமை - உறுதிமொழி வளர்புரு - வார்ப்புரு உள்ளடக்கம்: - வார்ப்புரு பெயர்: - தனிப்பயன் செயல் - வாதங்கள்: - ${களஞ்சிய} - களஞ்சியத்தின் பாதை; ${கிளை} - தேர்ந்தெடுக்கப்பட்ட கிளை; ${பாகொவ} - தேர்ந்தெடுக்கப்பட்ட உறுதிமொழிடியின் பாகொவ - இயக்கக்கூடிய கோப்பு: - பெயர்: - நோக்கம்: - கிளை - உறுதிமொழி - களஞ்சியம் - செயல்பாட்டிலிருந்து வெளியேற காத்திரு - மின்னஞ்சல் முகவரி - மின்னஞ்சல் முகவரி - அறிவிலி - தொலைகளை தானாக எடு - நிமையங்கள் - இயல்புநிலை தொலை - சிக்கல் கண்காணி - மாதிரி அசூர் வளர்பணிகள் விதியைச் சேர் - மாதிரி அறிவிலிஈ சிக்கலுக்கான விதியைச் சேர் - மாதிரி அறிவிலிஈ இழு கோரிக்கை விதியைச் சேர் - மாதிரி அறிவிலிமையம் விதியைச் சேர் - மாதிரி அறிவிலிஆய்வு சிக்கலுக்கான விதியைச் சேர் - மாதிரி அறிவிலிஆய்வு இணைப்பு கோரிக்கை விதியைச் சேர் - மாதிரி சீரா விதியைச் சேர் - புதிய விதி - வழக்கவெளி வெளிப்பாடு வெளியீடு: - விதியின் பெயர்: - முடிவு முகவரி: - வழக்கவெளி குழுக்கள் மதிப்புகளை அணுக $1, $2 ஐப் பயன்படுத்து - செநு - விருப்பமான சேவை: - 'விருப்பமான சேவை' அமைக்கப்பட்டிருந்தால், மூலஅறிவிலி இந்த களஞ்சியத்தில் மட்டுமே அதைப் பயன்படுத்தும். இல்லையெனில், ஒன்றுக்கு மேற்பட்ட சேவைகள் இருந்தால், அவற்றில் ஒன்றைத் தேர்ந்தெடுப்பதற்கான சூழல் பட்டயல் காண்பிக்கப்படும். - உஉபநெ பதிலாள் - இந்த களஞ்சியத்தால் பயன்படுத்தப்படும் உஉபநெ பதிலாள் - பயனர் பெயர் - இந்த களஞ்சியத்திற்கான பயனர் பெயர் - பணியிடங்கள் - நிறம் - பெயர் - தாவல்களை மீட்டமை - வழக்கமான உறுதிமொழி உதவியாளர் - உடைக்கும் மாற்றம்: - மூடப்பட்ட வெளியீடு சிக்கல்: - மாற்ற விவரங்கள்: - நோக்கம்: - குறுகிய விளக்கம்: - மாற்ற வகை: - நகல் - அனைத்து உரையையும் நகலெடு - முழு பாதையை நகலெடு - நகல் பாதை - கிளையை உருவாக்கு... - இதன் அடிப்படையில்: - உருவாக்கப்பட்ட கிளையைப் சரிபார் - உள்ளக மாற்றங்கள்: - நிராகரி - பதுக்கிவை & மீண்டும் இடு - புதிய கிளை பெயர்: - கிளை பெயரை உள்ளிடவும். - இடைவெளிகள் கோடுகளால் மாற்றப்படும். - உள்ளக கிளையை உருவாக்கு - குறிச்சொல்லை உருவாக்கு... - இங்கு புதிய குறிச்சொல்: - சீபிசீ கையொப்பமிடுதல் - குறிச்சொல் செய்தி: - விருப்பத்தேர்வு. - குறிச்சொல் பெயர்: - பரிந்துரைக்கப்பட்ட வடிவம்: ப1.0.0-ஆனா - உருவாக்கப்பட்ட பிறகு அனைத்து தொலைகளுக்கும் தள்ளு - புதிய குறிசொல் உருவாக்கு - வகை: - annotated - குறைந்தஎடை - நேரடியாகத் தொடங்க கட்டுப்பாட்டை அழுத்திப் பிடி - வெட்டு - கிளையை நீக்கு - கிளை: - நீங்கள் ஒரு தொலை கிளையை நீக்கப் போகிறீர்கள்!!! - தொலை ${0}$ கிளையையும் நீக்கு - பல கிளைகளை நீக்கு - நீங்கள் ஒரே நேரத்தில் பல கிளைகளை நீக்க முயற்சிக்கிறீர்கள் நடவடிக்கை எடுப்பதற்கு முன் மீண்டும் சரிபார்! - தொலையை நீக்கு - தொலை: - பாதை: - இலக்கு: - எல்லா குழந்தைகளும் பட்டியலிலிருந்து நீக்கப்படுவார்கள். - இது பட்டியலிலிருந்து மட்டுமே அகற்றும், வட்டிலிருந்து அல்ல! - குழுவை நீக்குவதை உறுதிப்படுத்து - களஞ்சியத்தை நீக்குவதை உறுதிப்படுத்து - துணைத்தொகுதியை நீக்கு - துணைத்தொகுதி பாதை: - குறிச்சொல்லை நீக்கு - குறிசொல்: - தொலை களஞ்சியங்களிலிருந்து நீக்கு - இருமம் வேறுபாடு - புதிய - பழைய - நகல் - கோப்பு முறை மாற்றப்பட்டது - முதல் வேறுபாடு - வெள்ளைவெளி மாற்றத்தை புறக்கணி - கடைசி வேறுபாடு - பெகோஅ பொருள் மாற்றம் - அடுத்த வேறுபாடு - மாற்றங்கள் இல்லை அல்லது வரிமுடிவு மாற்றங்கள் மட்டும் - முந்தைய வேறுபாடு - ஒட்டாகச் சேமி - மறைக்கப்பட்ட சின்னங்களைக் காட்டு - பக்கவாட்டு வேறுபாடு - துணைத் தொகுதி - புதிய - இடமாற்று - தொடரியல் சிறப்பம்சமாக்கல் - வரி சொல் மடக்கு - தடுப்பு-வழிசெலுத்தலை இயக்கு - ஒன்றிணை கருவியில் திற - அனைத்து வரிகளையும் காட்டு - தெரியும் வரிகளின் எண்ணிக்கையைக் குறை - தெரியும் வரிகளின் எண்ணிக்கையை அதிகரி - மாற்றங்களைக் காண கோப்பைத் தேர்ந்தெடு - ஒன்றிணை கருவியில் திற - மாற்றங்களை நிராகரி - செயல்படும் நகலில் உள்ள அனைத்து உள்ளக மாற்றங்கள். - மாற்றங்கள்: - புறக்கணிக்கப்பட்ட கோப்புகளைச் சேர் - {0} மாற்றங்கள் நிராகரிக்கப்படும் - இந்தச் செயலை நீங்கள் செயல்தவிர்க்க முடியாது!!! - புத்தகக்குறி: - புதிய பெயர்: - இலக்கு: - தேர்ந்தெடுக்கப்பட்ட குழுவைத் திருத்து - தேர்ந்தெடுக்கப்பட்ட களஞ்சியத்தைத் திருத்து - தனிப்பயன் செயலை இயக்கு - செயல் பெயர்: - பெறு - எல்லா தொலைகளையும் பெறு - உள்ளக குறிப்புகளை கட்டாயமாக மீறு - குறிச்சொற்கள் இல்லாமல் பெறு - தொலை: - தொலை மாற்றங்களைப் பெறு - மாறாமல் என கருது - நிராகரி... - {0} கோப்புகளை நிராகரி... - தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை நிராகரி - வெளிப்புற இணைப்பு கருவியைத் திற - ${0}$ஐப் பயன்படுத்தி தீர் - ஒட்டு என சேமி... - நிலைபடுத்து - {0} fகோப்புகள் நிலைபடுத்து - தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை நிலைபடுத்து - பதுக்கிவை... - {0} கோப்புகள் பதுக்கிவை... - நிலைநீக்கு - நிலைநீக்கு {0} கோப்புகள் - தேர்ந்தெடுக்கப்பட்ட வரிகளில் மாற்றங்களை நிலைநீக்கு - என்னுடையதைப் பயன்படுத்து (சரிபார் --நமது) - அவர்களுடையதைப் பயன்படுத்து (சரிபார் --அவர்களது) - கோப்பு வரலாறு - மாற்றம் - உள்ளடக்கம் - அறிவிலி-ஓட்டம் - மேம்பாட்டு கிளை: - நற்பொருத்தம்: - நற்பொருத்தம் முன்னொட்டு: - ஓட்டம் - நற்பொருத்தம் முடி - ஓட்டம் - சூடானதிருத்தம் முடி - ஓட்டம் - வெளியீட்டை முடி - இலக்கு: - சூடானதிருத்தம்: - சூடானதிருத்தம் முன்னொட்டு: - அறிவிலி-ஓட்டம் துவக்கு - கிளையை வைத்திரு - உற்பத்தி கிளை: - வெளியீடு: - வெளியீடு முன்னொட்டு: - நற்பொருத்தம் தொடங்கு... - ஓட்டம் - நற்பொருத்தம் தொடங்கு - சூடானதிருத்தம் தொடங்கு... - ஓட்டம் - சூடானதிருத்தம் தொடங்கு - பெயரை உள்ளிடு - வெளியீட்டைத் தொடங்கு... - ஓட்டம் - வெளியீட்டைத் தொடங்கு - பதிப்பு குறிச்சொல் முன்னொட்டு: - அறிவிலி பெகோஅ - அறிவிலி கண்காணி வடிவத்தைச் சேர்... - வடிவம் என்பது கோப்பு பெயர் - தனிப்பயன் வடிவம்: - அறிவிலி பெகோஅ இல் கண்காணி வடிவங்களைச் சேர் - பெறு - அறிவிலி பெகோஅ பொருள்களைப் பதிவிறக்க `அறிவிலி பெகோஅ பெறு` ஐ இயக்கவும் இது செயல்படும் நகலை புதுப்பிக்காது. - அறிவிலி பெகோஅ பொருள்களைப் பெறு - அறிவிலி பெகோஅ கொக்கிகளை நிறுவு - பூட்டுகளைக் காட்டு - பூட்டப்பட்ட கோப்புகள் இல்லை - பூட்டு - எனது பூட்டுகளை மட்டும் காட்டு - பெகோஅ பூட்டுகள் - திற - கட்டாயம் திற - கத்தரி - உள்ளக சேமிப்பகத்திலிருந்து பழைய பெகோஅ கோப்புகளை நீக்க `அறிவிலி பெகோஅ கத்தரி` ஐ இயக்கு - இழு - தற்போதைய குறிக்கு அனைத்து அறிவிலி பெகோஅ கோப்புகளையும் பதிவிறக்கி சரிபார்க்க `அறிவிலி பெகோஅ இழு`ஐ இயக்கு - பெகோஅ பொருள்களை இழு - தள்ளு - வரிசைப்படுத்தப்பட்ட பெரிய கோப்புகளை அறிவிலி பெகோஅ முடிவுபுள்ளிக்கு தள்ளு - பெகோஅ பொருள்கள் தள்ளு - தொலை: - '{0}' என பெயரிடப்பட்ட கோப்புகளைக் கண்காணி - அனைத்து *{0} கோப்புகளையும் கண்காணி - வரலாறு - ஆசிரியர் - ஆசிரியர் நேரம் - வரைபடம் & பொருள் - பாகொவ - உறுதிமொழி நேரம் - தேர்ந்தெடுக்கப்பட்ட {0} உறுதிமொழிகள் - பல உறுதிமொழிகளைத் தேர்ந்தெடுக்க 'கட்டுப்பாடு' அல்லது 'உயர்த்து'ஐ அழுத்திப் பிடி. - பல உறுதிமொழிகளைத் தேர்ந்தெடுக்க ⌘ அல்லது ⇧ ஐ அழுத்திப் பிடி. - குறிப்புகள்: - விசைப்பலகை குறுக்குவழிகள் குறிப்பு - உலகளாவிய - தற்போதைய மேல்தோன்றலை Cancel - புதிய களஞ்சியத்தை நகலி செய் - தற்போதைய பக்கத்தை மூடு - அடுத்த பக்கத்திற்குச் செல் - முந்தைய பக்கத்திற்குச் செல் - புதிய பக்கத்தை உருவாக்கு - விருப்பத்தேர்வுகள் உரையாடலைத் திற - களஞ்சியம் - நிலைபடுத்திய மாற்றங்களை உறுதிமொழி - நிலைபடுத்திய மாற்றங்களை உறுதிமொழி மற்றும் தள்ளு - அனைத்து மாற்றங்களையும் நிலைபடுத்தி உறுதிமொழி - தேர்ந்தெடுக்கப்பட்ட உறுதிமொழியின் அடிப்படையில் ஒரு புதிய கிளையை உருவாக்குகிறது - தேர்ந்தெடுக்கப்பட்ட மாற்றங்களை நிராகரி - எடு, நேரடியாகத் தொடங்குகிறது - முகப்பலகை பயன்முறை (இயல்புநிலை) - உறுதிமொழி தேடல் பயன்முறை - இழு, நேரடியாகத் தொடங்குகிறது - தள்ளு, நேரடியாகத் தொடங்குகிறது - இந்த களஞ்சியத்தை மீண்டும் ஏற்ற கட்டாயப்படுத்து - தேர்ந்தெடுக்கப்பட்ட மாற்றங்களை நிலைபடுத்து/நிலைநீக்கு - 'மாற்றங்கள்' என்பதற்கு மாறு - 'வரலாறுகள்' என்பதற்கு மாறு - 'பதுகிவைத்தவை' என்பதற்கு மாறு - உரை திருத்தி - தேடல் பலகத்தை மூடு - அடுத்த பொருத்தத்தைக் கண்டறி - முந்தைய பொருத்தத்தைக் கண்டறி - தேடல் பலகத்தைத் திற - நிராகரி - நிலைபடுத்து - நிலைநீக்கு - களஞ்சியத்தைத் துவக்கு - பாதை: - கனி-பறி செயல்பாட்டில் உள்ளது. - உறுதிமொழி செயலாக்குதல் - இணைத்தல் செயல்பாட்டில் உள்ளது. - இணைத்தல் - மறுதளம் செயல்பாட்டில் உள்ளது - இல் நிறுத்தப்பட்டது - திரும்ப்பெறும் செயல்பாட்டில் உள்ளது. - திரும்பபெறும் உறுதிமொழி - ஊடாடும் மறுதளம் - மேல்: - இலக்கு கிளை: - இணைப்பை நகலெடு - உலாவியில் திற - பிழை - அறிவிப்பு - கிளையை ஒன்றிணை - Into: - இணைப்பு விருப்பம்: - இதனுள்: - ஒன்றிணை (பல) - அனைத்து மாற்றங்களையும் உறுதிமொழி - சூழ்ச்சிமுறை: - இலக்குகள்: - களஞ்சிய முனையை நகர்த்து - இதற்கான பெற்றோர் முனையைத் தேர்ந்தெடு - பெயர்: - அறிவிலி உள்ளமைக்கப்படவில்லை. [விருப்பத்தேர்வுகள்]க்குச் சென்று முதலில் அதை உள்ளமை. - தரவு சேமிப்பக கோப்பகத்தைத் திற - இதனுடன் திற... - விருப்பத்தேர்வு. - புதிய பக்கத்தை உருவாக்கு - புத்தகக்குறி - மூடு தாவல் - பிற தாவல்களை மூடு - வலதுபுறத்தில் உள்ள தாவல்களை மூடு - களஞ்சிய பாதை நகலெடு - களஞ்சியங்கள் - ஒட்டு - {0} நாட்களுக்கு முன்பு - 1 மணி நேரத்திற்கு முன்பு - {0} மணி நேரத்திற்கு முன்பு - சற்றுமுன் - கடந்த திங்கள் - கடந்த ஆண்டு - {0} நிமையங்களுக்கு முன்பு - {0} திங்களுக்கு முன்பு - {0} ஆண்டுகளுக்கு முன்பு - நேற்று - விருப்பத்தேர்வுகள் - செநு - வேறுபாடு உடனடியாக பகுப்பாய்வு செய் - பநிஇ திறவுகோல் - பொருள் உடனடியாக உருவாக்கு - மாதிரி - பெயர் - சேவையகம் - ஓடையை இயக்கு - தோற்றம் - இயல்புநிலை எழுத்துரு - திருத்தி தாவல் அகலம் - எழுத்துரு அளவு - இயல்புநிலை - திருத்தி - ஒற்றைவெளி எழுத்துரு - ஒற்றைவெளி எழுத்துருவை உரை திருத்தியில் மட்டும் பயன்படுத்து - கருப்பொருள் - கருப்பொருள் மேலெழுதப்படுகிறது - தலைப்புப்பட்டியில் நிலையான தாவல் அகலத்தைப் பயன்படுத்து - சொந்த சாளர சட்டத்தைப் பயன்படுத்து - வேறு/ஒன்றிணை கருவி - நிறுவல் பாதை - வேறு/ஒன்றிணை கருவிக்கான பாதை உள்ளிடு - கருவி - பொது - தொடக்கத்தில் புதுப்பிப்புகளைச் சரிபார் - தேதி வடிவம் - மொழி - வரலாற்று உறுதிமொழிகள் - வரைபடத்தில் உறுதிமொழி நேரத்திற்குப் பதிலாக ஆசிரியர் நேரத்தைக் காட்டு - உறுதிமொழி விவரங்களில் குழந்தைகளைக் காட்டு - உறுதிமொழி வரைபடத்தில் குறிச்சொற்களைக் காட்டு - பொருள் வழிகாட்டி நீளம் - அறிவிலி - தானியங்கி வரிமுடிவை இயக்கு - இயல்புநிலை நகலி அடைவு - பயனர் மின்னஞ்சல் - உலகளாவிய அறிவிலி பயனர் மின்னஞ்சல் - --prune எடுக்கும்போது இயக்கு - அறிவிலி (>= 2.25.1) இந்த பயன்பாட்டிற்கு தேவைப்படுகிறது - நிறுவல் பாதை - உஉபநெ பாகுஅ சரிபார்ப்பை இயக்கு - பயனர் பெயர் - உலகளாவிய அறிவிலி பயனர் பெயர் - அறிவிலி பதிப்பு - சிபிசி கையொப்பமிடுதல் - சிபிசி கையொப்பமிடுதல் உறுதிமொழி - சிபிசி வடிவம் - நிரல் நிறுவல் பாதை - நிறுவப்பட்ட சிபிசி நிரலுக்கான உள்ளீட்டு பாதை - சிபிசி கையொப்பமிடுதலை குறிச்சொலிடு - பயனர் கையொப்பமிடும் திறவுகோல் - பயனரின் கையொப்பமிடும் திறவுகோல் - ஒருங்கிணைப்பு - ஓடு/முனையம் - பாதை - ஓடு/முனையம் - தொலை கத்தரி - இலக்கு: - பணிமரங்கள் கத்தரி - `$GIT_COMMON_DIR/பணிமரங்கள்` இதில் பணிமரம் தகவலை கத்தரி - இழு - தொலை கிளை: - இதனுள்: - உள்ளக மாற்றங்கள்: - நிராகரி - பதுக்கிவை & மீண்டும் இடு - தொலை: - இழு (எடுத்து ஒன்றிணை) - ஒன்றிணை என்பதற்குப் பதிலாக மறுதளத்தைப் பயன்படுத்து - தள்ளு - துணைத் தொகுதிகள் தள்ளப்பட்டது என்பதை உறுதிசெய் - கட்டாயமாக தள்ளு - உள்ளக கிளை: - தொலை: - மாற்றங்களை தொலைக்கு தள்ளு - தொலை கிளை: - கண்காணிப்பு கிளையாக அமை - அனைத்து குறிச்சொற்களையும் தள்ளு - தொலைக்கு குறிச்சொல்லை தள்ளு - அனைத்து தொலைகளுக்கும் தள்ளு - தொலை: - குறிச்சொல்: - வெளியேறு - தற்போதைய கிளையை மறுதளம் செய் - உள்ளக மாற்றங்களை பதுக்கிவை & மீண்டும் இடு - மேல்: - மறுதளம்: - தொலையைச் சேர் - தொலையைத் திருத்து - பெயர்: - களஞ்சிய பெயர் - களஞ்சிய முகவரி: - தொலை அறிவிலி களஞ்சிய முகவரி: - முகவரியை நகலெடு - நீக்கு... - திருத்து... - பெறு - உலாவியில் திற - கத்தரித்தல் - பணிமரத்தை அகற்றுவதை உறுதிப்படுத்து - `--கட்டாயம்` விருப்பத்தை இயக்கு - இலக்கு: - கிளையை மறுபெயரிடு - புதிய பெயர்: - இந்தக் கிளைக்கான தனித்துவமான பெயர் - கிளை: - நிறுத்து - தொலைகளிலிருந்து மாற்றங்களைத் தானாகப் பெறுதல்... - சுத்தப்படுத்தல்(சீசி & கத்தரித்தல்) - இந்த களஞ்சியத்திற்கு `அறிவிலி சீசி` கட்டளையை இயக்கு. - அனைத்தையும் அழி - இந்த களஞ்சியத்தை உள்ளமை - தொடர்க - தனிப்பயன் செயல்கள் - தனிப்பயன் செயல்கள் இல்லை - எல்லா மாற்றங்களையும் நிராகரி - '--குறிபதிவு' விருப்பத்தை இயக்கு - கோப்பு உலாவியில் திற - கிளைகள்/குறிச்சொற்கள்/துணைத் தொகுதிகளைத் தேடு - வரைபடத்தில் தெரிவுநிலை - அமைவை நீக்கு - உறுதிமொழி வரைபடத்தில் மறை - உறுதிமொழி வரைபடத்தில் வடிகட்டு - '--first-parent' விருப்பம் இயக்கு - தளவமைப்பு - கிடைமட்டம் - செங்குத்து - உறுதிமொழி வரிசை - உறுதிமொழி தேதி - இடவியல் மூலமாக - உள்ளக கிளைகள் - தலைக்கு செல் - கிளையை உருவாக்கு - அறிவிப்புகளை அழி - வரைபடத்தில் தற்போதைய கிளையை மட்டும் முன்னிலை படுத்து - {0} இல் திற - வெளிப்புற கருவிகளில் திற - புதுப்பி - தொலைகள் - தொலையைச் சேர் - உறுதிமொழி தேடு - ஆசிரியர் - உறுதிமொழியாளர் - கோப்பு - செய்தி - பாகொவ - தற்போதைய கிளை - குறிச்சொற்களை மரமாகக் காட்டு - தவிர் - புள்ளிவிவரங்கள் - துணைத் தொகுதிகள் - துணைத் தொகுதியைச் சேர் - துணைத் தொகுதியைப் புதுப்பி - குறிசொற்கள் - புதிய குறிசொல் - படைப்பாளர் தேதியின்படி - பெயர் மூலம் - வரிசைப்படுத்து - முனையத்தில் திற - வரலாறுகளில் உறவு நேரத்தைப் பயன்படுத்து - பணிமரங்கள் - பணிமரத்தைச் சேர் - கத்தரித்தல் - அறிவிலி களஞ்சிய முகவரி - தற்போதைய கிளையை திருத்தத்திற்கு மீட்டமை - மீட்டமை பயன்முறை: - இதற்கு நகர்த்து: - தற்போதைய கிளை: - கோப்பு உலாவியில் வெளிப்படுத்து - பின்வாங்கு உறுதிமொழி - உறுதிமொழி: - பின்வாங்கு மாற்றங்களை உறுதிமொழி - மாறுசொல் உறுதிமொழி செய்தி - புதிய வரியை உள்ளிட 'உயர்த்து+நுழை' ஐப் பயன்படுத்தவும். 'நுழை' என்பது சரி பொத்தானின் சூடானவிசை ஆகும் - இயங்குகிறது. காத்திருக்கவும்... - சேமி - எனச் சேமி... - ஒட்டு வெற்றிகரமாக சேமிக்கப்பட்டது! - களஞ்சியங்களை வருடு - வேர் அடைவு: - புதுப்பிப்புகளைச் சரிபார்... - இந்த மென்பொருளின் புதிய பதிப்பு கிடைக்கிறது: - புதுப்பிப்புகளைச் சரிபார்க்க முடியவில்லை! - பதிவிறக்கம் - இந்தப் பதிப்பைத் தவிர் - மென்பொருள் புதுப்பி - தற்போது புதுப்பிப்புகள் எதுவும் கிடைக்கவில்லை. - கண்காணிப்பு கிளையை அமை - கிளை: - மேல்ஓடையை நீக்கு - மேல்ஓடை: - SHA ஐ நகலெடு - இதற்கு செல் - நொறுக்கு உறுதிமொழிகள் - இதில்: - பாஓடு தனியார் திறவுகோல்: - தனியார் பாஓடு திறவுகோல் கடை பாதை - தொடங்கு - பதுக்கிவை - பதுக்கிவைத்த பிறகு தானியங்கி மீட்டமை - உங்கள் செயல்படும் கோப்புகள் மாறாமல் இருக்கும், ஆனால் ஒரு பதுக்கிவைக்கப்படும். - கண்காணிக்கப்படாத கோப்புகளைச் சேர் - நிலைப்படுத்தப்பட்ட கோப்புகளை வைத்திரு - செய்தி: - விருப்பத்தேர்வு. இந்த பதுக்கலின் பெயர் - நிலைப்படுத்தப்பட்ட மாற்றங்கள் மட்டும் - தேர்ந்தெடுக்கப்பட்ட கோப்புகளின் நிலைப்படுத்தப்பட்ட மற்றும் நிலைப்படுத்தப்படாத மாற்றங்கள் இரண்டும் பதுக்கிவைக்கப்படும்!!! - உள்ளக மாற்றங்களை பதுக்கிவை - இடு - கைவிடு - ஒட்டாகச் சேமி... - பதுக்கிவைத்தவை கைவிடு - கைவிடு: - பதுக்கிவைத்தவைகள் - மாற்றங்கள் - பதுக்கிவைத்தவைகள் - புள்ளிவிவரங்கள் - உறுதிமொழிகள் - உறுதிமொழியாளர் - மேலோட்டப் பார்வை - திங்கள் - வாரம் - ஆசிரியர்கள்: - உறுதிமொழிகள்: - துணைத் தொகுதி - துணைத் தொகுதியைச் சேர் - உறவு பாதையை நகலெடு - உள்ளமைக்கப்பட்ட துணைத் தொகுதிகளை எடு - துணைத் தொகுதி களஞ்சியத்தைத் திற - உறவு பாதை: - இந்த தொகுதியை சேமிப்பதற்கான தொடர்புடைய கோப்புறை. - துணை தொகுதியை நீக்கு - சரி - குறிச்சொல் பெயரை நகலெடு - குறிச்சொல் செய்தியை நகலெடு - நீக்கு ${0}$... - ${0}$ இதை ${1}$ இல் இணை... - தள்ளு ${0}$... - துணைத்தொகுதிகளைப் புதுப்பி - அனைத்து துணைத்தொகுதிகள் - தேவைக்கேற்றப துவக்கு - சுழற்சி முறையில் - --தொலை விருப்பத்தைப் பயன்படுத்து - முகவரி: - முன்னறிவிப்பு - வரவேற்பு பக்கம் - குழுவை உருவாக்கு - துணைக் குழுவை உருவாக்கு - நகலி களஞ்சியம் - நீக்கு - கோப்புறையை இழுத்து & விடு ஆதரிக்கப்படுகிறது. தனிப்பயன் குழுவாக்க ஆதரவு. - திருத்து - வேறொரு குழுவிற்கு நகர்த்து - அனைத்து களஞ்சியங்களையும் திற - களஞ்சியத்தைத் திற - முனையத்தைத் திற - இயல்புநிலை நகலி அடைவில் களஞ்சியங்களை மீண்டும் வருடு - களஞ்சியங்களைத் தேடு... - வரிசைப்படுத்து - உள்ளக மாற்றங்கள் - அறிவிலி புறக்கணி - எல்லா *{0} கோப்புகளையும் புறக்கணி - ஒரே கோப்புறையில் *{0} கோப்புகளைப் புறக்கணி - ஒரே கோப்புறையில் கோப்புகளைப் புறக்கணி - இந்த கோப்பை மட்டும் புறக்கணி - பின்னொட்டு - இந்த கோப்பை இப்போது நீங்கள் நிலைப்படுத்தலாம். - உறுதிமொழி - உறுதிமொழி & தள்ளு - வளர்புரு/வரலாறுகள் - சொடுக்கு நிகழ்வைத் தூண்டு - உறுதிமொழி (திருத்து) - அனைத்து மாற்றங்களையும் நிலைப்படுத்தி உறுதிமொழி - நீங்கள் {0} கோப்புகளை நிலைப்படுத்தியுள்ளீர்கள், ஆனால் {1} கோப்புகள் மட்டுமே காட்டப்பட்டுள்ளன ({2} கோப்புகள் வடிகட்டப்பட்டுள்ளன). தொடர விரும்புகிறீர்களா? - மோதல்கள் கண்டறியப்பட்டது - கோப்பு மோதல்கள் தீர்க்கப்பட்டது - கண்காணிக்கப்படாத கோப்புகளைச் சேர் - அண்மைக் கால உள்ளீட்டு செய்திகள் இல்லை - உறுதிமொழி வளர்புருகள் இல்லை - தேர்ந்தெடுக்கப்பட்ட கோப்பு(களை) வலது சொடுக்கு செய்து, முரண்பாடுகளைத் தீர்க்க உங்கள் விருப்பத்தைத் தேர்ந்தெடு. - கையெழுத்திடு - நிலைபடுத்தியது - நிலைநீக்கு - அனைத்தும் நிலைநீக்கு - நிலைநீக்கு - நிலைபடுத்து - அனைத்தும் நிலைபடுத்து - மாறாதது எனநினைப்பதை பார் - வளர்புரு: ${0}$ - பணியிடம்: - பணியிடங்களை உள்ளமை... - பணிமரம் - பாதையை நகலெடு - பூட்டு - நீக்கு - திற - diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml deleted file mode 100644 index 096b4398..00000000 --- a/src/Resources/Locales/uk_UA.axaml +++ /dev/null @@ -1,754 +0,0 @@ - - - - - - Про програму - Про SourceGit - Безкоштовний Git GUI клієнт з відкритим кодом - Додати робоче дерево - Розташування: - Шлях для цього робочого дерева. Відносний шлях підтримується. - Назва гілки: - Необов'язково. За замовчуванням — назва кінцевої папки. - Відстежувати гілку: - Відстежувати віддалену гілку - Що перемкнути: - Створити нову гілку - Наявна гілка - AI Асистент - ПЕРЕГЕНЕРУВАТИ - Використати AI для генерації повідомлення коміту - ЗАСТОСУВАТИ ЯК ПОВІДОМЛЕННЯ КОМІТУ - Застосувати - Файл патчу: - Виберіть файл .patch для застосування - Ігнорувати зміни пробілів - Застосувати Патч - Пробіли: - Застосувати схованку - Видалити після застосування - Відновити зміни індексу - Схованка: - Архівувати... - Зберегти архів у: - Виберіть шлях до файлу архіву - Ревізія: - Архівувати - SourceGit Askpass - ФАЙЛИ, ЩО ВВАЖАЮТЬСЯ НЕЗМІНЕНИМИ - НЕМАЄ ФАЙЛІВ, ЩО ВВАЖАЮТЬСЯ НЕЗМІНЕНИМИ - ВИДАЛИТИ - Оновити - БІНАРНИЙ ФАЙЛ НЕ ПІДТРИМУЄТЬСЯ!!! - Автор рядка - ПОШУК АВТОРА РЯДКА ДЛЯ ЦЬОГО ФАЙЛУ НЕ ПІДТРИМУЄТЬСЯ!!! - Перейти на ${0}$... - Порівняти з ${0}$ - Порівняти з робочим деревом - Копіювати назву гілки - Спеціальна дія - Видалити ${0}$... - Видалити вибрані {0} гілок - Перемотати до ${0}$ - Отримати ${0}$ в ${1}$... - Git Flow - Завершити ${0}$ - Злиття ${0}$ в ${1}$... - Злити вибрані {0} гілок в поточну - Витягти ${0}$ - Витягти ${0}$ в ${1}$... - Надіслати ${0}$ - Перебазувати ${0}$ на ${1}$... - Перейменувати ${0}$... - Встановити відстежувану гілку... - Порівняти гілки - Недійсний upstream! - Байтів - СКАСУВАТИ - Скинути до батьківської ревізії - Скинути до цієї ревізії - Згенерувати повідомлення коміту - ЗМІНИТИ РЕЖИМ ВІДОБРАЖЕННЯ - Показати як список файлів та тек - Показати як список шляхів - Показати як дерево файлової системи - Перейти на гілку - Перейти на коміт - Коміт: - Попередження: Перехід на коміт призведе до стану "від'єднаний HEAD" - Локальні зміни: - Скасувати - Сховати та Застосувати - Гілка: - Cherry-pick - Додати джерело до повідомлення коміту - Коміт(и): - Закомітити всі зміни - Батьківський коміт: - Зазвичай неможливо cherry-pick злиття, бо невідомо, яку сторону злиття вважати батьківською (mainline). Ця опція дозволяє відтворити зміни відносно вказаного батьківського коміту. - Очистити схованки - Ви намагаєтеся очистити всі схованки. Ви впевнені? - Клонувати віддалене сховище - Додаткові параметри: - Додаткові аргументи для клонування сховища. Необов'язково. - Локальна назва: - Назва сховища. Необов'язково. - Батьківська тека: - Ініціалізувати та оновити підмодулі - URL сховища: - ЗАКРИТИ - Редактор - Перейти на коміт - Cherry-pick коміт - Cherry-pick ... - Порівняти з HEAD - Порівняти з робочим деревом - Iнформацію - SHA - Спеціальна дія - Інтерактивно перебазувати ${0}$ сюди - Злиття в ${0}$ - Злити ... - Перебазувати ${0}$ сюди - Скинути ${0}$ сюди - Скасувати коміт - Змінити повідомлення - Зберегти як патч... - Склеїти з батьківським комітом - Склеїти дочірні коміти сюди - ЗМІНИ - Пошук змін... - ФАЙЛИ - LFS Файл - Пошук файлів... - Підмодуль - ІНФОРМАЦІЯ - АВТОР - ЗМІНЕНО - ДОЧІРНІ - КОМІТЕР - Перевірити посилання, що містять цей коміт - КОМІТ МІСТИТЬСЯ В - Показано лише перші 100 змін. Дивіться всі зміни на вкладці ЗМІНИ. - ПОВІДОМЛЕННЯ - БАТЬКІВСЬКІ - ПОСИЛАННЯ (Refs) - SHA - Відкрити в браузері - Опис - Введіть тему коміту - Налаштування сховища - ШАБЛОН КОМІТУ - Зміст шаблону: - Назва шаблону: - СПЕЦІАЛЬНА ДІЯ - Аргументи: - ${REPO} - Шлях до сховища; ${BRANCH} - Вибрана гілка; ${SHA} - SHA вибраного коміту - Виконуваний файл: - Назва: - Область застосування: - Гілка - Коміт - Репозиторій - Чекати завершення дії - Адреса Email - Адреса електронної пошти - GIT - Автоматично отримувати зміни з віддалених сховищ - хвилин(и) - Віддалене сховище за замовчуванням - Бажаний режим злиття - ТРЕКЕР ЗАВДАНЬ - Додати приклад правила для Azure DevOps - Додати приклад правила для Gitee Issue - Додати приклад правила для Gitee Pull Request - Додати приклад правила для Github - Додати приклад правила для GitLab Issue - Додати приклад правила для GitLab Merge Request - Додати приклад правила для Jira - Нове правило - Регулярний вираз для завдання: - Назва правила: - URL результату: - Використовуйте $1, $2 для доступу до значень груп регулярного виразу. - AI - Бажаний сервіс: - Якщо 'Бажаний сервіс' встановлено, SourceGit буде використовувати лише його у цьому сховищі. Інакше, якщо доступно більше одного сервісу, буде показано контекстне меню для вибору. - HTTP Проксі - HTTP проксі, що використовується цим сховищем - Ім'я користувача - Ім'я користувача для цього сховища - Робочі простори - Колір - Відновлювати вкладки при запуску - ПРОДОВЖИТИ - Виявлено порожній коміт! Продовжити (--allow-empty)? - ІНДЕКСУВАТИ ВСЕ ТА ЗАКОМІТИТИ - Виявлено порожній коміт! Продовжити (--allow-empty) чи індексувати все та закомітити? - Допомога Conventional Commit - Зворотньо несумісні зміни: - Закрите завдання: - Детальні зміни: - Область застосування: - Короткий опис: - Тип зміни: - Копіювати - Копіювати весь текст - Копіювати повний шлях - Копіювати шлях - Створити гілку... - На основі: - Перейти на створену гілку - Локальні зміни: - Скасувати - Сховати та Застосувати - Назва нової гілки: - Введіть назву гілки. - Пробіли будуть замінені на тире. - Створити локальну гілку - Створити тег... - Новий тег для: - Підпис GPG - Повідомлення тегу: - Необов'язково. - Назва тегу: - Рекомендований формат: v1.0.0-alpha - Надіслати на всі віддалені сховища після створення - Створити Новий Тег - Тип: - анотований - легкий - Утримуйте Ctrl для запуску без діалогу - Вирізати - Видалити гілку - Гілка: - Ви збираєтеся видалити віддалену гілку!!! - Також видалити віддалену гілку ${0}$ - Видалити кілька гілок - Ви намагаєтеся видалити кілька гілок одночасно. Перевірте ще раз перед виконанням! - Видалити віддалене сховище - Віддалене сховище: - Шлях: - Ціль: - Усі дочірні елементи будуть видалені зі списку. - Це видалить сховище лише зі списку, а не з диска! - Підтвердити видалення групи - Підтвердити видалення сховища - Видалити підмодуль - Шлях до підмодуля: - Видалити тег - Тег: - Видалити з віддалених сховищ - РІЗНИЦЯ ДЛЯ БІНАРНИХ ФАЙЛІВ - НОВИЙ - СТАРИЙ - Копіювати - Змінено режим файлу - Перша відмінність - Ігнорувати зміни пробілів - Остання відмінність - ЗМІНА ОБ'ЄКТА LFS - Наступна відмінність - НЕМАЄ ЗМІН АБО ЛИШЕ ЗМІНИ КІНЦЯ РЯДКА - Попередня відмінність - Зберегти як патч - Показати приховані символи - Порівняння пліч-о-пліч - ПІДМОДУЛЬ - НОВИЙ - Поміняти місцями - Підсвітка синтаксису - Перенос слів - Увімкнути навігацію блоками - Відкрити в інструменті злиття - Показати всі рядки - Зменшити кількість видимих рядків - Збільшити кількість видимих рядків - ОБЕРІТЬ ФАЙЛ ДЛЯ ПЕРЕГЛЯДУ ЗМІН - Відкрити в інструменті злиття - Скасувати зміни - Усі локальні зміни в робочій копії. - Зміни: - Включити файли, які ігноруються - {0} змін будуть відхилені - Ви не можете скасувати цю дію!!! - Закладка: - Нова назва: - Ціль: - Редагувати вибрану групу - Редагувати вибраний репозиторій - Виконати спеціальну дію - Ім'я дії: - Витягти - Витягти всі віддалені сховища - Примусово перезаписати локальні refs - Витягти без тегів - Віддалений: - Витягти зміни з віддалених репозиторіїв - Вважати незмінними - Скасувати... - Скасувати {0} файлів... - Скасувати зміни в вибраних рядках - Відкрити зовнішній інструмент злиття - Розв'язати за допомогою ${0}$ - Зберегти як патч... - Стагнути - Стагнути {0} файлів - Стагнути зміни в вибраних рядках - Схованка... - Схованка {0} файлів... - Скинути стаг - Скинути {0} файлів - Скинути зміни в вибраних рядках - Використовувати Mine (checkout --ours) - Використовувати Theirs (checkout --theirs) - Історія файлу - ЗМІНА - ЗМІСТ - Git-Flow - Розробка гілки: - Функція: - Префікс функції: - FLOW - Завершити функцію - FLOW - Завершити гарячу поправку - FLOW - Завершити реліз - Ціль: - Гаряча поправка: - Префікс гарячої поправки: - Ініціалізувати Git-Flow - Залишити гілку - Гілка виробництва: - Реліз: - Префікс релізу: - Почати функцію... - FLOW - Почати функцію - Почати гарячу поправку... - FLOW - Почати гарячу поправку - Введіть назву - Почати реліз... - FLOW - Почати реліз - Тег версії Префікс: - Git LFS - Додати шаблон для відстеження... - Шаблон є ім'ям файлу - Спеціальний шаблон: - Додати шаблон для відстеження до Git LFS - Витягти - Запустіть `git lfs fetch`, щоб завантажити об'єкти Git LFS. Це не оновлює робочу копію. - Витягти об'єкти LFS - Встановити Git LFS hooks - Показати блокування - Немає заблокованих файлів - Заблокувати - Показати лише мої блокування - LFS блокування - Розблокувати - Примусово розблокувати - Принт - Запустіть `git lfs prune`, щоб видалити старі файли з локального сховища - Витягти - Запустіть `git lfs pull`, щоб завантажити всі файли Git LFS для поточної ref & checkout - Витягти об'єкти LFS - Надіслати - Надіслати чернетки великих файлів до кінця Git LFS - Надіслати об'єкти LFS - Віддалений: - Відстежувати файли, названі '{0}' - Відстежувати всі *{0} файли - ІСТОРІЯ - АВТОР - ЧАС АВТОРА - ГРАФ ТА ТЕМА - SHA - ЧАС КОМІТУ - ВИБРАНО {0} КОМІТІВ - Утримуйте 'Ctrl' або 'Shift' для вибору кількох комітів. - Утримуйте ⌘ або ⇧ для вибору кількох комітів. - ПОРАДИ: - Гарячі клавіші - ГЛОБАЛЬНІ - Скасувати поточне спливаюче вікно - Клонувати нове сховище - Закрити поточну вкладку - Перейти до наступної вкладки - Перейти до попередньої вкладки - Створити нову вкладку - Відкрити діалог Налаштування - СХОВИЩЕ - Закомітити проіндексовані зміни - Закомітити та надіслати проіндексовані зміни - Індексувати всі зміни та закомітити - Створити нову гілку на основі вибраного коміту - Скасувати вибрані зміни - Fetch, запускається без діалогу - Режим панелі керування (за замовчуванням) - Режим пошуку комітів - Pull, запускається без діалогу - Push, запускається без діалогу - Примусово перезавантажити це сховище - Індексувати/Видалити з індексу вибрані зміни - Перейти до 'Зміни' - Перейти до 'Історія' - Перейти до 'Схованки' - ТЕКСТОВИЙ РЕДАКТОР - Закрити панель пошуку - Знайти наступний збіг - Знайти попередній збіг - Відкрити панель пошуку - Скасувати - Індексувати - Видалити з індексу - Ініціалізувати сховище - Шлях: - Cherry-pick в процесі. - Обробка коміту - Злиття в процесі. - Виконується злиття - Перебазування в процесі. - Зупинено на - Скасування в процесі. - Скасування коміту - Інтерактивне перебазування - На: - Цільова гілка: - Копіювати посилання - Відкрити в браузері - ПОМИЛКА - ПОВІДОМЛЕННЯ - Злиття гілки - В: - Опція злиття: - Джерело: - Злиття (Кілька) - Закомітити всі зміни - Стратегія: - Цілі: - Перемістити вузол сховища - Виберіть батьківський вузол для: - Назва: - Git не налаштовано. Будь ласка, перейдіть до [Налаштування] та налаштуйте його. - Відкрити теку зберігання даних - Відкрити за допомогою... - Необов'язково. - Створити нову вкладку - Закладка - Закрити вкладку - Закрити інші вкладки - Закрити вкладки праворуч - Копіювати шлях до сховища - Сховища - Вставити - {0} днів тому - годину тому - {0} годин тому - Щойно - Минулого місяця - Минулого року - {0} хвилин тому - {0} місяців тому - {0} років тому - Вчора - Налаштування - AI - Промпт для аналізу різниці - Ключ API - Промпт для генерації теми - Модель - Назва - Сервер - Увімкнути потокове відтворення - ВИГЛЯД - Шрифт за замовчуванням - Ширина табуляції в редакторі - Розмір шрифту - За замовчуванням - Редактор - Моноширинний шрифт - Використовувати моноширинний шрифт лише в текстовому редакторі - Тема - Перевизначення теми - Використовувати фіксовану ширину вкладки в заголовку - Використовувати системну рамку вікна - ІНСТРУМЕНТ DIFF/MERGE - Шлях встановлення - Введіть шлях до інструменту diff/merge - Інструмент - ЗАГАЛЬНІ - Перевіряти оновлення при запуску - Формат дати - Мова - Кількість комітів в історії - Показувати час автора замість часу коміту в графі - Показувати дочірні коміти в деталях - Показувати теги в графі комітів - Довжина лінії-орієнтира для теми - GIT - Увімкнути авто-CRLF - Тека клонування за замовчуванням - Email користувача - Глобальний email користувача git - Увімкнути --prune при fetch - Git (>= 2.25.1) є обов'язковим для цієї програми - Шлях встановлення - Увімкнути перевірку HTTP SSL - Ім'я користувача - Глобальне ім'я користувача git - Версія Git - ПІДПИС GPG - Підпис GPG для комітів - Формат GPG - Шлях встановлення програми - Введіть шлях до встановленої програми GPG - Підпис GPG для тегів - Ключ підпису користувача - Ключ підпису GPG користувача - ІНТЕГРАЦІЯ - КОНСОЛЬ/ТЕРМІНАЛ - Шлях - Консоль/Термінал - Prune для віддаленого сховища - Ціль: - Prune для робочих дерев - Видалити застарілу інформацію про робочі дерева в `$GIT_COMMON_DIR/worktrees` - Pull (Витягти) - Віддалена гілка: - В: - Локальні зміни: - Скасувати - Сховати та Застосувати - Віддалене сховище: - Pull (Fetch & Merge) - Використовувати rebase замість merge - Push (Надіслати) - Переконатися, що підмодулі надіслано - Примусовий push - Локальна гілка: - Віддалене сховище: - Надіслати зміни на віддалене сховище - Віддалена гілка: - Встановити як відстежувану гілку - Надіслати всі теги - Надіслати тег на віддалене сховище - Надіслати на всі віддалені сховища - Віддалене сховище: - Тег: - Вийти - Перебазувати поточну гілку - Сховати та застосувати локальні зміни - На: - Перебазувати: - Додати віддалене сховище - Редагувати віддалене сховище - Назва: - Назва віддаленого сховища - URL сховища: - URL віддаленого git сховища - Копіювати URL - Видалити... - Редагувати... - Fetch (Отримати) - Відкрити у браузері - Prune (Очистити) - Підтвердити видалення робочого дерева - Увімкнути опцію `--force` - Ціль: - Перейменувати гілку - Нова назва: - Унікальна назва для цієї гілки - Гілка: - ПЕРЕРВАТИ - Автоматичне отримання змін з віддалених сховищ... - Очистка (GC & Prune) - Виконати команду `git gc` для цього сховища. - Очистити все - Налаштувати це сховище - ПРОДОВЖИТИ - Спеціальні дії - Немає спеціальних дій - Скасувати всі зміни - Увімкнути опцію '--reflog' - Відкрити у файловому менеджері - Пошук гілок/тегів/підмодулів - Видимість у графі - Не встановлено - Приховати в графі комітів - Фільтрувати в графі комітів - Увімкнути опцію '--first-parent' - РОЗТАШУВАННЯ - Горизонтальне - Вертикальне - ПОРЯДОК КОМІТІВ - За датою коміту - Топологічний - ЛОКАЛЬНІ ГІЛКИ - Перейти до HEAD - Створити гілку - ОЧИСТИТИ СПОВІЩЕННЯ - Виділяти лише поточну гілку в графі - Відкрити в {0} - Відкрити в зовнішніх інструментах - Оновити - ВІДДАЛЕНІ СХОВИЩА - ДОДАТИ ВІДДАЛЕНЕ СХОВИЩЕ - Пошук коміту - Автор - Комітер - Файл - Повідомлення - SHA - Поточна гілка - Показати теги як дерево - ПРОПУСТИТИ - Статистика - ПІДМОДУЛІ - ДОДАТИ ПІДМОДУЛЬ - ОНОВИТИ ПІДМОДУЛЬ - ТЕГИ - НОВИЙ ТЕГ - За датою створення - За назвою - Сортувати - Відкрити в терміналі - Використовувати відносний час в історії - РОБОЧІ ДЕРЕВА - ДОДАТИ РОБОЧЕ ДЕРЕВО - PRUNE (ОЧИСТИТИ) - URL Git сховища - Скинути поточну гілку до ревізії - Режим скидання: - Перемістити до: - Поточна гілка: - Показати у файловому менеджері - Revert (Скасувати коміт) - Коміт: - Закомітити зміни скасування - Змінити повідомлення коміту - Використовуйте 'Shift+Enter' для введення нового рядка. 'Enter' - гаряча клавіша кнопки OK - Виконується. Будь ласка, зачекайте... - ЗБЕРЕГТИ - Зберегти як... - Патч успішно збережено! - Сканувати сховища - Коренева тека: - Перевірити оновлення... - Доступна нова версія програми: - Не вдалося перевірити оновлення! - Завантажити - Пропустити цю версію - Оновлення програми - У вас встановлена остання версія. - Встановити відстежувану гілку - Гілка: - Скасувати upstream - Upstream: - Копіювати SHA - Перейти до - Squash (Склеїти коміти) - В: - Приватний ключ SSH: - Шлях до сховища приватного ключа SSH - ПОЧАТИ - Stash (Сховати) - Автоматично відновити після схову - Ваші робочі файли залишаться без змін, але буде збережено схованку. - Включити невідстежувані файли - Зберегти проіндексовані файли - Повідомлення: - Необов'язково. Назва цієї схованки - Лише проіндексовані зміни - Будуть сховані як проіндексовані, так і не проіндексовані зміни вибраних файлів!!! - Сховати локальні зміни - Застосувати - Видалити - Зберегти як патч... - Видалити схованку - Видалити: - СХОВАНКИ - ЗМІНИ - СХОВАНКИ - Статистика - КОМІТИ - КОМІТЕР - ОГЛЯД - МІСЯЦЬ - ТИЖДЕНЬ - АВТОРІВ: - КОМІТІВ: - ПІДМОДУЛІ - Додати підмодуль - Копіювати відносний шлях - Отримати вкладені підмодулі - Відкрити сховище підмодуля - Відносний шлях: - Відносна тека для зберігання цього модуля. - Видалити підмодуль - OK - Копіювати назву тегу - Копіювати повідомлення тегу - Видалити ${0}$... - Злиття ${0}$ в ${1}$... - Надіслати ${0}$... - Оновити підмодулі - Усі підмодулі - Ініціалізувати за потреби - Рекурсивно - Підмодуль: - Використовувати опцію --remote - URL: - Попередження - Вітальна сторінка - Створити групу - Створити підгрупу - Клонувати сховище - Видалити - ПІДТРИМУЄТЬСЯ ПЕРЕТЯГУВАННЯ ТЕК. МОЖЛИВЕ ГРУПУВАННЯ. - Редагувати - Перемістити до іншої групи - Відкрити всі сховища - Відкрити сховище - Відкрити термінал - Пересканувати сховища у теці клонування за замовчуванням - Пошук сховищ... - Сортувати - ЛОКАЛЬНІ ЗМІНИ - Git Ignore - Ігнорувати всі файли *{0} - Ігнорувати файли *{0} у цій же теці - Ігнорувати файли у цій же теці - Ігнорувати лише цей файл - Amend (Доповнити) - Тепер ви можете проіндексувати цей файл. - КОМІТ - КОМІТ ТА PUSH - Шаблон/Історії - Викликати подію кліку - Коміт (Редагувати) - Індексувати всі зміни та закомітити - Ви проіндексували {0} файл(ів), але відображено лише {1} ({2} файлів відфільтровано). Продовжити? - ВИЯВЛЕНО КОНФЛІКТИ - ВІДКРИТИ ЗОВНІШНІЙ ІНСТРУМЕНТ ЗЛИТТЯ - ВІДКРИТИ ВСІ КОНФЛІКТИ В ЗОВНІШНЬОМУ ІНСТРУМЕНТІ ЗЛИТТЯ - КОНФЛІКТИ ФАЙЛІВ ВИРІШЕНО - ВИКОРИСТАТИ МОЮ ВЕРСІЮ - ВИКОРИСТАТИ ЇХНЮ ВЕРСІЮ - ВКЛЮЧИТИ НЕВІДСТЕЖУВАНІ ФАЙЛИ - НЕМАЄ ОСТАННІХ ПОВІДОМЛЕНЬ - НЕМАЄ ШАБЛОНІВ КОМІТІВ - Клацніть правою кнопкою миші на вибраних файлах та оберіть спосіб вирішення конфліктів. - Підпис - ПРОІНДЕКСОВАНІ - ВИДАЛИТИ З ІНДЕКСУ - ВИДАЛИТИ ВСЕ З ІНДЕКСУ - НЕПРОІНДЕКСОВАНІ - ІНДЕКСУВАТИ - ІНДЕКСУВАТИ ВСЕ - ПЕРЕГЛЯНУТИ ФАЙЛИ, ЩО ВВАЖАЮТЬСЯ НЕЗМІНЕНИМИ - Шаблон: ${0}$ - РОБОЧИЙ ПРОСТІР: - Налаштувати робочі простори... - РОБОЧЕ ДЕРЕВО - Копіювати шлях - Заблокувати - Видалити - Розблокувати - diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml index 2a117fb8..a6fdb67f 100644 --- a/src/Resources/Locales/zh_CN.axaml +++ b/src/Resources/Locales/zh_CN.axaml @@ -1,103 +1,62 @@ - - - - 关于软件 - 关于本软件 + • 项目依赖于 + Copyright © 2024 sourcegit-scm. + • 文本编辑器使用 + • 等宽字体来自于 + • 项目源代码地址 开源免费的Git客户端 - 新增工作树 - 工作树路径 ： - 填写该工作树的路径。支持相对路径。 - 分支名 ： - 选填。默认使用目标文件夹名称。 - 跟踪分支 - 设置上游跟踪分支 - 检出分支方式 ： - 创建新分支 - 已有分支 - AI助手 - 重新生成 - 使用AI助手生成提交信息 - 应用本次生成 应用补丁(apply) + 错误 + 输出错误，并终止应用补丁 + 更多错误 + 与【错误】级别相似，但输出内容更多 补丁文件 ： 选择补丁文件 忽略空白符号 + 忽略 + 关闭所有警告 应用补丁 + 警告 + 应用补丁，输出关于空白符的警告 空白符号处理 ： - 应用贮藏 - 在成功应用后丢弃该贮藏 - 恢复索引中已暂存的变化 - 已选贮藏 ： 存档(archive) ... 存档文件路径： 选择存档文件的存放路径 指定的提交： 存档 - SourceGit Askpass 不跟踪更改的文件 没有不跟踪更改的文件 移除 - 加载本地图片 - 重新加载 二进制文件不支持该操作!!! - 二分定位(bisect) - 终止 - 标记错误 - 二分定位进行中。当前提交是 '正确' 还是 '错误' ？ - 标记正确 - 无法判定 - 二分定位进行中。请标记当前的提交是 '正确' 还是 '错误'，然后检出另一个提交。 逐行追溯(blame) 选中文件不支持该操作!!! - 检出(checkout) ${0}$... - 与当前 ${0}$ 比较 - 与本地工作树比较 + 检出(checkout)${0}$ 复制分支名 - 自定义操作 - 删除 ${0}$... - 删除选中的 {0} 个分支 - 快进(fast-forward)到 ${0}$ - 拉取(fetch) ${0}$ 至 ${1}$... - GIT工作流 - 完成 ${0}$ - 合并 ${0}$ 到 ${1}$... - 合并 {0} 个分支到当前分支 - 拉回(pull) ${0}$ - 拉回(pull) ${0}$ 内容至 ${1}$... + 删除${0}$ + 放弃所有更改 + 快进(fast-forward)到${0}$ + GIT工作流 - 完成${0}$ + 合并${0}$到${1}$ + 拉回(pull)${0}$ + 拉回(pull)${0}$内容至${1}$ 推送(push)${0}$ - 变基(rebase) ${0}$ 至 ${1}$... - 重命名 ${0}$... - 重置 ${0}$ 到 ${1}$... - 切换上游分支 ... - 分支比较 - 跟踪的上游分支不存在或已删除！ + 变基(rebase)${0}$分支至${1}$ + 重命名${0}$ + 切换上游分支... + 取消追踪 字节 取 消 - 重置文件到上一版本 - 重置文件到该版本 - 生成提交信息 切换变更显示模式 - 文件名+路径列表模式 - 全路径列表模式 - 文件目录树形结构模式 + 网格模式 + 列表模式 + 树形模式 检出(checkout)分支 - 检出(checkout)提交 - 提交 ： - 注意：执行该操作后，当前HEAD会变为游离(detached)状态! - 未提交更改 ： - 丢弃更改 - 贮藏并自动恢复 - 同时更新所有子模块 目标分支 ： - 检出分支并快进 - 上游分支 ： - 挑选提交 - 提交信息中追加来源信息 - 提交列表 ： + 挑选(cherry-pick)此提交 + 提交ID ： 提交变化 - 对比的父提交 ： - 通常你不能对一个合并进行挑选，因为你不知道合并的哪一边应该被视为主线。这个选项指定了作为主线的父提交，允许挑选相对于该提交的修改。 + 挑选提交 丢弃贮藏确认 您正在丢弃所有的贮藏，一经操作，无法回退，是否继续？ 克隆远程仓库 @@ -106,154 +65,61 @@ 本地仓库名 ： 本地仓库目录的名字，选填。 父级目录 ： - 初始化并更新子模块 远程仓库 ： 关闭 - 提交信息编辑器 - 检出此提交 挑选(cherry-pick)此提交 - 挑选(cherry-pick)... - 与当前HEAD比较 - 与本地工作树比较 - 作者 - 提交者 - 简要信息 - 提交指纹 - 主题 - 自定义操作 - 交互式变基(rebase -i) ${0}$ 到此处 - 合并(merge)此提交至 ${0}$ - 合并(merge)... - 变基(rebase) ${0}$ 到此处 - 重置(reset) ${0}$ 到此处 + 复制提交指纹 + 变基(rebase)${0}$到此处 + 重置(reset)${0}$到此处 回滚此提交 编辑提交信息 另存为补丁 ... 合并此提交到上一个提交 - 合并之后的提交到此处 变更对比 - 个文件发生变更 - 查找变更... + 查找文件... 文件列表 LFS文件 - 查找文件... 子模块 + 标签文件 + 子树 基本信息 修改者 变更列表 - 子提交 提交者 - 查看包含此提交的分支/标签 - 本提交已被以下分支/标签包含 - 仅显示前100项变更。请前往【变更对比】页面查看全部。 提交信息 父提交 相关引用 提交指纹 - 浏览器中查看 - 详细描述 - 主题 - 填写提交信息主题 仓库配置 - 提交信息模板 - 模板内容 ： - 模板名 ： - 自定义操作 - 命令行参数 ： - 请使用${REPO}代替仓库路径，${BRANCH}代替选中的分支，${SHA}代替提交哈希 - 可执行文件路径 ： - 名称 ： - 作用目标 ： - 选中的分支 - 选中的提交 - 仓库 - 等待操作执行完成 电子邮箱 邮箱地址 - GIT配置 - 启用定时自动拉取远程更新 - 分钟 - 默认远程 - 默认合并方式 - ISSUE追踪 - 新增匹配Azure DevOps规则 - 新增匹配Gitee议题规则 - 新增匹配Gitee合并请求规则 - 新增匹配Github Issue规则 - 新增匹配GitLab议题规则 - 新增匹配GitLab合并请求规则 - 新增匹配Jira规则 - 新增自定义规则 - 匹配ISSUE的正则表达式 ： - 规则名 ： - 为ISSUE生成的URL链接 ： - 可在URL中使用$1，$2等变量填入正则表达式匹配的内容 - AI - 启用特定服务 ： - 当【启用特定服务】被设置时，SourceGit将在本仓库中仅使用该服务。否则将弹出可用的AI服务列表供用户选择。 HTTP代理 HTTP网络代理 用户名 应用于本仓库的用户名 - 工作区 - 颜色 - 名称 - 启动时恢复打开的仓库 - 确认继续 - 提交未包含变更文件！是否继续(--allow-empty)？ - 自动暂存并提交 - 提交未包含变更文件！是否继续(--allow-empty)或是自动暂存所有变更并提交？ - 规范化提交信息生成 - 破坏性更新： - 关闭的ISSUE： - 详细说明： - 模块： - 简述： - 类型： 复制 - 复制全部文本 - 复制完整路径 复制路径 - 新建分支 ... + 新建分支 新分支基于 ： 完成后切换到新分支 未提交更改 ： - 丢弃更改 - 贮藏并自动恢复 + 忽略 + 贮藏(stash)并自动恢复 新分支名 ： 填写分支名称。 - 空格将被替换为'-'符号 创建本地分支 - 允许重置已存在的分支 - 新建标签 ... + 新建标签 标签位于 ： - 使用GPG签名 标签描述 ： 选填。 标签名 ： 推荐格式 ：v1.0.0-alpha - 推送到所有远程仓库 - 新建标签 - 类型 ： - 附注标签 - 轻量标签 - 按住Ctrl键点击将以默认参数运行 剪切 - 取消初始化子模块 - 强制取消，即使包含本地变更 - 子模块 ： 删除分支确认 分支名 ： - 您正在删除远程上的分支，请务必小心！！！ - 同时删除远程分支 ${0}$ - 删除多个分支 - 您正在尝试一次性删除多个分支，请务必仔细检查后再执行操作！ 删除远程确认 远程名 ： - 路径 ： 目标 ： - 所有子节点将被同时从列表中移除。 - 仅从列表中移除，不会删除硬盘中的文件！ 删除分组确认 删除仓库确认 删除子模块确认 @@ -266,33 +132,18 @@ 原始大小 复制 文件权限已变化 - 首个差异 - 忽略空白符号变化 - 最后一个差异 LFS对象变更 下一个差异 没有变更或仅有换行符差异 上一个差异 - 保存为补丁文件 - 显示隐藏符号 分列对比 - 子模块 - 删除 - 新增 - 交换比对双方 语法高亮 - 自动换行 - 启用基于变更块的跳转 使用外部合并工具查看 - 显示完整文件 - 减少可见的行数 - 增加可见的行数 请选择需要对比的文件 使用外部比对工具查看 放弃更改确认 所有本地址未提交的修改。 - 变更 ： - 包括所有已忽略的文件 + 需要放弃的变更 ： 总计{0}项选中更改 本操作不支持回退，请确认后继续！！！ 书签 ： @@ -300,12 +151,10 @@ 目标 ： 编辑分组 编辑仓库 - 执行自定义操作 - 自定义操作 ： + 快进(fast-forward，无需checkout) 拉取(fetch) 拉取所有的远程仓库 - 强制覆盖本地REFs - 不拉取远程标签 + 自动清理远程已删除分支 远程仓库 ： 拉取远程仓库内容 不跟踪此文件的更改 @@ -313,21 +162,19 @@ 放弃 {0} 个文件的更改... 放弃选中的更改 使用外部合并工具打开 - 应用 ${0}$ 另存为补丁... - 暂存(add) - 暂存(add){0} 个文件 + 暂存(add)... + 暂存(add){0} 个文件... 暂存选中的更改 贮藏(stash)... 贮藏(stash)选中的 {0} 个文件... 从暂存中移除 从暂存中移除 {0} 个文件 从暂存中移除选中的更改 - 使用 MINE (checkout --ours) 使用 THEIRS (checkout --theirs) + 使用 MINE (checkout --ours) 文件历史 - 文件变更 - 文件内容 + 过滤 GIT工作流 开发分支 ： 特性分支 ： @@ -336,8 +183,6 @@ 结束修复分支 结束版本分支 目标分支 ： - 完成后自动推送 - 压缩变更为单一提交后合并分支 修复分支 ： 修复分支名前缀 ： 初始化GIT工作流 @@ -353,67 +198,21 @@ 开始版本分支... 开始版本分支 版本标签前缀 ： - Git LFS - 添加追踪文件规则... - 匹配完整文件名 - 规则 ： - 添加LFS追踪文件规则 - 拉取LFS对象 (fetch) - 执行`git lfs prune`命令，下载远程LFS对象，但不会更新工作副本。 - 拉取LFS对象 - 启用Git LFS支持 - 显示LFS对象锁 - 没有锁定的LFS文件 - 锁定 - 仅显示被我锁定的文件 - LFS对象锁状态 - 解锁 - 强制解锁 - 精简本地LFS对象存储 - 运行`git lfs prune`命令，从本地存储中精简当前版本不需要的LFS对象 - 拉回LFS对象 (pull) - 运行`git lfs pull`命令，下载远程LFS对象并更新工作副本。 - 拉回LFS对象 - 推送 - 将排队的大文件推送到Git LFS远程服务 - 推送LFS对象 - 远程 ： - 跟踪名为'{0}'的文件 - 跟踪所有 *{0} 文件 历史记录 - 作者 - 修改时间 - 路线图与主题 - 提交指纹 - 提交时间 + 切换横向/纵向显示 + 切换曲线/折线显示 + 查询提交指纹、信息、作者。回车键开始，ESC键取消 + 清空 已选中 {0} 项提交 - 可以按住 Ctrl 或 Shift 键选择多个提交 - 可以按住 ⌘ 或 ⇧ 键选择多个提交 - 小提示: - 快捷键参考 + 快捷键 全局快捷键 取消弹出面板 - 克隆远程仓库 关闭当前页面 切换到下一个页面 - 切换到上一个页面 新建页面 - 打开偏好设置面板 - 切换工作区 - 切换显示页面 仓库页面快捷键 - 提交暂存区更改 - 提交暂存区更改并推送 - 自动暂存全部变更并提交 - 基于选中提交创建新分支 - 丢弃选中的更改 - 拉取 (fetch) 远程变更 - 切换左边栏为分支/标签等显示模式（默认） - 切换左边栏为提交搜索模式 - 拉回 (pull) 远程变更 - 推送本地变更到远程 - 重新加载仓库状态 将选中的变更暂存或从暂存列表中移除 + 打开/关闭历史搜索 显示本地更改 显示历史记录 显示贮藏列表 @@ -421,154 +220,94 @@ 关闭搜索 定位到下一个匹配搜索的位置 定位到上一个匹配搜索的位置 - 使用外部比对工具查看 打开搜索 - 丢弃 - 暂存 - 移出暂存区 初始化新仓库 路径 ： - 挑选（Cherry-Pick）操作进行中。 - 正在处理提交 - 合并操作进行中。 - 正在处理 - 变基（Rebase）操作进行中。 - 当前停止于 - 回滚提交操作进行中。 - 正在回滚提交 - 交互式变基 - 起始提交 ： - 目标分支 ： - 复制链接地址 - 在浏览器中访问 + 选择目录不是有效的Git仓库。是否需要在此目录执行`git init`操作？ + 挑选（Cherry-Pick）操作进行中。点击【终止】回滚到操作前的状态。 + 合并操作进行中。点击【终止】回滚到操作前的状态。 + 变基（Rebase）操作进行中。点击【终止】回滚到操作前的状态。 + 回滚提交操作进行中。点击【终止】回滚到操作前的状态。 + Source Git 出错了 系统提示 - 工作区列表 - 页面列表 + 主菜单 合并分支 目标分支 ： 合并方式 ： - 合并目标 ： - 合并（多目标） - 提交变化 - 合并策略 ： - 目标列表 ： - 调整仓库分组 - 请选择目标分组： + 合并分支 ： 名称 ： GIT尚未配置。请打开【偏好设置】配置GIT路径。 - 浏览应用数据目录 + 系统提示 + 选择文件夹 打开文件... 选填。 - 新建空白页 + 新建空白页 (Ctrl+T) 设置书签 - 关闭标签页 + 关闭标签页 (Ctrl+W) 关闭其他标签页 关闭右侧标签页 复制仓库路径 新标签页 粘贴 - {0}天前 - 1小时前 - {0}小时前 - 刚刚 - 上个月 - 一年前 - {0}分钟前 - {0}个月前 - {0}年前 - 昨天 - 偏好设置 - AI - Analyze Diff Prompt - API密钥 - Generate Subject Prompt - 模型 - 配置名称 - 服务地址 - 启用流式输出 - 外观配置 - 缺省字体 - 编辑器制表符宽度 - 字体大小 - 默认 - 代码编辑器 - 等宽字体 - 仅在文本编辑器中使用等宽字体 - 主题 - 主题自定义 - 主标签使用固定宽度 - 使用系统默认窗体样式 - 对比/合并工具 - 安装路径 - 填写工具可执行文件所在位置 - 工具 - 通用配置 - 启动时检测软件更新 - 日期时间格式 - 显示语言 - 最大历史提交数 - 在提交路线图中显示修改时间而非提交时间 - 在提交详情页中显示子提交列表 - 在提交路线图中显示标签 - SUBJECT字数检测 - GIT配置 - 自动换行转换 - 默认克隆路径 - 邮箱 - 默认GIT用户邮箱 - 拉取更新时启用修剪（--prune） - 对比文件时，默认忽略换行符变更 (--ignore-cr-at-eol) - 本软件要求GIT最低版本为2.25.1 - 安装路径 - 启用HTTP SSL验证 - 用户名 - 默认GIT用户名 - Git 版本 - GPG签名 - 启用提交签名 - 签名格式 - 签名程序位置 - 签名程序所在路径 - 启用标签签名 - 用户签名KEY - 输入签名提交所使用的KEY - 第三方工具集成 - 终端/SHELL - 安装路径 - 终端/SHELL - 清理远程已删除分支 - 目标 ： - 清理工作树 - 清理在`$GIT_COMMON_DIR/worktrees`中的无效工作树信息 + 偏好设置 + 外观配置 + 缺省字体 + 默认字体大小 + 等宽字体 + 主题 + 通用配置 + 头像服务 + 启动时检测软件更新 + 显示语言 + 最大历史提交数 + 启动时恢复上次打开的仓库 + 使用固定宽度的标题栏标签 + GIT配置 + 启用定时自动拉取远程更新 + 自动换行转换 + 默认克隆路径 + 邮箱 + 默认GIT用户邮箱 + 安装路径 + 终端Shell + 用户名 + 默认GIT用户名 + Git 版本 + GPG签名 + 启用提交签名 + 可执行文件位置 + gpg.exe所在路径 + 用户签名KEY + 输入签名提交所使用的KEY + 外部合并工具 + 对比模式启动参数 + 合并模式启动参数 + 安装路径 + 填写工具可执行文件所在位置 + 工具 拉回(pull) + 自动贮藏并恢复本地变更 拉取分支 ： 本地分支 ： - 未提交更改 ： - 丢弃更改 - 贮藏并自动恢复 - 同时更新所有子模块 远程 ： 拉回（拉取并合并） 使用变基方式合并分支 推送(push) - 确保子模块变更已推送 启用强制推送 本地分支 ： 远程仓库 ： 推送到远程仓库 远程分支 ： - 跟踪远程分支 同时推送标签 推送标签到远程仓库 - 推送到所有远程仓库 远程仓库 ： 标签 ： - 退出 变基(rebase)操作 自动贮藏并恢复本地变更 目标提交 ： 分支 ： + 重新加载 添加远程仓库 编辑远程仓库 远程名 ： @@ -578,101 +317,54 @@ 复制远程地址 删除 ... 编辑 ... - 拉取(fetch)更新 - 在浏览器中打开 + 拉取(fetch)更新 ... 清理远程已删除分支 - 移除工作树操作确认 - 启用`--force`选项 - 目标工作树 ： + 目标 ： 分支重命名 新的名称 ： 新的分支名不能与现有分支名相同 分支 ： 终止合并 - 自动拉取远端变更中... - 排序方式 - 按提交时间 - 按名称 清理本仓库(GC) - 本操作将执行`git gc`命令。 - 清空过滤规则 - 清空 + 本操作将执行`gc`，对于启用LFS的仓库也会执行`lfs prune`。 配置本仓库 下一步 - 自定义操作 - 自定义操作未设置 - 放弃所有更改 - 启用 --reflog 选项 在文件浏览器中打开 - 快速查找分支/标签/子模块 - 设置在列表中的可见性 - 不指定 - 在提交列表中隐藏 - 使用其对提交列表过滤 - 启用 --first-parent 过滤选项 - 布局方式 - 水平排布 - 竖直排布 - 提交列表排序规则 - 按提交时间 - 按拓扑排序 本地分支 定位HEAD 新建分支 - 清空通知列表 - 提交路线图中仅高亮显示当前分支 在 {0} 中打开 使用外部工具打开 重新加载 远程列表 添加远程 - 查找提交 - 作者 - 提交者 - 变更内容 - 文件 - 提交信息 - 提交指纹 - 仅在当前分支中查找 - 以树型结构展示 - 以树型结构展示 - 跳过此提交 + 解决冲突 + 查找提交(Ctrl+F) + 支持搜索作者/提交者/主题/指纹 提交统计 子模块列表 添加子模块 更新子模块 标签列表 新建标签 - 按创建时间 - 按名称 - 排序 在终端中打开 - 在提交列表中使用相对时间 - 查看命令日志 - 访问远程仓库 '{0}' - 工作树列表 - 新增工作树 - 清理 + 工作区 远程仓库地址 重置(reset)当前分支到指定版本 重置模式 ： 提交 ： 当前分支 ： - 重置所选分支（非当前分支） - 重置点 ： - 操作分支 ： 在文件浏览器中查看 回滚操作确认 目标提交 ： 回滚后提交更改 编辑提交信息 - 请使用Shift+Enter换行。Enter键已被【确 定】按钮占用。 + 提交信息： + 提交： 执行操作中，请耐心等待... 保 存 另存为... 补丁已成功保存！ - 扫描仓库 - 根路径 ： 检测更新... 检测到软件有版本更新: 获取最新版本信息失败！ @@ -680,30 +372,21 @@ 忽略此版本 软件更新 当前已是最新版本。 - 切换上游分支 - 本地分支 ： - 取消追踪 - 上游分支 ： - 复制提交指纹 - 跳转到提交 - 压缩为单个提交 - 合并入： + 合并HEAD到上一个提交 + 当前提交 : + 修改提交信息： + 合并到 : SSH密钥 ： SSH密钥文件 开 始 贮藏(stash) - 贮藏后自动恢复工作区 - 工作区文件保持未修改状态，但贮藏内容已保存。 包含未跟踪的文件 - 保留暂存区文件 信息 ： 选填，用于命名此贮藏 - 仅贮藏暂存区的变更 - 选中文件的所有变更均会被贮藏！ 贮藏本地变更 应用(apply) 删除(drop) - 另存为补丁... + 应用并删除(pop) 丢弃贮藏确认 丢弃贮藏 ： 贮藏列表 @@ -712,98 +395,52 @@ 提交统计 提交次数 提交者 - 总览 本月 本周 - 贡献者人数: + 本年 提交次数: + 提交者: 子模块 添加子模块 复制路径 - 取消初始化 拉取子孙模块 打开仓库 相对仓库路径 ： 本地存放的相对路径。 删除子模块 - 状态 - 未提交修改 - 未初始化 - SHA变更 - 未解决冲突 - 仓库 确 定 复制标签名 - 复制标签信息 - 删除 ${0}$... - 合并 ${0}$ 到 ${1}$... - 推送 ${0}$... - 更新子模块 - 更新所有子模块 - 启用 '--init' - 启用 '--recursive' - 子模块 ： - 启用 '--remote' + 删除${0}$ + 推送${0}$ 仓库地址 ： - 日志列表 - 清空日志 - 复制 - 删除 警告 - 起始页 新建分组 新建子分组 克隆远程仓库 删除 支持拖放目录添加。支持自定义分组。 编辑 - 调整分组 - 打开所有包含仓库 打开本地仓库 打开终端 - 重新扫描默认克隆路径下的仓库 快速查找仓库... 排序 本地更改 - 添加至 .gitignore 忽略列表 - 忽略所有 *{0} 文件 - 忽略同目录下所有 *{0} 文件 - 忽略同目录下所有文件 - 忽略本文件 - 修补 - 现在您已可将其加入暂存区中 + 修补(--amend) 提交 提交并推送 - 历史输入/模板 - 触发点击事件 - 提交（修改原始提交） - 自动暂存所有变更并提交 - 当前有 {0} 个文件在暂存区中，但仅显示了 {1} 个文件（{2} 个文件被过滤掉了），是否继续提交？ + 填写提交信息 + CTRL + Enter 检测到冲突 - 打开合并工具 - 打开合并工具解决冲突 - 文件冲突已解决 - 使用 MINE - 使用 THEIRS + 最近输入的提交信息 显示未跟踪文件 + 历史提交信息 没有提交信息记录 - 没有可应用的提交信息模板 - 重置提交者 - 请选中冲突文件，打开右键菜单，选择合适的解决方式 - 署名 已暂存 从暂存区移除选中 从暂存区移除所有 未暂存 暂存选中 暂存所有 - 查看忽略变更文件 - 模板：${0}$ - 工作区： - 配置工作区... - 本地工作树 - 复制工作树路径 - 锁定工作树 - 移除工作树 - 解除工作树锁定 + 查看忽略变更文件 + 请选中冲突文件，打开右键菜单，选择合适的解决方式 diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml deleted file mode 100644 index 29a5346d..00000000 --- a/src/Resources/Locales/zh_TW.axaml +++ /dev/null @@ -1,809 +0,0 @@ - - - - - - 關於 - 關於 SourceGit - 開源免費的 Git 客戶端 - 新增工作區 - 工作區路徑: - 填寫該工作區的路徑。支援相對路徑。 - 分支名稱: - 選填。預設使用目標資料夾名稱。 - 追蹤分支 - 設定遠端追蹤分支 - 簽出分支方式: - 建立新分支 - 已有分支 - AI 助理 - 重新產生 - 使用 AI 產生提交訊息 - 套用為提交訊息 - 套用修補檔 (apply patch) - 修補檔: - 選擇修補檔 - 忽略空白符號 - 套用修補檔 - 空白字元處理: - 套用擱置變更 - 套用擱置變更後刪除 - 還原索引中已暫存的變更 (--index) - 已選擇擱置變更: - 封存 (archive)... - 封存檔案路徑: - 選擇封存檔案的儲存路徑 - 指定的提交: - 封存 - SourceGit Askpass - 不追蹤變更的檔案 - 沒有不追蹤變更的檔案 - 移除 - 載入本機圖片... - 重新載入 - 二進位檔案不支援該操作! - 二分搜尋 (bisect) - 中止 - 標記為錯誤 - 二分搜尋進行中。目前的提交是「良好」是「錯誤」? - 標記為良好 - 無法確認 - 二分搜尋進行中。請標記目前的提交為「良好」或「錯誤」，然後簽出另一個提交。 - 逐行溯源 (blame) - 所選擇的檔案不支援該操作! - 簽出 (checkout) ${0}$... - 與目前 ${0}$ 比較 - 與本機工作區比較 - 複製分支名稱 - 自訂動作 - 刪除 ${0}$... - 刪除所選的 {0} 個分支 - 快轉 (fast-forward) 到 ${0}$ - 提取 (fetch) ${0}$ 到 ${1}$... - Git 工作流 - 完成 ${0}$ - 合併 ${0}$ 到 ${1}$... - 合併 {0} 個分支到目前分支 - 拉取 (pull) ${0}$ - 拉取 (pull) ${0}$ 內容至 ${1}$... - 推送 (push) ${0}$ - 重定基底 (rebase) ${0}$ 分支至 ${1}$... - 重新命名 ${0}$... - 重設 ${0}$ 至 ${1}$... - 切換上游分支... - 分支比較 - 追蹤上游分支不存在或已刪除! - 位元組 - 取 消 - 重設檔案到上一版本 - 重設檔案為此版本 - 產生提交訊息 - 切換變更顯示模式 - 檔案名稱 + 路徑列表模式 - 全路徑列表模式 - 檔案目錄樹狀結構模式 - 簽出 (checkout) 分支 - 簽出 (checkout) 提交 - 提交: - 注意: 執行該操作後，目前 HEAD 會變為分離 (detached) 狀態! - 未提交變更: - 捨棄變更 - 擱置變更並自動復原 - 同時更新所有子模組 - 目標分支: - 簽出分支並快轉 - 上游分支 ： - 揀選提交 - 提交資訊中追加來源資訊 - 提交列表: - 提交變更 - 對比的父提交: - 通常您不能對一個合併進行揀選 (cherry-pick)，因為您不知道合併的哪一邊應該被視為主線。這個選項指定了作為主線的父提交，允許揀選相對於該提交的修改。 - 捨棄擱置變更確認 - 您正在捨棄所有的擱置變更，一經操作便無法復原，是否繼續? - 複製 (clone) 遠端存放庫 - 額外參數: - 其他複製參數，選填。 - 本機存放庫名稱: - 本機存放庫目錄的名稱，選填。 - 父級目錄: - 初始化並更新子模組 - 遠端存放庫: - 關閉 - 提交訊息編輯器 - 簽出 (checkout) 此提交 - 揀選 (cherry-pick) 此提交 - 揀選 (cherry-pick)... - 與目前 HEAD 比較 - 與本機工作區比較 - 作者 - 提交者 - 摘要資訊 - 提交編號 - 標題 - 自訂動作 - 互動式重定基底 (rebase -i) ${0}$ 到此處 - 合併 (merge) 此提交到 ${0}$ - 合併 (merge)... - 重定基底 (rebase) ${0}$ 到此處 - 重設 (reset) ${0}$ 到此處 - 復原此提交 - 編輯提交訊息 - 另存為修補檔 (patch)... - 合併此提交到上一個提交 - 合併之後的提交到此處 - 變更對比 - 個檔案已變更 - 搜尋變更... - 檔案列表 - LFS 檔案 - 搜尋檔案... - 子模組 - 基本資訊 - 作者 - 變更列表 - 後續提交 - 提交者 - 檢視包含此提交的分支或標籤 - 本提交包含於以下分支或標籤 - 僅顯示前 100 項變更。請前往 [變更對比] 頁面以瀏覽所有變更。 - 提交訊息 - 前次提交 - 相關參照 - 提交編號 - 在瀏覽器中檢視 - 詳細描述 - 標題 - 填寫提交訊息標題 - 存放庫設定 - 提交訊息範本 - 範本內容: - 範本名稱: - 自訂動作 - 指令參數: - 使用 ${REPO} 表示存放庫路徑、${BRANCH} 表示所選的分支、${SHA} 表示所選的提交編號 - 可執行檔案路徑: - 名稱: - 執行範圍: - 選取的分支 - 選取的提交 - 存放庫 - 等待自訂動作執行結束 - 電子郵件 - 電子郵件地址 - Git 設定 - 啟用定時自動提取 (fetch) 遠端更新 - 分鐘 - 預設遠端存放庫 - 預設合併模式 - Issue 追蹤 - 新增符合 Azure DevOps 規則 - 新增符合 Gitee 議題規則 - 新增符合 Gitee 合併請求規則 - 新增符合 GitHub Issue 規則 - 新增符合 GitLab 議題規則 - 新增符合 GitLab 合併請求規則 - 新增符合 Jira 規則 - 新增自訂規則 - 符合 Issue 的正規表達式: - 規則名稱: - 為 Issue 產生的網址連結: - 可在網址中使用 $1、$2 等變數填入正規表達式相符的內容 - AI - 偏好服務: - 設定 [偏好服務] 後，SourceGit 將於此存放庫中使用該服務，否則會顯示 AI 服務列表供使用者選擇。 - HTTP 代理 - HTTP 網路代理 - 使用者名稱 - 用於本存放庫的使用者名稱 - 工作區 - 顏色 - 名稱 - 啟動時還原上次開啟的存放庫 - 確認繼續 - 未包含任何檔案變更! 您是否仍要提交 (--allow-empty)? - 自動暫存並提交 - 未包含任何檔案變更! 您是否仍要提交 (--allow-empty) 或者自動暫存全部變更並提交? - 產生約定式提交訊息 - 破壞性變更: - 關閉的 Issue: - 詳細資訊: - 模組: - 簡述: - 類型: - 複製 - 複製全部內容 - 複製完整路徑 - 複製路徑 - 新增分支... - 新分支基於: - 完成後切換到新分支 - 未提交變更: - 捨棄變更 - 擱置變更並自動復原 - 新分支名稱: - 輸入分支名稱。 - 空格將以英文破折號取代 - 建立本機分支 - 允許覆寫現有分支 - 新增標籤... - 標籤位於: - 使用 GPG 簽章 - 標籤描述: - 選填。 - 標籤名稱: - 建議格式: v1.0.0-alpha - 推送到所有遠端存放庫 - 新增標籤 - 類型: - 附註標籤 - 輕量標籤 - 按住 Ctrl 鍵將直接以預設參數執行 - 剪下 - 取消初始化子模組 - 強制取消，即使它包含本地變更 - 子模組 ： - 刪除分支確認 - 分支名稱: - 您正在刪除遠端上的分支，請務必小心! - 同時刪除遠端分支 ${0}$ - 刪除多個分支 - 您正在嘗試一次性刪除多個分支，請務必仔細檢查後再刪除! - 刪除遠端確認 - 遠端名稱: - 路徑: - 目標: - 所有子節點都會從清單中移除。 - 只會從清單中移除，而不會刪除磁碟中的檔案! - 刪除群組確認 - 刪除存放庫確認 - 刪除子模組確認 - 子模組路徑: - 刪除標籤確認 - 標籤名稱: - 同時刪除遠端存放庫中的此標籤 - 二進位檔案 - 目前大小 - 原始大小 - 複製 - 檔案權限已變更 - 第一個差異 - 忽略空白符號變化 - 最後一個差異 - LFS 物件變更 - 下一個差異 - 沒有變更或僅有換行字元差異 - 上一個差異 - 另存為修補檔 (patch) - 顯示隱藏符號 - 並排對比 - 子模組 - 已刪除 - 新增 - 交換比對雙方 - 語法上色 - 自動換行 - 區塊切換上/下一個差異 - 使用外部合併工具檢視 - 顯示檔案的全部內容 - 減少可見的行數 - 增加可見的行數 - 請選擇需要對比的檔案 - 使用外部比對工具檢視 - 捨棄變更 - 所有本機未提交的變更。 - 變更: - 包括所有已忽略的檔案 - 將捨棄總計 {0} 項已選取的變更 - 您無法復原此操作，請確認後再繼續! - 書籤: - 名稱: - 目標: - 編輯群組 - 編輯存放庫 - 執行自訂動作 - 自訂動作: - 提取 (fetch) - 提取所有的遠端存放庫 - 強制覆寫本機 REFs - 不提取遠端標籤 - 遠端存放庫: - 提取遠端存放庫內容 - 不追蹤此檔案的變更 - 捨棄變更... - 捨棄已選的 {0} 個檔案變更... - 捨棄選取的變更 - 使用外部合併工具開啟 - 使用 ${0}$ - 另存為修補檔 (patch)... - 暫存 (add) - 暫存 (add) 已選的 {0} 個檔案 - 暫存選取的變更 - 擱置變更 (stash)... - 擱置變更 (stash) 所選的 {0} 個檔案... - 取消暫存 - 從暫存中移除 {0} 個檔案 - 取消暫存選取的變更 - 使用我方版本 (ours) - 使用對方版本 (theirs) - 檔案歷史 - 檔案變更 - 檔案内容 - Git 工作流 - 開發分支: - 功能分支: - 功能分支前置詞: - 完成功能分支 - 完成修復分支 - 完成發行分支 - 目標分支: - 完成後自動推送 - 壓縮為單一提交後合併 - 修復分支: - 修復分支前置詞: - 初始化 Git 工作流 - 保留分支 - 發行分支: - 版本分支: - 發行分支前置詞: - 開始功能分支... - 開始功能分支 - 開始修復分支... - 開始修復分支 - 輸入分支名稱 - 開始發行分支... - 開始發行分支 - 版本標籤前置詞: - Git LFS - 加入追蹤檔案規則... - 符合完整檔案名稱 - 規則: - 加入 LFS 追蹤檔案規則 - 提取 (fetch) - 執行 `git lfs fetch` 以下載遠端 LFS 物件，但不會更新工作副本。 - 提取 LFS 物件 - 啟用 Git LFS 支援 - 顯示 LFS 物件鎖 - 沒有鎖定的 LFS 物件 - 鎖定 - 僅顯示被我鎖定的檔案 - LFS 物件鎖 - 解鎖 - 強制解鎖 - 清理 (prune) - 執行 `git lfs prune` 以從本機中清理目前版本不需要的 LFS 物件 - 拉取 (pull) - 執行 `git lfs pull` 以下載遠端 LFS 物件並更新工作副本。 - 拉取 LFS 物件 - 推送 (push) - 將大型檔案推送到 Git LFS 遠端服務 - 推送 LFS 物件 - 遠端存放庫: - 追蹤名稱為「{0}」的檔案 - 追蹤所有 *{0} 檔案 - 歷史記錄 - 作者 - 修改時間 - 路線圖與訊息標題 - 提交編號 - 提交時間 - 已選取 {0} 項提交 - 可以按住 Ctrl 或 Shift 鍵選擇多個提交 - 可以按住 ⌘ 或 ⇧ 鍵選擇多個提交 - 小提示: - 快速鍵參考 - 全域快速鍵 - 取消彈出面板 - 複製 (clone) 遠端存放庫 - 關閉目前頁面 - 切換到下一個頁面 - 切換到上一個頁面 - 新增頁面 - 開啟偏好設定面板 - 切換工作區 - 切換目前頁面 - 存放庫頁面快速鍵 - 提交暫存區變更 - 提交暫存區變更並推送 - 自動暫存全部變更並提交 - 基於選取的提交建立新分支 - 捨棄選取的變更 - 提取 (fetch) 遠端的變更 - 切換左邊欄為分支/標籤等顯示模式 (預設) - 切換左邊欄為歷史搜尋模式 - 拉取 (pull) 遠端的變更 - 推送 (push) 本機變更到遠端存放庫 - 強制重新載入存放庫 - 暫存或取消暫存選取的變更 - 顯示本機變更 - 顯示歷史記錄 - 顯示擱置變更列表 - 文字編輯器快速鍵 - 關閉搜尋面板 - 前往下一個搜尋相符的位置 - 前往上一個搜尋相符的位置 - 使用外部比對工具檢視 - 開啟搜尋面板 - 捨棄 - 暫存 - 取消暫存 - 初始化存放庫 - 路徑: - 揀選 (cherry-pick) 操作進行中。 - 正在處理提交 - 合併操作進行中。 - 正在處理 - 重定基底 (rebase) 操作進行中。 - 目前停止於 - 復原提交操作進行中。 - 正在復原提交 - 互動式重定基底 - 起始提交: - 目標分支: - 複製連結 - 在瀏覽器中開啟連結 - 發生錯誤 - 系統提示 - 工作區列表 - 頁面列表 - 合併分支 - 目標分支: - 合併方式: - 合併來源: - 合併 (多個來源) - 提交變更 - 合併策略: - 目標列表: - 調整存放庫分組 - 請選擇目標分組: - 名稱: - 尚未設定 Git。請開啟 [偏好設定] 以設定 Git 路徑。 - 瀏覽程式資料目錄 - 開啟檔案... - 選填。 - 新增分頁 - 設定書籤 - 關閉分頁 - 關閉其他分頁 - 關閉右側分頁 - 複製存放庫路徑 - 新分頁 - 貼上 - {0} 天前 - 1 小時前 - {0} 小時前 - 剛剛 - 上個月 - 一年前 - {0} 分鐘前 - {0} 個月前 - {0} 年前 - 昨天 - 偏好設定 - AI - 分析變更差異提示詞 - API 金鑰 - 產生提交訊息提示詞 - 模型 - 名稱 - 伺服器 - 啟用串流輸出 - 外觀設定 - 預設字型 - 編輯器 Tab 寬度 - 字型大小 - 預設 - 程式碼 - 等寬字型 - 僅在文字編輯器中使用等寬字型 - 佈景主題 - 自訂主題 - 使用固定寬度的分頁標籤 - 使用系統原生預設視窗樣式 - 對比/合併工具 - 安裝路徑 - 填寫可執行檔案所在路徑 - 工具 - 一般設定 - 啟動時檢查軟體更新 - 日期時間格式 - 顯示語言 - 最大歷史提交數 - 在提交路線圖中顯示修改時間而非提交時間 - 在提交詳細資訊中顯示後續提交 - 在路線圖中顯示標籤 - 提交標題字數偵測 - Git 設定 - 自動換行轉換 - 預設複製 (clone) 路徑 - 電子郵件 - 預設 Git 使用者電子郵件 - 拉取變更時進行清理 (--prune) - 對比檔案時，預設忽略行尾的 CR 變更 (--ignore-cr-at-eol) - 本軟體要求 Git 最低版本為 2.25.1 - 安裝路徑 - 啟用 HTTP SSL 驗證 - 使用者名稱 - 預設 Git 使用者名稱 - Git 版本 - GPG 簽章 - 啟用提交簽章 - GPG 簽章格式 - 可執行檔案路徑 - 填寫 gpg.exe 所在路徑 - 啟用標籤簽章 - 使用者簽章金鑰 - 填寫簽章提交所使用的金鑰 - 第三方工具整合 - 終端機/Shell - 安裝路徑 - 終端機/Shell - 清理遠端已刪除分支 - 目標: - 清理工作區 - 清理在 `$GIT_COMMON_DIR/worktrees` 中的無效工作區資訊 - 拉取 (pull) - 拉取分支: - 本機分支: - 未提交變更: - 捨棄變更 - 擱置變更並自動復原 - 同時更新所有子模組 - 遠端: - 拉取 (提取並合併) - 使用重定基底 (rebase) 合併分支 - 推送 (push) - 確保已推送子模組 - 啟用強制推送 - 本機分支: - 遠端存放庫: - 推送到遠端存放庫 - 遠端分支: - 追蹤遠端分支 - 同時推送標籤 - 推送標籤到遠端存放庫 - 推送到所有遠端存放庫 - 遠端存放庫: - 標籤: - 結束 - 重定基底 (rebase) 操作 - 自動擱置變更並復原本機變更 - 目標提交: - 分支: - 新增遠端存放庫 - 編輯遠端存放庫 - 遠端名稱: - 唯一遠端名稱 - 存放庫網址: - 遠端存放庫的網址 - 複製遠端網址 - 刪除... - 編輯... - 提取 (fetch) 更新 - 在瀏覽器中存取網址 - 清理遠端已刪除分支 - 刪除工作區操作確認 - 啟用 [--force] 選項 - 目標工作區: - 分支重新命名 - 新名稱: - 新的分支名稱不能與現有分支名稱相同 - 分支: - 中止 - 自動提取遠端變更中... - 排序 - 依建立時間 - 依名稱升序 - 清理本存放庫 (GC) - 本操作將執行 `git gc` 命令。 - 清空篩選規則 - 清空 - 設定本存放庫 - 下一步 - 自訂動作 - 沒有自訂的動作 - 捨棄所有變更 - 啟用 [--reflog] 選項 - 在檔案瀏覽器中開啟 - 快速搜尋分支/標籤/子模組 - 篩選以顯示或隱藏 - 取消指定 - 在提交列表中隱藏 - 以其篩選提交列表 - 啟用 [--first-parent] 選項 - 版面配置 - 橫向顯示 - 縱向顯示 - 提交顯示順序 - 依時間排序 - 依拓撲排序 - 本機分支 - 回到 HEAD - 新增分支 - 清除所有通知 - 在提交路線圖中僅對目前分支上色 - 在 {0} 中開啟 - 使用外部工具開啟 - 重新載入 - 遠端列表 - 新增遠端 - 搜尋提交 - 作者 - 提交者 - 變更內容 - 檔案 - 提交訊息 - 提交編號 - 僅搜尋目前分支 - 以樹型結構展示 - 以樹型結構展示 - 跳過此提交 - 提交統計 - 子模組列表 - 新增子模組 - 更新子模組 - 標籤列表 - 新增標籤 - 依建立時間 - 依名稱 - 排序 - 在終端機中開啟 - 在提交列表中使用相對時間 - 檢視 Git 指令記錄 - 檢視遠端存放庫 '{0}' - 工作區列表 - 新增工作區 - 清理 - 遠端存放庫網址 - 重設目前分支到指定版本 - 重設模式: - 移至提交: - 目前分支: - 重設選取的分支（非目前分支） - 重設位置 ： - 選取分支 ： - 在檔案瀏覽器中檢視 - 復原操作確認 - 目標提交: - 復原後提交變更 - 編輯提交訊息 - 請使用 Shift + Enter 換行。Enter 鍵已被 [確定] 按鈕佔用。 - 執行操作中，請耐心等待... - 儲存 - 另存新檔... - 修補檔已成功儲存! - 掃描存放庫 - 頂層目錄: - 檢查更新... - 軟體有版本更新: - 取得最新版本資訊失敗! - 下載 - 忽略此版本 - 軟體更新 - 目前已是最新版本。 - 切換上游分支 - 本機分支: - 取消設定上游分支 - 上游分支: - 複製提交編號 - 前往此提交 - 壓縮為單個提交 - 合併入: - SSH 金鑰: - SSH 金鑰檔案 - 開 始 - 擱置變更 (stash) - 擱置變更後自動復原工作區 - 工作區檔案保持未修改，但擱置內容已儲存。 - 包含未追蹤的檔案 - 保留已暫存的變更 - 擱置變更訊息: - 選填，用於命名此擱置變更 - 僅擱置已暫存的變更 - 已選取的檔案中的變更均會被擱置! - 擱置本機變更 - 套用 (apply) - 刪除 (drop) - 另存為修補檔 (patch)... - 捨棄擱置變更確認 - 捨棄擱置變更: - 擱置變更 - 檢視變更 - 擱置變更列表 - 提交統計 - 提交次數 - 提交者 - 總覽 - 本月 - 本週 - 貢獻者人數: - 提交次數: - 子模組 - 新增子模組 - 複製路徑 - 取消初始化 - 提取子模組 - 開啟存放庫 - 相對存放庫路徑: - 本機存放的相對路徑。 - 刪除子模組 - 狀態 - 未提交變更 - 未初始化 - SHA 變更 - 未解決的衝突 - 存放庫 - 確 定 - 複製標籤名稱 - 複製標籤訊息 - 刪除 ${0}$... - 合併 ${0}$ 到 ${1}$... - 推送 ${0}$... - 更新子模組 - 更新所有子模組 - 啟用 [--init] 選項 - 啟用 [--recursive] 選項 - 子模組: - 啟用 [--remote] 選項 - 存放庫網址: - 記錄 - 清除所有記錄 - 複製 - 刪除 - 警告 - 起始頁 - 新增群組 - 新增子群組 - 複製 (clone) 遠端存放庫 - 刪除 - 支援拖放以新增目錄與自訂群組。 - 編輯 - 調整存放庫分組 - 開啟所有包含存放庫 - 開啟本機存放庫 - 開啟終端機 - 重新掃描預設複製 (clone) 目錄下的存放庫 - 快速搜尋存放庫... - 排序 - 本機變更 - 加入至 .gitignore 忽略清單 - 忽略所有 *{0} 檔案 - 忽略同路徑下所有 *{0} 檔案 - 忽略同路徑下所有檔案 - 忽略本檔案 - 修補 - 現在您已可將其加入暫存區中 - 提 交 - 提交並推送 - 歷史輸入/範本 - 觸發點擊事件 - 提交 (修改原始提交) - 自動暫存全部變更並提交 - 您已暫存 {0} 個檔案，但只顯示 {1} 個檔案 ({2} 個檔案被篩選器隱藏)。您確定要繼續提交嗎? - 偵測到衝突 - 使用外部合併工具開啟 - 使用外部合併工具開啟 - 檔案衝突已解決 - 使用我方版本 (ours) - 使用對方版本 (theirs) - 顯示未追蹤檔案 - 沒有提交訊息記錄 - 沒有可套用的提交訊息範本 - 重設作者 - 請選擇發生衝突的檔案，開啟右鍵選單，選擇合適的解決方式 - 署名 - 已暫存 - 取消暫存選取的檔案 - 取消暫存所有檔案 - 未暫存 - 暫存選取的檔案 - 暫存所有檔案 - 檢視不追蹤變更的檔案 - 範本: ${0}$ - 工作區: - 設定工作區... - 本機工作區 - 複製工作區路徑 - 鎖定工作區 - 移除工作區 - 解除鎖定工作區 - diff --git a/src/Resources/Images/ShellIcons/cmd.png b/src/Resources/ShellIcons/cmd.png similarity index 100% rename from src/Resources/Images/ShellIcons/cmd.png rename to src/Resources/ShellIcons/cmd.png diff --git a/src/Resources/Images/ShellIcons/git-bash.png b/src/Resources/ShellIcons/git-bash.png similarity index 100% rename from src/Resources/Images/ShellIcons/git-bash.png rename to src/Resources/ShellIcons/git-bash.png diff --git a/src/Resources/Images/ShellIcons/pwsh.png b/src/Resources/ShellIcons/pwsh.png similarity index 100% rename from src/Resources/Images/ShellIcons/pwsh.png rename to src/Resources/ShellIcons/pwsh.png diff --git a/src/Resources/Images/ShellIcons/wt.png b/src/Resources/ShellIcons/wt.png similarity index 100% rename from src/Resources/Images/ShellIcons/wt.png rename to src/Resources/ShellIcons/wt.png diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml index 15704775..a1549a13 100644 --- a/src/Resources/Styles.axaml +++ b/src/Resources/Styles.axaml @@ -1,11 +1,8 @@ @@ -16,218 +13,11 @@ 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + @@ -680,63 +472,48 @@ + - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + - - - + + + - + - - - - - - - - + + + + + - - - + + diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml index 3b463733..88f38d8c 100644 --- a/src/Resources/Themes.axaml +++ b/src/Resources/Themes.axaml @@ -2,88 +2,94 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + #FFFF6059 + #FFFFBE2F + #FF29c941 #FFF0F5F9 - #00000000 #FFCFDEEA #FFF0F5F9 #FFF8F8F8 #FFFAFAFA #FFB0CEE8 - #FF1F1F1F + #FF6F6F6F + #FFF8F8F8 #FF836C2E - #FFFFFFFF + #FFDFDFDF + #FFCFCFCF #FFCFCFCF #FF898989 #FFCFCFCF + #FFEFEFEF #FFF8F8F8 White + #FF4295FF + #FF529DFB #FF1F1F1F #FF6F6F6F - #10000000 - #80BFE6C1 - #80FF9797 - #A7E1A7 - #F19B9D - #0000EE - #FFE4E4E4 + #FFFFFFFF + #FF4295FF + #FF529DFB + #4C007ACC + #FFFF5E56 + #FFFCBB2D + #FF25C53C #FF252525 - #FF444444 #FF1F1F1F #FF2C2C2C #FF2B2B2B - #FF1C1C1C + #FF181818 #FF8F8F8F - #FFDDDDDD + #FF505050 + #FFF8F8F8 #FFFAFAD2 - #FF252525 + #FF323232 + #FF3F3F3F #FF181818 #FF7C7C7C #FF404040 + #FF252525 #FF303030 #FF333333 - #FFDDDDDD + #FF3A3A3A + #FF404040 + #FFF1F1F1 #40F1F1F1 - #3C000000 - #C03A5C3F - #C0633F3E - #A0308D3C - #A09F4247 - #4DAAFC - #FF383838 + #FF252525 + #FF007ACC + #FF006BBE + #8C007ACC + + + - - + + - + + + + + - - - - - - - - - - - fonts:Inter#Inter - fonts:SourceGit#JetBrains Mono - fonts:SourceGit#JetBrains Mono + + + + diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj index 5205ae4f..ecad8b6c 100644 --- a/src/SourceGit.csproj +++ b/src/SourceGit.csproj @@ -1,67 +1,46 @@  WinExe - net9.0 + net8.0 + true App.manifest App.ico - $([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)\\..\\VERSION")) + 8.8 + false true true SourceGit OpenSource GIT client sourcegit-scm - Copyright © $([System.DateTime]::Now.Year) sourcegit-scm. + Copyright © 2024 sourcegit-scm. MIT https://github.com/sourcegit-scm/sourcegit.git https://github.com/sourcegit-scm/sourcegit.git Public - - true - true - link - - - - $(DefineConstants);DISABLE_UPDATE_DETECTION - - + - - - - - + - - - - - - - - - - - - - - - + + + + + + + + + - - - - diff --git a/src/ViewModels/AIAssistant.cs b/src/ViewModels/AIAssistant.cs deleted file mode 100644 index 8756a30b..00000000 --- a/src/ViewModels/AIAssistant.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -using Avalonia.Threading; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class AIAssistant : ObservableObject - { - public bool IsGenerating - { - get => _isGenerating; - private set => SetProperty(ref _isGenerating, value); - } - - public string Text - { - get => _text; - private set => SetProperty(ref _text, value); - } - - public AIAssistant(Repository repo, Models.OpenAIService service, List changes, Action onApply) - { - _repo = repo; - _service = service; - _changes = changes; - _onApply = onApply; - _cancel = new CancellationTokenSource(); - - Gen(); - } - - public void Regen() - { - if (_cancel is { IsCancellationRequested: false }) - _cancel.Cancel(); - - Gen(); - } - - public void Apply() - { - _onApply?.Invoke(Text); - } - - public void Cancel() - { - _cancel?.Cancel(); - } - - private void Gen() - { - Text = string.Empty; - IsGenerating = true; - - _cancel = new CancellationTokenSource(); - Task.Run(() => - { - new Commands.GenerateCommitMessage(_service, _repo.FullPath, _changes, _cancel.Token, message => - { - Dispatcher.UIThread.Invoke(() => Text = message); - }).Exec(); - - Dispatcher.UIThread.Invoke(() => IsGenerating = false); - }, _cancel.Token); - } - - private readonly Repository _repo = null; - private Models.OpenAIService _service = null; - private List _changes = null; - private Action _onApply = null; - private CancellationTokenSource _cancel = null; - private bool _isGenerating = false; - private string _text = string.Empty; - } -} diff --git a/src/ViewModels/AddRemote.cs b/src/ViewModels/AddRemote.cs index 37bbc43a..6ec6f06c 100644 --- a/src/ViewModels/AddRemote.cs +++ b/src/ViewModels/AddRemote.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using System.IO; using System.Threading.Tasks; namespace SourceGit.ViewModels @@ -30,23 +29,19 @@ namespace SourceGit.ViewModels public bool UseSSH { get => _useSSH; - set - { - if (SetProperty(ref _useSSH, value)) - ValidateProperty(_sshkey, nameof(SSHKey)); - } + set => SetProperty(ref _useSSH, value); } - [CustomValidation(typeof(AddRemote), nameof(ValidateSSHKey))] public string SSHKey { - get => _sshkey; - set => SetProperty(ref _sshkey, value, true); + get; + set; } public AddRemote(Repository repo) { _repo = repo; + View = new Views.AddRemote() { DataContext = this }; } public static ValidationResult ValidateRemoteName(string name, ValidationContext ctx) @@ -76,38 +71,27 @@ namespace SourceGit.ViewModels return ValidationResult.Success; } - public static ValidationResult ValidateSSHKey(string sshkey, ValidationContext ctx) - { - if (ctx.ObjectInstance is AddRemote { _useSSH: true } && !string.IsNullOrEmpty(sshkey)) - { - if (!File.Exists(sshkey)) - return new ValidationResult("Given SSH private key can NOT be found!"); - } - - return ValidationResult.Success; - } - public override Task Sure() { _repo.SetWatcherEnabled(false); ProgressDescription = "Adding remote ..."; - var log = _repo.CreateLog("Add Remote"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Remote(_repo.FullPath).Use(log).Add(_name, _url); + var succ = new Commands.Remote(_repo.FullPath).Add(_name, _url); if (succ) { - new Commands.Config(_repo.FullPath).Use(log).Set($"remote.{_name}.sshkey", _useSSH ? SSHKey : null); - new Commands.Fetch(_repo.FullPath, _name, false, false).Use(log).Exec(); - } + SetProgressDescription("Fetching from added remote ..."); + new Commands.Fetch(_repo.FullPath, _name, true, SetProgressDescription).Exec(); - log.Complete(); + if (_useSSH) + { + SetProgressDescription("Post processing ..."); + new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", SSHKey); + } + } CallUIThread(() => { - _repo.MarkFetched(); _repo.MarkBranchesDirtyManually(); _repo.SetWatcherEnabled(true); }); @@ -119,6 +103,5 @@ namespace SourceGit.ViewModels private string _name = string.Empty; private string _url = string.Empty; private bool _useSSH = false; - private string _sshkey = string.Empty; } } diff --git a/src/ViewModels/AddSubmodule.cs b/src/ViewModels/AddSubmodule.cs index 82a1f62a..657075a9 100644 --- a/src/ViewModels/AddSubmodule.cs +++ b/src/ViewModels/AddSubmodule.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.IO; using System.Threading.Tasks; @@ -15,10 +14,12 @@ namespace SourceGit.ViewModels set => SetProperty(ref _url, value, true); } + [Required(ErrorMessage = "Reletive path is required!!!")] + [CustomValidation(typeof(AddSubmodule), nameof(ValidateRelativePath))] public string RelativePath { get => _relativePath; - set => SetProperty(ref _relativePath, value); + set => SetProperty(ref _relativePath, value, true); } public bool Recursive @@ -30,12 +31,27 @@ namespace SourceGit.ViewModels public AddSubmodule(Repository repo) { _repo = repo; + View = new Views.AddSubmodule() { DataContext = this }; } public static ValidationResult ValidateURL(string url, ValidationContext ctx) { if (!Models.Remote.IsValidURL(url)) return new ValidationResult("Invalid repository URL format"); + return ValidationResult.Success; + } + + public static ValidationResult ValidateRelativePath(string path, ValidationContext ctx) + { + if (Path.Exists(path)) + { + return new ValidationResult("Give path is exists already!"); + } + + if (Path.IsPathRooted(path)) + { + return new ValidationResult("Path must be relative to this repository!"); + } return ValidationResult.Success; } @@ -45,25 +61,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Adding submodule..."; - var log = _repo.CreateLog("Add Submodule"); - Use(log); - - var relativePath = _relativePath; - if (string.IsNullOrEmpty(relativePath)) - { - if (_url.EndsWith("/.git", StringComparison.Ordinal)) - relativePath = Path.GetFileName(Path.GetDirectoryName(_url)); - else if (_url.EndsWith(".git", StringComparison.Ordinal)) - relativePath = Path.GetFileNameWithoutExtension(_url); - else - relativePath = Path.GetFileName(_url); - } - return Task.Run(() => { - var succ = new Commands.Submodule(_repo.FullPath).Use(log).Add(_url, relativePath, Recursive); - log.Complete(); - + var succ = new Commands.Submodule(_repo.FullPath).Add(_url, _relativePath, Recursive, SetProgressDescription); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); diff --git a/src/ViewModels/AddWorktree.cs b/src/ViewModels/AddWorktree.cs deleted file mode 100644 index a089a391..00000000 --- a/src/ViewModels/AddWorktree.cs +++ /dev/null @@ -1,135 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.IO; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class AddWorktree : Popup - { - [Required(ErrorMessage = "Worktree path is required!")] - [CustomValidation(typeof(AddWorktree), nameof(ValidateWorktreePath))] - public string Path - { - get => _path; - set => SetProperty(ref _path, value, true); - } - - public bool CreateNewBranch - { - get => _createNewBranch; - set - { - if (SetProperty(ref _createNewBranch, value, true)) - { - if (value) - SelectedBranch = string.Empty; - else - SelectedBranch = LocalBranches.Count > 0 ? LocalBranches[0] : string.Empty; - } - } - } - - public List LocalBranches - { - get; - private set; - } - - public List RemoteBranches - { - get; - private set; - } - - public string SelectedBranch - { - get => _selectedBranch; - set => SetProperty(ref _selectedBranch, value); - } - - public bool SetTrackingBranch - { - get => _setTrackingBranch; - set => SetProperty(ref _setTrackingBranch, value); - } - - public string SelectedTrackingBranch - { - get; - set; - } - - public AddWorktree(Repository repo) - { - _repo = repo; - - LocalBranches = new List(); - RemoteBranches = new List(); - foreach (var branch in repo.Branches) - { - if (branch.IsLocal) - LocalBranches.Add(branch.Name); - else - RemoteBranches.Add(branch.FriendlyName); - } - - if (RemoteBranches.Count > 0) - SelectedTrackingBranch = RemoteBranches[0]; - else - SelectedTrackingBranch = string.Empty; - } - - public static ValidationResult ValidateWorktreePath(string path, ValidationContext ctx) - { - var creator = ctx.ObjectInstance as AddWorktree; - if (creator == null) - return new ValidationResult("Missing runtime context to create branch!"); - - if (string.IsNullOrEmpty(path)) - return new ValidationResult("Worktree path is required!"); - - var fullPath = System.IO.Path.IsPathRooted(path) ? path : System.IO.Path.Combine(creator._repo.FullPath, path); - var info = new DirectoryInfo(fullPath); - if (info.Exists) - { - var files = info.GetFiles(); - if (files.Length > 0) - return new ValidationResult("Given path is not empty!!!"); - - var folders = info.GetDirectories(); - if (folders.Length > 0) - return new ValidationResult("Given path is not empty!!!"); - } - - return ValidationResult.Success; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Adding worktree ..."; - - var branchName = _selectedBranch; - var tracking = _setTrackingBranch ? SelectedTrackingBranch : string.Empty; - var log = _repo.CreateLog("Add Worktree"); - - Use(log); - - return Task.Run(() => - { - var succ = new Commands.Worktree(_repo.FullPath).Use(log).Add(_path, branchName, _createNewBranch, tracking); - log.Complete(); - - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private Repository _repo = null; - private string _path = string.Empty; - private bool _createNewBranch = true; - private string _selectedBranch = string.Empty; - private bool _setTrackingBranch = false; - } -} diff --git a/src/ViewModels/Apply.cs b/src/ViewModels/Apply.cs index c7f3c185..09567761 100644 --- a/src/ViewModels/Apply.cs +++ b/src/ViewModels/Apply.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.IO; using System.Threading.Tasks; @@ -20,6 +21,12 @@ namespace SourceGit.ViewModels set => SetProperty(ref _ignoreWhiteSpace, value); } + public List WhiteSpaceModes + { + get; + private set; + } + public Models.ApplyWhiteSpaceMode SelectedWhiteSpaceMode { get; @@ -30,13 +37,23 @@ namespace SourceGit.ViewModels { _repo = repo; - SelectedWhiteSpaceMode = Models.ApplyWhiteSpaceMode.Supported[0]; + WhiteSpaceModes = new List { + new Models.ApplyWhiteSpaceMode("Apply.NoWarn", "Apply.NoWarn.Desc", "nowarn"), + new Models.ApplyWhiteSpaceMode("Apply.Warn", "Apply.Warn.Desc", "warn"), + new Models.ApplyWhiteSpaceMode("Apply.Error", "Apply.Error.Desc", "error"), + new Models.ApplyWhiteSpaceMode("Apply.ErrorAll", "Apply.ErrorAll.Desc", "error-all") + }; + SelectedWhiteSpaceMode = WhiteSpaceModes[0]; + + View = new Views.Apply() { DataContext = this }; } public static ValidationResult ValidatePatchFile(string file, ValidationContext _) { if (File.Exists(file)) + { return ValidationResult.Success; + } return new ValidationResult($"File '{file}' can NOT be found!!!"); } @@ -46,12 +63,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Apply patch..."; - var log = _repo.CreateLog("Apply Patch"); return Task.Run(() => { - var succ = new Commands.Apply(_repo.FullPath, _patchFile, _ignoreWhiteSpace, SelectedWhiteSpaceMode.Arg, null).Use(log).Exec(); - log.Complete(); - + var succ = new Commands.Apply(_repo.FullPath, _patchFile, _ignoreWhiteSpace, SelectedWhiteSpaceMode.Arg, null).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); diff --git a/src/ViewModels/ApplyStash.cs b/src/ViewModels/ApplyStash.cs deleted file mode 100644 index e7cd64e9..00000000 --- a/src/ViewModels/ApplyStash.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class ApplyStash : Popup - { - public Models.Stash Stash - { - get; - private set; - } - - public bool RestoreIndex - { - get; - set; - } = true; - - public bool DropAfterApply - { - get; - set; - } = false; - - public ApplyStash(Repository repo, Models.Stash stash) - { - _repo = repo; - Stash = stash; - } - - public override Task Sure() - { - ProgressDescription = $"Applying stash: {Stash.Name}"; - - var log = _repo.CreateLog("Apply Stash"); - return Task.Run(() => - { - var succ = new Commands.Stash(_repo.FullPath).Use(log).Apply(Stash.Name, RestoreIndex); - if (succ && DropAfterApply) - new Commands.Stash(_repo.FullPath).Use(log).Drop(Stash.Name); - - log.Complete(); - return true; - }); - } - - private readonly Repository _repo; - } -} diff --git a/src/ViewModels/Archive.cs b/src/ViewModels/Archive.cs index a4a4f6eb..3bc3b6be 100644 --- a/src/ViewModels/Archive.cs +++ b/src/ViewModels/Archive.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.IO; using System.Threading.Tasks; @@ -7,6 +6,7 @@ namespace SourceGit.ViewModels { public class Archive : Popup { + [Required(ErrorMessage = "Output file name is required")] public string SaveFile { @@ -24,24 +24,27 @@ namespace SourceGit.ViewModels { _repo = repo; _revision = branch.Head; - _saveFile = $"archive-{Path.GetFileName(branch.Name)}.zip"; + _saveFile = $"archive-{Path.GetFileNameWithoutExtension(branch.Name)}.zip"; BasedOn = branch; + View = new Views.Archive() { DataContext = this }; } public Archive(Repository repo, Models.Commit commit) { _repo = repo; _revision = commit.SHA; - _saveFile = $"archive-{commit.SHA.AsSpan(0, 10)}.zip"; + _saveFile = $"archive-{commit.SHA.Substring(0, 10)}.zip"; BasedOn = commit; + View = new Views.Archive() { DataContext = this }; } public Archive(Repository repo, Models.Tag tag) { _repo = repo; _revision = tag.SHA; - _saveFile = $"archive-{Path.GetFileName(tag.Name)}.zip"; + _saveFile = $"archive-{tag.Name}.zip"; BasedOn = tag; + View = new Views.Archive() { DataContext = this }; } public override Task Sure() @@ -49,14 +52,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Archiving ..."; - var log = _repo.CreateLog("Archive"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Archive(_repo.FullPath, _revision, _saveFile).Use(log).Exec(); - log.Complete(); - + var succ = new Commands.Archive(_repo.FullPath, _revision, _saveFile, SetProgressDescription).Exec(); CallUIThread(() => { _repo.SetWatcherEnabled(true); @@ -69,7 +67,7 @@ namespace SourceGit.ViewModels } private readonly Repository _repo = null; - private string _saveFile; - private readonly string _revision; + private string _saveFile = string.Empty; + private readonly string _revision = string.Empty; } } diff --git a/src/ViewModels/AssumeUnchangedManager.cs b/src/ViewModels/AssumeUnchangedManager.cs index 68151448..a8208937 100644 --- a/src/ViewModels/AssumeUnchangedManager.cs +++ b/src/ViewModels/AssumeUnchangedManager.cs @@ -9,29 +9,30 @@ namespace SourceGit.ViewModels { public AvaloniaList Files { get; private set; } - public AssumeUnchangedManager(Repository repo) + public AssumeUnchangedManager(string repo) { _repo = repo; Files = new AvaloniaList(); Task.Run(() => { - var collect = new Commands.QueryAssumeUnchangedFiles(_repo.FullPath).Result(); - Dispatcher.UIThread.Invoke(() => Files.AddRange(collect)); + var collect = new Commands.AssumeUnchanged(_repo).View(); + Dispatcher.UIThread.Invoke(() => + { + Files.AddRange(collect); + }); }); } - public void Remove(string file) + public void Remove(object param) { - if (!string.IsNullOrEmpty(file)) + if (param is string file) { - var log = _repo.CreateLog("Remove Assume Unchanged File"); - new Commands.AssumeUnchanged(_repo.FullPath, file, false).Use(log).Exec(); - log.Complete(); + new Commands.AssumeUnchanged(_repo).Remove(file); Files.Remove(file); } } - private readonly Repository _repo; + private readonly string _repo; } } diff --git a/src/ViewModels/Blame.cs b/src/ViewModels/Blame.cs index a189215a..bef29219 100644 --- a/src/ViewModels/Blame.cs +++ b/src/ViewModels/Blame.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; +using System.Threading.Tasks; using Avalonia.Threading; @@ -11,25 +8,16 @@ namespace SourceGit.ViewModels { public class Blame : ObservableObject { - public string FilePath + public string Title { get; + private set; } - public Models.Commit Revision + public string SelectedSHA { - get => _revision; - private set => SetProperty(ref _revision, value); - } - - public Models.BlameData Data - { - get => _data; - private set - { - if (SetProperty(ref _data, value)) - OnPropertyChanged(nameof(IsBinary)); - } + get => _selectedSHA; + private set => SetProperty(ref _selectedSHA, value); } public bool IsBinary @@ -37,135 +25,37 @@ namespace SourceGit.ViewModels get => _data != null && _data.IsBinary; } - public bool CanBack + public Models.BlameData Data { - get => _navigationActiveIndex > 0; + get => _data; + private set => SetProperty(ref _data, value); } - public bool CanForward + public Blame(string repo, string file, string revision) { - get => _navigationActiveIndex < _navigationHistory.Count - 1; - } - - public Blame(string repo, string file, Models.Commit commit) - { - var sha = commit.SHA.Substring(0, 10); - - FilePath = file; - Revision = commit; - _repo = repo; - _navigationHistory.Add(sha); - _commits.Add(sha, commit); - SetBlameData(sha); - } - public string GetCommitMessage(string sha) - { - if (_commitMessages.TryGetValue(sha, out var msg)) - return msg; - - msg = new Commands.QueryCommitFullMessage(_repo, sha).Result(); - _commitMessages[sha] = msg; - return msg; - } - - public void Back() - { - if (_navigationActiveIndex <= 0) - return; - - _navigationActiveIndex--; - OnPropertyChanged(nameof(CanBack)); - OnPropertyChanged(nameof(CanForward)); - NavigateToCommit(_navigationHistory[_navigationActiveIndex]); - } - - public void Forward() - { - if (_navigationActiveIndex >= _navigationHistory.Count - 1) - return; - - _navigationActiveIndex++; - OnPropertyChanged(nameof(CanBack)); - OnPropertyChanged(nameof(CanForward)); - NavigateToCommit(_navigationHistory[_navigationActiveIndex]); + Title = $"{file} @ {revision.Substring(0, 10)}"; + Task.Run(() => + { + var result = new Commands.Blame(repo, file, revision).Result(); + Dispatcher.UIThread.Invoke(() => + { + Data = result; + OnPropertyChanged(nameof(IsBinary)); + }); + }); } public void NavigateToCommit(string commitSHA) { - if (!_navigationHistory[_navigationActiveIndex].Equals(commitSHA, StringComparison.Ordinal)) - { - _navigationHistory.Add(commitSHA); - _navigationActiveIndex = _navigationHistory.Count - 1; - OnPropertyChanged(nameof(CanBack)); - OnPropertyChanged(nameof(CanForward)); - } - - if (!Revision.SHA.StartsWith(commitSHA, StringComparison.Ordinal)) - SetBlameData(commitSHA); - - if (App.GetLauncher() is { Pages: { } pages }) - { - foreach (var page in pages) - { - if (page.Data is Repository repo && repo.FullPath.Equals(_repo)) - { - repo.NavigateToCommit(commitSHA); - break; - } - } - } + var repo = Preference.FindRepository(_repo); + if (repo != null) + repo.NavigateToCommit(commitSHA); } - private void SetBlameData(string commitSHA) - { - if (_cancellationSource is { IsCancellationRequested: false }) - _cancellationSource.Cancel(); - - _cancellationSource = new CancellationTokenSource(); - var token = _cancellationSource.Token; - - if (_commits.TryGetValue(commitSHA, out var c)) - { - Revision = c; - } - else - { - Task.Run(() => - { - var result = new Commands.QuerySingleCommit(_repo, commitSHA).Result(); - - Dispatcher.UIThread.Invoke(() => - { - if (!token.IsCancellationRequested) - { - _commits.Add(commitSHA, result); - Revision = result ?? new Models.Commit() { SHA = commitSHA }; - } - }); - }, token); - } - - Task.Run(() => - { - var result = new Commands.Blame(_repo, FilePath, commitSHA).Result(); - - Dispatcher.UIThread.Invoke(() => - { - if (!token.IsCancellationRequested) - Data = result; - }); - }, token); - } - - private string _repo; - private Models.Commit _revision; - private CancellationTokenSource _cancellationSource = null; - private int _navigationActiveIndex = 0; - private List _navigationHistory = []; + private readonly string _repo = string.Empty; + private string _selectedSHA = string.Empty; private Models.BlameData _data = null; - private Dictionary _commits = new(); - private Dictionary _commitMessages = new(); } } diff --git a/src/ViewModels/BlockNavigation.cs b/src/ViewModels/BlockNavigation.cs deleted file mode 100644 index 9a5a926c..00000000 --- a/src/ViewModels/BlockNavigation.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System.Collections.Generic; -using Avalonia.Collections; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class BlockNavigation : ObservableObject - { - public class Block - { - public int Start { get; set; } = 0; - public int End { get; set; } = 0; - - public Block(int start, int end) - { - Start = start; - End = end; - } - - public bool IsInRange(int line) - { - return line >= Start && line <= End; - } - } - - public AvaloniaList Blocks - { - get; - } = []; - - public int Current - { - get => _current; - private set => SetProperty(ref _current, value); - } - - public string Indicator - { - get - { - if (Blocks.Count == 0) - return "-/-"; - - if (_current >= 0 && _current < Blocks.Count) - return $"{_current + 1}/{Blocks.Count}"; - - return $"-/{Blocks.Count}"; - } - } - - public BlockNavigation(object context) - { - Blocks.Clear(); - Current = -1; - - var lines = new List(); - if (context is Models.TextDiff combined) - lines = combined.Lines; - else if (context is TwoSideTextDiff twoSide) - lines = twoSide.Old; - - if (lines.Count == 0) - return; - - var lineIdx = 0; - var blockStartIdx = 0; - var isNewBlock = true; - var blocks = new List(); - - foreach (var line in lines) - { - lineIdx++; - if (line.Type == Models.TextDiffLineType.Added || - line.Type == Models.TextDiffLineType.Deleted || - line.Type == Models.TextDiffLineType.None) - { - if (isNewBlock) - { - isNewBlock = false; - blockStartIdx = lineIdx; - } - } - else - { - if (!isNewBlock) - { - blocks.Add(new Block(blockStartIdx, lineIdx - 1)); - isNewBlock = true; - } - } - } - - if (!isNewBlock) - blocks.Add(new Block(blockStartIdx, lines.Count - 1)); - - Blocks.AddRange(blocks); - } - - public Block GetCurrentBlock() - { - return (_current >= 0 && _current < Blocks.Count) ? Blocks[_current] : null; - } - - public Block GotoFirst() - { - if (Blocks.Count == 0) - return null; - - Current = 0; - return Blocks[_current]; - } - - public Block GotoPrev() - { - if (Blocks.Count == 0) - return null; - - if (_current == -1) - Current = 0; - else if (_current > 0) - Current = _current - 1; - return Blocks[_current]; - } - - public Block GotoNext() - { - if (Blocks.Count == 0) - return null; - - if (_current < Blocks.Count - 1) - Current = _current + 1; - return Blocks[_current]; - } - - public Block GotoLast() - { - if (Blocks.Count == 0) - return null; - - Current = Blocks.Count - 1; - return Blocks[_current]; - } - - private int _current = -1; - } -} diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs deleted file mode 100644 index f56cfd76..00000000 --- a/src/ViewModels/BranchCompare.cs +++ /dev/null @@ -1,244 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; - -using Avalonia.Controls; -using Avalonia.Threading; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class BranchCompare : ObservableObject - { - public Models.Branch Base - { - get => _based; - private set => SetProperty(ref _based, value); - } - - public Models.Branch To - { - get => _to; - private set => SetProperty(ref _to, value); - } - - public Models.Commit BaseHead - { - get => _baseHead; - private set => SetProperty(ref _baseHead, value); - } - - public Models.Commit ToHead - { - get => _toHead; - private set => SetProperty(ref _toHead, value); - } - - public List VisibleChanges - { - get => _visibleChanges; - private set => SetProperty(ref _visibleChanges, value); - } - - public List SelectedChanges - { - get => _selectedChanges; - set - { - if (SetProperty(ref _selectedChanges, value)) - { - if (value != null && value.Count == 1) - DiffContext = new DiffContext(_repo, new Models.DiffOption(_based.Head, _to.Head, value[0]), _diffContext); - else - DiffContext = null; - } - } - } - - public string SearchFilter - { - get => _searchFilter; - set - { - if (SetProperty(ref _searchFilter, value)) - { - RefreshVisible(); - } - } - } - - public DiffContext DiffContext - { - get => _diffContext; - private set => SetProperty(ref _diffContext, value); - } - - public BranchCompare(string repo, Models.Branch baseBranch, Models.Branch toBranch) - { - _repo = repo; - _based = baseBranch; - _to = toBranch; - - Refresh(); - } - - public void NavigateTo(string commitSHA) - { - var launcher = App.GetLauncher(); - if (launcher == null) - return; - - foreach (var page in launcher.Pages) - { - if (page.Data is Repository repo && repo.FullPath.Equals(_repo)) - { - repo.NavigateToCommit(commitSHA); - break; - } - } - } - - public void Swap() - { - (Base, To) = (_to, _based); - SelectedChanges = []; - - if (_baseHead != null) - (BaseHead, ToHead) = (_toHead, _baseHead); - - Refresh(); - } - - public void ClearSearchFilter() - { - SearchFilter = string.Empty; - } - - public ContextMenu CreateChangeContextMenu() - { - if (_selectedChanges == null || _selectedChanges.Count != 1) - return null; - - var change = _selectedChanges[0]; - var menu = new ContextMenu(); - - var diffWithMerger = new MenuItem(); - diffWithMerger.Header = App.Text("DiffWithMerger"); - diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); - diffWithMerger.Click += (_, ev) => - { - var toolType = Preferences.Instance.ExternalMergeToolType; - var toolPath = Preferences.Instance.ExternalMergeToolPath; - var opt = new Models.DiffOption(_based.Head, _to.Head, change); - - Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, opt)); - ev.Handled = true; - }; - menu.Items.Add(diffWithMerger); - - if (change.Index != Models.ChangeState.Deleted) - { - var full = Path.GetFullPath(Path.Combine(_repo, change.Path)); - var explore = new MenuItem(); - explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.IsEnabled = File.Exists(full); - explore.Click += (_, ev) => - { - Native.OS.OpenInFileManager(full, true); - ev.Handled = true; - }; - menu.Items.Add(explore); - } - - var copyPath = new MenuItem(); - copyPath.Header = App.Text("CopyPath"); - copyPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyPath.Click += (_, ev) => - { - App.CopyText(change.Path); - ev.Handled = true; - }; - menu.Items.Add(copyPath); - - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(Native.OS.GetAbsPath(_repo, change.Path)); - e.Handled = true; - }; - menu.Items.Add(copyFullPath); - - return menu; - } - - private void Refresh() - { - Task.Run(() => - { - if (_baseHead == null) - { - var baseHead = new Commands.QuerySingleCommit(_repo, _based.Head).Result(); - var toHead = new Commands.QuerySingleCommit(_repo, _to.Head).Result(); - Dispatcher.UIThread.Invoke(() => - { - BaseHead = baseHead; - ToHead = toHead; - }); - } - - _changes = new Commands.CompareRevisions(_repo, _based.Head, _to.Head).Result(); - - var visible = _changes; - if (!string.IsNullOrWhiteSpace(_searchFilter)) - { - visible = new List(); - foreach (var c in _changes) - { - if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) - visible.Add(c); - } - } - - Dispatcher.UIThread.Invoke(() => VisibleChanges = visible); - }); - } - - private void RefreshVisible() - { - if (_changes == null) - return; - - if (string.IsNullOrEmpty(_searchFilter)) - { - VisibleChanges = _changes; - } - else - { - var visible = new List(); - foreach (var c in _changes) - { - if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) - visible.Add(c); - } - - VisibleChanges = visible; - } - } - - private string _repo; - private Models.Branch _based = null; - private Models.Branch _to = null; - private Models.Commit _baseHead = null; - private Models.Commit _toHead = null; - private List _changes = null; - private List _visibleChanges = null; - private List _selectedChanges = null; - private string _searchFilter = string.Empty; - private DiffContext _diffContext = null; - } -} diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs deleted file mode 100644 index 130893ec..00000000 --- a/src/ViewModels/BranchTreeNode.cs +++ /dev/null @@ -1,278 +0,0 @@ -using System; -using System.Collections.Generic; -using Avalonia; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class BranchTreeNode : ObservableObject - { - public string Name { get; private set; } = string.Empty; - public string Path { get; private set; } = string.Empty; - public object Backend { get; private set; } = null; - public ulong TimeToSort { get; private set; } = 0; - public int Depth { get; set; } = 0; - public bool IsSelected { get; set; } = false; - public List Children { get; private set; } = new List(); - public int Counter { get; set; } = 0; - - public Models.FilterMode FilterMode - { - get => _filterMode; - set => SetProperty(ref _filterMode, value); - } - - public bool IsExpanded - { - get => _isExpanded; - set => SetProperty(ref _isExpanded, value); - } - - public CornerRadius CornerRadius - { - get => _cornerRadius; - set => SetProperty(ref _cornerRadius, value); - } - - public bool IsBranch - { - get => Backend is Models.Branch; - } - - public bool IsCurrent - { - get => Backend is Models.Branch { IsCurrent: true }; - } - - public bool ShowUpstreamGoneTip - { - get => Backend is Models.Branch { IsUpstreamGone: true }; - } - - public string BranchesCount - { - get => Counter > 0 ? $"({Counter})" : string.Empty; - } - - public string Tooltip - { - get - { - if (Backend is Models.Branch b) - return b.FriendlyName; - - if (Backend is Models.Remote r) - return r.URL; - - return null; - } - } - - private Models.FilterMode _filterMode = Models.FilterMode.None; - private bool _isExpanded = false; - private CornerRadius _cornerRadius = new CornerRadius(4); - - public class Builder - { - public List Locals => _locals; - public List Remotes => _remotes; - public List InvalidExpandedNodes => _invalidExpandedNodes; - - public Builder(Models.BranchSortMode localSortMode, Models.BranchSortMode remoteSortMode) - { - _localSortMode = localSortMode; - _remoteSortMode = remoteSortMode; - } - - public void SetExpandedNodes(List expanded) - { - foreach (var node in expanded) - _expanded.Add(node); - } - - public void Run(List branches, List remotes, bool bForceExpanded) - { - var folders = new Dictionary(); - - var fakeRemoteTime = (ulong)remotes.Count; - foreach (var remote in remotes) - { - var path = $"refs/remotes/{remote.Name}"; - var node = new BranchTreeNode() - { - Name = remote.Name, - Path = path, - Backend = remote, - IsExpanded = bForceExpanded || _expanded.Contains(path), - TimeToSort = fakeRemoteTime, - }; - - fakeRemoteTime--; - folders.Add(path, node); - _remotes.Add(node); - } - - foreach (var branch in branches) - { - if (branch.IsLocal) - { - MakeBranchNode(branch, _locals, folders, "refs/heads", bForceExpanded); - continue; - } - - var rk = $"refs/remotes/{branch.Remote}"; - if (folders.TryGetValue(rk, out var remote)) - { - remote.Counter++; - MakeBranchNode(branch, remote.Children, folders, rk, bForceExpanded); - } - } - - foreach (var path in _expanded) - { - if (!folders.ContainsKey(path)) - _invalidExpandedNodes.Add(path); - } - - folders.Clear(); - - if (_localSortMode == Models.BranchSortMode.Name) - SortNodesByName(_locals); - else - SortNodesByTime(_locals); - - if (_remoteSortMode == Models.BranchSortMode.Name) - SortNodesByName(_remotes); - else - SortNodesByTime(_remotes); - } - - private void MakeBranchNode(Models.Branch branch, List roots, Dictionary folders, string prefix, bool bForceExpanded) - { - var time = branch.CommitterDate; - var fullpath = $"{prefix}/{branch.Name}"; - var sepIdx = branch.Name.IndexOf('/', StringComparison.Ordinal); - if (sepIdx == -1 || branch.IsDetachedHead) - { - roots.Add(new BranchTreeNode() - { - Name = branch.Name, - Path = fullpath, - Backend = branch, - IsExpanded = false, - TimeToSort = time, - }); - return; - } - - var lastFolder = null as BranchTreeNode; - var start = 0; - - while (sepIdx != -1) - { - var folder = string.Concat(prefix, "/", branch.Name.Substring(0, sepIdx)); - var name = branch.Name.Substring(start, sepIdx - start); - if (folders.TryGetValue(folder, out var val)) - { - lastFolder = val; - lastFolder.Counter++; - lastFolder.TimeToSort = Math.Max(lastFolder.TimeToSort, time); - if (!lastFolder.IsExpanded) - lastFolder.IsExpanded |= (branch.IsCurrent || _expanded.Contains(folder)); - } - else if (lastFolder == null) - { - lastFolder = new BranchTreeNode() - { - Name = name, - Path = folder, - IsExpanded = bForceExpanded || branch.IsCurrent || _expanded.Contains(folder), - TimeToSort = time, - Counter = 1, - }; - roots.Add(lastFolder); - folders.Add(folder, lastFolder); - } - else - { - var cur = new BranchTreeNode() - { - Name = name, - Path = folder, - IsExpanded = bForceExpanded || branch.IsCurrent || _expanded.Contains(folder), - TimeToSort = time, - Counter = 1, - }; - lastFolder.Children.Add(cur); - folders.Add(folder, cur); - lastFolder = cur; - } - - start = sepIdx + 1; - sepIdx = branch.Name.IndexOf('/', start); - } - - lastFolder?.Children.Add(new BranchTreeNode() - { - Name = System.IO.Path.GetFileName(branch.Name), - Path = fullpath, - Backend = branch, - IsExpanded = false, - TimeToSort = time, - }); - } - - private void SortNodesByName(List nodes) - { - nodes.Sort((l, r) => - { - if (l.Backend is Models.Branch { IsDetachedHead: true }) - return -1; - - if (l.Backend is Models.Branch) - return r.Backend is Models.Branch ? Models.NumericSort.Compare(l.Name, r.Name) : 1; - - return r.Backend is Models.Branch ? -1 : Models.NumericSort.Compare(l.Name, r.Name); - }); - - foreach (var node in nodes) - SortNodesByName(node.Children); - } - - private void SortNodesByTime(List nodes) - { - nodes.Sort((l, r) => - { - if (l.Backend is Models.Branch { IsDetachedHead: true }) - return -1; - - if (l.Backend is Models.Branch) - { - if (r.Backend is Models.Branch) - return r.TimeToSort == l.TimeToSort ? Models.NumericSort.Compare(l.Name, r.Name) : r.TimeToSort.CompareTo(l.TimeToSort); - else - return 1; - } - - if (r.Backend is Models.Branch) - return -1; - - if (r.TimeToSort == l.TimeToSort) - return Models.NumericSort.Compare(l.Name, r.Name); - - return r.TimeToSort.CompareTo(l.TimeToSort); - }); - - foreach (var node in nodes) - SortNodesByTime(node.Children); - } - - private readonly Models.BranchSortMode _localSortMode = Models.BranchSortMode.Name; - private readonly Models.BranchSortMode _remoteSortMode = Models.BranchSortMode.Name; - private readonly List _locals = new List(); - private readonly List _remotes = new List(); - private readonly List _invalidExpandedNodes = new List(); - private readonly HashSet _expanded = new HashSet(); - } - } -} diff --git a/src/ViewModels/ChangeCollection.cs b/src/ViewModels/ChangeCollection.cs deleted file mode 100644 index 5de9f4fd..00000000 --- a/src/ViewModels/ChangeCollection.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; - -using Avalonia.Collections; - -namespace SourceGit.ViewModels -{ - public class ChangeCollectionAsTree - { - public List Tree { get; set; } = new List(); - public AvaloniaList Rows { get; set; } = new AvaloniaList(); - public AvaloniaList SelectedRows { get; set; } = new AvaloniaList(); - } - - public class ChangeCollectionAsGrid - { - public AvaloniaList Changes { get; set; } = new AvaloniaList(); - public AvaloniaList SelectedChanges { get; set; } = new AvaloniaList(); - } - - public class ChangeCollectionAsList - { - public AvaloniaList Changes { get; set; } = new AvaloniaList(); - public AvaloniaList SelectedChanges { get; set; } = new AvaloniaList(); - } -} diff --git a/src/ViewModels/ChangeTreeNode.cs b/src/ViewModels/ChangeTreeNode.cs deleted file mode 100644 index 6c061f65..00000000 --- a/src/ViewModels/ChangeTreeNode.cs +++ /dev/null @@ -1,135 +0,0 @@ -using System; -using System.Collections.Generic; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class ChangeTreeNode : ObservableObject - { - public string FullPath { get; set; } - public int Depth { get; private set; } = 0; - public Models.Change Change { get; set; } = null; - public List Children { get; set; } = new List(); - - public bool IsFolder - { - get => Change == null; - } - - public bool ShowConflictMarker - { - get => Change is { IsConflicted: true }; - } - - public string ConflictMarker - { - get => Change?.ConflictMarker ?? string.Empty; - } - - public bool IsExpanded - { - get => _isExpanded; - set => SetProperty(ref _isExpanded, value); - } - - public ChangeTreeNode(Models.Change c, int depth) - { - FullPath = c.Path; - Depth = depth; - Change = c; - IsExpanded = false; - } - - public ChangeTreeNode(string path, bool isExpanded, int depth) - { - FullPath = path; - Depth = depth; - IsExpanded = isExpanded; - } - - public static List Build(IList changes, HashSet folded) - { - var nodes = new List(); - var folders = new Dictionary(); - - foreach (var c in changes) - { - var sepIdx = c.Path.IndexOf('/', StringComparison.Ordinal); - if (sepIdx == -1) - { - nodes.Add(new ChangeTreeNode(c, 0)); - } - else - { - ChangeTreeNode lastFolder = null; - int depth = 0; - - while (sepIdx != -1) - { - var folder = c.Path.Substring(0, sepIdx); - if (folders.TryGetValue(folder, out var value)) - { - lastFolder = value; - } - else if (lastFolder == null) - { - lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder), depth); - folders.Add(folder, lastFolder); - InsertFolder(nodes, lastFolder); - } - else - { - var cur = new ChangeTreeNode(folder, !folded.Contains(folder), depth); - folders.Add(folder, cur); - InsertFolder(lastFolder.Children, cur); - lastFolder = cur; - } - - depth++; - sepIdx = c.Path.IndexOf('/', sepIdx + 1); - } - - lastFolder?.Children.Add(new ChangeTreeNode(c, depth)); - } - } - - Sort(nodes); - - folders.Clear(); - return nodes; - } - - private static void InsertFolder(List collection, ChangeTreeNode subFolder) - { - for (int i = 0; i < collection.Count; i++) - { - if (!collection[i].IsFolder) - { - collection.Insert(i, subFolder); - return; - } - } - - collection.Add(subFolder); - } - - private static void Sort(List nodes) - { - foreach (var node in nodes) - { - if (node.IsFolder) - Sort(node.Children); - } - - nodes.Sort((l, r) => - { - if (l.IsFolder == r.IsFolder) - return Models.NumericSort.Compare(l.FullPath, r.FullPath); - return l.IsFolder ? -1 : 1; - }); - } - - private bool _isExpanded = true; - } -} diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs index 630a97a5..adfc70db 100644 --- a/src/ViewModels/Checkout.cs +++ b/src/ViewModels/Checkout.cs @@ -7,30 +7,14 @@ namespace SourceGit.ViewModels public string Branch { get; - } - - public bool DiscardLocalChanges - { - get; - set; - } - - public bool IsRecurseSubmoduleVisible - { - get => _repo.Submodules.Count > 0; - } - - public bool RecurseSubmodules - { - get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch; - set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value; + private set; } public Checkout(Repository repo, string branch) { _repo = repo; Branch = branch; - DiscardLocalChanges = false; + View = new Views.Checkout() { DataContext = this }; } public override Task Sure() @@ -38,70 +22,14 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = $"Checkout '{Branch}' ..."; - var log = _repo.CreateLog($"Checkout '{Branch}'"); - Use(log); - - var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules; return Task.Run(() => { - var succ = false; - var needPopStash = false; - - if (DiscardLocalChanges) - { - succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(Branch, true); - } - else - { - var changes = new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).Result(); - if (changes > 0) - { - succ = new Commands.Stash(_repo.FullPath).Use(log).Push("CHECKOUT_AUTO_STASH"); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } - - needPopStash = true; - } - - succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(Branch, false); - } - - if (succ) - { - if (updateSubmodules) - { - var submodules = new Commands.QueryUpdatableSubmodules(_repo.FullPath).Result(); - if (submodules.Count > 0) - new Commands.Submodule(_repo.FullPath).Use(log).Update(submodules, true, true); - } - - if (needPopStash) - new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}"); - } - - log.Complete(); - - CallUIThread(() => - { - ProgressDescription = "Waiting for branch updated..."; - - var b = _repo.Branches.Find(x => x.IsLocal && x.Name == Branch); - if (b != null && _repo.HistoriesFilterMode == Models.FilterMode.Included) - _repo.SetBranchFilterMode(b, Models.FilterMode.Included, true, false); - - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - }); - - Task.Delay(400).Wait(); + var succ = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription); + CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private readonly Repository _repo = null; + private readonly Repository _repo; } } diff --git a/src/ViewModels/CheckoutAndFastForward.cs b/src/ViewModels/CheckoutAndFastForward.cs deleted file mode 100644 index 97ab86d7..00000000 --- a/src/ViewModels/CheckoutAndFastForward.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class CheckoutAndFastForward : Popup - { - public Models.Branch LocalBranch - { - get; - } - - public Models.Branch RemoteBranch - { - get; - } - - public bool DiscardLocalChanges - { - get; - set; - } - - public bool IsRecurseSubmoduleVisible - { - get => _repo.Submodules.Count > 0; - } - - public bool RecurseSubmodules - { - get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch; - set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value; - } - - public CheckoutAndFastForward(Repository repo, Models.Branch localBranch, Models.Branch remoteBranch) - { - _repo = repo; - LocalBranch = localBranch; - RemoteBranch = remoteBranch; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = $"Checkout and Fast-Forward '{LocalBranch.Name}' ..."; - - var log = _repo.CreateLog($"Checkout and Fast-Forward '{LocalBranch.Name}' ..."); - Use(log); - - var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules; - return Task.Run(() => - { - var succ = false; - var needPopStash = false; - - if (DiscardLocalChanges) - { - succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(LocalBranch.Name, RemoteBranch.Head, true, true); - } - else - { - var changes = new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).Result(); - if (changes > 0) - { - succ = new Commands.Stash(_repo.FullPath).Use(log).Push("CHECKOUT_AND_FASTFORWARD_AUTO_STASH"); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } - - needPopStash = true; - } - - succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(LocalBranch.Name, RemoteBranch.Head, false, true); - } - - if (succ) - { - if (updateSubmodules) - { - var submodules = new Commands.QueryUpdatableSubmodules(_repo.FullPath).Result(); - if (submodules.Count > 0) - new Commands.Submodule(_repo.FullPath).Use(log).Update(submodules, true, true); - } - - if (needPopStash) - new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}"); - } - - log.Complete(); - - CallUIThread(() => - { - ProgressDescription = "Waiting for branch updated..."; - - if (_repo.HistoriesFilterMode == Models.FilterMode.Included) - _repo.SetBranchFilterMode(LocalBranch, Models.FilterMode.Included, true, false); - - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - }); - - Task.Delay(400).Wait(); - return succ; - }); - } - - private Repository _repo; - } -} diff --git a/src/ViewModels/CheckoutCommit.cs b/src/ViewModels/CheckoutCommit.cs deleted file mode 100644 index c41fd2ce..00000000 --- a/src/ViewModels/CheckoutCommit.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class CheckoutCommit : Popup - { - public Models.Commit Commit - { - get; - } - - public bool DiscardLocalChanges - { - get; - set; - } - - public bool IsRecurseSubmoduleVisible - { - get => _repo.Submodules.Count > 0; - } - - public bool RecurseSubmodules - { - get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch; - set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value; - } - - public CheckoutCommit(Repository repo, Models.Commit commit) - { - _repo = repo; - Commit = commit; - DiscardLocalChanges = false; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = $"Checkout Commit '{Commit.SHA}' ..."; - - var log = _repo.CreateLog("Checkout Commit"); - Use(log); - - var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules; - return Task.Run(() => - { - var succ = false; - var needPop = false; - - if (DiscardLocalChanges) - { - succ = new Commands.Checkout(_repo.FullPath).Use(log).Commit(Commit.SHA, true); - } - else - { - var changes = new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).Result(); - if (changes > 0) - { - succ = new Commands.Stash(_repo.FullPath).Use(log).Push("CHECKOUT_AUTO_STASH"); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } - - needPop = true; - } - - succ = new Commands.Checkout(_repo.FullPath).Use(log).Commit(Commit.SHA, false); - } - - if (succ) - { - if (updateSubmodules) - { - var submodules = new Commands.QueryUpdatableSubmodules(_repo.FullPath).Result(); - if (submodules.Count > 0) - new Commands.Submodule(_repo.FullPath).Use(log).Update(submodules, true, true); - } - - if (needPop) - new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}"); - } - - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/CherryPick.cs b/src/ViewModels/CherryPick.cs index d5238bb3..a11d835c 100644 --- a/src/ViewModels/CherryPick.cs +++ b/src/ViewModels/CherryPick.cs @@ -1,101 +1,39 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; namespace SourceGit.ViewModels { public class CherryPick : Popup { - public List Targets + public Models.Commit Target { get; private set; } - public bool IsMergeCommit - { - get; - private set; - } - - public List ParentsForMergeCommit - { - get; - private set; - } - - public int MainlineForMergeCommit - { - get; - set; - } - - public bool AppendSourceToMessage - { - get; - set; - } - public bool AutoCommit { get; set; } - public CherryPick(Repository repo, List targets) + public CherryPick(Repository repo, Models.Commit target) { _repo = repo; - Targets = targets; - IsMergeCommit = false; - ParentsForMergeCommit = []; - MainlineForMergeCommit = 0; - AppendSourceToMessage = true; - AutoCommit = true; - } - - public CherryPick(Repository repo, Models.Commit merge, List parents) - { - _repo = repo; - Targets = [merge]; - IsMergeCommit = true; - ParentsForMergeCommit = parents; - MainlineForMergeCommit = 0; - AppendSourceToMessage = true; + Target = target; AutoCommit = true; + View = new Views.CherryPick() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - _repo.ClearCommitMessage(); - ProgressDescription = $"Cherry-Pick commit(s) ..."; - - var log = _repo.CreateLog("Cherry-Pick"); - Use(log); + ProgressDescription = $"Cherry-Pick commit '{Target.SHA}' ..."; return Task.Run(() => { - if (IsMergeCommit) - { - new Commands.CherryPick( - _repo.FullPath, - Targets[0].SHA, - !AutoCommit, - AppendSourceToMessage, - $"-m {MainlineForMergeCommit + 1}").Use(log).Exec(); - } - else - { - new Commands.CherryPick( - _repo.FullPath, - string.Join(' ', Targets.ConvertAll(c => c.SHA)), - !AutoCommit, - AppendSourceToMessage, - string.Empty).Use(log).Exec(); - } - - log.Complete(); + var succ = new Commands.CherryPick(_repo.FullPath, Target.SHA, !AutoCommit).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; + return succ; }); } diff --git a/src/ViewModels/Cleanup.cs b/src/ViewModels/Cleanup.cs index 1fc39cb5..75cc5943 100644 --- a/src/ViewModels/Cleanup.cs +++ b/src/ViewModels/Cleanup.cs @@ -7,6 +7,7 @@ namespace SourceGit.ViewModels public Cleanup(Repository repo) { _repo = repo; + View = new Views.Cleanup() { DataContext = this }; } public override Task Sure() @@ -14,13 +15,17 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Cleanup (GC & prune) ..."; - var log = _repo.CreateLog("Cleanup (GC & prune)"); - Use(log); - return Task.Run(() => { - new Commands.GC(_repo.FullPath).Use(log).Exec(); - log.Complete(); + new Commands.GC(_repo.FullPath, SetProgressDescription).Exec(); + + var lfs = new Commands.LFS(_repo.FullPath); + if (lfs.IsEnabled()) + { + SetProgressDescription("Run LFS prune ..."); + lfs.Prune(SetProgressDescription); + } + CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; }); diff --git a/src/ViewModels/ClearStashes.cs b/src/ViewModels/ClearStashes.cs index d71bab31..dad4059a 100644 --- a/src/ViewModels/ClearStashes.cs +++ b/src/ViewModels/ClearStashes.cs @@ -7,6 +7,7 @@ namespace SourceGit.ViewModels public ClearStashes(Repository repo) { _repo = repo; + View = new Views.ClearStashes() { DataContext = this }; } public override Task Sure() @@ -14,13 +15,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Clear all stashes..."; - var log = _repo.CreateLog("Clear Stashes"); - Use(log); - return Task.Run(() => { - new Commands.Stash(_repo.FullPath).Use(log).Clear(); - log.Complete(); + new Commands.Stash(_repo.FullPath).Clear(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; }); diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs index 94a74893..d1702860 100644 --- a/src/ViewModels/Clone.cs +++ b/src/ViewModels/Clone.cs @@ -3,8 +3,6 @@ using System.ComponentModel.DataAnnotations; using System.IO; using System.Threading.Tasks; -using Avalonia.Threading; - namespace SourceGit.ViewModels { public class Clone : Popup @@ -53,34 +51,12 @@ namespace SourceGit.ViewModels set => SetProperty(ref _extraArgs, value); } - public bool InitAndUpdateSubmodules + public Clone(Launcher launcher, LauncherPage page) { - get; - set; - } = true; + _launcher = launcher; + _page = page; - public Clone(string pageId) - { - _pageId = pageId; - - var activeWorkspace = Preferences.Instance.GetActiveWorkspace(); - _parentFolder = activeWorkspace?.DefaultCloneDir; - if (string.IsNullOrEmpty(ParentFolder)) - _parentFolder = Preferences.Instance.GitDefaultCloneDir; - - Task.Run(async () => - { - try - { - var text = await App.GetClipboardTextAsync(); - if (Models.Remote.IsValidURL(text)) - Dispatcher.UIThread.Invoke(() => Remote = text); - } - catch - { - // ignore - } - }); + View = new Views.Clone() { DataContext = this }; } public static ValidationResult ValidateRemote(string remote, ValidationContext _) @@ -101,12 +77,9 @@ namespace SourceGit.ViewModels { ProgressDescription = "Clone ..."; - var log = new CommandLog("Clone"); - Use(log); - return Task.Run(() => { - var cmd = new Commands.Clone(_pageId, _parentFolder, _remote, _local, _useSSH ? _sshKey : "", _extraArgs).Use(log); + var cmd = new Commands.Clone(HostPageId, _parentFolder, _remote, _local, _useSSH ? _sshKey : "", _extraArgs, SetProgressDescription); if (!cmd.Exec()) return false; @@ -117,8 +90,8 @@ namespace SourceGit.ViewModels } else { - var name = Path.GetFileName(_remote)!; - if (name.EndsWith(".git", StringComparison.Ordinal)) + var name = Path.GetFileName(_remote); + if (name.EndsWith(".git")) name = name.Substring(0, name.Length - 4); path = Path.GetFullPath(Path.Combine(path, name)); } @@ -127,7 +100,7 @@ namespace SourceGit.ViewModels { CallUIThread(() => { - App.RaiseException(_pageId, $"Folder '{path}' can NOT be found"); + App.RaiseException(HostPageId, $"Folder '{path}' can NOT be found"); }); return false; } @@ -138,42 +111,31 @@ namespace SourceGit.ViewModels config.Set("remote.origin.sshkey", _sshKey); } - if (InitAndUpdateSubmodules) - { - var submodules = new Commands.QueryUpdatableSubmodules(path).Result(); - if (submodules.Count > 0) - new Commands.Submodule(path).Use(log).Update(submodules, true, true); - } - - log.Complete(); - CallUIThread(() => { - var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, null, true); - var launcher = App.GetLauncher(); - var page = null as LauncherPage; - foreach (var one in launcher.Pages) + var repo = Preference.AddRepository(path, Path.Combine(path, ".git")); + var node = new RepositoryNode() { - if (one.Node.Id == _pageId) - { - page = one; - break; - } - } + Id = repo.FullPath, + Name = Path.GetFileName(repo.FullPath), + Bookmark = 0, + IsRepository = true, + }; + Preference.AddNode(node); - Welcome.Instance.Refresh(); - launcher.OpenRepositoryInTab(node, page); + _launcher.OpenRepositoryInTab(node, _page); }); return true; }); } - private string _pageId = string.Empty; + private readonly Launcher _launcher = null; + private readonly LauncherPage _page = null; private string _remote = string.Empty; private bool _useSSH = false; private string _sshKey = string.Empty; - private string _parentFolder = string.Empty; + private string _parentFolder = Preference.Instance.GitDefaultCloneDir; private string _local = string.Empty; private string _extraArgs = string.Empty; } diff --git a/src/ViewModels/CommandLog.cs b/src/ViewModels/CommandLog.cs deleted file mode 100644 index e73bc1ec..00000000 --- a/src/ViewModels/CommandLog.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.Text; -using Avalonia.Threading; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class CommandLog : ObservableObject, Models.ICommandLog - { - public string Name - { - get; - private set; - } = string.Empty; - - public DateTime StartTime - { - get; - } = DateTime.Now; - - public DateTime EndTime - { - get; - private set; - } = DateTime.Now; - - public bool IsComplete - { - get; - private set; - } = false; - - public string Content - { - get - { - return IsComplete ? _content : _builder.ToString(); - } - } - - public CommandLog(string name) - { - Name = name; - } - - public void Register(Action handler) - { - if (!IsComplete) - _onNewLineReceived += handler; - } - - public void AppendLine(string line = null) - { - var newline = line ?? string.Empty; - - Dispatcher.UIThread.Invoke(() => - { - _builder.AppendLine(newline); - _onNewLineReceived?.Invoke(newline); - }); - } - - public void Complete() - { - IsComplete = true; - - Dispatcher.UIThread.Invoke(() => - { - _content = _builder.ToString(); - _builder.Clear(); - _builder = null; - - EndTime = DateTime.Now; - - OnPropertyChanged(nameof(IsComplete)); - - if (_onNewLineReceived != null) - { - var dumpHandlers = _onNewLineReceived.GetInvocationList(); - foreach (var d in dumpHandlers) - _onNewLineReceived -= (Action)d; - } - }); - } - - private string _content = string.Empty; - private StringBuilder _builder = new StringBuilder(); - private event Action _onNewLineReceived; - } - - public static class CommandExtensions - { - public static T Use(this T cmd, CommandLog log) where T : Commands.Command - { - cmd.Log = log; - return cmd; - } - } -} diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs index fbecf30e..6fdcd93c 100644 --- a/src/ViewModels/CommitDetail.cs +++ b/src/ViewModels/CommitDetail.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.IO; -using System.Text.RegularExpressions; -using System.Threading; using System.Threading.Tasks; using Avalonia.Controls; +using Avalonia.Media.Imaging; using Avalonia.Platform.Storage; using Avalonia.Threading; @@ -13,19 +12,18 @@ using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public partial class CommitDetail : ObservableObject, IDisposable + public class CommitDetail : ObservableObject { + public DiffContext DiffContext + { + get => _diffContext; + private set => SetProperty(ref _diffContext, value); + } + public int ActivePageIndex { - get => _repo.CommitDetailActivePageIndex; - set - { - if (_repo.CommitDetailActivePageIndex != value) - { - _repo.CommitDetailActivePageIndex = value; - OnPropertyChanged(); - } - } + get => _activePageIndex; + set => SetProperty(ref _activePageIndex, value); } public Models.Commit Commit @@ -38,30 +36,6 @@ namespace SourceGit.ViewModels } } - public Models.CommitFullMessage FullMessage - { - get => _fullMessage; - private set => SetProperty(ref _fullMessage, value); - } - - public Models.CommitSignInfo SignInfo - { - get => _signInfo; - private set => SetProperty(ref _signInfo, value); - } - - public List WebLinks - { - get; - private set; - } - - public List Children - { - get => _children; - private set => SetProperty(ref _children, value); - } - public List Changes { get => _changes; @@ -74,25 +48,50 @@ namespace SourceGit.ViewModels set => SetProperty(ref _visibleChanges, value); } - public List SelectedChanges + public List ChangeTree { - get => _selectedChanges; + get => _changeTree; + set => SetProperty(ref _changeTree, value); + } + + public Models.Change SelectedChange + { + get => _selectedChange; set { - if (SetProperty(ref _selectedChanges, value)) + if (SetProperty(ref _selectedChange, value)) { - if (value == null || value.Count != 1) + if (value == null) + { + SelectedChangeNode = null; DiffContext = null; + } else - DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_commit, value[0]), _diffContext); + { + SelectedChangeNode = FileTreeNode.SelectByPath(_changeTree, value.Path); + DiffContext = new DiffContext(_repo, new Models.DiffOption(_commit, value), _diffContext); + } } } } - public DiffContext DiffContext + public FileTreeNode SelectedChangeNode { - get => _diffContext; - private set => SetProperty(ref _diffContext, value); + get => _selectedChangeNode; + set + { + if (SetProperty(ref _selectedChangeNode, value)) + { + if (value == null) + { + SelectedChange = null; + } + else + { + SelectedChange = value.Backend as Models.Change; + } + } + } } public string SearchChangeFilter @@ -101,69 +100,86 @@ namespace SourceGit.ViewModels set { if (SetProperty(ref _searchChangeFilter, value)) + { RefreshVisibleChanges(); + } } } - public string ViewRevisionFilePath + public List RevisionFilesTree { - get => _viewRevisionFilePath; - private set => SetProperty(ref _viewRevisionFilePath, value); + get => _revisionFilesTree; + set => SetProperty(ref _revisionFilesTree, value); + } + + public FileTreeNode SelectedRevisionFileNode + { + get => _selectedRevisionFileNode; + set + { + if (SetProperty(ref _selectedRevisionFileNode, value) && value != null && !value.IsFolder) + { + RefreshViewRevisionFile(value.Backend as Models.Object); + } + else + { + ViewRevisionFileContent = null; + } + } + } + + public string SearchFileFilter + { + get => _searchFileFilter; + set + { + if (SetProperty(ref _searchFileFilter, value)) + { + RefreshVisibleFiles(); + } + } } public object ViewRevisionFileContent { get => _viewRevisionFileContent; - private set => SetProperty(ref _viewRevisionFileContent, value); + set => SetProperty(ref _viewRevisionFileContent, value); } - public string RevisionFileSearchFilter - { - get => _revisionFileSearchFilter; - set - { - if (SetProperty(ref _revisionFileSearchFilter, value)) - RefreshRevisionSearchSuggestion(); - } - } - - public List RevisionFileSearchSuggestion - { - get => _revisionFileSearchSuggestion; - private set => SetProperty(ref _revisionFileSearchSuggestion, value); - } - - public CommitDetail(Repository repo) + public CommitDetail(string repo) { _repo = repo; - WebLinks = Models.CommitLink.Get(repo.Remotes); } - public void Dispose() + public void Cleanup() { _repo = null; _commit = null; - _changes = null; - _visibleChanges = null; - _selectedChanges = null; - _signInfo = null; + if (_changes != null) + _changes.Clear(); + if (_visibleChanges != null) + _visibleChanges.Clear(); + if (_changeTree != null) + _changeTree.Clear(); + _selectedChange = null; + _selectedChangeNode = null; _searchChangeFilter = null; _diffContext = null; + if (_revisionFiles != null) + _revisionFiles.Clear(); + if (_revisionFilesTree != null) + _revisionFilesTree.Clear(); + _selectedRevisionFileNode = null; + _searchFileFilter = null; _viewRevisionFileContent = null; - _cancellationSource = null; - _requestingRevisionFiles = false; - _revisionFiles = null; - _revisionFileSearchSuggestion = null; + _cancelToken = null; } public void NavigateTo(string commitSHA) { - _repo?.NavigateToCommit(commitSHA); - } - - public List GetRefsContainsThisCommit() - { - return new Commands.QueryRefsContainsCommit(_repo.FullPath, _commit.SHA).Result(); + var repo = Preference.FindRepository(_repo); + if (repo != null) + repo.NavigateToCommit(commitSHA); } public void ClearSearchChangeFilter() @@ -171,214 +187,75 @@ namespace SourceGit.ViewModels SearchChangeFilter = string.Empty; } - public void ClearRevisionFileSearchFilter() + public void ClearSearchFileFilter() { - RevisionFileSearchFilter = string.Empty; - } - - public void CancelRevisionFileSuggestions() - { - RevisionFileSearchSuggestion = null; - } - - public Models.Commit GetParent(string sha) - { - return new Commands.QuerySingleCommit(_repo.FullPath, sha).Result(); - } - - public List GetRevisionFilesUnderFolder(string parentFolder) - { - return new Commands.QueryRevisionObjects(_repo.FullPath, _commit.SHA, parentFolder).Result(); - } - - public void ViewRevisionFile(Models.Object file) - { - if (file == null) - { - ViewRevisionFilePath = string.Empty; - ViewRevisionFileContent = null; - return; - } - - ViewRevisionFilePath = file.Path; - - switch (file.Type) - { - case Models.ObjectType.Blob: - Task.Run(() => - { - var isBinary = new Commands.IsBinary(_repo.FullPath, _commit.SHA, file.Path).Result(); - if (isBinary) - { - var imgDecoder = ImageSource.GetDecoder(file.Path); - if (imgDecoder != Models.ImageDecoder.None) - { - var source = ImageSource.FromRevision(_repo.FullPath, _commit.SHA, file.Path, imgDecoder); - var image = new Models.RevisionImageFile(file.Path, source.Bitmap, source.Size); - Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = image); - } - else - { - var size = new Commands.QueryFileSize(_repo.FullPath, file.Path, _commit.SHA).Result(); - var binary = new Models.RevisionBinaryFile() { Size = size }; - Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = binary); - } - - return; - } - - var contentStream = Commands.QueryFileContent.Run(_repo.FullPath, _commit.SHA, file.Path); - var content = new StreamReader(contentStream).ReadToEnd(); - var lfs = Models.LFSObject.Parse(content); - if (lfs != null) - { - var imgDecoder = ImageSource.GetDecoder(file.Path); - if (imgDecoder != Models.ImageDecoder.None) - { - var combined = new RevisionLFSImage(_repo.FullPath, file.Path, lfs, imgDecoder); - Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = combined); - } - else - { - var rlfs = new Models.RevisionLFSObject() { Object = lfs }; - Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = rlfs); - } - } - else - { - var txt = new Models.RevisionTextFile() { FileName = file.Path, Content = content }; - Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = txt); - } - }); - break; - case Models.ObjectType.Commit: - Task.Run(() => - { - var submoduleRoot = Path.Combine(_repo.FullPath, file.Path).Replace('\\', '/').Trim('/'); - var commit = new Commands.QuerySingleCommit(submoduleRoot, file.SHA).Result(); - var message = commit != null ? new Commands.QueryCommitFullMessage(submoduleRoot, file.SHA).Result() : null; - var module = new Models.RevisionSubmodule() - { - Commit = commit ?? new Models.Commit() { SHA = _commit.SHA }, - FullMessage = new Models.CommitFullMessage { Message = message } - }; - - Dispatcher.UIThread.Invoke(() => ViewRevisionFileContent = module); - }); - break; - default: - ViewRevisionFileContent = null; - break; - } + SearchFileFilter = string.Empty; } public ContextMenu CreateChangeContextMenu(Models.Change change) { + var menu = new ContextMenu(); + var diffWithMerger = new MenuItem(); diffWithMerger.Header = App.Text("DiffWithMerger"); - diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + diffWithMerger.Icon = App.CreateMenuIcon("Icons.Diff"); diffWithMerger.Click += (_, ev) => { - var toolType = Preferences.Instance.ExternalMergeToolType; - var toolPath = Preferences.Instance.ExternalMergeToolPath; var opt = new Models.DiffOption(_commit, change); + var type = Preference.Instance.ExternalMergeToolType; + var exec = Preference.Instance.ExternalMergeToolPath; - Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt)); - ev.Handled = true; - }; - - var fullPath = Native.OS.GetAbsPath(_repo.FullPath, change.Path); - var explore = new MenuItem(); - explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.IsEnabled = File.Exists(fullPath); - explore.Click += (_, ev) => - { - Native.OS.OpenInFileManager(fullPath, true); - ev.Handled = true; - }; - - var history = new MenuItem(); - history.Header = App.Text("FileHistory"); - history.Icon = App.CreateMenuIcon("Icons.Histories"); - history.Click += (_, ev) => - { - App.ShowWindow(new FileHistories(_repo, change.Path, _commit.SHA), false); - ev.Handled = true; - }; - - var blame = new MenuItem(); - blame.Header = App.Text("Blame"); - blame.Icon = App.CreateMenuIcon("Icons.Blame"); - blame.IsEnabled = change.Index != Models.ChangeState.Deleted; - blame.Click += (_, ev) => - { - App.ShowWindow(new Blame(_repo.FullPath, change.Path, _commit), false); - ev.Handled = true; - }; - - var patch = new MenuItem(); - patch.Header = App.Text("FileCM.SaveAsPatch"); - patch.Icon = App.CreateMenuIcon("Icons.Diff"); - patch.Click += async (_, e) => - { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) - return; - - var options = new FilePickerSaveOptions(); - options.Title = App.Text("FileCM.SaveAsPatch"); - options.DefaultExtension = ".patch"; - options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - - var baseRevision = _commit.Parents.Count == 0 ? Models.Commit.EmptyTreeSHA1 : _commit.Parents[0]; - var storageFile = await storageProvider.SaveFilePickerAsync(options); - if (storageFile != null) + var tool = Models.ExternalMerger.Supported.Find(x => x.Type == type); + if (tool == null || !File.Exists(exec)) { - var saveTo = storageFile.Path.LocalPath; - var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo.FullPath, [change], baseRevision, _commit.SHA, saveTo)); - if (succ) - App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); + App.RaiseException(_repo, "Invalid merge tool in preference setting!"); + return; } - e.Handled = true; + var args = tool.Type != 0 ? tool.DiffCmd : Preference.Instance.ExternalMergeToolDiffCmd; + Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, opt)); + ev.Handled = true; }; - - var menu = new ContextMenu(); menu.Items.Add(diffWithMerger); - menu.Items.Add(explore); - menu.Items.Add(new MenuItem { Header = "-" }); - menu.Items.Add(history); - menu.Items.Add(blame); - menu.Items.Add(patch); - menu.Items.Add(new MenuItem { Header = "-" }); - if (!_repo.IsBare) + if (change.Index != Models.ChangeState.Deleted) { - var resetToThisRevision = new MenuItem(); - resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision"); - resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout"); - resetToThisRevision.Click += async (_, ev) => + var history = new MenuItem(); + history.Header = App.Text("FileHistory"); + history.Icon = App.CreateMenuIcon("Icons.Histories"); + history.Click += (_, ev) => { - await ResetToThisRevision(change.Path); + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo, change.Path) }; + window.Show(); ev.Handled = true; }; - var resetToFirstParent = new MenuItem(); - resetToFirstParent.Header = App.Text("ChangeCM.CheckoutFirstParentRevision"); - resetToFirstParent.Icon = App.CreateMenuIcon("Icons.File.Checkout"); - resetToFirstParent.IsEnabled = _commit.Parents.Count > 0; - resetToFirstParent.Click += async (_, ev) => + var blame = new MenuItem(); + blame.Header = App.Text("Blame"); + blame.Icon = App.CreateMenuIcon("Icons.Blame"); + blame.Click += (o, ev) => { - await ResetToParentRevision(change); + var window = new Views.Blame() { DataContext = new Blame(_repo, change.Path, _commit.SHA) }; + window.Show(); + ev.Handled = true; + }; + + var full = Path.GetFullPath(Path.Combine(_repo, change.Path)); + var explore = new MenuItem(); + explore.Header = App.Text("RevealFile"); + explore.Icon = App.CreateMenuIcon("Icons.Folder.Open"); + explore.IsEnabled = File.Exists(full); + explore.Click += (_, ev) => + { + Native.OS.OpenInFileManager(full, true); ev.Handled = true; }; - menu.Items.Add(resetToThisRevision); - menu.Items.Add(resetToFirstParent); menu.Items.Add(new MenuItem { Header = "-" }); - - TryToAddContextMenuItemsForGitLFS(menu, fullPath, change.Path); + menu.Items.Add(history); + menu.Items.Add(blame); + menu.Items.Add(explore); + menu.Items.Add(new MenuItem { Header = "-" }); } var copyPath = new MenuItem(); @@ -389,45 +266,40 @@ namespace SourceGit.ViewModels App.CopyText(change.Path); ev.Handled = true; }; - - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(fullPath); - e.Handled = true; - }; - menu.Items.Add(copyPath); - menu.Items.Add(copyFullPath); + return menu; } public ContextMenu CreateRevisionFileContextMenu(Models.Object file) { - var menu = new ContextMenu(); - var fullPath = Native.OS.GetAbsPath(_repo.FullPath, file.Path); - var explore = new MenuItem(); - explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.IsEnabled = File.Exists(fullPath); - explore.Click += (_, ev) => + var history = new MenuItem(); + history.Header = App.Text("FileHistory"); + history.Icon = App.CreateMenuIcon("Icons.Histories"); + history.Click += (_, ev) => { - Native.OS.OpenInFileManager(fullPath, file.Type == Models.ObjectType.Blob); + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo, file.Path) }; + window.Show(); ev.Handled = true; }; - var openWith = new MenuItem(); - openWith.Header = App.Text("OpenWith"); - openWith.Icon = App.CreateMenuIcon("Icons.OpenWith"); - openWith.Click += async (_, ev) => + var blame = new MenuItem(); + blame.Header = App.Text("Blame"); + blame.Icon = App.CreateMenuIcon("Icons.Blame"); + blame.Click += (o, ev) => { - var fileName = Path.GetFileNameWithoutExtension(fullPath) ?? ""; - var fileExt = Path.GetExtension(fullPath) ?? ""; - var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_commit.SHA.Substring(0, 10)}{fileExt}"); - await Task.Run(() => Commands.SaveRevisionFile.Run(_repo.FullPath, _commit.SHA, file.Path, tmpFile)); - Native.OS.OpenWithDefaultEditor(tmpFile); + var window = new Views.Blame() { DataContext = new Blame(_repo, file.Path, _commit.SHA) }; + window.Show(); + ev.Handled = true; + }; + + var full = Path.GetFullPath(Path.Combine(_repo, file.Path)); + var explore = new MenuItem(); + explore.Header = App.Text("RevealFile"); + explore.Icon = App.CreateMenuIcon("Icons.Folder.Open"); + explore.Click += (_, ev) => + { + Native.OS.OpenInFileManager(full, file.Type == Models.ObjectType.Blob); ev.Handled = true; }; @@ -437,87 +309,21 @@ namespace SourceGit.ViewModels saveAs.IsEnabled = file.Type == Models.ObjectType.Blob; saveAs.Click += async (_, ev) => { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; var options = new FolderPickerOpenOptions() { AllowMultiple = false }; - try + var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options); + if (selected.Count == 1) { - var selected = await storageProvider.OpenFolderPickerAsync(options); - if (selected.Count == 1) - { - var folder = selected[0]; - var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder.Path.ToString(); - var saveTo = Path.Combine(folderPath, Path.GetFileName(file.Path)!); - await Task.Run(() => Commands.SaveRevisionFile.Run(_repo.FullPath, _commit.SHA, file.Path, saveTo)); - } - } - catch (Exception e) - { - App.RaiseException(_repo.FullPath, $"Failed to save file: {e.Message}"); + var saveTo = Path.Combine(selected[0].Path.LocalPath, Path.GetFileName(file.Path)); + Commands.SaveRevisionFile.Run(_repo, _commit.SHA, file.Path, saveTo); } ev.Handled = true; }; - menu.Items.Add(explore); - menu.Items.Add(openWith); - menu.Items.Add(saveAs); - menu.Items.Add(new MenuItem() { Header = "-" }); - - var history = new MenuItem(); - history.Header = App.Text("FileHistory"); - history.Icon = App.CreateMenuIcon("Icons.Histories"); - history.Click += (_, ev) => - { - App.ShowWindow(new FileHistories(_repo, file.Path, _commit.SHA), false); - ev.Handled = true; - }; - - var blame = new MenuItem(); - blame.Header = App.Text("Blame"); - blame.Icon = App.CreateMenuIcon("Icons.Blame"); - blame.IsEnabled = file.Type == Models.ObjectType.Blob; - blame.Click += (_, ev) => - { - App.ShowWindow(new Blame(_repo.FullPath, file.Path, _commit), false); - ev.Handled = true; - }; - - menu.Items.Add(history); - menu.Items.Add(blame); - menu.Items.Add(new MenuItem() { Header = "-" }); - - if (!_repo.IsBare) - { - var resetToThisRevision = new MenuItem(); - resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision"); - resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout"); - resetToThisRevision.Click += async (_, ev) => - { - await ResetToThisRevision(file.Path); - ev.Handled = true; - }; - - var change = _changes.Find(x => x.Path == file.Path) ?? new Models.Change() { Index = Models.ChangeState.None, Path = file.Path }; - var resetToFirstParent = new MenuItem(); - resetToFirstParent.Header = App.Text("ChangeCM.CheckoutFirstParentRevision"); - resetToFirstParent.Icon = App.CreateMenuIcon("Icons.File.Checkout"); - resetToFirstParent.IsEnabled = _commit.Parents.Count > 0; - resetToFirstParent.Click += async (_, ev) => - { - await ResetToParentRevision(change); - ev.Handled = true; - }; - - menu.Items.Add(resetToThisRevision); - menu.Items.Add(resetToFirstParent); - menu.Items.Add(new MenuItem() { Header = "-" }); - - TryToAddContextMenuItemsForGitLFS(menu, fullPath, file.Path); - } - var copyPath = new MenuItem(); copyPath.Header = App.Text("CopyPath"); copyPath.Icon = App.CreateMenuIcon("Icons.Copy"); @@ -527,74 +333,39 @@ namespace SourceGit.ViewModels ev.Handled = true; }; - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(fullPath); - e.Handled = true; - }; - + var menu = new ContextMenu(); + menu.Items.Add(history); + menu.Items.Add(blame); + menu.Items.Add(explore); + menu.Items.Add(saveAs); menu.Items.Add(copyPath); - menu.Items.Add(copyFullPath); return menu; } private void Refresh() { _changes = null; - _requestingRevisionFiles = false; - _revisionFiles = null; - - SignInfo = null; - ViewRevisionFileContent = null; - Children = null; - RevisionFileSearchFilter = string.Empty; - RevisionFileSearchSuggestion = null; - + VisibleChanges = null; + SelectedChange = null; + RevisionFilesTree = null; + SelectedRevisionFileNode = null; if (_commit == null) return; + if (_cancelToken != null) + _cancelToken.Requested = true; - if (_cancellationSource is { IsCancellationRequested: false }) - _cancellationSource.Cancel(); + _cancelToken = new Commands.Command.CancelToken(); - _cancellationSource = new CancellationTokenSource(); - var token = _cancellationSource.Token; + var parent = _commit.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : _commit.Parents[0]; + var cmdChanges = new Commands.CompareRevisions(_repo, parent, _commit.SHA) { Cancel = _cancelToken }; + var cmdRevisionFiles = new Commands.QueryRevisionObjects(_repo, _commit.SHA) { Cancel = _cancelToken }; Task.Run(() => { - var message = new Commands.QueryCommitFullMessage(_repo.FullPath, _commit.SHA).Result(); - var inlines = ParseInlinesInMessage(message); + var changes = cmdChanges.Result(); + if (cmdChanges.Cancel.Requested) + return; - if (!token.IsCancellationRequested) - Dispatcher.UIThread.Invoke(() => FullMessage = new Models.CommitFullMessage { Message = message, Inlines = inlines }); - }, token); - - Task.Run(() => - { - var signInfo = new Commands.QueryCommitSignInfo(_repo.FullPath, _commit.SHA, !_repo.HasAllowedSignersFile).Result(); - if (!token.IsCancellationRequested) - Dispatcher.UIThread.Invoke(() => SignInfo = signInfo); - }, token); - - if (Preferences.Instance.ShowChildren) - { - Task.Run(() => - { - var max = Preferences.Instance.MaxHistoryCommits; - var cmd = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { CancellationToken = token }; - var children = cmd.Result(); - if (!token.IsCancellationRequested) - Dispatcher.UIThread.Post(() => Children = children); - }, token); - } - - Task.Run(() => - { - var parent = _commit.Parents.Count == 0 ? Models.Commit.EmptyTreeSHA1 : _commit.Parents[0]; - var cmd = new Commands.CompareRevisions(_repo.FullPath, parent, _commit.SHA) { CancellationToken = token }; - var changes = cmd.Result(); var visible = changes; if (!string.IsNullOrWhiteSpace(_searchChangeFilter)) { @@ -602,70 +373,47 @@ namespace SourceGit.ViewModels foreach (var c in changes) { if (c.Path.Contains(_searchChangeFilter, StringComparison.OrdinalIgnoreCase)) + { visible.Add(c); + } } } - if (!token.IsCancellationRequested) + var tree = FileTreeNode.Build(visible); + Dispatcher.UIThread.Invoke(() => { - Dispatcher.UIThread.Post(() => + Changes = changes; + VisibleChanges = visible; + ChangeTree = tree; + }); + }); + + Task.Run(() => + { + var files = cmdRevisionFiles.Result(); + if (cmdRevisionFiles.Cancel.Requested) + return; + + var visible = files; + if (!string.IsNullOrWhiteSpace(_searchFileFilter)) + { + visible = new List(); + foreach (var f in files) { - Changes = changes; - VisibleChanges = visible; - - if (visible.Count == 0) - SelectedChanges = null; - }); + if (f.Path.Contains(_searchFileFilter, StringComparison.OrdinalIgnoreCase)) + { + visible.Add(f); + } + } } - }, token); - } - private Models.InlineElementCollector ParseInlinesInMessage(string message) - { - var inlines = new Models.InlineElementCollector(); - if (_repo.Settings.IssueTrackerRules is { Count: > 0 } rules) - { - foreach (var rule in rules) - rule.Matches(inlines, message); - } - - var urlMatches = REG_URL_FORMAT().Matches(message); - for (int i = 0; i < urlMatches.Count; i++) - { - var match = urlMatches[i]; - if (!match.Success) - continue; - - var start = match.Index; - var len = match.Length; - if (inlines.Intersect(start, len) != null) - continue; - - var url = message.Substring(start, len); - if (Uri.IsWellFormedUriString(url, UriKind.Absolute)) - inlines.Add(new Models.InlineElement(Models.InlineElementType.Link, start, len, url)); - } - - var shaMatches = REG_SHA_FORMAT().Matches(message); - for (int i = 0; i < shaMatches.Count; i++) - { - var match = shaMatches[i]; - if (!match.Success) - continue; - - var start = match.Index; - var len = match.Length; - if (inlines.Intersect(start, len) != null) - continue; - - var sha = match.Groups[1].Value; - var isCommitSHA = new Commands.IsCommitSHA(_repo.FullPath, sha).Result(); - if (isCommitSHA) - inlines.Add(new Models.InlineElement(Models.InlineElementType.CommitSHA, start, len, sha)); - } - - inlines.Sort(); - return inlines; + var tree = FileTreeNode.Build(visible); + Dispatcher.UIThread.Invoke(() => + { + _revisionFiles = files; + RevisionFilesTree = tree; + }); + }); } private void RefreshVisibleChanges() @@ -683,209 +431,136 @@ namespace SourceGit.ViewModels foreach (var c in _changes) { if (c.Path.Contains(_searchChangeFilter, StringComparison.OrdinalIgnoreCase)) + { visible.Add(c); + } } VisibleChanges = visible; } + + ChangeTree = FileTreeNode.Build(_visibleChanges); } - private void TryToAddContextMenuItemsForGitLFS(ContextMenu menu, string fullPath, string path) + private void RefreshVisibleFiles() { - if (_repo.Remotes.Count == 0 || !File.Exists(fullPath)) + if (_revisionFiles == null) return; - var lfsEnabled = new Commands.LFS(_repo.FullPath).IsEnabled(); - if (!lfsEnabled) - return; - - var lfs = new MenuItem(); - lfs.Header = App.Text("GitLFS"); - lfs.Icon = App.CreateMenuIcon("Icons.LFS"); - - var lfsLock = new MenuItem(); - lfsLock.Header = App.Text("GitLFS.Locks.Lock"); - lfsLock.Icon = App.CreateMenuIcon("Icons.Lock"); - if (_repo.Remotes.Count == 1) + var visible = _revisionFiles; + if (!string.IsNullOrWhiteSpace(_searchFileFilter)) { - lfsLock.Click += async (_, e) => + visible = new List(); + foreach (var f in _revisionFiles) { - var log = _repo.CreateLog("Lock LFS file"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Lock(_repo.Remotes[0].Name, path, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Lock file \"{path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - } - else - { - foreach (var remote in _repo.Remotes) - { - var remoteName = remote.Name; - var lockRemote = new MenuItem(); - lockRemote.Header = remoteName; - lockRemote.Click += async (_, e) => + if (f.Path.Contains(_searchFileFilter, StringComparison.OrdinalIgnoreCase)) { - var log = _repo.CreateLog("Lock LFS file"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Lock(remoteName, path, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Lock file \"{path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfsLock.Items.Add(lockRemote); + visible.Add(f); + } } } - lfs.Items.Add(lfsLock); - var lfsUnlock = new MenuItem(); - lfsUnlock.Header = App.Text("GitLFS.Locks.Unlock"); - lfsUnlock.Icon = App.CreateMenuIcon("Icons.Unlock"); - if (_repo.Remotes.Count == 1) - { - lfsUnlock.Click += async (_, e) => - { - var log = _repo.CreateLog("Unlock LFS file"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Unlock(_repo.Remotes[0].Name, path, false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Unlock file \"{path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - } - else - { - foreach (var remote in _repo.Remotes) - { - var remoteName = remote.Name; - var unlockRemote = new MenuItem(); - unlockRemote.Header = remoteName; - unlockRemote.Click += async (_, e) => - { - var log = _repo.CreateLog("Unlock LFS file"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Unlock(remoteName, path, false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Unlock file \"{path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfsUnlock.Items.Add(unlockRemote); - } - } - lfs.Items.Add(lfsUnlock); - - menu.Items.Add(lfs); - menu.Items.Add(new MenuItem() { Header = "-" }); + RevisionFilesTree = FileTreeNode.Build(visible); } - private void RefreshRevisionSearchSuggestion() + private void RefreshViewRevisionFile(Models.Object file) { - if (!string.IsNullOrEmpty(_revisionFileSearchFilter)) + switch (file.Type) { - if (_revisionFiles == null) - { - if (_requestingRevisionFiles) - return; - - var sha = Commit.SHA; - _requestingRevisionFiles = true; - + case Models.ObjectType.Blob: Task.Run(() => { - var files = new Commands.QueryRevisionFileNames(_repo.FullPath, sha).Result(); + var isBinary = new Commands.IsBinary(_repo, _commit.SHA, file.Path).Result(); + if (isBinary) + { + var ext = Path.GetExtension(file.Path); + if (IMG_EXTS.Contains(ext)) + { + var stream = Commands.QueryFileContent.Run(_repo, _commit.SHA, file.Path); + var bitmap = stream.Length > 0 ? new Bitmap(stream) : null; + Dispatcher.UIThread.Invoke(() => + { + ViewRevisionFileContent = new Models.RevisionImageFile() { Image = bitmap }; + }); + } + else + { + var size = new Commands.QueryFileSize(_repo, file.Path, _commit.SHA).Result(); + Dispatcher.UIThread.Invoke(() => + { + ViewRevisionFileContent = new Models.RevisionBinaryFile() { Size = size }; + }); + } + + return; + } + + var contentStream = Commands.QueryFileContent.Run(_repo, _commit.SHA, file.Path); + var content = new StreamReader(contentStream).ReadToEnd(); + if (content.StartsWith("version https://git-lfs.github.com/spec/", StringComparison.Ordinal)) + { + var obj = new Models.RevisionLFSObject() { Object = new Models.LFSObject() }; + var lines = content.Split('\n', StringSplitOptions.RemoveEmptyEntries); + if (lines.Length == 3) + { + foreach (var line in lines) + { + if (line.StartsWith("oid sha256:", StringComparison.Ordinal)) + { + obj.Object.Oid = line.Substring(11); + } + else if (line.StartsWith("size ", StringComparison.Ordinal)) + { + obj.Object.Size = long.Parse(line.Substring(5)); + } + } + Dispatcher.UIThread.Invoke(() => + { + ViewRevisionFileContent = obj; + }); + return; + } + } + Dispatcher.UIThread.Invoke(() => { - if (sha == Commit.SHA && _requestingRevisionFiles) + ViewRevisionFileContent = new Models.RevisionTextFile() { - _revisionFiles = files; - _requestingRevisionFiles = false; - - if (!string.IsNullOrEmpty(_revisionFileSearchFilter)) - CalcRevisionFileSearchSuggestion(); - } + FileName = file.Path, + Content = content + }; }); }); - } - else - { - CalcRevisionFileSearchSuggestion(); - } - } - else - { - RevisionFileSearchSuggestion = null; - GC.Collect(); - } - } - - private void CalcRevisionFileSearchSuggestion() - { - var suggestion = new List(); - foreach (var file in _revisionFiles) - { - if (file.Contains(_revisionFileSearchFilter, StringComparison.OrdinalIgnoreCase) && - file.Length != _revisionFileSearchFilter.Length) - suggestion.Add(file); - - if (suggestion.Count >= 100) + break; + case Models.ObjectType.Commit: + ViewRevisionFileContent = new Models.RevisionSubmodule() { SHA = file.SHA }; + break; + default: + ViewRevisionFileContent = null; break; } - - RevisionFileSearchSuggestion = suggestion; } - private Task ResetToThisRevision(string path) + private static readonly HashSet IMG_EXTS = new HashSet() { - var log = _repo.CreateLog($"Reset File to '{_commit.SHA}'"); + ".ico", ".bmp", ".jpg", ".png", ".jpeg" + }; - return Task.Run(() => - { - new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevision(path, $"{_commit.SHA}"); - log.Complete(); - }); - } - - private Task ResetToParentRevision(Models.Change change) - { - var log = _repo.CreateLog($"Reset File to '{_commit.SHA}~1'"); - - return Task.Run(() => - { - if (change.Index == Models.ChangeState.Renamed) - new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevision(change.OriginalPath, $"{_commit.SHA}~1"); - - new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevision(change.Path, $"{_commit.SHA}~1"); - log.Complete(); - }); - } - - [GeneratedRegex(@"\b(https?://|ftp://)[\w\d\._/\-~%@()+:?&=#!]*[\w\d/]")] - private static partial Regex REG_URL_FORMAT(); - - [GeneratedRegex(@"\b([0-9a-fA-F]{6,40})\b")] - private static partial Regex REG_SHA_FORMAT(); - - private Repository _repo = null; + private string _repo = string.Empty; + private int _activePageIndex = 0; private Models.Commit _commit = null; - private Models.CommitFullMessage _fullMessage = null; - private Models.CommitSignInfo _signInfo = null; - private List _children = null; private List _changes = null; private List _visibleChanges = null; - private List _selectedChanges = null; + private List _changeTree = null; + private Models.Change _selectedChange = null; + private FileTreeNode _selectedChangeNode = null; private string _searchChangeFilter = string.Empty; private DiffContext _diffContext = null; - private string _viewRevisionFilePath = string.Empty; + private List _revisionFiles = null; + private List _revisionFilesTree = null; + private FileTreeNode _selectedRevisionFileNode = null; + private string _searchFileFilter = string.Empty; private object _viewRevisionFileContent = null; - private CancellationTokenSource _cancellationSource = null; - private bool _requestingRevisionFiles = false; - private List _revisionFiles = null; - private string _revisionFileSearchFilter = string.Empty; - private List _revisionFileSearchSuggestion = null; + private Commands.Command.CancelToken _cancelToken = null; } } diff --git a/src/ViewModels/ConfigureWorkspace.cs b/src/ViewModels/ConfigureWorkspace.cs deleted file mode 100644 index 5be066ae..00000000 --- a/src/ViewModels/ConfigureWorkspace.cs +++ /dev/null @@ -1,85 +0,0 @@ -using System; -using Avalonia.Collections; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class ConfigureWorkspace : ObservableObject - { - public AvaloniaList Workspaces - { - get; - } - - public Workspace Selected - { - get => _selected; - set - { - if (SetProperty(ref _selected, value)) - CanDeleteSelected = value != null && !value.IsActive; - } - } - - public bool CanDeleteSelected - { - get => _canDeleteSelected; - private set => SetProperty(ref _canDeleteSelected, value); - } - - public ConfigureWorkspace() - { - Workspaces = new(Preferences.Instance.Workspaces); - } - - public void Add() - { - var workspace = new Workspace() { Name = $"Unnamed {DateTime.Now:yyyy-MM-dd HH:mm:ss}" }; - Preferences.Instance.Workspaces.Add(workspace); - Workspaces.Add(workspace); - Selected = workspace; - } - - public void Delete() - { - if (_selected == null || _selected.IsActive) - return; - - Preferences.Instance.Workspaces.Remove(_selected); - Workspaces.Remove(_selected); - } - - public void MoveSelectedUp() - { - if (_selected == null) - return; - - var idx = Workspaces.IndexOf(_selected); - if (idx == 0) - return; - - Workspaces.Move(idx - 1, idx); - - Preferences.Instance.Workspaces.RemoveAt(idx); - Preferences.Instance.Workspaces.Insert(idx - 1, _selected); - } - - public void MoveSelectedDown() - { - if (_selected == null) - return; - - var idx = Workspaces.IndexOf(_selected); - if (idx == Workspaces.Count - 1) - return; - - Workspaces.Move(idx + 1, idx); - - Preferences.Instance.Workspaces.RemoveAt(idx); - Preferences.Instance.Workspaces.Insert(idx + 1, _selected); - } - - private Workspace _selected = null; - private bool _canDeleteSelected = false; - } -} diff --git a/src/ViewModels/ConfirmCommit.cs b/src/ViewModels/ConfirmCommit.cs deleted file mode 100644 index cea56948..00000000 --- a/src/ViewModels/ConfirmCommit.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; - -namespace SourceGit.ViewModels -{ - public class ConfirmCommit - { - public string Message - { - get; - private set; - } - - public ConfirmCommit(string message, Action onSure) - { - Message = message; - _onSure = onSure; - } - - public void Continue() - { - _onSure?.Invoke(); - } - - private Action _onSure; - } -} diff --git a/src/ViewModels/ConfirmEmptyCommit.cs b/src/ViewModels/ConfirmEmptyCommit.cs deleted file mode 100644 index 87178b75..00000000 --- a/src/ViewModels/ConfirmEmptyCommit.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; - -namespace SourceGit.ViewModels -{ - public class ConfirmEmptyCommit - { - public bool HasLocalChanges - { - get; - private set; - } - - public string Message - { - get; - private set; - } - - public ConfirmEmptyCommit(bool hasLocalChanges, Action onSure) - { - HasLocalChanges = hasLocalChanges; - Message = App.Text(hasLocalChanges ? "ConfirmEmptyCommit.WithLocalChanges" : "ConfirmEmptyCommit.NoLocalChanges"); - _onSure = onSure; - } - - public void StageAllThenCommit() - { - _onSure?.Invoke(true); - } - - public void Continue() - { - _onSure?.Invoke(false); - } - - private Action _onSure; - } -} diff --git a/src/ViewModels/Conflict.cs b/src/ViewModels/Conflict.cs deleted file mode 100644 index bf93b5bc..00000000 --- a/src/ViewModels/Conflict.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System; - -namespace SourceGit.ViewModels -{ - public class ConflictSourceBranch - { - public string Name { get; private set; } - public string Head { get; private set; } - public Models.Commit Revision { get; private set; } - - public ConflictSourceBranch(string name, string head, Models.Commit revision) - { - Name = name; - Head = head; - Revision = revision; - } - - public ConflictSourceBranch(Repository repo, Models.Branch branch) - { - Name = branch.Name; - Head = branch.Head; - Revision = new Commands.QuerySingleCommit(repo.FullPath, branch.Head).Result() ?? new Models.Commit() { SHA = branch.Head }; - } - } - - public class Conflict - { - public string Marker - { - get => _change.ConflictMarker; - } - - public string Description - { - get => _change.ConflictDesc; - } - - public object Theirs - { - get; - private set; - } - - public object Mine - { - get; - private set; - } - - public bool IsResolved - { - get; - private set; - } = false; - - public bool CanUseExternalMergeTool - { - get; - private set; - } = false; - - public Conflict(Repository repo, WorkingCopy wc, Models.Change change) - { - _wc = wc; - _change = change; - - var isSubmodule = repo.Submodules.Find(x => x.Path.Equals(change.Path, StringComparison.Ordinal)) != null; - if (!isSubmodule && (_change.ConflictReason == Models.ConflictReason.BothAdded || _change.ConflictReason == Models.ConflictReason.BothModified)) - { - CanUseExternalMergeTool = true; - IsResolved = new Commands.IsConflictResolved(repo.FullPath, change).Result(); - } - - var context = wc.InProgressContext; - if (context is CherryPickInProgress cherryPick) - { - Theirs = cherryPick.Head; - Mine = new ConflictSourceBranch(repo, repo.CurrentBranch); - } - else if (context is RebaseInProgress rebase) - { - var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName); - if (b != null) - Theirs = new ConflictSourceBranch(b.Name, b.Head, rebase.StoppedAt); - else - Theirs = new ConflictSourceBranch(rebase.HeadName, rebase.StoppedAt?.SHA ?? "----------", rebase.StoppedAt); - - Mine = rebase.Onto; - } - else if (context is RevertInProgress revert) - { - Theirs = revert.Head; - Mine = new ConflictSourceBranch(repo, repo.CurrentBranch); - } - else if (context is MergeInProgress merge) - { - Theirs = merge.Source; - Mine = new ConflictSourceBranch(repo, repo.CurrentBranch); - } - else - { - Theirs = "Stash or Patch"; - Mine = new ConflictSourceBranch(repo, repo.CurrentBranch); - } - } - - public void UseTheirs() - { - _wc.UseTheirs([_change]); - } - - public void UseMine() - { - _wc.UseMine([_change]); - } - - public void OpenExternalMergeTool() - { - _wc.UseExternalMergeTool(_change); - } - - private WorkingCopy _wc = null; - private Models.Change _change = null; - } -} diff --git a/src/ViewModels/ConventionalCommitMessageBuilder.cs b/src/ViewModels/ConventionalCommitMessageBuilder.cs deleted file mode 100644 index 8faabe86..00000000 --- a/src/ViewModels/ConventionalCommitMessageBuilder.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using System.Text; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class ConventionalCommitMessageBuilder : ObservableValidator - { - [Required(ErrorMessage = "Type of changes can not be null")] - public Models.ConventionalCommitType Type - { - get => _type; - set => SetProperty(ref _type, value, true); - } - - public string Scope - { - get => _scope; - set => SetProperty(ref _scope, value); - } - - [Required(ErrorMessage = "Short description can not be empty")] - public string Description - { - get => _description; - set => SetProperty(ref _description, value, true); - } - - public string Detail - { - get => _detail; - set => SetProperty(ref _detail, value); - } - - public string BreakingChanges - { - get => _breakingChanges; - set => SetProperty(ref _breakingChanges, value); - } - - public string ClosedIssue - { - get => _closedIssue; - set => SetProperty(ref _closedIssue, value); - } - - public ConventionalCommitMessageBuilder(Action onApply) - { - _onApply = onApply; - } - - [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")] - public bool Apply() - { - if (HasErrors) - return false; - - ValidateAllProperties(); - if (HasErrors) - return false; - - var builder = new StringBuilder(); - builder.Append(_type.Type); - - if (!string.IsNullOrEmpty(_scope)) - { - builder.Append("("); - builder.Append(_scope); - builder.Append(")"); - } - - if (string.IsNullOrEmpty(_breakingChanges)) - builder.Append(": "); - else - builder.Append("!: "); - - builder.Append(_description); - builder.Append("\n\n"); - - if (!string.IsNullOrEmpty(_detail)) - { - builder.Append(_detail); - builder.Append("\n\n"); - } - - if (!string.IsNullOrEmpty(_breakingChanges)) - { - builder.Append("BREAKING CHANGE: "); - builder.Append(_breakingChanges); - builder.Append("\n\n"); - } - - if (!string.IsNullOrEmpty(_closedIssue)) - { - builder.Append("Closed "); - builder.Append(_closedIssue); - } - - _onApply?.Invoke(builder.ToString()); - return true; - } - - private Action _onApply = null; - private Models.ConventionalCommitType _type = Models.ConventionalCommitType.Supported[0]; - private string _scope = string.Empty; - private string _description = string.Empty; - private string _detail = string.Empty; - private string _breakingChanges = string.Empty; - private string _closedIssue = string.Empty; - } -} diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs index e518e977..15761f03 100644 --- a/src/ViewModels/CreateBranch.cs +++ b/src/ViewModels/CreateBranch.cs @@ -6,7 +6,7 @@ namespace SourceGit.ViewModels public class CreateBranch : Popup { [Required(ErrorMessage = "Branch name is required!")] - [RegularExpression(@"^[\w \-/\.#\+]+$", ErrorMessage = "Bad branch name format!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] [CustomValidation(typeof(CreateBranch), nameof(ValidateBranchName))] public string Name { @@ -17,57 +17,25 @@ namespace SourceGit.ViewModels public object BasedOn { get; - } - - public bool DiscardLocalChanges - { - get; - set; + private set; } public bool CheckoutAfterCreated { - get => _repo.Settings.CheckoutBranchOnCreateBranch; - set - { - if (_repo.Settings.CheckoutBranchOnCreateBranch != value) - { - _repo.Settings.CheckoutBranchOnCreateBranch = value; - OnPropertyChanged(); - } - } - } + get; + set; + } = true; - public bool IsBareRepository + public bool AutoStash { - get => _repo.IsBare; - } - - public bool AllowOverwrite - { - get => _allowOverwrite; - set - { - if (SetProperty(ref _allowOverwrite, value)) - ValidateProperty(_name, nameof(Name)); - } - } - - public bool IsRecurseSubmoduleVisible - { - get => _repo.Submodules.Count > 0; - } - - public bool RecurseSubmodules - { - get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch; - set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value; - } + get; + set; + } = true; public CreateBranch(Repository repo, Models.Branch branch) { _repo = repo; - _baseOnRevision = branch.IsDetachedHead ? branch.Head : branch.FullName; + _baseOnRevision = branch.FullName; if (!branch.IsLocal && repo.Branches.Find(x => x.IsLocal && x.Name == branch.Name) == null) { @@ -75,7 +43,7 @@ namespace SourceGit.ViewModels } BasedOn = branch; - DiscardLocalChanges = false; + View = new Views.CreateBranch() { DataContext = this }; } public CreateBranch(Repository repo, Models.Commit commit) @@ -84,7 +52,7 @@ namespace SourceGit.ViewModels _baseOnRevision = commit.SHA; BasedOn = commit; - DiscardLocalChanges = false; + View = new Views.CreateBranch() { DataContext = this }; } public CreateBranch(Repository repo, Models.Tag tag) @@ -93,130 +61,81 @@ namespace SourceGit.ViewModels _baseOnRevision = tag.SHA; BasedOn = tag; - DiscardLocalChanges = false; + View = new Views.CreateBranch() { DataContext = this }; } public static ValidationResult ValidateBranchName(string name, ValidationContext ctx) { - if (ctx.ObjectInstance is CreateBranch creator) - { - if (!creator._allowOverwrite) - { - var fixedName = creator.FixName(name); - foreach (var b in creator._repo.Branches) - { - if (b.FriendlyName == fixedName) - return new ValidationResult("A branch with same name already exists!"); - } - } - - return ValidationResult.Success; - } - else - { + var creator = ctx.ObjectInstance as CreateBranch; + if (creator == null) return new ValidationResult("Missing runtime context to create branch!"); + + foreach (var b in creator._repo.Branches) + { + var test = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}"; + if (test == name) + return new ValidationResult("A branch with same name already exists!"); } + + return ValidationResult.Success; } public override Task Sure() { _repo.SetWatcherEnabled(false); - - var fixedName = FixName(_name); - var log = _repo.CreateLog($"Create Branch '{fixedName}'"); - Use(log); - - var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules; return Task.Run(() => { - bool succ = false; - if (CheckoutAfterCreated && !_repo.IsBare) + if (CheckoutAfterCreated) { - var needPopStash = false; - if (DiscardLocalChanges) + bool needPopStash = false; + if (_repo.WorkingCopyChangesCount > 0) { - succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, true, _allowOverwrite); - } - else - { - var changes = new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).Result(); - if (changes > 0) + if (AutoStash) { - succ = new Commands.Stash(_repo.FullPath).Use(log).Push("CREATE_BRANCH_AUTO_STASH"); + SetProgressDescription("Adding untracked changes..."); + var succ = new Commands.Add(_repo.FullPath).Exec(); + if (succ) + { + SetProgressDescription("Stash local changes"); + succ = new Commands.Stash(_repo.FullPath).Push("CREATE_BRANCH_AUTO_STASH"); + } + if (!succ) { - log.Complete(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return false; } needPopStash = true; } - - succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, false, _allowOverwrite); + else + { + SetProgressDescription("Discard local changes..."); + Commands.Discard.All(_repo.FullPath); + } } - if (succ) - { - if (updateSubmodules) - { - var submodules = new Commands.QueryUpdatableSubmodules(_repo.FullPath).Result(); - if (submodules.Count > 0) - new Commands.Submodule(_repo.FullPath).Use(log).Update(submodules, true, true); - } + SetProgressDescription($"Create new branch '{_name}'"); + new Commands.Checkout(_repo.FullPath).Branch(_name, _baseOnRevision, SetProgressDescription); - if (needPopStash) - new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}"); + if (needPopStash) + { + SetProgressDescription("Re-apply local changes..."); + new Commands.Stash(_repo.FullPath).Pop("stash@{0}"); } } else { - succ = Commands.Branch.Create(_repo.FullPath, fixedName, _baseOnRevision, _allowOverwrite, log); + Commands.Branch.Create(_repo.FullPath, _name, _baseOnRevision); } - log.Complete(); - - CallUIThread(() => - { - if (succ && CheckoutAfterCreated) - { - var fake = new Models.Branch() { IsLocal = true, FullName = $"refs/heads/{fixedName}" }; - if (BasedOn is Models.Branch based && !based.IsLocal) - fake.Upstream = based.FullName; - - var folderEndIdx = fake.FullName.LastIndexOf('/'); - if (folderEndIdx > 10) - _repo.Settings.ExpandedBranchNodesInSideBar.Add(fake.FullName.Substring(0, folderEndIdx)); - - if (_repo.HistoriesFilterMode == Models.FilterMode.Included) - _repo.SetBranchFilterMode(fake, Models.FilterMode.Included, true, false); - - ProgressDescription = "Waiting for branch updated..."; - } - - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - }); - - if (CheckoutAfterCreated) - Task.Delay(400).Wait(); - + CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; }); } - private string FixName(string name) - { - if (!name.Contains(' ')) - return name; - - var parts = name.Split(' ', System.StringSplitOptions.RemoveEmptyEntries); - return string.Join("-", parts); - } - private readonly Repository _repo = null; private string _name = null; private readonly string _baseOnRevision = null; - private bool _allowOverwrite = false; } } diff --git a/src/ViewModels/CreateGroup.cs b/src/ViewModels/CreateGroup.cs index fb0218f0..cfe9d9ee 100644 --- a/src/ViewModels/CreateGroup.cs +++ b/src/ViewModels/CreateGroup.cs @@ -16,19 +16,19 @@ namespace SourceGit.ViewModels public CreateGroup(RepositoryNode parent) { _parent = parent; + View = new Views.CreateGroup() { DataContext = this }; } public override Task Sure() { - Preferences.Instance.AddNode(new RepositoryNode() + Preference.AddNode(new RepositoryNode() { Id = Guid.NewGuid().ToString(), Name = _name, IsRepository = false, IsExpanded = false, - }, _parent, true); + }, _parent); - Welcome.Instance.Refresh(); return null; } diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs index d3cd512b..34232bb2 100644 --- a/src/ViewModels/CreateTag.cs +++ b/src/ViewModels/CreateTag.cs @@ -1,19 +1,14 @@ using System; using System.ComponentModel.DataAnnotations; +using System.Text.RegularExpressions; using System.Threading.Tasks; namespace SourceGit.ViewModels { public class CreateTag : Popup { - public object BasedOn - { - get; - private set; - } - [Required(ErrorMessage = "Tag name is required!")] - [RegularExpression(@"^(?!\.)(?!/)(?!.*\.$)(?!.*/$)(?!.*\.\.)[\w\-\./]+$", ErrorMessage = "Bad tag name format!")] + [RegularExpression(@"^[\w\-\.]+$", ErrorMessage = "Bad tag name format!")] [CustomValidation(typeof(CreateTag), nameof(ValidateTagName))] public string TagName { @@ -27,22 +22,10 @@ namespace SourceGit.ViewModels set; } - public bool Annotated - { - get => _annotated; - set => SetProperty(ref _annotated, value); - } - - public bool SignTag + public object BasedOn { get; - set; - } = false; - - public bool PushToRemotes - { - get => _repo.Settings.PushToRemoteWhenCreateTag; - set => _repo.Settings.PushToRemoteWhenCreateTag = value; + private set; } public CreateTag(Repository repo, Models.Branch branch) @@ -51,7 +34,7 @@ namespace SourceGit.ViewModels _basedOn = branch.Head; BasedOn = branch; - SignTag = new Commands.Config(repo.FullPath).Get("tag.gpgsign").Equals("true", StringComparison.OrdinalIgnoreCase); + View = new Views.CreateTag() { DataContext = this }; } public CreateTag(Repository repo, Models.Commit commit) @@ -60,12 +43,13 @@ namespace SourceGit.ViewModels _basedOn = commit.SHA; BasedOn = commit; - SignTag = new Commands.Config(repo.FullPath).Get("tag.gpgsign").Equals("true", StringComparison.OrdinalIgnoreCase); + View = new Views.CreateTag() { DataContext = this }; } public static ValidationResult ValidateTagName(string name, ValidationContext ctx) { - if (ctx.ObjectInstance is CreateTag creator) + var creator = ctx.ObjectInstance as CreateTag; + if (creator != null) { var found = creator._repo.Tags.Find(x => x.Name == name); if (found != null) @@ -79,33 +63,16 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Create tag..."; - var remotes = PushToRemotes ? _repo.Remotes : null; - var log = _repo.CreateLog("Create Tag"); - Use(log); - return Task.Run(() => { - bool succ; - if (_annotated) - succ = Commands.Tag.Add(_repo.FullPath, _tagName, _basedOn, Message, SignTag, log); - else - succ = Commands.Tag.Add(_repo.FullPath, _tagName, _basedOn, log); - - if (succ && remotes != null) - { - foreach (var remote in remotes) - new Commands.Push(_repo.FullPath, remote.Name, $"refs/tags/{_tagName}", false).Use(log).Exec(); - } - - log.Complete(); + Commands.Tag.Add(_repo.FullPath, TagName, _basedOn, Message); CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; + return true; }); } private readonly Repository _repo = null; private string _tagName = string.Empty; - private bool _annotated = true; - private readonly string _basedOn; + private readonly string _basedOn = string.Empty; } } diff --git a/src/ViewModels/DeinitSubmodule.cs b/src/ViewModels/DeinitSubmodule.cs deleted file mode 100644 index a96a65d0..00000000 --- a/src/ViewModels/DeinitSubmodule.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class DeinitSubmodule : Popup - { - public string Submodule - { - get; - private set; - } - - public bool Force - { - get; - set; - } - - public DeinitSubmodule(Repository repo, string submodule) - { - _repo = repo; - Submodule = submodule; - Force = false; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "De-initialize Submodule"; - - var log = _repo.CreateLog("De-initialize Submodule"); - Use(log); - - return Task.Run(() => - { - var succ = new Commands.Submodule(_repo.FullPath).Use(log).Deinit(Submodule, false); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private Repository _repo; - } -} diff --git a/src/ViewModels/DeleteBranch.cs b/src/ViewModels/DeleteBranch.cs index 4decdb40..5192383f 100644 --- a/src/ViewModels/DeleteBranch.cs +++ b/src/ViewModels/DeleteBranch.cs @@ -5,38 +5,16 @@ namespace SourceGit.ViewModels public class DeleteBranch : Popup { public Models.Branch Target - { - get; - } - - public Models.Branch TrackingRemoteBranch - { - get; - } - - public string DeleteTrackingRemoteTip { get; private set; } - public bool AlsoDeleteTrackingRemote - { - get => _alsoDeleteTrackingRemote; - set => SetProperty(ref _alsoDeleteTrackingRemote, value); - } - public DeleteBranch(Repository repo, Models.Branch branch) { _repo = repo; Target = branch; - - if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream)) - { - TrackingRemoteBranch = repo.Branches.Find(x => x.FullName == branch.Upstream); - if (TrackingRemoteBranch != null) - DeleteTrackingRemoteTip = App.Text("DeleteBranch.WithTrackingRemote", TrackingRemoteBranch.FriendlyName); - } + View = new Views.DeleteBranch() { DataContext = this }; } public override Task Sure() @@ -44,35 +22,22 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Deleting branch..."; - var log = _repo.CreateLog("Delete Branch"); - Use(log); - return Task.Run(() => { if (Target.IsLocal) { - Commands.Branch.DeleteLocal(_repo.FullPath, Target.Name, log); - - if (_alsoDeleteTrackingRemote && TrackingRemoteBranch != null) - Commands.Branch.DeleteRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name, log); + Commands.Branch.Delete(_repo.FullPath, Target.Name); } else { - Commands.Branch.DeleteRemote(_repo.FullPath, Target.Remote, Target.Name, log); + new Commands.Push(_repo.FullPath, Target.Remote, Target.Name).Exec(); } - log.Complete(); - - CallUIThread(() => - { - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - }); + CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; }); } private readonly Repository _repo = null; - private bool _alsoDeleteTrackingRemote = false; } } diff --git a/src/ViewModels/DeleteMultipleBranches.cs b/src/ViewModels/DeleteMultipleBranches.cs deleted file mode 100644 index b40ff223..00000000 --- a/src/ViewModels/DeleteMultipleBranches.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class DeleteMultipleBranches : Popup - { - public List Targets - { - get; - } - - public DeleteMultipleBranches(Repository repo, List branches, bool isLocal) - { - _repo = repo; - _isLocal = isLocal; - Targets = branches; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Deleting multiple branches..."; - - var log = _repo.CreateLog("Delete Multiple Branches"); - Use(log); - - return Task.Run(() => - { - if (_isLocal) - { - foreach (var target in Targets) - Commands.Branch.DeleteLocal(_repo.FullPath, target.Name, log); - } - else - { - foreach (var target in Targets) - Commands.Branch.DeleteRemote(_repo.FullPath, target.Remote, target.Name, log); - } - - log.Complete(); - - CallUIThread(() => - { - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - }); - - return true; - }); - } - - private Repository _repo = null; - private bool _isLocal = false; - } -} diff --git a/src/ViewModels/DeleteRemote.cs b/src/ViewModels/DeleteRemote.cs index faf7c8a9..e1fba02d 100644 --- a/src/ViewModels/DeleteRemote.cs +++ b/src/ViewModels/DeleteRemote.cs @@ -14,6 +14,7 @@ namespace SourceGit.ViewModels { _repo = repo; Remote = remote; + View = new Views.DeleteRemote() { DataContext = this }; } public override Task Sure() @@ -21,14 +22,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Deleting remote ..."; - var log = _repo.CreateLog("Delete Remote"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Remote(_repo.FullPath).Use(log).Delete(Remote.Name); - log.Complete(); - + var succ = new Commands.Remote(_repo.FullPath).Delete(Remote.Name); CallUIThread(() => { _repo.MarkBranchesDirtyManually(); diff --git a/src/ViewModels/DeleteRepositoryNode.cs b/src/ViewModels/DeleteRepositoryNode.cs index 38e03d9f..a42fc8d6 100644 --- a/src/ViewModels/DeleteRepositoryNode.cs +++ b/src/ViewModels/DeleteRepositoryNode.cs @@ -6,19 +6,22 @@ namespace SourceGit.ViewModels { public RepositoryNode Node { - get; + get => _node; + set => SetProperty(ref _node, value); } public DeleteRepositoryNode(RepositoryNode node) { - Node = node; + _node = node; + View = new Views.DeleteRepositoryNode() { DataContext = this }; } public override Task Sure() { - Preferences.Instance.RemoveNode(Node, true); - Welcome.Instance.Refresh(); + Preference.RemoveNode(_node); return null; } + + private RepositoryNode _node = null; } } diff --git a/src/ViewModels/DeleteSubmodule.cs b/src/ViewModels/DeleteSubmodule.cs index 239c7d31..459b4026 100644 --- a/src/ViewModels/DeleteSubmodule.cs +++ b/src/ViewModels/DeleteSubmodule.cs @@ -4,6 +4,7 @@ namespace SourceGit.ViewModels { public class DeleteSubmodule : Popup { + public string Submodule { get; @@ -14,6 +15,7 @@ namespace SourceGit.ViewModels { _repo = repo; Submodule = submodule; + View = new Views.DeleteSubmodule() { DataContext = this }; } public override Task Sure() @@ -21,13 +23,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Deleting submodule ..."; - var log = _repo.CreateLog("Delete Submodule"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Submodule(_repo.FullPath).Use(log).Delete(Submodule); - log.Complete(); + var succ = new Commands.Submodule(_repo.FullPath).Delete(Submodule); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); diff --git a/src/ViewModels/DeleteTag.cs b/src/ViewModels/DeleteTag.cs index f7de6341..7d631a38 100644 --- a/src/ViewModels/DeleteTag.cs +++ b/src/ViewModels/DeleteTag.cs @@ -10,16 +10,18 @@ namespace SourceGit.ViewModels private set; } - public bool PushToRemotes + public bool ShouldPushToRemote { - get => _repo.Settings.PushToRemoteWhenDeleteTag; - set => _repo.Settings.PushToRemoteWhenDeleteTag = value; + get; + set; } public DeleteTag(Repository repo, Models.Tag tag) { _repo = repo; Target = tag; + ShouldPushToRemote = true; + View = new Views.DeleteTag() { DataContext = this }; } public override Task Sure() @@ -27,26 +29,11 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = $"Deleting tag '{Target.Name}' ..."; - var remotes = PushToRemotes ? _repo.Remotes : []; - var log = _repo.CreateLog("Delete Tag"); - Use(log); - return Task.Run(() => { - var succ = Commands.Tag.Delete(_repo.FullPath, Target.Name, log); - if (succ) - { - foreach (var r in remotes) - new Commands.Push(_repo.FullPath, r.Name, $"refs/tags/{Target.Name}", true).Use(log).Exec(); - } - - log.Complete(); - - CallUIThread(() => - { - _repo.MarkTagsDirtyManually(); - _repo.SetWatcherEnabled(true); - }); + var remotes = ShouldPushToRemote ? _repo.Remotes : null; + var succ = Commands.Tag.Delete(_repo.FullPath, Target.Name, remotes); + CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs index 9bb3c710..18c03936 100644 --- a/src/ViewModels/DiffContext.cs +++ b/src/ViewModels/DiffContext.cs @@ -1,7 +1,9 @@ -using System; +using System.Collections.Generic; using System.IO; using System.Threading.Tasks; +using Avalonia; +using Avalonia.Media.Imaging; using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; @@ -10,23 +12,25 @@ namespace SourceGit.ViewModels { public class DiffContext : ObservableObject { - public string Title + public string RepositoryPath { - get; + get => _repo; } - public bool IgnoreWhitespace + public Models.Change WorkingCopyChange { - get => Preferences.Instance.IgnoreWhitespaceChangesInDiff; - set - { - if (value != Preferences.Instance.IgnoreWhitespaceChangesInDiff) - { - Preferences.Instance.IgnoreWhitespaceChangesInDiff = value; - OnPropertyChanged(); - LoadDiffContent(); - } - } + get => _option.WorkingCopyChange; + } + + public bool IsUnstaged + { + get => _option.IsUnstaged; + } + + public string Title + { + get => _title; + private set => SetProperty(ref _title, value); } public string FileModeChange @@ -35,6 +39,12 @@ namespace SourceGit.ViewModels private set => SetProperty(ref _fileModeChange, value); } + public bool IsLoading + { + get => _isLoading; + private set => SetProperty(ref _isLoading, value); + } + public bool IsTextDiff { get => _isTextDiff; @@ -47,10 +57,10 @@ namespace SourceGit.ViewModels private set => SetProperty(ref _content, value); } - public int UnifiedLines + public Vector SyncScrollOffset { - get => _unifiedLines; - private set => SetProperty(ref _unifiedLines, value); + get => _syncScrollOffset; + set => SetProperty(ref _syncScrollOffset, value); } public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null) @@ -62,150 +72,51 @@ namespace SourceGit.ViewModels { _isTextDiff = previous._isTextDiff; _content = previous._content; - _fileModeChange = previous._fileModeChange; - _unifiedLines = previous._unifiedLines; - _info = previous._info; - } - - if (string.IsNullOrEmpty(_option.OrgPath) || _option.OrgPath == "/dev/null") - Title = _option.Path; - else - Title = $"{_option.OrgPath} → {_option.Path}"; - - LoadDiffContent(); - } - - public void ToggleFullTextDiff() - { - Preferences.Instance.UseFullTextDiff = !Preferences.Instance.UseFullTextDiff; - LoadDiffContent(); - } - - public void IncrUnified() - { - UnifiedLines = _unifiedLines + 1; - LoadDiffContent(); - } - - public void DecrUnified() - { - UnifiedLines = Math.Max(4, _unifiedLines - 1); - LoadDiffContent(); - } - - public void OpenExternalMergeTool() - { - var toolType = Preferences.Instance.ExternalMergeToolType; - var toolPath = Preferences.Instance.ExternalMergeToolPath; - Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, _option)); - } - - private void LoadDiffContent() - { - if (_option.Path.EndsWith('/')) - { - Content = null; - IsTextDiff = false; - return; } Task.Run(() => { - var numLines = Preferences.Instance.UseFullTextDiff ? 999999999 : _unifiedLines; - var ignoreWhitespace = Preferences.Instance.IgnoreWhitespaceChangesInDiff; - var latest = new Commands.Diff(_repo, _option, numLines, ignoreWhitespace).Result(); - var info = new Info(_option, numLines, ignoreWhitespace, latest); - if (_info != null && info.IsSame(_info)) - return; - - _info = info; - + var latest = new Commands.Diff(repo, option).Result(); var rs = null as object; + if (latest.TextDiff != null) { - var count = latest.TextDiff.Lines.Count; - var isSubmodule = false; - if (count <= 3) - { - var submoduleDiff = new Models.SubmoduleDiff(); - var submoduleRoot = $"{_repo}/{_option.Path}".Replace('\\', '/').TrimEnd('/'); - isSubmodule = true; - for (int i = 1; i < count; i++) - { - var line = latest.TextDiff.Lines[i]; - if (!line.Content.StartsWith("Subproject commit ", StringComparison.Ordinal)) - { - isSubmodule = false; - break; - } - - var sha = line.Content.Substring(18); - if (line.Type == Models.TextDiffLineType.Added) - submoduleDiff.New = QuerySubmoduleRevision(submoduleRoot, sha); - else if (line.Type == Models.TextDiffLineType.Deleted) - submoduleDiff.Old = QuerySubmoduleRevision(submoduleRoot, sha); - } - - if (isSubmodule) - rs = submoduleDiff; - } - - if (!isSubmodule) - { - latest.TextDiff.File = _option.Path; - rs = latest.TextDiff; - } + latest.TextDiff.File = _option.Path; + rs = latest.TextDiff; } else if (latest.IsBinary) { var oldPath = string.IsNullOrEmpty(_option.OrgPath) ? _option.Path : _option.OrgPath; - var imgDecoder = ImageSource.GetDecoder(_option.Path); + var ext = Path.GetExtension(oldPath); - if (imgDecoder != Models.ImageDecoder.None) + if (IMG_EXTS.Contains(ext)) { var imgDiff = new Models.ImageDiff(); - - if (_option.Revisions.Count == 2) + if (option.Revisions.Count == 2) { - var oldImage = ImageSource.FromRevision(_repo, _option.Revisions[0], oldPath, imgDecoder); - var newImage = ImageSource.FromRevision(_repo, _option.Revisions[1], _option.Path, imgDecoder); - imgDiff.Old = oldImage.Bitmap; - imgDiff.OldFileSize = oldImage.Size; - imgDiff.New = newImage.Bitmap; - imgDiff.NewFileSize = newImage.Size; + imgDiff.Old = BitmapFromRevisionFile(repo, option.Revisions[0], oldPath); + imgDiff.New = BitmapFromRevisionFile(repo, option.Revisions[1], oldPath); } else { - if (!oldPath.Equals("/dev/null", StringComparison.Ordinal)) - { - var oldImage = ImageSource.FromRevision(_repo, "HEAD", oldPath, imgDecoder); - imgDiff.Old = oldImage.Bitmap; - imgDiff.OldFileSize = oldImage.Size; - } - - var fullPath = Path.Combine(_repo, _option.Path); - if (File.Exists(fullPath)) - { - var newImage = ImageSource.FromFile(fullPath, imgDecoder); - imgDiff.New = newImage.Bitmap; - imgDiff.NewFileSize = newImage.Size; - } + var fullPath = Path.Combine(repo, _option.Path); + imgDiff.Old = BitmapFromRevisionFile(repo, "HEAD", oldPath); + imgDiff.New = File.Exists(fullPath) ? new Bitmap(fullPath) : null; } - rs = imgDiff; } else { var binaryDiff = new Models.BinaryDiff(); - if (_option.Revisions.Count == 2) + if (option.Revisions.Count == 2) { - binaryDiff.OldSize = new Commands.QueryFileSize(_repo, oldPath, _option.Revisions[0]).Result(); - binaryDiff.NewSize = new Commands.QueryFileSize(_repo, _option.Path, _option.Revisions[1]).Result(); + binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, option.Revisions[0]).Result(); + binaryDiff.NewSize = new Commands.QueryFileSize(repo, _option.Path, option.Revisions[1]).Result(); } else { - var fullPath = Path.Combine(_repo, _option.Path); - binaryDiff.OldSize = new Commands.QueryFileSize(_repo, oldPath, "HEAD").Result(); + var fullPath = Path.Combine(repo, _option.Path); + binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, "HEAD").Result(); binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0; } rs = binaryDiff; @@ -213,11 +124,7 @@ namespace SourceGit.ViewModels } else if (latest.IsLFS) { - var imgDecoder = ImageSource.GetDecoder(_option.Path); - if (imgDecoder != Models.ImageDecoder.None) - rs = new LFSImageDiff(_repo, latest.LFSDiff, imgDecoder); - else - rs = latest.LFSDiff; + rs = latest.LFSDiff; } else { @@ -226,63 +133,53 @@ namespace SourceGit.ViewModels Dispatcher.UIThread.Post(() => { - if (_content is Models.TextDiff old && rs is Models.TextDiff cur && old.File == cur.File) - cur.ScrollOffset = old.ScrollOffset; + if (string.IsNullOrEmpty(_option.OrgPath)) + Title = _option.Path; + else + Title = $"{_option.OrgPath} → {_option.Path}"; FileModeChange = latest.FileModeChange; Content = rs; - IsTextDiff = rs is Models.TextDiff; + IsTextDiff = latest.TextDiff != null; + IsLoading = false; }); }); } - private Models.RevisionSubmodule QuerySubmoduleRevision(string repo, string sha) + public void OpenExternalMergeTool() { - var commit = new Commands.QuerySingleCommit(repo, sha).Result(); - if (commit == null) - return new Models.RevisionSubmodule() { Commit = new Models.Commit() { SHA = sha } }; + var type = Preference.Instance.ExternalMergeToolType; + var exec = Preference.Instance.ExternalMergeToolPath; - var body = new Commands.QueryCommitFullMessage(repo, sha).Result(); - return new Models.RevisionSubmodule() + var tool = Models.ExternalMerger.Supported.Find(x => x.Type == type); + if (tool == null || !File.Exists(exec)) { - Commit = commit, - FullMessage = new Models.CommitFullMessage { Message = body } - }; - } - - private class Info - { - public string Argument { get; } - public int UnifiedLines { get; } - public bool IgnoreWhitespace { get; } - public string OldHash { get; } - public string NewHash { get; } - - public Info(Models.DiffOption option, int unifiedLines, bool ignoreWhitespace, Models.DiffResult result) - { - Argument = option.ToString(); - UnifiedLines = unifiedLines; - IgnoreWhitespace = ignoreWhitespace; - OldHash = result.OldHash; - NewHash = result.NewHash; + App.RaiseException(_repo, "Invalid merge tool in preference setting!"); + return; } - public bool IsSame(Info other) - { - return Argument.Equals(other.Argument, StringComparison.Ordinal) && - UnifiedLines == other.UnifiedLines && - IgnoreWhitespace == other.IgnoreWhitespace && - OldHash.Equals(other.OldHash, StringComparison.Ordinal) && - NewHash.Equals(other.NewHash, StringComparison.Ordinal); - } + var args = tool.Type != 0 ? tool.DiffCmd : Preference.Instance.ExternalMergeToolDiffCmd; + Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, _option)); } - private readonly string _repo; + private Bitmap BitmapFromRevisionFile(string repo, string revision, string file) + { + var stream = Commands.QueryFileContent.Run(repo, revision, file); + return stream.Length > 0 ? new Bitmap(stream) : null; + } + + private static readonly HashSet IMG_EXTS = new HashSet() + { + ".ico", ".bmp", ".jpg", ".png", ".jpeg" + }; + + private readonly string _repo = string.Empty; private readonly Models.DiffOption _option = null; + private string _title = string.Empty; private string _fileModeChange = string.Empty; - private int _unifiedLines = 4; + private bool _isLoading = true; private bool _isTextDiff = false; private object _content = null; - private Info _info = null; + private Vector _syncScrollOffset = Vector.Zero; } } diff --git a/src/ViewModels/Discard.cs b/src/ViewModels/Discard.cs index 7619635c..8e25a6cf 100644 --- a/src/ViewModels/Discard.cs +++ b/src/ViewModels/Discard.cs @@ -3,57 +3,47 @@ using System.Threading.Tasks; namespace SourceGit.ViewModels { - public class DiscardAllMode - { - public bool IncludeIgnored - { - get; - set; - } = false; - } - - public class DiscardSingleFile - { - public string Path - { - get; - set; - } = string.Empty; - } - - public class DiscardMultipleFiles - { - public int Count - { - get; - set; - } = 0; - } + public class DiscardModeAll { } + public class DiscardModeSingle { public string File { get; set; } } + public class DiscardModeMulti { public int Count { get; set; } } public class Discard : Popup { + public object Mode { get; + private set; } public Discard(Repository repo) { _repo = repo; - Mode = new DiscardAllMode(); + + Mode = new DiscardModeAll(); + View = new Views.Discard { DataContext = this }; } - public Discard(Repository repo, List changes) + public Discard(Repository repo, List changes, bool isUnstaged) { _repo = repo; _changes = changes; + _isUnstaged = isUnstaged; if (_changes == null) - Mode = new DiscardAllMode(); + { + Mode = new DiscardModeAll(); + } else if (_changes.Count == 1) - Mode = new DiscardSingleFile() { Path = _changes[0].Path }; + { + Mode = new DiscardModeSingle() { File = _changes[0].Path }; + } else - Mode = new DiscardMultipleFiles() { Count = _changes.Count }; + { + Mode = new DiscardModeMulti() { Count = _changes.Count }; + } + + View = new Views.Discard() { DataContext = this }; } public override Task Sure() @@ -61,29 +51,28 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = _changes == null ? "Discard all local changes ..." : $"Discard total {_changes.Count} changes ..."; - var log = _repo.CreateLog("Discard all"); - Use(log); - return Task.Run(() => { - if (Mode is DiscardAllMode all) - Commands.Discard.All(_repo.FullPath, all.IncludeIgnored, log); - else - Commands.Discard.Changes(_repo.FullPath, _changes, log); - - log.Complete(); - - CallUIThread(() => + if (_changes == null) { - _repo.MarkWorkingCopyDirtyManually(); - _repo.SetWatcherEnabled(true); - }); + Commands.Discard.All(_repo.FullPath); + } + else if (_isUnstaged) + { + Commands.Discard.ChangesInWorkTree(_repo.FullPath, _changes); + } + else + { + Commands.Discard.ChangesInStaged(_repo.FullPath, _changes); + } + CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; }); } private readonly Repository _repo = null; private readonly List _changes = null; + private readonly bool _isUnstaged = true; } } diff --git a/src/ViewModels/DropStash.cs b/src/ViewModels/DropStash.cs index 545da010..ea6ff277 100644 --- a/src/ViewModels/DropStash.cs +++ b/src/ViewModels/DropStash.cs @@ -4,29 +4,26 @@ namespace SourceGit.ViewModels { public class DropStash : Popup { - public Models.Stash Stash { get; } + public Models.Stash Stash { get; private set; } - public DropStash(Repository repo, Models.Stash stash) + public DropStash(string repo, Models.Stash stash) { _repo = repo; Stash = stash; + View = new Views.DropStash() { DataContext = this }; } public override Task Sure() { ProgressDescription = $"Dropping stash: {Stash.Name}"; - var log = _repo.CreateLog("Drop Stash"); - Use(log); - return Task.Run(() => { - new Commands.Stash(_repo.FullPath).Use(log).Drop(Stash.Name); - log.Complete(); + new Commands.Stash(_repo).Drop(Stash.Name); return true; }); } - private readonly Repository _repo; + private readonly string _repo; } } diff --git a/src/ViewModels/EditRemote.cs b/src/ViewModels/EditRemote.cs index 763c8ce1..91cf8749 100644 --- a/src/ViewModels/EditRemote.cs +++ b/src/ViewModels/EditRemote.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using System.IO; using System.Threading.Tasks; namespace SourceGit.ViewModels @@ -30,18 +29,13 @@ namespace SourceGit.ViewModels public bool UseSSH { get => _useSSH; - set - { - if (SetProperty(ref _useSSH, value)) - ValidateProperty(_sshkey, nameof(SSHKey)); - } + set => SetProperty(ref _useSSH, value); } - [CustomValidation(typeof(EditRemote), nameof(ValidateSSHKey))] public string SSHKey { - get => _sshkey; - set => SetProperty(ref _sshkey, value, true); + get; + set; } public EditRemote(Repository repo, Models.Remote remote) @@ -56,6 +50,8 @@ namespace SourceGit.ViewModels { SSHKey = new Commands.Config(repo.FullPath).Get($"remote.{remote.Name}.sshkey"); } + + View = new Views.EditRemote() { DataContext = this }; } public static ValidationResult ValidateRemoteName(string name, ValidationContext ctx) @@ -65,7 +61,7 @@ namespace SourceGit.ViewModels foreach (var remote in edit._repo.Remotes) { if (remote != edit._remote && name == remote.Name) - return new ValidationResult("A remote with given name already exists!!!"); + new ValidationResult("A remote with given name already exists!!!"); } } @@ -82,24 +78,13 @@ namespace SourceGit.ViewModels foreach (var remote in edit._repo.Remotes) { if (remote != edit._remote && url == remote.URL) - return new ValidationResult("A remote with the same url already exists!!!"); + new ValidationResult("A remote with the same url already exists!!!"); } } return ValidationResult.Success; } - public static ValidationResult ValidateSSHKey(string sshkey, ValidationContext ctx) - { - if (ctx.ObjectInstance is EditRemote { _useSSH: true } && !string.IsNullOrEmpty(sshkey)) - { - if (!File.Exists(sshkey)) - return new ValidationResult("Given SSH private key can NOT be found!"); - } - - return ValidationResult.Success; - } - public override Task Sure() { _repo.SetWatcherEnabled(false); @@ -116,16 +101,16 @@ namespace SourceGit.ViewModels if (_remote.URL != _url) { - var succ = new Commands.Remote(_repo.FullPath).SetURL(_name, _url, false); + var succ = new Commands.Remote(_repo.FullPath).SetURL(_name, _url); if (succ) _remote.URL = _url; } - var pushURL = new Commands.Remote(_repo.FullPath).GetURL(_name, true); - if (pushURL != _url) - new Commands.Remote(_repo.FullPath).SetURL(_name, _url, true); - - new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", _useSSH ? SSHKey : null); + if (_useSSH) + { + SetProgressDescription("Post processing ..."); + new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", SSHKey); + } CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; @@ -134,9 +119,8 @@ namespace SourceGit.ViewModels private readonly Repository _repo = null; private readonly Models.Remote _remote = null; - private string _name = null; - private string _url = null; + private string _name = string.Empty; + private string _url = string.Empty; private bool _useSSH = false; - private string _sshkey = string.Empty; } } diff --git a/src/ViewModels/EditRepositoryNode.cs b/src/ViewModels/EditRepositoryNode.cs index 599b7f63..99567c13 100644 --- a/src/ViewModels/EditRepositoryNode.cs +++ b/src/ViewModels/EditRepositoryNode.cs @@ -1,10 +1,17 @@ -using System.ComponentModel.DataAnnotations; +using System; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; namespace SourceGit.ViewModels { public class EditRepositoryNode : Popup { + public RepositoryNode Node + { + get => _node; + set => SetProperty(ref _node, value); + } + public string Id { get => _id; @@ -37,26 +44,20 @@ namespace SourceGit.ViewModels _name = node.Name; _isRepository = node.IsRepository; _bookmark = node.Bookmark; + + View = new Views.EditRepositoryNode() { DataContext = this }; } public override Task Sure() { - bool needSort = _node.Name != _name; _node.Name = _name; _node.Bookmark = _bookmark; - - if (needSort) - { - Preferences.Instance.SortByRenamedNode(_node); - Welcome.Instance.Refresh(); - } - return null; } private RepositoryNode _node = null; - private string _id = null; - private string _name = null; + private string _id = string.Empty; + private string _name = string.Empty; private bool _isRepository = false; private int _bookmark = 0; } diff --git a/src/ViewModels/ExecuteCustomAction.cs b/src/ViewModels/ExecuteCustomAction.cs deleted file mode 100644 index 72570bf0..00000000 --- a/src/ViewModels/ExecuteCustomAction.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class ExecuteCustomAction : Popup - { - public Models.CustomAction CustomAction - { - get; - } - - public ExecuteCustomAction(Repository repo, Models.CustomAction action) - { - _repo = repo; - _args = action.Arguments.Replace("${REPO}", GetWorkdir()); - CustomAction = action; - } - - public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Branch branch) - { - _repo = repo; - _args = action.Arguments.Replace("${REPO}", GetWorkdir()).Replace("${BRANCH}", branch.FriendlyName); - CustomAction = action; - } - - public ExecuteCustomAction(Repository repo, Models.CustomAction action, Models.Commit commit) - { - _repo = repo; - _args = action.Arguments.Replace("${REPO}", GetWorkdir()).Replace("${SHA}", commit.SHA); - CustomAction = action; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Run custom action ..."; - - var log = _repo.CreateLog(CustomAction.Name); - Use(log); - - return Task.Run(() => - { - if (CustomAction.WaitForExit) - Commands.ExecuteCustomAction.RunAndWait(_repo.FullPath, CustomAction.Executable, _args, log); - else - Commands.ExecuteCustomAction.Run(_repo.FullPath, CustomAction.Executable, _args); - - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private string GetWorkdir() - { - return OperatingSystem.IsWindows() ? _repo.FullPath.Replace("/", "\\") : _repo.FullPath; - } - - private readonly Repository _repo = null; - private readonly string _args; - } -} diff --git a/src/ViewModels/FastForwardWithoutCheckout.cs b/src/ViewModels/FastForwardWithoutCheckout.cs new file mode 100644 index 00000000..3861046d --- /dev/null +++ b/src/ViewModels/FastForwardWithoutCheckout.cs @@ -0,0 +1,42 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels +{ + public class FastForwardWithoutCheckout : Popup + { + public Models.Branch Local + { + get; + private set; + } + + public Models.Branch To + { + get; + private set; + } + + public FastForwardWithoutCheckout(Repository repo, Models.Branch local, Models.Branch upstream) + { + _repo = repo; + Local = local; + To = upstream; + View = new Views.FastForwardWithoutCheckout() { DataContext = this }; + } + + public override Task Sure() + { + _repo.SetWatcherEnabled(false); + ProgressDescription = "Fast-Forward ..."; + + return Task.Run(() => + { + new Commands.Fetch(_repo.FullPath, To.Remote, Local.Name, To.Name, SetProgressDescription).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private readonly Repository _repo = null; + } +} diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs index 2fa4dae2..43ad49dc 100644 --- a/src/ViewModels/Fetch.cs +++ b/src/ViewModels/Fetch.cs @@ -22,83 +22,46 @@ namespace SourceGit.ViewModels set; } - public bool NoTags + public bool Prune { - get => _repo.Settings.FetchWithoutTags; - set => _repo.Settings.FetchWithoutTags = value; + get; + set; } - public bool Force - { - get => _repo.Settings.EnableForceOnFetch; - set => _repo.Settings.EnableForceOnFetch = value; - } - - public Fetch(Repository repo, Models.Remote preferredRemote = null) + public Fetch(Repository repo, Models.Remote preferedRemote = null) { _repo = repo; - _fetchAllRemotes = preferredRemote == null; - - if (preferredRemote != null) - { - SelectedRemote = preferredRemote; - } - else if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote)) - { - var def = _repo.Remotes.Find(r => r.Name == _repo.Settings.DefaultRemote); - if (def != null) - SelectedRemote = def; - else - SelectedRemote = _repo.Remotes[0]; - } - else - { - SelectedRemote = _repo.Remotes[0]; - } + _fetchAllRemotes = preferedRemote == null; + SelectedRemote = preferedRemote != null ? preferedRemote : _repo.Remotes[0]; + Prune = true; + View = new Views.Fetch() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - - var notags = _repo.Settings.FetchWithoutTags; - var force = _repo.Settings.EnableForceOnFetch; - var log = _repo.CreateLog("Fetch"); - Use(log); - return Task.Run(() => { if (FetchAllRemotes) { foreach (var remote in _repo.Remotes) - new Commands.Fetch(_repo.FullPath, remote.Name, notags, force).Use(log).Exec(); + { + SetProgressDescription($"Fetching remote: {remote.Name}"); + new Commands.Fetch(_repo.FullPath, remote.Name, Prune, SetProgressDescription).Exec(); + } } else { - new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, notags, force).Use(log).Exec(); + SetProgressDescription($"Fetching remote: {SelectedRemote.Name}"); + new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, Prune, SetProgressDescription).Exec(); } - log.Complete(); - - var upstream = _repo.CurrentBranch?.Upstream; - var upstreamHead = string.Empty; - if (!string.IsNullOrEmpty(upstream)) - upstreamHead = new Commands.QueryRevisionByRefName(_repo.FullPath, upstream.Substring(13)).Result(); - - CallUIThread(() => - { - if (!string.IsNullOrEmpty(upstreamHead)) - _repo.NavigateToCommit(upstreamHead, true); - - _repo.MarkFetched(); - _repo.SetWatcherEnabled(true); - }); - + CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; }); } private readonly Repository _repo = null; - private bool _fetchAllRemotes; + private bool _fetchAllRemotes = true; } } diff --git a/src/ViewModels/FetchInto.cs b/src/ViewModels/FetchInto.cs deleted file mode 100644 index c681b637..00000000 --- a/src/ViewModels/FetchInto.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class FetchInto : Popup - { - public Models.Branch Local - { - get; - } - - public Models.Branch Upstream - { - get; - } - - public FetchInto(Repository repo, Models.Branch local, Models.Branch upstream) - { - _repo = repo; - Local = local; - Upstream = upstream; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Fast-Forward ..."; - - var log = _repo.CreateLog($"Fetch Into '{Local.FriendlyName}'"); - Use(log); - - return Task.Run(() => - { - new Commands.Fetch(_repo.FullPath, Local, Upstream).Use(log).Exec(); - log.Complete(); - - var changedLocalBranchHead = new Commands.QueryRevisionByRefName(_repo.FullPath, Local.Name).Result(); - CallUIThread(() => - { - _repo.NavigateToCommit(changedLocalBranchHead, true); - _repo.SetWatcherEnabled(true); - }); - - return true; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs index c3e5aac1..2a01f3c8 100644 --- a/src/ViewModels/FileHistories.cs +++ b/src/ViewModels/FileHistories.cs @@ -1,223 +1,12 @@ using System.Collections.Generic; -using System.IO; using System.Threading.Tasks; -using Avalonia.Collections; using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class FileHistoriesRevisionFile(string path, object content) - { - public string Path { get; set; } = path; - public object Content { get; set; } = content; - } - - public class FileHistoriesSingleRevision : ObservableObject - { - public bool IsDiffMode - { - get => _isDiffMode; - set - { - if (SetProperty(ref _isDiffMode, value)) - RefreshViewContent(); - } - } - - public object ViewContent - { - get => _viewContent; - set => SetProperty(ref _viewContent, value); - } - - public FileHistoriesSingleRevision(Repository repo, string file, Models.Commit revision, bool prevIsDiffMode) - { - _repo = repo; - _file = file; - _revision = revision; - _isDiffMode = prevIsDiffMode; - _viewContent = null; - - RefreshViewContent(); - } - - public Task ResetToSelectedRevision() - { - return Task.Run(() => new Commands.Checkout(_repo.FullPath).FileWithRevision(_file, $"{_revision.SHA}")); - } - - private void RefreshViewContent() - { - if (_isDiffMode) - SetViewContentAsDiff(); - else - SetViewContentAsRevisionFile(); - } - - private void SetViewContentAsRevisionFile() - { - var objs = new Commands.QueryRevisionObjects(_repo.FullPath, _revision.SHA, _file).Result(); - if (objs.Count == 0) - { - ViewContent = new FileHistoriesRevisionFile(_file, null); - return; - } - - var obj = objs[0]; - switch (obj.Type) - { - case Models.ObjectType.Blob: - Task.Run(() => - { - var isBinary = new Commands.IsBinary(_repo.FullPath, _revision.SHA, _file).Result(); - if (isBinary) - { - var imgDecoder = ImageSource.GetDecoder(_file); - if (imgDecoder != Models.ImageDecoder.None) - { - var source = ImageSource.FromRevision(_repo.FullPath, _revision.SHA, _file, imgDecoder); - var image = new Models.RevisionImageFile(_file, source.Bitmap, source.Size); - Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, image)); - } - else - { - var size = new Commands.QueryFileSize(_repo.FullPath, _file, _revision.SHA).Result(); - var binaryFile = new Models.RevisionBinaryFile() { Size = size }; - Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, binaryFile)); - } - - return; - } - - var contentStream = Commands.QueryFileContent.Run(_repo.FullPath, _revision.SHA, _file); - var content = new StreamReader(contentStream).ReadToEnd(); - var lfs = Models.LFSObject.Parse(content); - if (lfs != null) - { - var imgDecoder = ImageSource.GetDecoder(_file); - if (imgDecoder != Models.ImageDecoder.None) - { - var combined = new RevisionLFSImage(_repo.FullPath, _file, lfs, imgDecoder); - Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, combined)); - } - else - { - var rlfs = new Models.RevisionLFSObject() { Object = lfs }; - Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, rlfs)); - } - } - else - { - var txt = new Models.RevisionTextFile() { FileName = obj.Path, Content = content }; - Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, txt)); - } - }); - break; - case Models.ObjectType.Commit: - Task.Run(() => - { - var submoduleRoot = Path.Combine(_repo.FullPath, _file); - var commit = new Commands.QuerySingleCommit(submoduleRoot, obj.SHA).Result(); - var message = commit != null ? new Commands.QueryCommitFullMessage(submoduleRoot, obj.SHA).Result() : null; - var module = new Models.RevisionSubmodule() - { - Commit = commit ?? new Models.Commit() { SHA = obj.SHA }, - FullMessage = new Models.CommitFullMessage { Message = message } - }; - - Dispatcher.UIThread.Invoke(() => ViewContent = new FileHistoriesRevisionFile(_file, module)); - }); - break; - default: - ViewContent = new FileHistoriesRevisionFile(_file, null); - break; - } - } - - private void SetViewContentAsDiff() - { - var option = new Models.DiffOption(_revision, _file); - ViewContent = new DiffContext(_repo.FullPath, option, _viewContent as DiffContext); - } - - private Repository _repo = null; - private string _file = null; - private Models.Commit _revision = null; - private bool _isDiffMode = false; - private object _viewContent = null; - } - - public class FileHistoriesCompareRevisions : ObservableObject - { - public Models.Commit StartPoint - { - get => _startPoint; - set => SetProperty(ref _startPoint, value); - } - - public Models.Commit EndPoint - { - get => _endPoint; - set => SetProperty(ref _endPoint, value); - } - - public DiffContext ViewContent - { - get => _viewContent; - set => SetProperty(ref _viewContent, value); - } - - public FileHistoriesCompareRevisions(Repository repo, string file, Models.Commit start, Models.Commit end) - { - _repo = repo; - _file = file; - _startPoint = start; - _endPoint = end; - RefreshViewContent(); - } - - public void Swap() - { - (StartPoint, EndPoint) = (_endPoint, _startPoint); - RefreshViewContent(); - } - - public Task SaveAsPatch(string saveTo) - { - return Task.Run(() => - { - Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo.FullPath, _changes, _startPoint.SHA, _endPoint.SHA, saveTo); - return true; - }); - } - - private void RefreshViewContent() - { - Task.Run(() => - { - _changes = new Commands.CompareRevisions(_repo.FullPath, _startPoint.SHA, _endPoint.SHA, _file).Result(); - if (_changes.Count == 0) - { - Dispatcher.UIThread.Invoke(() => ViewContent = null); - return; - } - - var option = new Models.DiffOption(_startPoint.SHA, _endPoint.SHA, _changes[0]); - Dispatcher.UIThread.Invoke(() => ViewContent = new DiffContext(_repo.FullPath, option, _viewContent)); - }); - } - - private Repository _repo = null; - private string _file = null; - private Models.Commit _startPoint = null; - private Models.Commit _endPoint = null; - private List _changes = []; - private DiffContext _viewContent = null; - } - public class FileHistories : ObservableObject { public bool IsLoading @@ -232,76 +21,64 @@ namespace SourceGit.ViewModels set => SetProperty(ref _commits, value); } - public AvaloniaList SelectedCommits + public Models.Commit SelectedCommit { - get; - set; - } = []; - - public object ViewContent - { - get => _viewContent; - private set => SetProperty(ref _viewContent, value); + get => _selectedCommit; + set + { + if (SetProperty(ref _selectedCommit, value)) + { + if (value == null) + { + DiffContext = null; + DetailContext.Commit = null; + } + else + { + DiffContext = new DiffContext(_repo, new Models.DiffOption(value, _file), _diffContext); + DetailContext.Commit = value; + } + } + } } - public FileHistories(Repository repo, string file, string commit = null) + public DiffContext DiffContext + { + get => _diffContext; + set => SetProperty(ref _diffContext, value); + } + + public CommitDetail DetailContext + { + get => _detailContext; + set => SetProperty(ref _detailContext, value); + } + + public FileHistories(string repo, string file) { _repo = repo; + _file = file; + _detailContext = new CommitDetail(repo); Task.Run(() => { - var based = commit ?? string.Empty; - var commits = new Commands.QueryCommits(_repo.FullPath, $"--date-order -n 10000 {based} -- \"{file}\"", false).Result(); + var commits = new Commands.QueryCommits(_repo, $"-n 10000 -- \"{file}\"").Result(); Dispatcher.UIThread.Invoke(() => { IsLoading = false; Commits = commits; - if (Commits.Count > 0) - SelectedCommits.Add(Commits[0]); + if (commits.Count > 0) + SelectedCommit = commits[0]; }); }); - - SelectedCommits.CollectionChanged += (_, _) => - { - if (_viewContent is FileHistoriesSingleRevision singleRevision) - _prevIsDiffMode = singleRevision.IsDiffMode; - - switch (SelectedCommits.Count) - { - case 1: - ViewContent = new FileHistoriesSingleRevision(_repo, file, SelectedCommits[0], _prevIsDiffMode); - break; - case 2: - ViewContent = new FileHistoriesCompareRevisions(_repo, file, SelectedCommits[0], SelectedCommits[1]); - break; - default: - ViewContent = SelectedCommits.Count; - break; - } - }; } - public void NavigateToCommit(Models.Commit commit) - { - _repo.NavigateToCommit(commit.SHA); - } - - public string GetCommitFullMessage(Models.Commit commit) - { - var sha = commit.SHA; - if (_fullCommitMessages.TryGetValue(sha, out var msg)) - return msg; - - msg = new Commands.QueryCommitFullMessage(_repo.FullPath, sha).Result(); - _fullCommitMessages[sha] = msg; - return msg; - } - - private readonly Repository _repo = null; + private readonly string _repo = string.Empty; + private readonly string _file = string.Empty; private bool _isLoading = true; - private bool _prevIsDiffMode = true; private List _commits = null; - private Dictionary _fullCommitMessages = new(); - private object _viewContent = null; + private Models.Commit _selectedCommit = null; + private DiffContext _diffContext = null; + private CommitDetail _detailContext = null; } } diff --git a/src/ViewModels/FileTreeNode.cs b/src/ViewModels/FileTreeNode.cs new file mode 100644 index 00000000..ca6d850f --- /dev/null +++ b/src/ViewModels/FileTreeNode.cs @@ -0,0 +1,217 @@ +using System; +using System.Collections.Generic; + +using CommunityToolkit.Mvvm.ComponentModel; + +namespace SourceGit.ViewModels +{ + public class FileTreeNode : ObservableObject + { + public string FullPath { get; set; } = string.Empty; + public bool IsFolder { get; set; } = false; + public object Backend { get; set; } = null; + public List Children { get; set; } = new List(); + + public bool IsExpanded + { + get => _isExpanded; + set => SetProperty(ref _isExpanded, value); + } + + public static List Build(List changes) + { + var nodes = new List(); + var folders = new Dictionary(); + var expanded = changes.Count <= 50; + + foreach (var c in changes) + { + var sepIdx = c.Path.IndexOf('/', StringComparison.Ordinal); + if (sepIdx == -1) + { + nodes.Add(new FileTreeNode() + { + FullPath = c.Path, + Backend = c, + IsFolder = false, + IsExpanded = false + }); + } + else + { + FileTreeNode lastFolder = null; + var start = 0; + + while (sepIdx != -1) + { + var folder = c.Path.Substring(0, sepIdx); + if (folders.TryGetValue(folder, out var value)) + { + lastFolder = value; + } + else if (lastFolder == null) + { + lastFolder = new FileTreeNode() + { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + nodes.Add(lastFolder); + folders.Add(folder, lastFolder); + } + else + { + var cur = new FileTreeNode() + { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + folders.Add(folder, cur); + lastFolder.Children.Add(cur); + lastFolder = cur; + } + + start = sepIdx + 1; + sepIdx = c.Path.IndexOf('/', start); + } + + lastFolder.Children.Add(new FileTreeNode() + { + FullPath = c.Path, + Backend = c, + IsFolder = false, + IsExpanded = false + }); + } + } + + folders.Clear(); + Sort(nodes); + return nodes; + } + + public static List Build(List files) + { + var nodes = new List(); + var folders = new Dictionary(); + var expanded = files.Count <= 50; + + foreach (var f in files) + { + var sepIdx = f.Path.IndexOf('/', StringComparison.Ordinal); + if (sepIdx == -1) + { + nodes.Add(new FileTreeNode() + { + FullPath = f.Path, + Backend = f, + IsFolder = false, + IsExpanded = false + }); + } + else + { + FileTreeNode lastFolder = null; + var start = 0; + + while (sepIdx != -1) + { + var folder = f.Path.Substring(0, sepIdx); + if (folders.TryGetValue(folder, out var value)) + { + lastFolder = value; + } + else if (lastFolder == null) + { + lastFolder = new FileTreeNode() + { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + nodes.Add(lastFolder); + folders.Add(folder, lastFolder); + } + else + { + var cur = new FileTreeNode() + { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + folders.Add(folder, cur); + lastFolder.Children.Add(cur); + lastFolder = cur; + } + + start = sepIdx + 1; + sepIdx = f.Path.IndexOf('/', start); + } + + lastFolder.Children.Add(new FileTreeNode() + { + FullPath = f.Path, + Backend = f, + IsFolder = false, + IsExpanded = false + }); + } + } + + folders.Clear(); + Sort(nodes); + return nodes; + } + + public static FileTreeNode SelectByPath(List nodes, string path) + { + foreach (var node in nodes) + { + if (node.FullPath == path) + return node; + + if (node.IsFolder && path.StartsWith(node.FullPath + "/", StringComparison.Ordinal)) + { + var foundInChildren = SelectByPath(node.Children, path); + if (foundInChildren != null) + { + node.IsExpanded = true; + } + return foundInChildren; + } + } + + return null; + } + + private static void Sort(List nodes) + { + nodes.Sort((l, r) => + { + if (l.IsFolder == r.IsFolder) + { + return l.FullPath.CompareTo(r.FullPath); + } + else + { + return l.IsFolder ? -1 : 1; + } + }); + + foreach (var node in nodes) + { + if (node.Children.Count > 1) + Sort(node.Children); + } + } + + private bool _isExpanded = true; + } +} diff --git a/src/ViewModels/FilterModeInGraph.cs b/src/ViewModels/FilterModeInGraph.cs deleted file mode 100644 index 9930b816..00000000 --- a/src/ViewModels/FilterModeInGraph.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class FilterModeInGraph : ObservableObject - { - public bool IsFiltered - { - get => _mode == Models.FilterMode.Included; - set => SetFilterMode(value ? Models.FilterMode.Included : Models.FilterMode.None); - } - - public bool IsExcluded - { - get => _mode == Models.FilterMode.Excluded; - set => SetFilterMode(value ? Models.FilterMode.Excluded : Models.FilterMode.None); - } - - public FilterModeInGraph(Repository repo, object target) - { - _repo = repo; - _target = target; - - if (_target is Models.Branch b) - _mode = GetFilterMode(b.FullName); - else if (_target is Models.Tag t) - _mode = GetFilterMode(t.Name); - } - - private Models.FilterMode GetFilterMode(string pattern) - { - foreach (var filter in _repo.Settings.HistoriesFilters) - { - if (filter.Pattern.Equals(pattern, StringComparison.Ordinal)) - return filter.Mode; - } - - return Models.FilterMode.None; - } - - private void SetFilterMode(Models.FilterMode mode) - { - if (_mode != mode) - { - _mode = mode; - - if (_target is Models.Branch branch) - _repo.SetBranchFilterMode(branch, _mode, false, true); - else if (_target is Models.Tag tag) - _repo.SetTagFilterMode(tag, _mode); - - OnPropertyChanged(nameof(IsFiltered)); - OnPropertyChanged(nameof(IsExcluded)); - } - } - - private Repository _repo = null; - private object _target = null; - private Models.FilterMode _mode = Models.FilterMode.None; - } -} diff --git a/src/ViewModels/GitFlowFinish.cs b/src/ViewModels/GitFlowFinish.cs index bef4c2d9..1520285a 100644 --- a/src/ViewModels/GitFlowFinish.cs +++ b/src/ViewModels/GitFlowFinish.cs @@ -4,28 +4,10 @@ namespace SourceGit.ViewModels { public class GitFlowFinish : Popup { - public Models.Branch Branch - { - get; - } - - public Models.GitFlowBranchType Type - { - get; - private set; - } - - public bool Squash - { - get; - set; - } = false; - - public bool AutoPush - { - get; - set; - } = false; + public Models.Branch Branch => _branch; + public bool IsFeature => _type == Models.GitFlowBranchType.Feature; + public bool IsRelease => _type == Models.GitFlowBranchType.Release; + public bool IsHotfix => _type == Models.GitFlowBranchType.Hotfix; public bool KeepBranch { @@ -36,30 +18,38 @@ namespace SourceGit.ViewModels public GitFlowFinish(Repository repo, Models.Branch branch, Models.GitFlowBranchType type) { _repo = repo; - Branch = branch; - Type = type; + _branch = branch; + _type = type; + View = new Views.GitFlowFinish() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - ProgressDescription = $"Git Flow - Finish {Branch.Name} ..."; - - var log = _repo.CreateLog("GitFlow - Finish"); - Use(log); - - var prefix = _repo.GitFlow.GetPrefix(Type); - var name = Branch.Name.StartsWith(prefix) ? Branch.Name.Substring(prefix.Length) : Branch.Name; - return Task.Run(() => { - var succ = Commands.GitFlow.Finish(_repo.FullPath, Type, name, Squash, AutoPush, KeepBranch, log); - log.Complete(); + var branch = _branch.Name; + switch (_type) + { + case Models.GitFlowBranchType.Feature: + branch = branch.Substring(_repo.GitFlow.Feature.Length); + break; + case Models.GitFlowBranchType.Release: + branch = branch.Substring(_repo.GitFlow.Release.Length); + break; + default: + branch = branch.Substring(_repo.GitFlow.Hotfix.Length); + break; + } + + var succ = new Commands.GitFlow(_repo.FullPath).Finish(_type, branch, KeepBranch); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private readonly Repository _repo; + private readonly Repository _repo = null; + private readonly Models.Branch _branch = null; + private readonly Models.GitFlowBranchType _type = Models.GitFlowBranchType.None; } } diff --git a/src/ViewModels/GitFlowStart.cs b/src/ViewModels/GitFlowStart.cs index 3ecba883..ddcec725 100644 --- a/src/ViewModels/GitFlowStart.cs +++ b/src/ViewModels/GitFlowStart.cs @@ -5,20 +5,8 @@ namespace SourceGit.ViewModels { public class GitFlowStart : Popup { - public Models.GitFlowBranchType Type - { - get; - private set; - } - - public string Prefix - { - get; - private set; - } - [Required(ErrorMessage = "Name is required!!!")] - [RegularExpression(@"^[\w\-/\.#]+$", ErrorMessage = "Bad branch name format!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] [CustomValidation(typeof(GitFlowStart), nameof(ValidateBranchName))] public string Name { @@ -26,22 +14,45 @@ namespace SourceGit.ViewModels set => SetProperty(ref _name, value, true); } + public string Prefix + { + get => _prefix; + } + + public bool IsFeature => _type == Models.GitFlowBranchType.Feature; + public bool IsRelease => _type == Models.GitFlowBranchType.Release; + public bool IsHotfix => _type == Models.GitFlowBranchType.Hotfix; + public GitFlowStart(Repository repo, Models.GitFlowBranchType type) { _repo = repo; + _type = type; - Type = type; - Prefix = _repo.GitFlow.GetPrefix(type); + switch (type) + { + case Models.GitFlowBranchType.Feature: + _prefix = repo.GitFlow.Feature; + break; + case Models.GitFlowBranchType.Release: + _prefix = repo.GitFlow.Release; + break; + default: + _prefix = repo.GitFlow.Hotfix; + break; + } + + View = new Views.GitFlowStart() { DataContext = this }; } public static ValidationResult ValidateBranchName(string name, ValidationContext ctx) { if (ctx.ObjectInstance is GitFlowStart starter) { - var check = $"{starter.Prefix}{name}"; + var check = $"{starter._prefix}{name}"; foreach (var b in starter._repo.Branches) { - if (b.FriendlyName == check) + var test = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}"; + if (test == check) return new ValidationResult("A branch with same name already exists!"); } } @@ -52,21 +63,17 @@ namespace SourceGit.ViewModels public override Task Sure() { _repo.SetWatcherEnabled(false); - ProgressDescription = $"Git Flow - Start {Prefix}{_name} ..."; - - var log = _repo.CreateLog("GitFlow - Start"); - Use(log); - return Task.Run(() => { - var succ = Commands.GitFlow.Start(_repo.FullPath, Type, _name, log); - log.Complete(); + var succ = new Commands.GitFlow(_repo.FullPath).Start(_type, _name); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private readonly Repository _repo; + private readonly Repository _repo = null; + private readonly Models.GitFlowBranchType _type = Models.GitFlowBranchType.Feature; + private readonly string _prefix = string.Empty; private string _name = null; } } diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs index db368d80..a4102543 100644 --- a/src/ViewModels/Histories.cs +++ b/src/ViewModels/Histories.cs @@ -1,40 +1,50 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; -using System.IO; -using System.Text; using System.Threading.Tasks; using Avalonia.Controls; using Avalonia.Platform.Storage; +using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class Histories : ObservableObject, IDisposable + public class CountSelectedCommits { - public Repository Repo - { - get => _repo; - } + public int Count { get; set; } + } + public class Histories : ObservableObject + { public bool IsLoading { get => _isLoading; set => SetProperty(ref _isLoading, value); } + public double DataGridRowHeight + { + get => _dataGridRowHeight; + } + public List Commits { get => _commits; set { - var lastSelected = AutoSelectedCommit; if (SetProperty(ref _commits, value)) { - if (value.Count > 0 && lastSelected != null) - AutoSelectedCommit = value.Find(x => x.SHA == lastSelected.SHA); + Graph = null; + Task.Run(() => + { + var graph = Models.CommitGraph.Parse(value, DataGridRowHeight, 8); + Dispatcher.UIThread.Invoke(() => + { + Graph = graph; + }); + }); } } } @@ -48,7 +58,7 @@ namespace SourceGit.ViewModels public Models.Commit AutoSelectedCommit { get => _autoSelectedCommit; - set => SetProperty(ref _autoSelectedCommit, value); + private set => SetProperty(ref _autoSelectedCommit, value); } public long NavigationId @@ -57,40 +67,10 @@ namespace SourceGit.ViewModels private set => SetProperty(ref _navigationId, value); } - public IDisposable DetailContext + public object DetailContext { get => _detailContext; - set => SetProperty(ref _detailContext, value); - } - - public Models.Bisect Bisect - { - get => _bisect; - private set => SetProperty(ref _bisect, value); - } - - public GridLength LeftArea - { - get => _leftArea; - set => SetProperty(ref _leftArea, value); - } - - public GridLength RightArea - { - get => _rightArea; - set => SetProperty(ref _rightArea, value); - } - - public GridLength TopArea - { - get => _topArea; - set => SetProperty(ref _topArea, value); - } - - public GridLength BottomArea - { - get => _bottomArea; - set => SetProperty(ref _bottomArea, value); + private set => SetProperty(ref _detailContext, value); } public Histories(Repository repo) @@ -98,93 +78,56 @@ namespace SourceGit.ViewModels _repo = repo; } - public void Dispose() + public void Cleanup() { - Commits = []; + Commits = new List(); + _repo = null; _graph = null; _autoSelectedCommit = null; - _detailContext?.Dispose(); + + if (_detailContext is CommitDetail cd) + { + cd.Cleanup(); + } + else if (_detailContext is RevisionCompare rc) + { + rc.Cleanup(); + } + _detailContext = null; } - public Models.BisectState UpdateBisectInfo() - { - var test = Path.Combine(_repo.GitDir, "BISECT_START"); - if (!File.Exists(test)) - { - Bisect = null; - return Models.BisectState.None; - } - - var info = new Models.Bisect(); - var dir = Path.Combine(_repo.GitDir, "refs", "bisect"); - if (Directory.Exists(dir)) - { - var files = new DirectoryInfo(dir).GetFiles(); - foreach (var file in files) - { - if (file.Name.StartsWith("bad")) - info.Bads.Add(File.ReadAllText(file.FullName).Trim()); - else if (file.Name.StartsWith("good")) - info.Goods.Add(File.ReadAllText(file.FullName).Trim()); - } - } - - Bisect = info; - - if (info.Bads.Count == 0 || info.Goods.Count == 0) - return Models.BisectState.WaitingForRange; - else - return Models.BisectState.Detecting; - } - public void NavigateTo(string commitSHA) { var commit = _commits.Find(x => x.SHA.StartsWith(commitSHA, StringComparison.Ordinal)); - if (commit == null) - { - AutoSelectedCommit = null; - commit = new Commands.QuerySingleCommit(_repo.FullPath, commitSHA).Result(); - } - else + if (commit != null) { AutoSelectedCommit = commit; NavigationId = _navigationId + 1; - } - if (commit != null) - { if (_detailContext is CommitDetail detail) { detail.Commit = commit; } else { - var commitDetail = new CommitDetail(_repo); + var commitDetail = new CommitDetail(_repo.FullPath); commitDetail.Commit = commit; DetailContext = commitDetail; } } - else - { - DetailContext = null; - } } public void Select(IList commits) { if (commits.Count == 0) { - _repo.SelectedSearchedCommit = null; DetailContext = null; } else if (commits.Count == 1) { - var commit = (commits[0] as Models.Commit)!; - if (_repo.SelectedSearchedCommit == null || _repo.SelectedSearchedCommit.SHA != commit.SHA) - _repo.SelectedSearchedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA); - + var commit = commits[0] as Models.Commit; AutoSelectedCommit = commit; NavigationId = _navigationId + 1; @@ -194,221 +137,34 @@ namespace SourceGit.ViewModels } else { - var commitDetail = new CommitDetail(_repo); + var commitDetail = new CommitDetail(_repo.FullPath); commitDetail.Commit = commit; DetailContext = commitDetail; } } else if (commits.Count == 2) { - _repo.SelectedSearchedCommit = null; - var end = commits[0] as Models.Commit; var start = commits[1] as Models.Commit; DetailContext = new RevisionCompare(_repo.FullPath, start, end); } else { - _repo.SelectedSearchedCommit = null; - DetailContext = new Models.Count(commits.Count); + DetailContext = new CountSelectedCommits() { Count = commits.Count }; } } - public void DoubleTapped(Models.Commit commit) + public ContextMenu MakeContextMenu() { - if (commit == null || commit.IsCurrentHead) - return; - - var firstRemoteBranch = null as Models.Branch; - foreach (var d in commit.Decorators) - { - if (d.Type == Models.DecoratorType.LocalBranchHead) - { - var b = _repo.Branches.Find(x => x.FriendlyName == d.Name); - if (b != null) - { - _repo.CheckoutBranch(b); - return; - } - } - else if (d.Type == Models.DecoratorType.RemoteBranchHead) - { - var remoteBranch = _repo.Branches.Find(x => x.FriendlyName == d.Name); - if (remoteBranch != null) - { - var localBranch = _repo.Branches.Find(x => x.IsLocal && x.Upstream == remoteBranch.FullName); - if (localBranch is { TrackStatus.Ahead.Count: 0 }) - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new CheckoutAndFastForward(_repo, localBranch, remoteBranch)); - return; - } - } - - if (firstRemoteBranch == null) - firstRemoteBranch = remoteBranch; - } - } - - if (_repo.CanCreatePopup()) - { - if (firstRemoteBranch != null) - _repo.ShowPopup(new CreateBranch(_repo, firstRemoteBranch)); - else if (!_repo.IsBare) - _repo.ShowPopup(new CheckoutCommit(_repo, commit)); - } - } - - public ContextMenu MakeContextMenu(ListBox list) - { - var current = _repo.CurrentBranch; - if (current == null || list.SelectedItems == null) + var detail = _detailContext as CommitDetail; + if (detail == null) return null; - if (list.SelectedItems.Count > 1) - { - var selected = new List(); - var canCherryPick = true; - var canMerge = true; + var current = _repo.Branches.Find(x => x.IsCurrent); + if (current == null) + return null; - foreach (var item in list.SelectedItems) - { - if (item is Models.Commit c) - { - selected.Add(c); - - if (c.IsMerged) - { - canMerge = false; - canCherryPick = false; - } - else if (c.Parents.Count > 1) - { - canCherryPick = false; - } - } - } - - // Sort selected commits in order. - selected.Sort((l, r) => _commits.IndexOf(r) - _commits.IndexOf(l)); - - var multipleMenu = new ContextMenu(); - - if (!_repo.IsBare) - { - if (canCherryPick) - { - var cherryPickMultiple = new MenuItem(); - cherryPickMultiple.Header = App.Text("CommitCM.CherryPickMultiple"); - cherryPickMultiple.Icon = App.CreateMenuIcon("Icons.CherryPick"); - cherryPickMultiple.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new CherryPick(_repo, selected)); - e.Handled = true; - }; - multipleMenu.Items.Add(cherryPickMultiple); - } - - if (canMerge) - { - var mergeMultiple = new MenuItem(); - mergeMultiple.Header = App.Text("CommitCM.MergeMultiple"); - mergeMultiple.Icon = App.CreateMenuIcon("Icons.Merge"); - mergeMultiple.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new MergeMultiple(_repo, selected)); - e.Handled = true; - }; - multipleMenu.Items.Add(mergeMultiple); - } - - if (canCherryPick || canMerge) - multipleMenu.Items.Add(new MenuItem() { Header = "-" }); - } - - var saveToPatchMultiple = new MenuItem(); - saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff"); - saveToPatchMultiple.Header = App.Text("CommitCM.SaveAsPatch"); - saveToPatchMultiple.Click += async (_, e) => - { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) - return; - - var options = new FolderPickerOpenOptions() { AllowMultiple = false }; - var log = null as CommandLog; - try - { - var picker = await storageProvider.OpenFolderPickerAsync(options); - if (picker.Count == 1) - { - log = _repo.CreateLog("Save as Patch"); - - var folder = picker[0]; - var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder.Path.ToString(); - var succ = false; - for (var i = 0; i < selected.Count; i++) - { - var saveTo = GetPatchFileName(folderPath, selected[i], i); - succ = await Task.Run(() => new Commands.FormatPatch(_repo.FullPath, selected[i].SHA, saveTo).Use(log).Exec()); - if (!succ) - break; - } - - if (succ) - App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); - } - } - catch (Exception exception) - { - App.RaiseException(_repo.FullPath, $"Failed to save as patch: {exception.Message}"); - } - - log?.Complete(); - e.Handled = true; - }; - multipleMenu.Items.Add(saveToPatchMultiple); - multipleMenu.Items.Add(new MenuItem() { Header = "-" }); - - var copyMultipleSHAs = new MenuItem(); - copyMultipleSHAs.Header = App.Text("CommitCM.CopySHA"); - copyMultipleSHAs.Icon = App.CreateMenuIcon("Icons.Fingerprint"); - copyMultipleSHAs.Click += (_, e) => - { - var builder = new StringBuilder(); - foreach (var c in selected) - builder.AppendLine(c.SHA); - - App.CopyText(builder.ToString()); - e.Handled = true; - }; - - var copyMultipleInfo = new MenuItem(); - copyMultipleInfo.Header = App.Text("CommitCM.CopyInfo"); - copyMultipleInfo.Icon = App.CreateMenuIcon("Icons.Info"); - copyMultipleInfo.Click += (_, e) => - { - var builder = new StringBuilder(); - foreach (var c in selected) - builder.AppendLine($"{c.SHA.AsSpan(0, 10)} - {c.Subject}"); - - App.CopyText(builder.ToString()); - e.Handled = true; - }; - - var copyMultiple = new MenuItem(); - copyMultiple.Header = App.Text("Copy"); - copyMultiple.Icon = App.CreateMenuIcon("Icons.Copy"); - copyMultiple.Items.Add(copyMultipleSHAs); - copyMultiple.Items.Add(copyMultipleInfo); - multipleMenu.Items.Add(copyMultiple); - - return multipleMenu; - } - - var commit = (list.SelectedItem as Models.Commit)!; + var commit = detail.Commit; var menu = new ContextMenu(); var tags = new List(); @@ -427,7 +183,7 @@ namespace SourceGit.ViewModels } else if (d.Type == Models.DecoratorType.RemoteBranchHead) { - var b = _repo.Branches.Find(x => !x.IsLocal && d.Name == x.FriendlyName); + var b = _repo.Branches.Find(x => !x.IsLocal && d.Name == $"{x.Remote}/{x.Name}"); FillRemoteBranchMenu(menu, b, current, commit.IsMerged); } else if (d.Type == Models.DecoratorType.Tag) @@ -445,233 +201,101 @@ namespace SourceGit.ViewModels if (tags.Count > 0) { foreach (var tag in tags) - FillTagMenu(menu, tag, current, commit.IsMerged); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - if (!_repo.IsBare) - { - if (current.Head != commit.SHA) - { - var reset = new MenuItem(); - reset.Header = App.Text("CommitCM.Reset", current.Name); - reset.Icon = App.CreateMenuIcon("Icons.Reset"); - reset.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Reset(_repo, current, commit)); - e.Handled = true; - }; - menu.Items.Add(reset); - - if (commit.IsMerged) - { - var squash = new MenuItem(); - squash.Header = App.Text("CommitCM.SquashCommitsSinceThis"); - squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent"); - squash.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Squash(_repo, commit, commit.SHA)); - - e.Handled = true; - }; - menu.Items.Add(squash); - } - } - else - { - var reword = new MenuItem(); - reword.Header = App.Text("CommitCM.Reword"); - reword.Icon = App.CreateMenuIcon("Icons.Edit"); - reword.Click += (_, e) => - { - if (_repo.LocalChangesCount > 0) - { - App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first."); - return; - } - - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Reword(_repo, commit)); - e.Handled = true; - }; - menu.Items.Add(reword); - - var squash = new MenuItem(); - squash.Header = App.Text("CommitCM.Squash"); - squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent"); - squash.IsEnabled = commit.Parents.Count == 1; - squash.Click += (_, e) => - { - if (commit.Parents.Count == 1) - { - var parent = _commits.Find(x => x.SHA == commit.Parents[0]); - if (parent != null && _repo.CanCreatePopup()) - _repo.ShowPopup(new Squash(_repo, parent, commit.SHA)); - } - - e.Handled = true; - }; - menu.Items.Add(squash); - } - - if (!commit.IsMerged) - { - var rebase = new MenuItem(); - rebase.Header = App.Text("CommitCM.Rebase", current.Name); - rebase.Icon = App.CreateMenuIcon("Icons.Rebase"); - rebase.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Rebase(_repo, current, commit)); - e.Handled = true; - }; - menu.Items.Add(rebase); - - if (!commit.HasDecorators) - { - var merge = new MenuItem(); - merge.Header = App.Text("CommitCM.Merge", current.Name); - merge.Icon = App.CreateMenuIcon("Icons.Merge"); - merge.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Merge(_repo, commit, current.Name)); - - e.Handled = true; - }; - menu.Items.Add(merge); - } - - var cherryPick = new MenuItem(); - cherryPick.Header = App.Text("CommitCM.CherryPick"); - cherryPick.Icon = App.CreateMenuIcon("Icons.CherryPick"); - cherryPick.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - { - if (commit.Parents.Count <= 1) - { - _repo.ShowPopup(new CherryPick(_repo, [commit])); - } - else - { - var parents = new List(); - foreach (var sha in commit.Parents) - { - var parent = _commits.Find(x => x.SHA == sha); - if (parent == null) - parent = new Commands.QuerySingleCommit(_repo.FullPath, sha).Result(); - - if (parent != null) - parents.Add(parent); - } - - _repo.ShowPopup(new CherryPick(_repo, commit, parents)); - } - } - - e.Handled = true; - }; - menu.Items.Add(cherryPick); - } - else - { - var revert = new MenuItem(); - revert.Header = App.Text("CommitCM.Revert"); - revert.Icon = App.CreateMenuIcon("Icons.Undo"); - revert.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Revert(_repo, commit)); - e.Handled = true; - }; - menu.Items.Add(revert); - } - - if (current.Head != commit.SHA) - { - var checkoutCommit = new MenuItem(); - checkoutCommit.Header = App.Text("CommitCM.Checkout"); - checkoutCommit.Icon = App.CreateMenuIcon("Icons.Detached"); - checkoutCommit.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new CheckoutCommit(_repo, commit)); - e.Handled = true; - }; - - var interactiveRebase = new MenuItem(); - interactiveRebase.Header = App.Text("CommitCM.InteractiveRebase", current.Name); - interactiveRebase.Icon = App.CreateMenuIcon("Icons.InteractiveRebase"); - interactiveRebase.Click += (_, e) => - { - if (_repo.LocalChangesCount > 0) - { - App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first."); - return; - } - - App.ShowWindow(new InteractiveRebase(_repo, current, commit), true); - e.Handled = true; - }; - - menu.Items.Add(checkoutCommit); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(interactiveRebase); - } - + FillTagMenu(menu, tag); menu.Items.Add(new MenuItem() { Header = "-" }); } if (current.Head != commit.SHA) { - var compareWithHead = new MenuItem(); - compareWithHead.Header = App.Text("CommitCM.CompareWithHead"); - compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare"); - compareWithHead.Click += (_, e) => + var reset = new MenuItem(); + reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name); + reset.Icon = App.CreateMenuIcon("Icons.Reset"); + reset.Click += (o, e) => { - var head = _commits.Find(x => x.SHA == current.Head); - if (head == null) + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Reset(_repo, current, commit)); + e.Handled = true; + }; + menu.Items.Add(reset); + } + else + { + var reword = new MenuItem(); + reword.Header = App.Text("CommitCM.Reword"); + reword.Icon = App.CreateMenuIcon("Icons.Edit"); + reword.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Reword(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(reword); + + var squash = new MenuItem(); + squash.Header = App.Text("CommitCM.Squash"); + squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent"); + squash.IsEnabled = commit.Parents.Count == 1; + squash.Click += (o, e) => + { + if (commit.Parents.Count == 1) { - _repo.SelectedSearchedCommit = null; - head = new Commands.QuerySingleCommit(_repo.FullPath, current.Head).Result(); - if (head != null) - DetailContext = new RevisionCompare(_repo.FullPath, commit, head); - } - else - { - list.SelectedItems.Add(head); + var parent = _commits.Find(x => x.SHA == commit.Parents[0]); + if (parent != null && PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Squash(_repo, commit, parent)); } e.Handled = true; }; - menu.Items.Add(compareWithHead); - - if (_repo.LocalChangesCount > 0) - { - var compareWithWorktree = new MenuItem(); - compareWithWorktree.Header = App.Text("CommitCM.CompareWithWorktree"); - compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare"); - compareWithWorktree.Click += (_, e) => - { - DetailContext = new RevisionCompare(_repo.FullPath, commit, null); - e.Handled = true; - }; - menu.Items.Add(compareWithWorktree); - } - - menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(squash); } + if (!commit.IsMerged) + { + var rebase = new MenuItem(); + rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name); + rebase.Icon = App.CreateMenuIcon("Icons.Rebase"); + rebase.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Rebase(_repo, current, commit)); + e.Handled = true; + }; + menu.Items.Add(rebase); + + var cherryPick = new MenuItem(); + cherryPick.Header = App.Text("CommitCM.CherryPick"); + cherryPick.Icon = App.CreateMenuIcon("Icons.CherryPick"); + cherryPick.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CherryPick(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(cherryPick); + } + else + { + var revert = new MenuItem(); + revert.Header = App.Text("CommitCM.Revert"); + revert.Icon = App.CreateMenuIcon("Icons.Undo"); + revert.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Revert(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(revert); + } + + menu.Items.Add(new MenuItem() { Header = "-" }); + var createBranch = new MenuItem(); createBranch.Icon = App.CreateMenuIcon("Icons.Branch.Add"); createBranch.Header = App.Text("CreateBranch"); - createBranch.Click += (_, e) => + createBranch.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new CreateBranch(_repo, commit)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(_repo, commit)); e.Handled = true; }; menu.Items.Add(createBranch); @@ -679,10 +303,10 @@ namespace SourceGit.ViewModels var createTag = new MenuItem(); createTag.Icon = App.CreateMenuIcon("Icons.Tag.Add"); createTag.Header = App.Text("CreateTag"); - createTag.Click += (_, e) => + createTag.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new CreateTag(_repo, commit)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateTag(_repo, commit)); e.Handled = true; }; menu.Items.Add(createTag); @@ -693,33 +317,19 @@ namespace SourceGit.ViewModels saveToPatch.Header = App.Text("CommitCM.SaveAsPatch"); saveToPatch.Click += async (_, e) => { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; var options = new FolderPickerOpenOptions() { AllowMultiple = false }; - var log = null as CommandLog; - try + var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options); + if (selected.Count == 1) { - var selected = await storageProvider.OpenFolderPickerAsync(options); - if (selected.Count == 1) - { - log = _repo.CreateLog("Save as Patch"); - - var folder = selected[0]; - var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder.Path.ToString(); - var saveTo = GetPatchFileName(folderPath, commit); - var succ = await Task.Run(() => new Commands.FormatPatch(_repo.FullPath, commit.SHA, saveTo).Use(log).Exec()); - if (succ) - App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); - } - } - catch (Exception exception) - { - App.RaiseException(_repo.FullPath, $"Failed to save as patch: {exception.Message}"); + var succ = new Commands.FormatPatch(_repo.FullPath, commit.SHA, selected[0].Path.LocalPath).Exec(); + if (succ) + App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); } - log?.Complete(); e.Handled = true; }; menu.Items.Add(saveToPatch); @@ -727,98 +337,24 @@ namespace SourceGit.ViewModels var archive = new MenuItem(); archive.Icon = App.CreateMenuIcon("Icons.Archive"); archive.Header = App.Text("Archive"); - archive.Click += (_, e) => + archive.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Archive(_repo, commit)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Archive(_repo, commit)); e.Handled = true; }; menu.Items.Add(archive); menu.Items.Add(new MenuItem() { Header = "-" }); - var actions = _repo.GetCustomActions(Models.CustomActionScope.Commit); - if (actions.Count > 0) - { - var custom = new MenuItem(); - custom.Header = App.Text("CommitCM.CustomAction"); - custom.Icon = App.CreateMenuIcon("Icons.Action"); - - foreach (var action in actions) - { - var dup = action; - var item = new MenuItem(); - item.Icon = App.CreateMenuIcon("Icons.Action"); - item.Header = dup.Name; - item.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowAndStartPopup(new ExecuteCustomAction(_repo, dup, commit)); - - e.Handled = true; - }; - - custom.Items.Add(item); - } - - menu.Items.Add(custom); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - var copySHA = new MenuItem(); copySHA.Header = App.Text("CommitCM.CopySHA"); - copySHA.Icon = App.CreateMenuIcon("Icons.Fingerprint"); - copySHA.Click += (_, e) => + copySHA.Icon = App.CreateMenuIcon("Icons.Copy"); + copySHA.Click += (o, e) => { App.CopyText(commit.SHA); e.Handled = true; }; - - var copySubject = new MenuItem(); - copySubject.Header = App.Text("CommitCM.CopySubject"); - copySubject.Icon = App.CreateMenuIcon("Icons.Subject"); - copySubject.Click += (_, e) => - { - App.CopyText(commit.Subject); - e.Handled = true; - }; - - var copyInfo = new MenuItem(); - copyInfo.Header = App.Text("CommitCM.CopyInfo"); - copyInfo.Icon = App.CreateMenuIcon("Icons.Info"); - copyInfo.Click += (_, e) => - { - App.CopyText($"{commit.SHA.AsSpan(0, 10)} - {commit.Subject}"); - e.Handled = true; - }; - - var copyAuthor = new MenuItem(); - copyAuthor.Header = App.Text("CommitCM.CopyAuthor"); - copyAuthor.Icon = App.CreateMenuIcon("Icons.User"); - copyAuthor.Click += (_, e) => - { - App.CopyText(commit.Author.ToString()); - e.Handled = true; - }; - - var copyCommitter = new MenuItem(); - copyCommitter.Header = App.Text("CommitCM.CopyCommitter"); - copyCommitter.Icon = App.CreateMenuIcon("Icons.User"); - copyCommitter.Click += (_, e) => - { - App.CopyText(commit.Committer.ToString()); - e.Handled = true; - }; - - var copy = new MenuItem(); - copy.Header = App.Text("Copy"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Items.Add(copySHA); - copy.Items.Add(copySubject); - copy.Items.Add(copyInfo); - copy.Items.Add(copyAuthor); - copy.Items.Add(copyCommitter); - menu.Items.Add(copy); - + menu.Items.Add(copySHA); return menu; } @@ -828,97 +364,74 @@ namespace SourceGit.ViewModels submenu.Icon = App.CreateMenuIcon("Icons.Branch"); submenu.Header = current.Name; - var visibility = new MenuItem(); - visibility.Classes.Add("filter_mode_switcher"); - visibility.Header = new FilterModeInGraph(_repo, current); - submenu.Items.Add(visibility); - submenu.Items.Add(new MenuItem() { Header = "-" }); - if (!string.IsNullOrEmpty(current.Upstream)) { var upstream = current.Upstream.Substring(13); var fastForward = new MenuItem(); - fastForward.Header = App.Text("BranchCM.FastForward", upstream); + fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream); fastForward.Icon = App.CreateMenuIcon("Icons.FastForward"); - fastForward.IsEnabled = current.TrackStatus.Ahead.Count == 0; - fastForward.Click += (_, e) => + fastForward.IsEnabled = !string.IsNullOrEmpty(current.UpstreamTrackStatus) && current.UpstreamTrackStatus.IndexOf('↑') < 0; + ; + fastForward.Click += (o, e) => { - var b = _repo.Branches.Find(x => x.FriendlyName == upstream); - if (b == null) - return; - - if (_repo.CanCreatePopup()) - _repo.ShowAndStartPopup(new Merge(_repo, b, current.Name, true)); - + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Merge(_repo, upstream, current.Name)); e.Handled = true; }; submenu.Items.Add(fastForward); var pull = new MenuItem(); - pull.Header = App.Text("BranchCM.Pull", upstream); + pull.Header = new Views.NameHighlightedTextBlock("BranchCM.Pull", upstream); pull.Icon = App.CreateMenuIcon("Icons.Pull"); - pull.Click += (_, e) => + pull.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Pull(_repo, null)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Pull(_repo, null)); e.Handled = true; }; submenu.Items.Add(pull); } var push = new MenuItem(); - push.Header = App.Text("BranchCM.Push", current.Name); + push.Header = new Views.NameHighlightedTextBlock("BranchCM.Push", current.Name); push.Icon = App.CreateMenuIcon("Icons.Push"); push.IsEnabled = _repo.Remotes.Count > 0; - push.Click += (_, e) => + push.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Push(_repo, current)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Push(_repo, current)); e.Handled = true; }; submenu.Items.Add(push); + submenu.Items.Add(new MenuItem() { Header = "-" }); + + var type = _repo.GitFlow.GetBranchType(current.Name); + if (type != Models.GitFlowBranchType.None) + { + var finish = new MenuItem(); + finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", current.Name); + finish.Icon = App.CreateMenuIcon("Icons.Flow"); + finish.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new GitFlowFinish(_repo, current, type)); + e.Handled = true; + }; + submenu.Items.Add(finish); + submenu.Items.Add(new MenuItem() { Header = "-" }); + } var rename = new MenuItem(); - rename.Header = App.Text("BranchCM.Rename", current.Name); + rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", current.Name); rename.Icon = App.CreateMenuIcon("Icons.Rename"); - rename.Click += (_, e) => + rename.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new RenameBranch(_repo, current)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new RenameBranch(_repo, current)); e.Handled = true; }; submenu.Items.Add(rename); - submenu.Items.Add(new MenuItem() { Header = "-" }); - - if (!_repo.IsBare) - { - var type = _repo.GetGitFlowType(current); - if (type != Models.GitFlowBranchType.None) - { - var finish = new MenuItem(); - finish.Header = App.Text("BranchCM.Finish", current.Name); - finish.Icon = App.CreateMenuIcon("Icons.GitFlow"); - finish.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new GitFlowFinish(_repo, current, type)); - e.Handled = true; - }; - submenu.Items.Add(finish); - submenu.Items.Add(new MenuItem() { Header = "-" }); - } - } - - var copy = new MenuItem(); - copy.Header = App.Text("BranchCM.CopyName"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => - { - App.CopyText(current.Name); - e.Handled = true; - }; - submenu.Items.Add(copy); menu.Items.Add(submenu); } @@ -929,260 +442,170 @@ namespace SourceGit.ViewModels submenu.Icon = App.CreateMenuIcon("Icons.Branch"); submenu.Header = branch.Name; - var visibility = new MenuItem(); - visibility.Classes.Add("filter_mode_switcher"); - visibility.Header = new FilterModeInGraph(_repo, branch); - submenu.Items.Add(visibility); + var checkout = new MenuItem(); + checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name); + checkout.Icon = App.CreateMenuIcon("Icons.Check"); + checkout.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Checkout(_repo, branch.Name)); + e.Handled = true; + }; + submenu.Items.Add(checkout); + + var merge = new MenuItem(); + merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, current.Name); + merge.Icon = App.CreateMenuIcon("Icons.Merge"); + merge.IsEnabled = !merged; + merge.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Merge(_repo, branch.Name, current.Name)); + e.Handled = true; + }; + submenu.Items.Add(merge); submenu.Items.Add(new MenuItem() { Header = "-" }); - if (!_repo.IsBare) + var type = _repo.GitFlow.GetBranchType(branch.Name); + if (type != Models.GitFlowBranchType.None) { - var checkout = new MenuItem(); - checkout.Header = App.Text("BranchCM.Checkout", branch.Name); - checkout.Icon = App.CreateMenuIcon("Icons.Check"); - checkout.Click += (_, e) => + var finish = new MenuItem(); + finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name); + finish.Icon = App.CreateMenuIcon("Icons.Flow"); + finish.Click += (o, e) => { - _repo.CheckoutBranch(branch); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new GitFlowFinish(_repo, branch, type)); e.Handled = true; }; - submenu.Items.Add(checkout); - - var merge = new MenuItem(); - merge.Header = App.Text("BranchCM.Merge", branch.Name, current.Name); - merge.Icon = App.CreateMenuIcon("Icons.Merge"); - merge.IsEnabled = !merged; - merge.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Merge(_repo, branch, current.Name, false)); - e.Handled = true; - }; - submenu.Items.Add(merge); + submenu.Items.Add(finish); + submenu.Items.Add(new MenuItem() { Header = "-" }); } var rename = new MenuItem(); - rename.Header = App.Text("BranchCM.Rename", branch.Name); + rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name); rename.Icon = App.CreateMenuIcon("Icons.Rename"); - rename.Click += (_, e) => + rename.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new RenameBranch(_repo, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new RenameBranch(_repo, branch)); e.Handled = true; }; submenu.Items.Add(rename); var delete = new MenuItem(); - delete.Header = App.Text("BranchCM.Delete", branch.Name); + delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", branch.Name); delete.Icon = App.CreateMenuIcon("Icons.Clear"); - delete.Click += (_, e) => + delete.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new DeleteBranch(_repo, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteBranch(_repo, branch)); e.Handled = true; }; submenu.Items.Add(delete); - submenu.Items.Add(new MenuItem() { Header = "-" }); - - if (!_repo.IsBare) - { - var type = _repo.GetGitFlowType(branch); - if (type != Models.GitFlowBranchType.None) - { - var finish = new MenuItem(); - finish.Header = App.Text("BranchCM.Finish", branch.Name); - finish.Icon = App.CreateMenuIcon("Icons.GitFlow"); - finish.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new GitFlowFinish(_repo, branch, type)); - e.Handled = true; - }; - submenu.Items.Add(finish); - submenu.Items.Add(new MenuItem() { Header = "-" }); - } - } - - var copy = new MenuItem(); - copy.Header = App.Text("BranchCM.CopyName"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => - { - App.CopyText(branch.Name); - e.Handled = true; - }; - submenu.Items.Add(copy); menu.Items.Add(submenu); } private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged) { - var name = branch.FriendlyName; + var name = $"{branch.Remote}/{branch.Name}"; var submenu = new MenuItem(); submenu.Icon = App.CreateMenuIcon("Icons.Branch"); submenu.Header = name; - var visibility = new MenuItem(); - visibility.Classes.Add("filter_mode_switcher"); - visibility.Header = new FilterModeInGraph(_repo, branch); - submenu.Items.Add(visibility); - submenu.Items.Add(new MenuItem() { Header = "-" }); - var checkout = new MenuItem(); - checkout.Header = App.Text("BranchCM.Checkout", name); + checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", name); checkout.Icon = App.CreateMenuIcon("Icons.Check"); - checkout.Click += (_, e) => + checkout.Click += (o, e) => { - _repo.CheckoutBranch(branch); + foreach (var b in _repo.Branches) + { + if (b.IsLocal && b.Upstream == branch.FullName) + { + if (b.IsCurrent) + return; + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Checkout(_repo, b.Name)); + return; + } + } + + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(_repo, branch)); e.Handled = true; }; submenu.Items.Add(checkout); var merge = new MenuItem(); - merge.Header = App.Text("BranchCM.Merge", name, current.Name); + merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", name, current.Name); merge.Icon = App.CreateMenuIcon("Icons.Merge"); merge.IsEnabled = !merged; - merge.Click += (_, e) => + merge.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Merge(_repo, branch, current.Name, false)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Merge(_repo, name, current.Name)); e.Handled = true; }; submenu.Items.Add(merge); + submenu.Items.Add(new MenuItem() { Header = "-" }); var delete = new MenuItem(); - delete.Header = App.Text("BranchCM.Delete", name); + delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name); delete.Icon = App.CreateMenuIcon("Icons.Clear"); - delete.Click += (_, e) => + delete.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new DeleteBranch(_repo, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteBranch(_repo, branch)); e.Handled = true; }; submenu.Items.Add(delete); - submenu.Items.Add(new MenuItem() { Header = "-" }); - - var copy = new MenuItem(); - copy.Header = App.Text("BranchCM.CopyName"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => - { - App.CopyText(name); - e.Handled = true; - }; - submenu.Items.Add(copy); menu.Items.Add(submenu); } - private void FillTagMenu(ContextMenu menu, Models.Tag tag, Models.Branch current, bool merged) + private void FillTagMenu(ContextMenu menu, Models.Tag tag) { var submenu = new MenuItem(); submenu.Header = tag.Name; submenu.Icon = App.CreateMenuIcon("Icons.Tag"); submenu.MinWidth = 200; - var visibility = new MenuItem(); - visibility.Classes.Add("filter_mode_switcher"); - visibility.Header = new FilterModeInGraph(_repo, tag); - submenu.Items.Add(visibility); - submenu.Items.Add(new MenuItem() { Header = "-" }); - var push = new MenuItem(); - push.Header = App.Text("TagCM.Push", tag.Name); + push.Header = new Views.NameHighlightedTextBlock("TagCM.Push", tag.Name); push.Icon = App.CreateMenuIcon("Icons.Push"); push.IsEnabled = _repo.Remotes.Count > 0; - push.Click += (_, e) => + push.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new PushTag(_repo, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new PushTag(_repo, tag)); e.Handled = true; }; submenu.Items.Add(push); - if (!_repo.IsBare && !merged) - { - var merge = new MenuItem(); - merge.Header = App.Text("TagCM.Merge", tag.Name, current.Name); - merge.Icon = App.CreateMenuIcon("Icons.Merge"); - merge.Click += (_, e) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Merge(_repo, tag, current.Name)); - e.Handled = true; - }; - submenu.Items.Add(merge); - } - var delete = new MenuItem(); - delete.Header = App.Text("TagCM.Delete", tag.Name); + delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name); delete.Icon = App.CreateMenuIcon("Icons.Clear"); - delete.Click += (_, e) => + delete.Click += (o, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new DeleteTag(_repo, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteTag(_repo, tag)); e.Handled = true; }; submenu.Items.Add(delete); - submenu.Items.Add(new MenuItem() { Header = "-" }); - - var copy = new MenuItem(); - copy.Header = App.Text("TagCM.Copy"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => - { - App.CopyText(tag.Name); - e.Handled = true; - }; - submenu.Items.Add(copy); menu.Items.Add(submenu); } - private string GetPatchFileName(string dir, Models.Commit commit, int index = 0) - { - var ignore_chars = new HashSet { '/', '\\', ':', ',', '*', '?', '\"', '<', '>', '|', '`', '$', '^', '%', '[', ']', '+', '-' }; - var builder = new StringBuilder(); - builder.Append(index.ToString("D4")); - builder.Append('-'); - - var chars = commit.Subject.ToCharArray(); - var len = 0; - foreach (var c in chars) - { - if (!ignore_chars.Contains(c)) - { - if (c == ' ' || c == '\t') - builder.Append('-'); - else - builder.Append(c); - - len++; - - if (len >= 48) - break; - } - } - builder.Append(".patch"); - - return Path.Combine(dir, builder.ToString()); - } - private Repository _repo = null; + private readonly double _dataGridRowHeight = 28; private bool _isLoading = true; private List _commits = new List(); private Models.CommitGraph _graph = null; private Models.Commit _autoSelectedCommit = null; private long _navigationId = 0; - private IDisposable _detailContext = null; - - private Models.Bisect _bisect = null; - - private GridLength _leftArea = new GridLength(1, GridUnitType.Star); - private GridLength _rightArea = new GridLength(1, GridUnitType.Star); - private GridLength _topArea = new GridLength(1, GridUnitType.Star); - private GridLength _bottomArea = new GridLength(1, GridUnitType.Star); + private object _detailContext = null; } } diff --git a/src/ViewModels/ImageSource.cs b/src/ViewModels/ImageSource.cs deleted file mode 100644 index f94b0c95..00000000 --- a/src/ViewModels/ImageSource.cs +++ /dev/null @@ -1,180 +0,0 @@ -using System; -using System.Globalization; -using System.IO; -using System.Runtime.InteropServices; - -using Avalonia; -using Avalonia.Media.Imaging; -using Avalonia.Platform; - -using BitMiracle.LibTiff.Classic; -using Pfim; - -namespace SourceGit.ViewModels -{ - public class ImageSource - { - public Bitmap Bitmap { get; } - public long Size { get; } - - public ImageSource(Bitmap bitmap, long size) - { - Bitmap = bitmap; - Size = size; - } - - public static Models.ImageDecoder GetDecoder(string file) - { - var ext = (Path.GetExtension(file) ?? ".invalid_img").ToLower(CultureInfo.CurrentCulture); - - switch (ext) - { - case ".ico": - case ".bmp": - case ".gif": - case ".jpg": - case ".jpeg": - case ".png": - case ".webp": - return Models.ImageDecoder.Builtin; - case ".tga": - case ".dds": - return Models.ImageDecoder.Pfim; - case ".tif": - case ".tiff": - return Models.ImageDecoder.Tiff; - default: - return Models.ImageDecoder.None; - } - } - - public static ImageSource FromFile(string fullpath, Models.ImageDecoder decoder) - { - using (var stream = File.OpenRead(fullpath)) - return LoadFromStream(stream, decoder); - } - - public static ImageSource FromRevision(string repo, string revision, string file, Models.ImageDecoder decoder) - { - var stream = Commands.QueryFileContent.Run(repo, revision, file); - return LoadFromStream(stream, decoder); - } - - public static ImageSource FromLFSObject(string repo, Models.LFSObject lfs, Models.ImageDecoder decoder) - { - if (string.IsNullOrEmpty(lfs.Oid) || lfs.Size == 0) - return new ImageSource(null, 0); - - var stream = Commands.QueryFileContent.FromLFS(repo, lfs.Oid, lfs.Size); - return LoadFromStream(stream, decoder); - } - - private static ImageSource LoadFromStream(Stream stream, Models.ImageDecoder decoder) - { - var size = stream.Length; - if (size > 0) - { - try - { - switch (decoder) - { - case Models.ImageDecoder.Builtin: - return DecodeWithAvalonia(stream, size); - case Models.ImageDecoder.Pfim: - return DecodeWithPfim(stream, size); - case Models.ImageDecoder.Tiff: - return DecodeWithTiff(stream, size); - } - } - catch (Exception e) - { - Console.Out.WriteLine(e.Message); - } - } - - return new ImageSource(null, 0); - } - - private static ImageSource DecodeWithAvalonia(Stream stream, long size) - { - var bitmap = new Bitmap(stream); - return new ImageSource(bitmap, size); - } - - private static ImageSource DecodeWithPfim(Stream stream, long size) - { - using (var pfiImage = Pfimage.FromStream(stream)) - { - var data = pfiImage.Data; - var stride = pfiImage.Stride; - - var pixelFormat = PixelFormats.Bgra8888; - var alphaFormat = AlphaFormat.Opaque; - switch (pfiImage.Format) - { - case ImageFormat.Rgb8: - pixelFormat = PixelFormats.Gray8; - break; - case ImageFormat.R5g5b5: - case ImageFormat.R5g5b5a1: - pixelFormat = PixelFormats.Bgr555; - break; - case ImageFormat.R5g6b5: - pixelFormat = PixelFormats.Bgr565; - break; - case ImageFormat.Rgb24: - pixelFormat = PixelFormats.Bgr24; - break; - case ImageFormat.Rgba16: - var pixels2 = pfiImage.DataLen / 2; - data = new byte[pixels2 * 4]; - stride = pfiImage.Width * 4; - for (var i = 0; i < pixels2; i++) - { - var src = BitConverter.ToUInt16(pfiImage.Data, i * 2); - data[i * 4 + 0] = (byte)Math.Round((src & 0x0F) / 15F * 255); // B - data[i * 4 + 1] = (byte)Math.Round(((src >> 4) & 0x0F) / 15F * 255); // G - data[i * 4 + 2] = (byte)Math.Round(((src >> 8) & 0x0F) / 15F * 255); // R - data[i * 4 + 3] = (byte)Math.Round(((src >> 12) & 0x0F) / 15F * 255); // A - } - - alphaFormat = AlphaFormat.Premul; - break; - case ImageFormat.Rgba32: - alphaFormat = AlphaFormat.Premul; - break; - default: - return new ImageSource(null, 0); - } - - var ptr = Marshal.UnsafeAddrOfPinnedArrayElement(data, 0); - var pixelSize = new PixelSize(pfiImage.Width, pfiImage.Height); - var dpi = new Vector(96, 96); - var bitmap = new Bitmap(pixelFormat, alphaFormat, ptr, pixelSize, dpi, stride); - return new ImageSource(bitmap, size); - } - } - - private static ImageSource DecodeWithTiff(Stream stream, long size) - { - using (var tiff = Tiff.ClientOpen($"{Guid.NewGuid()}.tif", "r", stream, new TiffStream())) - { - if (tiff == null) - return new ImageSource(null, 0); - - var width = tiff.GetField(TiffTag.IMAGEWIDTH)[0].ToInt(); - var height = tiff.GetField(TiffTag.IMAGELENGTH)[0].ToInt(); - var pixels = new int[width * height]; - - // Currently only supports image when its `BITSPERSAMPLE` is one in [1,2,4,8,16] - tiff.ReadRGBAImageOriented(width, height, pixels, Orientation.TOPLEFT); - - var ptr = Marshal.UnsafeAddrOfPinnedArrayElement(pixels, 0); - var pixelSize = new PixelSize(width, height); - var dpi = new Vector(96, 96); - var bitmap = new Bitmap(PixelFormats.Rgba8888, AlphaFormat.Premul, ptr, pixelSize, dpi, width * 4); - return new ImageSource(bitmap, size); - } - } - } -} diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs index a1a87a42..e38cab13 100644 --- a/src/ViewModels/InProgressContexts.cs +++ b/src/ViewModels/InProgressContexts.cs @@ -4,29 +4,31 @@ namespace SourceGit.ViewModels { public abstract class InProgressContext { - protected InProgressContext(string repo, string cmd) + public string Repository { - _repo = repo; - _cmd = cmd; + get; + set; } - public bool Abort() + public string Cmd { - return new Commands.Command() - { - WorkingDirectory = _repo, - Context = _repo, - Args = $"{_cmd} --abort", - }.Exec(); + get; + set; } - public virtual bool Skip() + public InProgressContext(string repo, string cmd) { - return new Commands.Command() + Repository = repo; + Cmd = cmd; + } + + public void Abort() + { + new Commands.Command() { - WorkingDirectory = _repo, - Context = _repo, - Args = $"{_cmd} --skip", + WorkingDirectory = Repository, + Context = Repository, + Args = $"{Cmd} --abort", }.Exec(); } @@ -34,154 +36,54 @@ namespace SourceGit.ViewModels { return new Commands.Command() { - WorkingDirectory = _repo, - Context = _repo, - Editor = Commands.Command.EditorType.None, - Args = $"{_cmd} --continue", + WorkingDirectory = Repository, + Context = Repository, + Args = $"-c core.editor=true {Cmd} --continue", }.Exec(); } - - protected string GetFriendlyNameOfCommit(Models.Commit commit) - { - var branchDecorator = commit.Decorators.Find(x => x.Type == Models.DecoratorType.LocalBranchHead || x.Type == Models.DecoratorType.RemoteBranchHead); - if (branchDecorator != null) - return branchDecorator.Name; - - var tagDecorator = commit.Decorators.Find(x => x.Type == Models.DecoratorType.Tag); - if (tagDecorator != null) - return tagDecorator.Name; - - return commit.SHA.Substring(0, 10); - } - - protected string _repo = string.Empty; - protected string _cmd = string.Empty; } public class CherryPickInProgress : InProgressContext { - public Models.Commit Head - { - get; - private set; - } - - public string HeadName - { - get => GetFriendlyNameOfCommit(Head); - } - - public CherryPickInProgress(Repository repo) : base(repo.FullPath, "cherry-pick") - { - var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD")).Trim(); - Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result() ?? new Models.Commit() { SHA = headSHA }; - } + public CherryPickInProgress(string repo) : base(repo, "cherry-pick") { } } public class RebaseInProgress : InProgressContext { - public string HeadName - { - get; - private set; - } - - public string BaseName - { - get => GetFriendlyNameOfCommit(Onto); - } - - public Models.Commit StoppedAt - { - get; - private set; - } - - public Models.Commit Onto - { - get; - private set; - } - public RebaseInProgress(Repository repo) : base(repo.FullPath, "rebase") { - HeadName = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "head-name")).Trim(); - if (HeadName.StartsWith("refs/heads/")) - HeadName = HeadName.Substring(11); - else if (HeadName.StartsWith("refs/tags/")) - HeadName = HeadName.Substring(10); - - var stoppedSHAPath = Path.Combine(repo.GitDir, "rebase-merge", "stopped-sha"); - var stoppedSHA = string.Empty; - if (File.Exists(stoppedSHAPath)) - stoppedSHA = File.ReadAllText(stoppedSHAPath).Trim(); - else - stoppedSHA = new Commands.QueryRevisionByRefName(repo.FullPath, HeadName).Result(); - - if (!string.IsNullOrEmpty(stoppedSHA)) - StoppedAt = new Commands.QuerySingleCommit(repo.FullPath, stoppedSHA).Result() ?? new Models.Commit() { SHA = stoppedSHA }; - - var ontoSHA = File.ReadAllText(Path.Combine(repo.GitDir, "rebase-merge", "onto")).Trim(); - Onto = new Commands.QuerySingleCommit(repo.FullPath, ontoSHA).Result() ?? new Models.Commit() { SHA = ontoSHA }; + _gitDir = repo.GitDir; } public override bool Continue() { - return new Commands.Command() + var succ = base.Continue(); + if (succ) { - WorkingDirectory = _repo, - Context = _repo, - Editor = Commands.Command.EditorType.RebaseEditor, - Args = $"rebase --continue", - }.Exec(); + var rebaseMergeHead = Path.Combine(_gitDir, "REBASE_HEAD"); + var rebaseMergeFolder = Path.Combine(_gitDir, "rebase-merge"); + var rebaseApplyFolder = Path.Combine(_gitDir, "rebase-apply"); + if (File.Exists(rebaseMergeHead)) + File.Delete(rebaseMergeHead); + if (Directory.Exists(rebaseMergeFolder)) + Directory.Delete(rebaseMergeFolder); + if (Directory.Exists(rebaseApplyFolder)) + Directory.Delete(rebaseApplyFolder); + } + + return succ; } + + private string _gitDir; } public class RevertInProgress : InProgressContext { - public Models.Commit Head - { - get; - private set; - } - - public RevertInProgress(Repository repo) : base(repo.FullPath, "revert") - { - var headSHA = File.ReadAllText(Path.Combine(repo.GitDir, "REVERT_HEAD")).Trim(); - Head = new Commands.QuerySingleCommit(repo.FullPath, headSHA).Result() ?? new Models.Commit() { SHA = headSHA }; - } + public RevertInProgress(string repo) : base(repo, "revert") { } } public class MergeInProgress : InProgressContext { - public string Current - { - get; - private set; - } - - public Models.Commit Source - { - get; - private set; - } - - public string SourceName - { - get => GetFriendlyNameOfCommit(Source); - } - - public MergeInProgress(Repository repo) : base(repo.FullPath, "merge") - { - Current = Commands.Branch.ShowCurrent(repo.FullPath); - - var sourceSHA = File.ReadAllText(Path.Combine(repo.GitDir, "MERGE_HEAD")).Trim(); - Source = new Commands.QuerySingleCommit(repo.FullPath, sourceSHA).Result() ?? new Models.Commit() { SHA = sourceSHA }; - } - - public override bool Skip() - { - return true; - } + public MergeInProgress(string repo) : base(repo, "merge") { } } } diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs index b47ba663..5f1e846e 100644 --- a/src/ViewModels/Init.cs +++ b/src/ViewModels/Init.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.IO; +using System.Threading.Tasks; namespace SourceGit.ViewModels { @@ -10,47 +11,41 @@ namespace SourceGit.ViewModels set => SetProperty(ref _targetPath, value); } - public string Reason + public Init(string path) { - get; - private set; - } - - public Init(string pageId, string path, RepositoryNode parent, string reason) - { - _pageId = pageId; - _targetPath = path; - _parentNode = parent; - Reason = string.IsNullOrEmpty(reason) ? "Invalid repository detected!" : reason; + TargetPath = path; + View = new Views.Init() { DataContext = this }; } public override Task Sure() { ProgressDescription = $"Initialize git repository at: '{_targetPath}'"; - var log = new CommandLog("Initialize"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Init(_pageId, _targetPath).Use(log).Exec(); - log.Complete(); + var succ = new Commands.Init(HostPageId, _targetPath).Exec(); + if (!succ) + return false; - if (succ) + var gitDir = Path.GetFullPath(Path.Combine(_targetPath, ".git")); + + CallUIThread(() => { - CallUIThread(() => + var repo = Preference.AddRepository(_targetPath, gitDir); + var node = new RepositoryNode() { - Preferences.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true); - Welcome.Instance.Refresh(); - }); - } + Id = repo.FullPath, + Name = Path.GetFileName(repo.FullPath), + Bookmark = 0, + IsRepository = true, + }; + Preference.AddNode(node); + }); - return succ; + return true; }); } - private readonly string _pageId = null; - private string _targetPath = null; - private readonly RepositoryNode _parentNode = null; + private string _targetPath; } } diff --git a/src/ViewModels/InitGitFlow.cs b/src/ViewModels/InitGitFlow.cs index 265a73d3..3faf5e61 100644 --- a/src/ViewModels/InitGitFlow.cs +++ b/src/ViewModels/InitGitFlow.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -8,6 +6,7 @@ namespace SourceGit.ViewModels { public partial class InitGitFlow : Popup { + [GeneratedRegex(@"^[\w\-/\.]+$")] private static partial Regex TAG_PREFIX(); @@ -31,7 +30,7 @@ namespace SourceGit.ViewModels [Required(ErrorMessage = "Feature prefix is required!!!")] [RegularExpression(@"^[\w\-\.]+/$", ErrorMessage = "Bad feature prefix format!")] - public string FeaturePrefix + public string FeturePrefix { get => _featurePrefix; set => SetProperty(ref _featurePrefix, value, true); @@ -63,22 +62,7 @@ namespace SourceGit.ViewModels public InitGitFlow(Repository repo) { _repo = repo; - - var localBranches = new List(); - foreach (var branch in repo.Branches) - { - if (branch.IsLocal) - localBranches.Add(branch.Name); - } - - if (localBranches.Contains("master")) - _master = "master"; - else if (localBranches.Contains("main")) - _master = "main"; - else if (localBranches.Count > 0) - _master = localBranches[0]; - else - _master = "master"; + View = new Views.InitGitFlow() { DataContext = this }; } public static ValidationResult ValidateBaseBranch(string _, ValidationContext ctx) @@ -95,7 +79,9 @@ namespace SourceGit.ViewModels public static ValidationResult ValidateTagPrefix(string tagPrefix, ValidationContext ctx) { if (!string.IsNullOrWhiteSpace(tagPrefix) && !TAG_PREFIX().IsMatch(tagPrefix)) + { return new ValidationResult("Bad tag prefix format!"); + } return ValidationResult.Success; } @@ -105,72 +91,23 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Init git-flow ..."; - var log = _repo.CreateLog("Gitflow - Init"); - Use(log); - return Task.Run(() => { - var succ = false; - var current = _repo.CurrentBranch; - - var masterBranch = _repo.Branches.Find(x => x.IsLocal && x.Name.Equals(_master, StringComparison.Ordinal)); - if (masterBranch == null) + var succ = new Commands.GitFlow(_repo.FullPath).Init(_repo.Branches, _master, _develop, _featurePrefix, _releasePrefix, _hotfixPrefix, _tagPrefix); + if (succ) { - succ = Commands.Branch.Create(_repo.FullPath, _master, current.Head, true, log); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } + _repo.GitFlow.Feature = _featurePrefix; + _repo.GitFlow.Release = _releasePrefix; + _repo.GitFlow.Hotfix = _hotfixPrefix; } - var developBranch = _repo.Branches.Find(x => x.IsLocal && x.Name.Equals(_develop, StringComparison.Ordinal)); - if (developBranch == null) - { - succ = Commands.Branch.Create(_repo.FullPath, _develop, current.Head, true, log); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } - } - - succ = Commands.GitFlow.Init( - _repo.FullPath, - _master, - _develop, - _featurePrefix, - _releasePrefix, - _hotfixPrefix, - _tagPrefix, - log); - - log.Complete(); - - CallUIThread(() => - { - if (succ) - { - var gitflow = new Models.GitFlow(); - gitflow.Master = _master; - gitflow.Develop = _develop; - gitflow.FeaturePrefix = _featurePrefix; - gitflow.ReleasePrefix = _releasePrefix; - gitflow.HotfixPrefix = _hotfixPrefix; - _repo.GitFlow = gitflow; - } - - _repo.SetWatcherEnabled(true); - }); - + CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private readonly Repository _repo; - private string _master; + private readonly Repository _repo = null; + private string _master = "master"; private string _develop = "develop"; private string _featurePrefix = "feature/"; private string _releasePrefix = "release/"; diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs deleted file mode 100644 index 01e38e41..00000000 --- a/src/ViewModels/InteractiveRebase.cs +++ /dev/null @@ -1,241 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.Json; -using System.Threading.Tasks; - -using Avalonia.Collections; -using Avalonia.Threading; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class InteractiveRebaseItem : ObservableObject - { - public Models.Commit Commit - { - get; - private set; - } - - public bool CanSquashOrFixup - { - get => _canSquashOrFixup; - set - { - if (SetProperty(ref _canSquashOrFixup, value)) - { - if (_action == Models.InteractiveRebaseAction.Squash || _action == Models.InteractiveRebaseAction.Fixup) - Action = Models.InteractiveRebaseAction.Pick; - } - } - } - - public Models.InteractiveRebaseAction Action - { - get => _action; - set => SetProperty(ref _action, value); - } - - public string Subject - { - get => _subject; - private set => SetProperty(ref _subject, value); - } - - public string FullMessage - { - get => _fullMessage; - set - { - if (SetProperty(ref _fullMessage, value)) - { - var normalized = value.ReplaceLineEndings("\n"); - var idx = normalized.IndexOf("\n\n", StringComparison.Ordinal); - if (idx > 0) - Subject = normalized.Substring(0, idx).ReplaceLineEndings(" "); - else - Subject = value.ReplaceLineEndings(" "); - } - } - } - - public InteractiveRebaseItem(Models.Commit c, string message, bool canSquashOrFixup) - { - Commit = c; - FullMessage = message; - CanSquashOrFixup = canSquashOrFixup; - } - - private Models.InteractiveRebaseAction _action = Models.InteractiveRebaseAction.Pick; - private string _subject; - private string _fullMessage; - private bool _canSquashOrFixup = true; - } - - public class InteractiveRebase : ObservableObject - { - public Models.Branch Current - { - get; - private set; - } - - public Models.Commit On - { - get; - private set; - } - - public bool IsLoading - { - get => _isLoading; - private set => SetProperty(ref _isLoading, value); - } - - public AvaloniaList Items - { - get; - private set; - } = []; - - public InteractiveRebaseItem SelectedItem - { - get => _selectedItem; - set - { - if (SetProperty(ref _selectedItem, value)) - DetailContext.Commit = value?.Commit; - } - } - - public CommitDetail DetailContext - { - get; - private set; - } - - public InteractiveRebase(Repository repo, Models.Branch current, Models.Commit on) - { - var repoPath = repo.FullPath; - _repo = repo; - - Current = current; - On = on; - IsLoading = true; - DetailContext = new CommitDetail(repo); - - Task.Run(() => - { - var commits = new Commands.QueryCommitsForInteractiveRebase(repoPath, on.SHA).Result(); - var list = new List(); - - for (var i = 0; i < commits.Count; i++) - { - var c = commits[i]; - list.Add(new InteractiveRebaseItem(c.Commit, c.Message, i < commits.Count - 1)); - } - - Dispatcher.UIThread.Invoke(() => - { - Items.AddRange(list); - IsLoading = false; - }); - }); - } - - public void MoveItemUp(InteractiveRebaseItem item) - { - var idx = Items.IndexOf(item); - if (idx > 0) - { - var prev = Items[idx - 1]; - Items.RemoveAt(idx - 1); - Items.Insert(idx, prev); - SelectedItem = item; - UpdateItems(); - } - } - - public void MoveItemDown(InteractiveRebaseItem item) - { - var idx = Items.IndexOf(item); - if (idx < Items.Count - 1) - { - var next = Items[idx + 1]; - Items.RemoveAt(idx + 1); - Items.Insert(idx, next); - SelectedItem = item; - UpdateItems(); - } - } - - public void ChangeAction(InteractiveRebaseItem item, Models.InteractiveRebaseAction action) - { - if (!item.CanSquashOrFixup) - { - if (action == Models.InteractiveRebaseAction.Squash || action == Models.InteractiveRebaseAction.Fixup) - return; - } - - item.Action = action; - UpdateItems(); - } - - public Task Start() - { - _repo.SetWatcherEnabled(false); - - var saveFile = Path.Combine(_repo.GitDir, "sourcegit_rebase_jobs.json"); - var collection = new Models.InteractiveRebaseJobCollection(); - collection.OrigHead = _repo.CurrentBranch.Head; - collection.Onto = On.SHA; - for (int i = Items.Count - 1; i >= 0; i--) - { - var item = Items[i]; - collection.Jobs.Add(new Models.InteractiveRebaseJob() - { - SHA = item.Commit.SHA, - Action = item.Action, - Message = item.FullMessage, - }); - } - File.WriteAllText(saveFile, JsonSerializer.Serialize(collection, JsonCodeGen.Default.InteractiveRebaseJobCollection)); - - var log = _repo.CreateLog("Interactive Rebase"); - return Task.Run(() => - { - var succ = new Commands.InteractiveRebase(_repo.FullPath, On.SHA).Use(log).Exec(); - log.Complete(); - Dispatcher.UIThread.Invoke(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private void UpdateItems() - { - if (Items.Count == 0) - return; - - var hasValidParent = false; - for (var i = Items.Count - 1; i >= 0; i--) - { - var item = Items[i]; - if (hasValidParent) - { - item.CanSquashOrFixup = true; - } - else - { - item.CanSquashOrFixup = false; - hasValidParent = item.Action != Models.InteractiveRebaseAction.Drop; - } - } - } - - private Repository _repo = null; - private bool _isLoading = false; - private InteractiveRebaseItem _selectedItem = null; - } -} diff --git a/src/ViewModels/LFSFetch.cs b/src/ViewModels/LFSFetch.cs deleted file mode 100644 index 43ca88fb..00000000 --- a/src/ViewModels/LFSFetch.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class LFSFetch : Popup - { - public List Remotes => _repo.Remotes; - - public Models.Remote SelectedRemote - { - get; - set; - } - - public LFSFetch(Repository repo) - { - _repo = repo; - SelectedRemote = _repo.Remotes[0]; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = $"Fetching LFS objects from remote ..."; - - var log = _repo.CreateLog("LFS Fetch"); - Use(log); - - return Task.Run(() => - { - new Commands.LFS(_repo.FullPath).Fetch(SelectedRemote.Name, log); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/LFSImageDiff.cs b/src/ViewModels/LFSImageDiff.cs deleted file mode 100644 index bb69fd65..00000000 --- a/src/ViewModels/LFSImageDiff.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Threading.Tasks; -using Avalonia.Threading; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class LFSImageDiff : ObservableObject - { - public Models.LFSDiff LFS - { - get; - } - - public Models.ImageDiff Image - { - get => _image; - private set => SetProperty(ref _image, value); - } - - public LFSImageDiff(string repo, Models.LFSDiff lfs, Models.ImageDecoder decoder) - { - LFS = lfs; - - Task.Run(() => - { - var oldImage = ImageSource.FromLFSObject(repo, lfs.Old, decoder); - var newImage = ImageSource.FromLFSObject(repo, lfs.New, decoder); - - var img = new Models.ImageDiff() - { - Old = oldImage.Bitmap, - OldFileSize = oldImage.Size, - New = newImage.Bitmap, - NewFileSize = newImage.Size - }; - - Dispatcher.UIThread.Invoke(() => Image = img); - }); - } - - private Models.ImageDiff _image; - } -} diff --git a/src/ViewModels/LFSLocks.cs b/src/ViewModels/LFSLocks.cs deleted file mode 100644 index 0ee149d0..00000000 --- a/src/ViewModels/LFSLocks.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -using Avalonia.Threading; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class LFSLocks : ObservableObject - { - public bool HasValidUserName - { - get; - private set; - } = false; - - public bool IsLoading - { - get => _isLoading; - private set => SetProperty(ref _isLoading, value); - } - - public bool ShowOnlyMyLocks - { - get => _showOnlyMyLocks; - set - { - if (SetProperty(ref _showOnlyMyLocks, value)) - UpdateVisibleLocks(); - } - } - - public List VisibleLocks - { - get => _visibleLocks; - private set => SetProperty(ref _visibleLocks, value); - } - - public LFSLocks(Repository repo, string remote) - { - _repo = repo; - _remote = remote; - _userName = new Commands.Config(repo.FullPath).Get("user.name"); - - HasValidUserName = !string.IsNullOrEmpty(_userName); - - Task.Run(() => - { - _cachedLocks = new Commands.LFS(_repo.FullPath).Locks(_remote); - Dispatcher.UIThread.Invoke(() => - { - UpdateVisibleLocks(); - IsLoading = false; - }); - }); - } - - public void Unlock(Models.LFSLock lfsLock, bool force) - { - if (_isLoading) - return; - - IsLoading = true; - - var log = _repo.CreateLog("Unlock LFS File"); - Task.Run(() => - { - var succ = new Commands.LFS(_repo.FullPath).Unlock(_remote, lfsLock.ID, force, log); - log.Complete(); - - Dispatcher.UIThread.Invoke(() => - { - if (succ) - { - _cachedLocks.Remove(lfsLock); - UpdateVisibleLocks(); - } - - IsLoading = false; - }); - }); - } - - private void UpdateVisibleLocks() - { - var visible = new List(); - - if (!_showOnlyMyLocks) - { - foreach (var lfsLock in _cachedLocks) - visible.Add(lfsLock); - } - else - { - foreach (var lfsLock in _cachedLocks) - { - if (lfsLock.User == _userName) - visible.Add(lfsLock); - } - } - - VisibleLocks = visible; - } - - private Repository _repo; - private string _remote; - private bool _isLoading = true; - private List _cachedLocks = []; - private List _visibleLocks = []; - private bool _showOnlyMyLocks = false; - private string _userName; - } -} diff --git a/src/ViewModels/LFSPrune.cs b/src/ViewModels/LFSPrune.cs deleted file mode 100644 index 9a6bd8a7..00000000 --- a/src/ViewModels/LFSPrune.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class LFSPrune : Popup - { - public LFSPrune(Repository repo) - { - _repo = repo; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "LFS prune ..."; - - var log = _repo.CreateLog("LFS Prune"); - Use(log); - - return Task.Run(() => - { - new Commands.LFS(_repo.FullPath).Prune(log); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/LFSPull.cs b/src/ViewModels/LFSPull.cs deleted file mode 100644 index 8bac8bbb..00000000 --- a/src/ViewModels/LFSPull.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class LFSPull : Popup - { - public List Remotes => _repo.Remotes; - - public Models.Remote SelectedRemote - { - get; - set; - } - - public LFSPull(Repository repo) - { - _repo = repo; - SelectedRemote = _repo.Remotes[0]; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = $"Pull LFS objects from remote ..."; - - var log = _repo.CreateLog("LFS Pull"); - Use(log); - - return Task.Run(() => - { - new Commands.LFS(_repo.FullPath).Pull(SelectedRemote.Name, log); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/LFSPush.cs b/src/ViewModels/LFSPush.cs deleted file mode 100644 index 0013ee29..00000000 --- a/src/ViewModels/LFSPush.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class LFSPush : Popup - { - public List Remotes => _repo.Remotes; - - public Models.Remote SelectedRemote - { - get; - set; - } - - public LFSPush(Repository repo) - { - _repo = repo; - SelectedRemote = _repo.Remotes[0]; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = $"Push LFS objects to remote ..."; - - var log = _repo.CreateLog("LFS Push"); - Use(log); - - return Task.Run(() => - { - new Commands.LFS(_repo.FullPath).Push(SelectedRemote.Name, log); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/LFSTrackCustomPattern.cs b/src/ViewModels/LFSTrackCustomPattern.cs deleted file mode 100644 index b69733e8..00000000 --- a/src/ViewModels/LFSTrackCustomPattern.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class LFSTrackCustomPattern : Popup - { - [Required(ErrorMessage = "LFS track pattern is required!!!")] - public string Pattern - { - get => _pattern; - set => SetProperty(ref _pattern, value, true); - } - - public bool IsFilename - { - get; - set; - } = false; - - public LFSTrackCustomPattern(Repository repo) - { - _repo = repo; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Adding custom LFS tracking pattern ..."; - - var log = _repo.CreateLog("LFS Add Custom Pattern"); - Use(log); - - return Task.Run(() => - { - var succ = new Commands.LFS(_repo.FullPath).Track(_pattern, IsFilename, log); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private readonly Repository _repo = null; - private string _pattern = string.Empty; - } -} diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs index bb3efd51..59cf309a 100644 --- a/src/ViewModels/Launcher.cs +++ b/src/ViewModels/Launcher.cs @@ -1,9 +1,7 @@ -using System; +using System; using System.IO; using Avalonia.Collections; -using Avalonia.Controls; -using Avalonia.Input; using CommunityToolkit.Mvvm.ComponentModel; @@ -11,24 +9,12 @@ namespace SourceGit.ViewModels { public class Launcher : ObservableObject { - public string Title - { - get => _title; - private set => SetProperty(ref _title, value); - } - public AvaloniaList Pages { get; private set; } - public Workspace ActiveWorkspace - { - get => _activeWorkspace; - private set => SetProperty(ref _activeWorkspace, value); - } - public LauncherPage ActivePage { get => _activePage; @@ -36,183 +22,50 @@ namespace SourceGit.ViewModels { if (SetProperty(ref _activePage, value)) { - UpdateTitle(); - - if (!_ignoreIndexChange && value is { Data: Repository repo }) - _activeWorkspace.ActiveIdx = _activeWorkspace.Repositories.IndexOf(repo.FullPath); + PopupHost.Active = value; } } } - public IDisposable Switcher + public Launcher() { - get => _switcher; - private set => SetProperty(ref _switcher, value); - } - - public Launcher(string startupRepo) - { - _ignoreIndexChange = true; - Pages = new AvaloniaList(); AddNewTab(); - var pref = Preferences.Instance; - if (string.IsNullOrEmpty(startupRepo)) + if (Preference.Instance.RestoreTabs) { - ActiveWorkspace = pref.GetActiveWorkspace(); - - var repos = ActiveWorkspace.Repositories.ToArray(); - foreach (var repo in repos) + foreach (var id in Preference.Instance.OpenedTabs) { - var node = pref.FindNode(repo); + var node = Preference.FindNode(id); if (node == null) - { - node = new RepositoryNode() - { - Id = repo, - Name = Path.GetFileName(repo), - Bookmark = 0, - IsRepository = true, - }; - } + continue; OpenRepositoryInTab(node, null); } - var activeIdx = ActiveWorkspace.ActiveIdx; - if (activeIdx >= 0 && activeIdx < Pages.Count) + var lastActiveIdx = Preference.Instance.LastActiveTabIdx; + if (lastActiveIdx >= 0 && lastActiveIdx < Pages.Count) { - ActivePage = Pages[activeIdx]; - } - else - { - ActivePage = Pages[0]; - ActiveWorkspace.ActiveIdx = 0; + ActivePage = Pages[lastActiveIdx]; } } - else - { - ActiveWorkspace = new Workspace() { Name = "Unnamed" }; - - foreach (var w in pref.Workspaces) - w.IsActive = false; - - var test = new Commands.QueryRepositoryRootPath(startupRepo).ReadToEnd(); - if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut)) - { - Pages[0].Notifications.Add(new Models.Notification - { - IsError = true, - Message = $"Given path: '{startupRepo}' is NOT a valid repository!" - }); - } - else - { - var node = pref.FindOrAddNodeByRepositoryPath(test.StdOut.Trim(), null, false); - Welcome.Instance.Refresh(); - OpenRepositoryInTab(node, null); - } - } - - _ignoreIndexChange = false; - - if (string.IsNullOrEmpty(_title)) - UpdateTitle(); } - public void Quit(double width, double height) + public void Quit() { - var pref = Preferences.Instance; - pref.Layout.LauncherWidth = width; - pref.Layout.LauncherHeight = height; - pref.Save(); + Preference.Instance.OpenedTabs.Clear(); - _ignoreIndexChange = true; - - foreach (var one in Pages) - CloseRepositoryInTab(one, false); - - _ignoreIndexChange = false; - } - - public void OpenWorkspaceSwitcher() - { - Switcher = new WorkspaceSwitcher(this); - } - - public void OpenTabSwitcher() - { - Switcher = new LauncherPageSwitcher(this); - } - - public void CancelSwitcher() - { - Switcher?.Dispose(); - Switcher = null; - } - - public void SwitchWorkspace(Workspace to) - { - if (to == null || to.IsActive) - return; - - foreach (var one in Pages) + if (Preference.Instance.RestoreTabs) { - if (!one.CanCreatePopup() || one.Data is Repository { IsAutoFetching: true }) + foreach (var page in Pages) { - App.RaiseException(null, "You have unfinished task(s) in opened pages. Please wait!!!"); - return; + if (page.Node.IsRepository) + Preference.Instance.OpenedTabs.Add(page.Node.Id); } } - _ignoreIndexChange = true; - - var pref = Preferences.Instance; - foreach (var w in pref.Workspaces) - w.IsActive = false; - - ActiveWorkspace = to; - to.IsActive = true; - - foreach (var one in Pages) - CloseRepositoryInTab(one, false); - - Pages.Clear(); - AddNewTab(); - - var repos = to.Repositories.ToArray(); - foreach (var repo in repos) - { - var node = pref.FindNode(repo); - if (node == null) - { - node = new RepositoryNode() - { - Id = repo, - Name = Path.GetFileName(repo), - Bookmark = 0, - IsRepository = true, - }; - } - - OpenRepositoryInTab(node, null); - } - - var activeIdx = to.ActiveIdx; - if (activeIdx >= 0 && activeIdx < Pages.Count) - { - ActivePage = Pages[activeIdx]; - } - else - { - ActivePage = Pages[0]; - to.ActiveIdx = 0; - } - - _ignoreIndexChange = false; - Preferences.Instance.Save(); - GC.Collect(); + Preference.Instance.LastActiveTabIdx = Pages.IndexOf(ActivePage); + Preference.Save(); } public void AddNewTab() @@ -224,22 +77,10 @@ namespace SourceGit.ViewModels public void MoveTab(LauncherPage from, LauncherPage to) { - _ignoreIndexChange = true; - var fromIdx = Pages.IndexOf(from); var toIdx = Pages.IndexOf(to); Pages.Move(fromIdx, toIdx); ActivePage = from; - - ActiveWorkspace.Repositories.Clear(); - foreach (var p in Pages) - { - if (p.Data is Repository r) - ActiveWorkspace.Repositories.Add(r.FullPath); - } - ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(from.Node.Id); - - _ignoreIndexChange = false; } public void GotoNextTab() @@ -252,91 +93,92 @@ namespace SourceGit.ViewModels ActivePage = Pages[nextIdx]; } - public void GotoPrevTab() - { - if (Pages.Count == 1) - return; - - var activeIdx = Pages.IndexOf(_activePage); - var prevIdx = activeIdx == 0 ? Pages.Count - 1 : activeIdx - 1; - ActivePage = Pages[prevIdx]; - } - - public void CloseTab(LauncherPage page) + public void CloseTab(object param) { if (Pages.Count == 1) { - var last = Pages[0]; - if (last.Data is Repository repo) - { - ActiveWorkspace.Repositories.Clear(); - ActiveWorkspace.ActiveIdx = 0; - - repo.Close(); - - Welcome.Instance.ClearSearchFilter(); - last.Node = new RepositoryNode() { Id = Guid.NewGuid().ToString() }; - last.Data = Welcome.Instance; - last.Popup = null; - UpdateTitle(); - - GC.Collect(); - } - else - { - App.Quit(0); - } - + App.Quit(); return; } + LauncherPage page = param as LauncherPage; if (page == null) page = _activePage; var removeIdx = Pages.IndexOf(page); var activeIdx = Pages.IndexOf(_activePage); if (removeIdx == activeIdx) - ActivePage = Pages[removeIdx > 0 ? removeIdx - 1 : removeIdx + 1]; + { + if (removeIdx == Pages.Count - 1) + { + ActivePage = Pages[removeIdx - 1]; + } + else + { + ActivePage = Pages[removeIdx + 1]; + } + + CloseRepositoryInTab(page); + Pages.RemoveAt(removeIdx); + OnPropertyChanged(nameof(Pages)); + } + else if (removeIdx + 1 == activeIdx) + { + CloseRepositoryInTab(page); + Pages.RemoveAt(removeIdx); + OnPropertyChanged(nameof(Pages)); + } + else + { + CloseRepositoryInTab(page); + Pages.RemoveAt(removeIdx); + } - CloseRepositoryInTab(page); - Pages.RemoveAt(removeIdx); GC.Collect(); } - public void CloseOtherTabs() + public void CloseOtherTabs(object param) { if (Pages.Count == 1) return; - _ignoreIndexChange = true; + var page = param as LauncherPage; + if (page == null) + page = _activePage; + + ActivePage = page; - var id = ActivePage.Node.Id; foreach (var one in Pages) { - if (one.Node.Id != id) + if (one.Node.Id != page.Node.Id) CloseRepositoryInTab(one); } - Pages = new AvaloniaList { ActivePage }; - ActiveWorkspace.ActiveIdx = 0; + Pages = new AvaloniaList { page }; OnPropertyChanged(nameof(Pages)); - _ignoreIndexChange = false; GC.Collect(); } - public void CloseRightTabs() + public void CloseRightTabs(object param) { - _ignoreIndexChange = true; + LauncherPage page = param as LauncherPage; + if (page == null) + page = _activePage; + + var endIdx = Pages.IndexOf(page); + var activeIdx = Pages.IndexOf(_activePage); + if (endIdx < activeIdx) + { + ActivePage = page; + } - var endIdx = Pages.IndexOf(ActivePage); for (var i = Pages.Count - 1; i > endIdx; i--) { CloseRepositoryInTab(Pages[i]); Pages.Remove(Pages[i]); } - _ignoreIndexChange = false; GC.Collect(); } @@ -351,22 +193,16 @@ namespace SourceGit.ViewModels } } - if (!Path.Exists(node.Id)) + var repo = Preference.FindRepository(node.Id); + if (repo == null || !Path.Exists(repo.FullPath)) { - App.RaiseException(node.Id, "Repository does NOT exist any more. Please remove it."); + var ctx = page == null ? ActivePage.Node.Id : page.Node.Id; + App.RaiseException(ctx, "Repository does NOT exists any more. Please remove it."); return; } - var isBare = new Commands.IsBareRepository(node.Id).Result(); - var gitDir = isBare ? node.Id : GetRepositoryGitDir(node.Id); - if (string.IsNullOrEmpty(gitDir)) - { - App.RaiseException(node.Id, "Given path is not a valid git repository!"); - return; - } - - var repo = new Repository(isBare, node.Id, gitDir); repo.Open(); + Commands.AutoFetch.AddRepository(repo.FullPath); if (page == null) { @@ -388,235 +224,20 @@ namespace SourceGit.ViewModels page.Data = repo; } - if (page != _activePage) - ActivePage = page; - else - UpdateTitle(); - - ActiveWorkspace.Repositories.Clear(); - foreach (var p in Pages) - { - if (p.Data is Repository r) - ActiveWorkspace.Repositories.Add(r.FullPath); - } - - if (!_ignoreIndexChange) - ActiveWorkspace.ActiveIdx = ActiveWorkspace.Repositories.IndexOf(node.Id); + ActivePage = page; } - public void DispatchNotification(string pageId, string message, bool isError) - { - var notification = new Models.Notification() - { - IsError = isError, - Message = message, - }; - - foreach (var page in Pages) - { - var id = page.Node.Id.Replace('\\', '/').TrimEnd('/'); - if (id == pageId) - { - page.Notifications.Add(notification); - return; - } - } - - if (_activePage != null) - _activePage.Notifications.Add(notification); - } - - public ContextMenu CreateContextForWorkspace() - { - var pref = Preferences.Instance; - var menu = new ContextMenu(); - - for (var i = 0; i < pref.Workspaces.Count; i++) - { - var workspace = pref.Workspaces[i]; - - var icon = App.CreateMenuIcon(workspace.IsActive ? "Icons.Check" : "Icons.Workspace"); - icon.Fill = workspace.Brush; - - var item = new MenuItem(); - item.Header = workspace.Name; - item.Icon = icon; - item.Click += (_, e) => - { - if (!workspace.IsActive) - SwitchWorkspace(workspace); - - e.Handled = true; - }; - - menu.Items.Add(item); - } - - menu.Items.Add(new MenuItem() { Header = "-" }); - - var configure = new MenuItem(); - configure.Header = App.Text("Workspace.Configure"); - configure.Click += (_, e) => - { - App.ShowWindow(new ConfigureWorkspace(), true); - e.Handled = true; - }; - menu.Items.Add(configure); - - return menu; - } - - public ContextMenu CreateContextForPageTab(LauncherPage page) - { - if (page == null) - return null; - - var menu = new ContextMenu(); - var close = new MenuItem(); - close.Header = App.Text("PageTabBar.Tab.Close"); - close.InputGesture = KeyGesture.Parse(OperatingSystem.IsMacOS() ? "⌘+W" : "Ctrl+W"); - close.Click += (_, e) => - { - CloseTab(page); - e.Handled = true; - }; - menu.Items.Add(close); - - var closeOthers = new MenuItem(); - closeOthers.Header = App.Text("PageTabBar.Tab.CloseOther"); - closeOthers.Click += (_, e) => - { - CloseOtherTabs(); - e.Handled = true; - }; - menu.Items.Add(closeOthers); - - var closeRight = new MenuItem(); - closeRight.Header = App.Text("PageTabBar.Tab.CloseRight"); - closeRight.Click += (_, e) => - { - CloseRightTabs(); - e.Handled = true; - }; - menu.Items.Add(closeRight); - - if (page.Node.IsRepository) - { - var bookmark = new MenuItem(); - bookmark.Header = App.Text("PageTabBar.Tab.Bookmark"); - bookmark.Icon = App.CreateMenuIcon("Icons.Bookmark"); - - for (int i = 0; i < Models.Bookmarks.Supported.Count; i++) - { - var icon = App.CreateMenuIcon("Icons.Bookmark"); - - if (i != 0) - icon.Fill = Models.Bookmarks.Brushes[i]; - - var dupIdx = i; - var setter = new MenuItem(); - setter.Header = icon; - setter.Click += (_, e) => - { - page.Node.Bookmark = dupIdx; - e.Handled = true; - }; - bookmark.Items.Add(setter); - } - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(bookmark); - - var copyPath = new MenuItem(); - copyPath.Header = App.Text("PageTabBar.Tab.CopyPath"); - copyPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyPath.Click += (_, e) => - { - page.CopyPath(); - e.Handled = true; - }; - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(copyPath); - } - - return menu; - } - - private string GetRepositoryGitDir(string repo) - { - var fullpath = Path.Combine(repo, ".git"); - if (Directory.Exists(fullpath)) - { - if (Directory.Exists(Path.Combine(fullpath, "refs")) && - Directory.Exists(Path.Combine(fullpath, "objects")) && - File.Exists(Path.Combine(fullpath, "HEAD"))) - return fullpath; - - return null; - } - - if (File.Exists(fullpath)) - { - var redirect = File.ReadAllText(fullpath).Trim(); - if (redirect.StartsWith("gitdir: ", StringComparison.Ordinal)) - redirect = redirect.Substring(8); - - if (!Path.IsPathRooted(redirect)) - redirect = Path.GetFullPath(Path.Combine(repo, redirect)); - - if (Directory.Exists(redirect)) - return redirect; - - return null; - } - - return new Commands.QueryGitDir(repo).Result(); - } - - private void CloseRepositoryInTab(LauncherPage page, bool removeFromWorkspace = true) + private void CloseRepositoryInTab(LauncherPage page) { if (page.Data is Repository repo) { - if (removeFromWorkspace) - ActiveWorkspace.Repositories.Remove(repo.FullPath); - + Commands.AutoFetch.RemoveRepository(repo.FullPath); repo.Close(); } page.Data = null; } - private void UpdateTitle() - { - if (_activeWorkspace == null) - return; - - var workspace = _activeWorkspace.Name; - if (_activePage is { Data: Repository }) - { - var node = _activePage.Node; - var name = node.Name; - var path = node.Id; - - if (!OperatingSystem.IsWindows()) - { - var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length; - if (path.StartsWith(home, StringComparison.Ordinal)) - path = $"~{path.AsSpan(prefixLen)}"; - } - - Title = $"[{workspace}] {name} ({path})"; - } - else - { - Title = $"[{workspace}] Repositories"; - } - } - - private Workspace _activeWorkspace = null; private LauncherPage _activePage = null; - private bool _ignoreIndexChange = false; - private string _title = string.Empty; - private IDisposable _switcher = null; } } diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs index 8a59d246..c8765c0d 100644 --- a/src/ViewModels/LauncherPage.cs +++ b/src/ViewModels/LauncherPage.cs @@ -1,13 +1,10 @@ using System; using Avalonia.Collections; -using Avalonia.Media; - -using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class LauncherPage : ObservableObject + public class LauncherPage : PopupHost { public RepositoryNode Node { @@ -21,18 +18,6 @@ namespace SourceGit.ViewModels set => SetProperty(ref _data, value); } - public IBrush DirtyBrush - { - get => _dirtyBrush; - private set => SetProperty(ref _dirtyBrush, value); - } - - public Popup Popup - { - get => _popup; - set => SetProperty(ref _popup, value); - } - public AvaloniaList Notifications { get; @@ -41,11 +26,14 @@ namespace SourceGit.ViewModels public LauncherPage() { - _node = new RepositoryNode() { Id = Guid.NewGuid().ToString() }; - _data = Welcome.Instance; - - // New welcome page will clear the search filter before. - Welcome.Instance.ClearSearchFilter(); + _node = new RepositoryNode() + { + Id = Guid.NewGuid().ToString(), + Name = "WelcomePage", + Bookmark = 0, + IsRepository = false, + }; + _data = new Welcome(); } public LauncherPage(RepositoryNode node, Repository repo) @@ -54,9 +42,9 @@ namespace SourceGit.ViewModels _data = repo; } - public void ClearNotifications() + public override string GetId() { - Notifications.Clear(); + return _node.Id; } public void CopyPath() @@ -65,85 +53,15 @@ namespace SourceGit.ViewModels App.CopyText(_node.Id); } - public void ChangeDirtyState(Models.DirtyState flag, bool remove) + public void DismissNotification(object param) { - if (remove) + if (param is Models.Notification notice) { - if (_dirtyState.HasFlag(flag)) - _dirtyState -= flag; + Notifications.Remove(notice); } - else - { - _dirtyState |= flag; - } - - if (_dirtyState.HasFlag(Models.DirtyState.HasLocalChanges)) - DirtyBrush = Brushes.Gray; - else if (_dirtyState.HasFlag(Models.DirtyState.HasPendingPullOrPush)) - DirtyBrush = Brushes.RoyalBlue; - else - DirtyBrush = null; - } - - public bool CanCreatePopup() - { - return _popup == null || !_popup.InProgress; - } - - public void StartPopup(Popup popup) - { - Popup = popup; - - if (popup.CanStartDirectly()) - ProcessPopup(); - } - - public async void ProcessPopup() - { - if (_popup is { InProgress: false } dump) - { - if (!dump.Check()) - return; - - dump.InProgress = true; - var task = dump.Sure(); - var finished = false; - if (task != null) - { - try - { - finished = await task; - } - catch (Exception e) - { - App.LogException(e); - } - - dump.InProgress = false; - if (finished) - Popup = null; - } - else - { - dump.InProgress = false; - Popup = null; - } - } - } - - public void CancelPopup() - { - if (_popup == null) - return; - if (_popup.InProgress) - return; - Popup = null; } private RepositoryNode _node = null; private object _data = null; - private IBrush _dirtyBrush = null; - private Models.DirtyState _dirtyState = Models.DirtyState.None; - private Popup _popup = null; } } diff --git a/src/ViewModels/LauncherPageSwitcher.cs b/src/ViewModels/LauncherPageSwitcher.cs deleted file mode 100644 index 5f53021d..00000000 --- a/src/ViewModels/LauncherPageSwitcher.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class LauncherPageSwitcher : ObservableObject, IDisposable - { - public List VisiblePages - { - get => _visiblePages; - private set => SetProperty(ref _visiblePages, value); - } - - public string SearchFilter - { - get => _searchFilter; - set - { - if (SetProperty(ref _searchFilter, value)) - UpdateVisiblePages(); - } - } - - public LauncherPage SelectedPage - { - get => _selectedPage; - set => SetProperty(ref _selectedPage, value); - } - - public LauncherPageSwitcher(Launcher launcher) - { - _launcher = launcher; - UpdateVisiblePages(); - } - - public void ClearFilter() - { - SearchFilter = string.Empty; - } - - public void Switch() - { - _launcher.ActivePage = _selectedPage ?? _launcher.ActivePage; - _launcher.CancelSwitcher(); - } - - public void Dispose() - { - _visiblePages.Clear(); - _selectedPage = null; - _searchFilter = string.Empty; - } - - private void UpdateVisiblePages() - { - var visible = new List(); - if (string.IsNullOrEmpty(_searchFilter)) - { - visible.AddRange(_launcher.Pages); - } - else - { - foreach (var page in _launcher.Pages) - { - if (page.Node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase) || - (page.Node.IsRepository && page.Node.Id.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase))) - { - visible.Add(page); - } - } - } - - VisiblePages = visible; - SelectedPage = visible.Count > 0 ? visible[0] : null; - } - - private Launcher _launcher = null; - private List _visiblePages = []; - private string _searchFilter = string.Empty; - private LauncherPage _selectedPage = null; - } -} diff --git a/src/ViewModels/LayoutInfo.cs b/src/ViewModels/LayoutInfo.cs deleted file mode 100644 index d5f7ec2b..00000000 --- a/src/ViewModels/LayoutInfo.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Avalonia.Controls; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class LayoutInfo : ObservableObject - { - public double LauncherWidth - { - get; - set; - } = 1280; - - public double LauncherHeight - { - get; - set; - } = 720; - - public WindowState LauncherWindowState - { - get; - set; - } = WindowState.Normal; - - public GridLength RepositorySidebarWidth - { - get => _repositorySidebarWidth; - set => SetProperty(ref _repositorySidebarWidth, value); - } - - public GridLength HistoriesAuthorColumnWidth - { - get => _historiesAuthorColumnWidth; - set => SetProperty(ref _historiesAuthorColumnWidth, value); - } - - public GridLength WorkingCopyLeftWidth - { - get => _workingCopyLeftWidth; - set => SetProperty(ref _workingCopyLeftWidth, value); - } - - public GridLength StashesLeftWidth - { - get => _stashesLeftWidth; - set => SetProperty(ref _stashesLeftWidth, value); - } - - public GridLength CommitDetailChangesLeftWidth - { - get => _commitDetailChangesLeftWidth; - set => SetProperty(ref _commitDetailChangesLeftWidth, value); - } - - public GridLength CommitDetailFilesLeftWidth - { - get => _commitDetailFilesLeftWidth; - set => SetProperty(ref _commitDetailFilesLeftWidth, value); - } - - private GridLength _repositorySidebarWidth = new GridLength(250, GridUnitType.Pixel); - private GridLength _historiesAuthorColumnWidth = new GridLength(120, GridUnitType.Pixel); - private GridLength _workingCopyLeftWidth = new GridLength(300, GridUnitType.Pixel); - private GridLength _stashesLeftWidth = new GridLength(300, GridUnitType.Pixel); - private GridLength _commitDetailChangesLeftWidth = new GridLength(256, GridUnitType.Pixel); - private GridLength _commitDetailFilesLeftWidth = new GridLength(256, GridUnitType.Pixel); - } -} diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs index eb54418c..37b537fc 100644 --- a/src/ViewModels/Merge.cs +++ b/src/ViewModels/Merge.cs @@ -1,103 +1,76 @@ -using System; +using System.Collections.Generic; using System.Threading.Tasks; namespace SourceGit.ViewModels { + public class MergeMode + { + public string Name { get; set; } + public string Desc { get; set; } + public string Arg { get; set; } + + public MergeMode(string n, string d, string a) + { + Name = n; + Desc = d; + Arg = a; + } + } + public class Merge : Popup { - public object Source + public string Source { get; + private set; } public string Into { get; + private set; } - public Models.MergeMode Mode + public List Modes + { + get; + private set; + } + + public MergeMode SelectedMode { get; set; } - public Merge(Repository repo, Models.Branch source, string into, bool forceFastForward) + public Merge(Repository repo, string source, string into) { _repo = repo; - _sourceName = source.FriendlyName; - Source = source; Into = into; - Mode = forceFastForward ? Models.MergeMode.Supported[1] : AutoSelectMergeMode(); - } - - public Merge(Repository repo, Models.Commit source, string into) - { - _repo = repo; - _sourceName = source.SHA; - - Source = source; - Into = into; - Mode = AutoSelectMergeMode(); - } - - public Merge(Repository repo, Models.Tag source, string into) - { - _repo = repo; - _sourceName = source.Name; - - Source = source; - Into = into; - Mode = AutoSelectMergeMode(); + Modes = new List() { + new MergeMode("Default", "Fast-forward if possible", ""), + new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"), + new MergeMode("Squash", "Use '--squash'", "--squash"), + new MergeMode("Don't commit", "Merge without commit", "--no-commit"), + }; + SelectedMode = Modes[0]; + View = new Views.Merge() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - _repo.ClearCommitMessage(); - ProgressDescription = $"Merging '{_sourceName}' into '{Into}' ..."; - - var log = _repo.CreateLog($"Merging '{_sourceName}' into '{Into}'"); - Use(log); + ProgressDescription = $"Merging '{Source}' into '{Into}' ..."; return Task.Run(() => { - new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg).Use(log).Exec(); - log.Complete(); - - var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result(); - CallUIThread(() => - { - _repo.NavigateToCommit(head, true); - _repo.SetWatcherEnabled(true); - }); - return true; + var succ = new Commands.Merge(_repo.FullPath, Source, SelectedMode.Arg, SetProgressDescription).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; }); } - private Models.MergeMode AutoSelectMergeMode() - { - var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode; - if (preferredMergeModeIdx < 0 || preferredMergeModeIdx > Models.MergeMode.Supported.Length) - preferredMergeModeIdx = 0; - - var defaultMergeMode = Models.MergeMode.Supported[preferredMergeModeIdx]; - var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions"); - if (string.IsNullOrEmpty(config)) - return defaultMergeMode; - if (config.Equals("--ff-only", StringComparison.Ordinal)) - return Models.MergeMode.Supported[1]; - if (config.Equals("--no-ff", StringComparison.Ordinal)) - return Models.MergeMode.Supported[2]; - if (config.Equals("--squash", StringComparison.Ordinal)) - return Models.MergeMode.Supported[3]; - if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal)) - return Models.MergeMode.Supported[4]; - - return defaultMergeMode; - } - private readonly Repository _repo = null; - private readonly string _sourceName; } } diff --git a/src/ViewModels/MergeMultiple.cs b/src/ViewModels/MergeMultiple.cs deleted file mode 100644 index aaa21cce..00000000 --- a/src/ViewModels/MergeMultiple.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class MergeMultiple : Popup - { - public List Targets - { - get; - } = []; - - public bool AutoCommit - { - get; - set; - } - - public Models.MergeStrategy Strategy - { - get; - set; - } - - public MergeMultiple(Repository repo, List commits) - { - _repo = repo; - Targets.AddRange(commits); - AutoCommit = true; - Strategy = Models.MergeStrategy.ForMultiple[0]; - } - - public MergeMultiple(Repository repo, List branches) - { - _repo = repo; - Targets.AddRange(branches); - AutoCommit = true; - Strategy = Models.MergeStrategy.ForMultiple[0]; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - _repo.ClearCommitMessage(); - ProgressDescription = "Merge head(s) ..."; - - var log = _repo.CreateLog("Merge Multiple Heads"); - Use(log); - - return Task.Run(() => - { - new Commands.Merge( - _repo.FullPath, - ConvertTargetToMergeSources(), - AutoCommit, - Strategy.Arg).Use(log).Exec(); - - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private List ConvertTargetToMergeSources() - { - var ret = new List(); - foreach (var t in Targets) - { - if (t is Models.Branch branch) - { - ret.Add(branch.FriendlyName); - } - else if (t is Models.Commit commit) - { - var d = commit.Decorators.Find(x => x.Type is - Models.DecoratorType.LocalBranchHead or - Models.DecoratorType.RemoteBranchHead or - Models.DecoratorType.Tag); - - if (d != null) - ret.Add(d.Name); - else - ret.Add(commit.SHA); - } - } - - return ret; - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/MoveRepositoryNode.cs b/src/ViewModels/MoveRepositoryNode.cs deleted file mode 100644 index 51f2e974..00000000 --- a/src/ViewModels/MoveRepositoryNode.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class MoveRepositoryNode : Popup - { - public RepositoryNode Target - { - get; - } = null; - - public List Rows - { - get; - } = []; - - public RepositoryNode Selected - { - get => _selected; - set => SetProperty(ref _selected, value); - } - - public MoveRepositoryNode(RepositoryNode target) - { - Target = target; - Rows.Add(new RepositoryNode() - { - Name = "ROOT", - Depth = 0, - Id = Guid.NewGuid().ToString() - }); - MakeRows(Preferences.Instance.RepositoryNodes, 1); - } - - public override Task Sure() - { - if (_selected != null) - { - var node = Preferences.Instance.FindNode(_selected.Id); - Preferences.Instance.MoveNode(Target, node, true); - Welcome.Instance.Refresh(); - } - - return null; - } - - private void MakeRows(List collection, int depth) - { - foreach (var node in collection) - { - if (node.IsRepository || node.Id == Target.Id) - continue; - - var dump = new RepositoryNode() - { - Name = node.Name, - Depth = depth, - Id = node.Id - }; - Rows.Add(dump); - MakeRows(node.SubNodes, depth + 1); - } - } - - private RepositoryNode _selected = null; - } -} diff --git a/src/ViewModels/Popup.cs b/src/ViewModels/Popup.cs index b3fe7e23..1b4ff9a8 100644 --- a/src/ViewModels/Popup.cs +++ b/src/ViewModels/Popup.cs @@ -10,6 +10,18 @@ namespace SourceGit.ViewModels { public class Popup : ObservableValidator { + public string HostPageId + { + get; + set; + } + + public object View + { + get; + set; + } + public bool InProgress { get => _inProgress; @@ -31,11 +43,6 @@ namespace SourceGit.ViewModels return !HasErrors; } - public virtual bool CanStartDirectly() - { - return true; - } - public virtual Task Sure() { return null; @@ -46,16 +53,9 @@ namespace SourceGit.ViewModels Dispatcher.UIThread.Invoke(action); } - protected void Use(CommandLog log) + protected void SetProgressDescription(string description) { - log.Register(SetDescription); - } - - private void SetDescription(string data) - { - var desc = data.Trim(); - if (!string.IsNullOrEmpty(desc)) - ProgressDescription = desc; + CallUIThread(() => ProgressDescription = description); } private bool _inProgress = false; diff --git a/src/ViewModels/PopupHost.cs b/src/ViewModels/PopupHost.cs new file mode 100644 index 00000000..b6351fcb --- /dev/null +++ b/src/ViewModels/PopupHost.cs @@ -0,0 +1,82 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace SourceGit.ViewModels +{ + public class PopupHost : ObservableObject + { + public static PopupHost Active + { + get; + set; + } = null; + + public Popup Popup + { + get => _popup; + set => SetProperty(ref _popup, value); + } + + public static bool CanCreatePopup() + { + return Active != null && (Active._popup == null || !Active._popup.InProgress); + } + + public static void ShowPopup(Popup popup) + { + popup.HostPageId = Active.GetId(); + Active.Popup = popup; + } + + public static void ShowAndStartPopup(Popup popup) + { + var dumpPage = Active; + popup.HostPageId = dumpPage.GetId(); + dumpPage.Popup = popup; + dumpPage.ProcessPopup(); + } + + public virtual string GetId() + { + return string.Empty; + } + + public async void ProcessPopup() + { + if (_popup != null) + { + if (!_popup.Check()) + return; + + _popup.InProgress = true; + var task = _popup.Sure(); + if (task != null) + { + var finished = await task; + if (finished) + { + Popup = null; + } + else + { + _popup.InProgress = false; + } + } + else + { + Popup = null; + } + } + } + + public void CancelPopup() + { + if (_popup == null) + return; + if (_popup.InProgress) + return; + Popup = null; + } + + private Popup _popup = null; + } +} diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs new file mode 100644 index 00000000..8d0520c8 --- /dev/null +++ b/src/ViewModels/Preference.cs @@ -0,0 +1,483 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Text.Json.Serialization; + +using Avalonia.Collections; +using Avalonia.Media; + +using CommunityToolkit.Mvvm.ComponentModel; + +namespace SourceGit.ViewModels +{ + public class Preference : ObservableObject + { + [JsonIgnore] + public static Preference Instance + { + get + { + if (_instance == null) + { + if (!File.Exists(_savePath)) + { + _instance = new Preference(); + } + else + { + try + { + _instance = JsonSerializer.Deserialize(File.ReadAllText(_savePath), JsonCodeGen.Default.Preference); + } + catch + { + _instance = new Preference(); + } + } + } + + _instance.Repositories.RemoveAll(x => !Directory.Exists(x.FullPath)); + + if (_instance.DefaultFont == null) + { + _instance.DefaultFont = FontManager.Current.DefaultFontFamily; + } + + if (_instance.MonospaceFont == null) + { + _instance.MonospaceFont = new FontFamily("fonts:SourceGit#JetBrains Mono"); + } + + if (!_instance.IsGitConfigured) + { + _instance.GitInstallPath = Native.OS.FindGitExecutable(); + } + + return _instance; + } + } + + public string Locale + { + get => _locale; + set + { + if (SetProperty(ref _locale, value)) + { + App.SetLocale(value); + } + } + } + + public string Theme + { + get => _theme; + set + { + if (SetProperty(ref _theme, value)) + { + App.SetTheme(value); + } + } + } + + [JsonConverter(typeof(FontFamilyConverter))] + public FontFamily DefaultFont + { + get => _defaultFont; + set => SetProperty(ref _defaultFont, value); + } + + [JsonConverter(typeof(FontFamilyConverter))] + public FontFamily MonospaceFont + { + get => _monospaceFont; + set => SetProperty(ref _monospaceFont, value); + } + + public double DefaultFontSize + { + get => _defaultFontSize; + set => SetProperty(ref _defaultFontSize, value); + } + + public string AvatarServer + { + get => Models.AvatarManager.SelectedServer; + set + { + if (Models.AvatarManager.SelectedServer != value) + { + Models.AvatarManager.SelectedServer = value; + OnPropertyChanged(nameof(AvatarServer)); + } + } + } + + public int MaxHistoryCommits + { + get => _maxHistoryCommits; + set => SetProperty(ref _maxHistoryCommits, value); + } + + public bool RestoreTabs + { + get => _restoreTabs; + set => SetProperty(ref _restoreTabs, value); + } + + public bool UseFixedTabWidth + { + get => _useFixedTabWidth; + set => SetProperty(ref _useFixedTabWidth, value); + } + + public bool Check4UpdatesOnStartup + { + get => _check4UpdatesOnStartup; + set => SetProperty(ref _check4UpdatesOnStartup, value); + } + + public string IgnoreUpdateTag + { + get; + set; + } = string.Empty; + + public bool UseTwoColumnsLayoutInHistories + { + get => _useTwoColumnsLayoutInHistories; + set => SetProperty(ref _useTwoColumnsLayoutInHistories, value); + } + + public bool UseSideBySideDiff + { + get => _useSideBySideDiff; + set => SetProperty(ref _useSideBySideDiff, value); + } + + public bool UseSyntaxHighlighting + { + get => _useSyntaxHighlighting; + set => SetProperty(ref _useSyntaxHighlighting, value); + } + + public Models.ChangeViewMode UnstagedChangeViewMode + { + get => _unstagedChangeViewMode; + set => SetProperty(ref _unstagedChangeViewMode, value); + } + + public Models.ChangeViewMode StagedChangeViewMode + { + get => _stagedChangeViewMode; + set => SetProperty(ref _stagedChangeViewMode, value); + } + + public Models.ChangeViewMode CommitChangeViewMode + { + get => _commitChangeViewMode; + set => SetProperty(ref _commitChangeViewMode, value); + } + + [JsonIgnore] + public bool IsGitConfigured + { + get => !string.IsNullOrEmpty(GitInstallPath) && File.Exists(GitInstallPath); + } + + public string GitInstallPath + { + get => Native.OS.GitExecutable; + set + { + if (Native.OS.GitExecutable != value) + { + Native.OS.GitExecutable = value; + OnPropertyChanged(nameof(GitInstallPath)); + } + } + } + + public Models.Shell GitShell + { + get => Native.OS.GetShell(); + set + { + if (Native.OS.SetShell(value)) + { + OnPropertyChanged(nameof(GitShell)); + } + } + } + + public string GitDefaultCloneDir + { + get => _gitDefaultCloneDir; + set => SetProperty(ref _gitDefaultCloneDir, value); + } + + public bool GitAutoFetch + { + get => Commands.AutoFetch.IsEnabled; + set + { + if (Commands.AutoFetch.IsEnabled != value) + { + Commands.AutoFetch.IsEnabled = value; + OnPropertyChanged(nameof(GitAutoFetch)); + } + } + } + + public int ExternalMergeToolType + { + get => _externalMergeToolType; + set + { + var changed = SetProperty(ref _externalMergeToolType, value); + if (changed && !OperatingSystem.IsWindows() && value > 0 && value < Models.ExternalMerger.Supported.Count) + { + var tool = Models.ExternalMerger.Supported[value]; + if (File.Exists(tool.Exec)) + ExternalMergeToolPath = tool.Exec; + else + ExternalMergeToolPath = string.Empty; + } + } + } + + public string ExternalMergeToolPath + { + get => _externalMergeToolPath; + set => SetProperty(ref _externalMergeToolPath, value); + } + + public string ExternalMergeToolCmd + { + get => _externalMergeToolCmd; + set => SetProperty(ref _externalMergeToolCmd, value); + } + + public string ExternalMergeToolDiffCmd + { + get => _externalMergeToolDiffCmd; + set => SetProperty(ref _externalMergeToolDiffCmd, value); + } + + public List Repositories + { + get; + set; + } = new List(); + + public AvaloniaList RepositoryNodes + { + get => _repositoryNodes; + set => SetProperty(ref _repositoryNodes, value); + } + + public List OpenedTabs + { + get; + set; + } = new List(); + + public int LastActiveTabIdx + { + get; + set; + } = 0; + + public double LastCheckUpdateTime + { + get; + set; + } = 0; + + [JsonIgnore] + public bool ShouldCheck4UpdateOnStartup + { + get + { + if (!_check4UpdatesOnStartup) + return false; + + var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime(); + var now = DateTime.Now; + + if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day) + return false; + + LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds; + return true; + } + } + + public static void AddNode(RepositoryNode node, RepositoryNode to = null) + { + var collection = to == null ? _instance._repositoryNodes : to.SubNodes; + var list = new List(); + list.AddRange(collection); + list.Add(node); + list.Sort((l, r) => + { + if (l.IsRepository != r.IsRepository) + { + return l.IsRepository ? 1 : -1; + } + else + { + return l.Name.CompareTo(r.Name); + } + }); + + collection.Clear(); + foreach (var one in list) + { + collection.Add(one); + } + } + + public static RepositoryNode FindNode(string id) + { + return FindNodeRecursive(id, _instance.RepositoryNodes); + } + + public static void MoveNode(RepositoryNode node, RepositoryNode to = null) + { + if (to == null && _instance._repositoryNodes.Contains(node)) + return; + if (to != null && to.SubNodes.Contains(node)) + return; + + RemoveNode(node); + AddNode(node, to); + } + + public static void RemoveNode(RepositoryNode node) + { + RemoveNodeRecursive(node, _instance._repositoryNodes); + } + + public static Repository FindRepository(string path) + { + foreach (var repo in _instance.Repositories) + { + if (repo.FullPath == path) + return repo; + } + return null; + } + + public static Repository AddRepository(string rootDir, string gitDir) + { + var normalized = rootDir.Replace('\\', '/'); + var repo = FindRepository(normalized); + if (repo != null) + { + repo.GitDir = gitDir; + return repo; + } + + repo = new Repository() + { + FullPath = normalized, + GitDir = gitDir + }; + + _instance.Repositories.Add(repo); + return repo; + } + + public static void Save() + { + var dir = Path.GetDirectoryName(_savePath); + if (!Directory.Exists(dir)) + Directory.CreateDirectory(dir); + + var data = JsonSerializer.Serialize(_instance, JsonCodeGen.Default.Preference); + File.WriteAllText(_savePath, data); + } + + private static RepositoryNode FindNodeRecursive(string id, AvaloniaList collection) + { + foreach (var node in collection) + { + if (node.Id == id) + return node; + + var sub = FindNodeRecursive(id, node.SubNodes); + if (sub != null) + return sub; + } + + return null; + } + + private static bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList collection) + { + if (collection.Contains(node)) + { + collection.Remove(node); + return true; + } + + foreach (RepositoryNode one in collection) + { + if (RemoveNodeRecursive(node, one.SubNodes)) + return true; + } + + return false; + } + + private static Preference _instance = null; + private static readonly string _savePath = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + "SourceGit", + "preference.json"); + + private string _locale = "en_US"; + private string _theme = "Default"; + private FontFamily _defaultFont = null; + private FontFamily _monospaceFont = null; + private double _defaultFontSize = 13; + + private int _maxHistoryCommits = 20000; + private bool _restoreTabs = false; + private bool _useFixedTabWidth = true; + private bool _check4UpdatesOnStartup = true; + private bool _useTwoColumnsLayoutInHistories = false; + private bool _useSideBySideDiff = false; + private bool _useSyntaxHighlighting = false; + + private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List; + private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List; + private Models.ChangeViewMode _commitChangeViewMode = Models.ChangeViewMode.List; + + private string _gitDefaultCloneDir = string.Empty; + + private int _externalMergeToolType = 0; + private string _externalMergeToolPath = string.Empty; + private string _externalMergeToolCmd = string.Empty; + private string _externalMergeToolDiffCmd = string.Empty; + + private AvaloniaList _repositoryNodes = new AvaloniaList(); + } + + public class FontFamilyConverter : JsonConverter + { + public override FontFamily Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + var name = reader.GetString(); + return new FontFamily(name); + } + + public override void Write(Utf8JsonWriter writer, FontFamily value, JsonSerializerOptions options) + { + writer.WriteStringValue(value.ToString()); + } + } +} diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs deleted file mode 100644 index 665b7604..00000000 --- a/src/ViewModels/Preferences.cs +++ /dev/null @@ -1,711 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.Json; -using System.Text.Json.Serialization; -using Avalonia.Collections; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class Preferences : ObservableObject - { - [JsonIgnore] - public static Preferences Instance - { - get - { - if (_instance != null) - return _instance; - - _instance = Load(); - _instance._isLoading = false; - - _instance.PrepareGit(); - _instance.PrepareShellOrTerminal(); - _instance.PrepareWorkspaces(); - - return _instance; - } - } - - public string Locale - { - get => _locale; - set - { - if (SetProperty(ref _locale, value) && !_isLoading) - App.SetLocale(value); - } - } - - public string Theme - { - get => _theme; - set - { - if (SetProperty(ref _theme, value) && !_isLoading) - App.SetTheme(_theme, _themeOverrides); - } - } - - public string ThemeOverrides - { - get => _themeOverrides; - set - { - if (SetProperty(ref _themeOverrides, value) && !_isLoading) - App.SetTheme(_theme, value); - } - } - - public string DefaultFontFamily - { - get => _defaultFontFamily; - set - { - if (SetProperty(ref _defaultFontFamily, value) && !_isLoading) - App.SetFonts(value, _monospaceFontFamily, _onlyUseMonoFontInEditor); - } - } - - public string MonospaceFontFamily - { - get => _monospaceFontFamily; - set - { - if (SetProperty(ref _monospaceFontFamily, value) && !_isLoading) - App.SetFonts(_defaultFontFamily, value, _onlyUseMonoFontInEditor); - } - } - - public bool OnlyUseMonoFontInEditor - { - get => _onlyUseMonoFontInEditor; - set - { - if (SetProperty(ref _onlyUseMonoFontInEditor, value) && !_isLoading) - App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor); - } - } - - public bool UseSystemWindowFrame - { - get => Native.OS.UseSystemWindowFrame; - set => Native.OS.UseSystemWindowFrame = value; - } - - public double DefaultFontSize - { - get => _defaultFontSize; - set => SetProperty(ref _defaultFontSize, value); - } - - public double EditorFontSize - { - get => _editorFontSize; - set => SetProperty(ref _editorFontSize, value); - } - - public int EditorTabWidth - { - get => _editorTabWidth; - set => SetProperty(ref _editorTabWidth, value); - } - - public LayoutInfo Layout - { - get => _layout; - set => SetProperty(ref _layout, value); - } - - public int MaxHistoryCommits - { - get => _maxHistoryCommits; - set => SetProperty(ref _maxHistoryCommits, value); - } - - public int SubjectGuideLength - { - get => _subjectGuideLength; - set => SetProperty(ref _subjectGuideLength, value); - } - - public int DateTimeFormat - { - get => Models.DateTimeFormat.ActiveIndex; - set - { - if (value != Models.DateTimeFormat.ActiveIndex && - value >= 0 && - value < Models.DateTimeFormat.Supported.Count) - { - Models.DateTimeFormat.ActiveIndex = value; - OnPropertyChanged(); - } - } - } - - public bool UseFixedTabWidth - { - get => _useFixedTabWidth; - set => SetProperty(ref _useFixedTabWidth, value); - } - - public bool Check4UpdatesOnStartup - { - get => _check4UpdatesOnStartup; - set => SetProperty(ref _check4UpdatesOnStartup, value); - } - - public bool ShowAuthorTimeInGraph - { - get => _showAuthorTimeInGraph; - set => SetProperty(ref _showAuthorTimeInGraph, value); - } - - public bool ShowChildren - { - get => _showChildren; - set => SetProperty(ref _showChildren, value); - } - - public string IgnoreUpdateTag - { - get => _ignoreUpdateTag; - set => SetProperty(ref _ignoreUpdateTag, value); - } - - public bool ShowTagsAsTree - { - get; - set; - } = false; - - public bool ShowTagsInGraph - { - get => _showTagsInGraph; - set => SetProperty(ref _showTagsInGraph, value); - } - - public bool ShowSubmodulesAsTree - { - get; - set; - } = false; - - public bool UseTwoColumnsLayoutInHistories - { - get => _useTwoColumnsLayoutInHistories; - set => SetProperty(ref _useTwoColumnsLayoutInHistories, value); - } - - public bool DisplayTimeAsPeriodInHistories - { - get => _displayTimeAsPeriodInHistories; - set => SetProperty(ref _displayTimeAsPeriodInHistories, value); - } - - public bool UseSideBySideDiff - { - get => _useSideBySideDiff; - set => SetProperty(ref _useSideBySideDiff, value); - } - - public bool UseSyntaxHighlighting - { - get => _useSyntaxHighlighting; - set => SetProperty(ref _useSyntaxHighlighting, value); - } - - public bool IgnoreCRAtEOLInDiff - { - get => Models.DiffOption.IgnoreCRAtEOL; - set - { - if (Models.DiffOption.IgnoreCRAtEOL != value) - { - Models.DiffOption.IgnoreCRAtEOL = value; - OnPropertyChanged(); - } - } - } - - public bool IgnoreWhitespaceChangesInDiff - { - get => _ignoreWhitespaceChangesInDiff; - set => SetProperty(ref _ignoreWhitespaceChangesInDiff, value); - } - - public bool EnableDiffViewWordWrap - { - get => _enableDiffViewWordWrap; - set => SetProperty(ref _enableDiffViewWordWrap, value); - } - - public bool ShowHiddenSymbolsInDiffView - { - get => _showHiddenSymbolsInDiffView; - set => SetProperty(ref _showHiddenSymbolsInDiffView, value); - } - - public bool UseFullTextDiff - { - get => _useFullTextDiff; - set => SetProperty(ref _useFullTextDiff, value); - } - - public bool UseBlockNavigationInDiffView - { - get => _useBlockNavigationInDiffView; - set => SetProperty(ref _useBlockNavigationInDiffView, value); - } - - public int LFSImageActiveIdx - { - get => _lfsImageActiveIdx; - set => SetProperty(ref _lfsImageActiveIdx, value); - } - - public Models.ChangeViewMode UnstagedChangeViewMode - { - get => _unstagedChangeViewMode; - set => SetProperty(ref _unstagedChangeViewMode, value); - } - - public Models.ChangeViewMode StagedChangeViewMode - { - get => _stagedChangeViewMode; - set => SetProperty(ref _stagedChangeViewMode, value); - } - - public Models.ChangeViewMode CommitChangeViewMode - { - get => _commitChangeViewMode; - set => SetProperty(ref _commitChangeViewMode, value); - } - - public string GitInstallPath - { - get => Native.OS.GitExecutable; - set - { - if (Native.OS.GitExecutable != value) - { - Native.OS.GitExecutable = value; - OnPropertyChanged(); - } - } - } - - public string GitDefaultCloneDir - { - get => _gitDefaultCloneDir; - set => SetProperty(ref _gitDefaultCloneDir, value); - } - - public int ShellOrTerminal - { - get => _shellOrTerminal; - set - { - if (SetProperty(ref _shellOrTerminal, value)) - { - if (value >= 0 && value < Models.ShellOrTerminal.Supported.Count) - Native.OS.SetShellOrTerminal(Models.ShellOrTerminal.Supported[value]); - else - Native.OS.SetShellOrTerminal(null); - - OnPropertyChanged(nameof(ShellOrTerminalPath)); - } - } - } - - public string ShellOrTerminalPath - { - get => Native.OS.ShellOrTerminal; - set - { - if (value != Native.OS.ShellOrTerminal) - { - Native.OS.ShellOrTerminal = value; - OnPropertyChanged(); - } - } - } - - public int ExternalMergeToolType - { - get => _externalMergeToolType; - set - { - var changed = SetProperty(ref _externalMergeToolType, value); - if (changed && !OperatingSystem.IsWindows() && value > 0 && value < Models.ExternalMerger.Supported.Count) - { - var tool = Models.ExternalMerger.Supported[value]; - if (File.Exists(tool.Exec)) - ExternalMergeToolPath = tool.Exec; - else - ExternalMergeToolPath = string.Empty; - } - } - } - - public string ExternalMergeToolPath - { - get => _externalMergeToolPath; - set => SetProperty(ref _externalMergeToolPath, value); - } - - public uint StatisticsSampleColor - { - get => _statisticsSampleColor; - set => SetProperty(ref _statisticsSampleColor, value); - } - - public List RepositoryNodes - { - get; - set; - } = []; - - public List Workspaces - { - get; - set; - } = []; - - public AvaloniaList CustomActions - { - get; - set; - } = []; - - public AvaloniaList OpenAIServices - { - get; - set; - } = []; - - public double LastCheckUpdateTime - { - get => _lastCheckUpdateTime; - set => SetProperty(ref _lastCheckUpdateTime, value); - } - - public void SetCanModify() - { - _isReadonly = false; - } - - public bool IsGitConfigured() - { - var path = GitInstallPath; - return !string.IsNullOrEmpty(path) && File.Exists(path); - } - - public bool ShouldCheck4UpdateOnStartup() - { - if (!_check4UpdatesOnStartup) - return false; - - var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime(); - var now = DateTime.Now; - - if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day) - return false; - - LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds; - return true; - } - - public Workspace GetActiveWorkspace() - { - foreach (var w in Workspaces) - { - if (w.IsActive) - return w; - } - - var first = Workspaces[0]; - first.IsActive = true; - return first; - } - - public void AddNode(RepositoryNode node, RepositoryNode to, bool save) - { - var collection = to == null ? RepositoryNodes : to.SubNodes; - collection.Add(node); - SortNodes(collection); - - if (save) - Save(); - } - - public void SortNodes(List collection) - { - collection?.Sort((l, r) => - { - if (l.IsRepository != r.IsRepository) - return l.IsRepository ? 1 : -1; - - return Models.NumericSort.Compare(l.Name, r.Name); - }); - } - - public RepositoryNode FindNode(string id) - { - return FindNodeRecursive(id, RepositoryNodes); - } - - public RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode, bool save = true) - { - var normalized = repo.Replace('\\', '/').TrimEnd('/'); - - var node = FindNodeRecursive(normalized, RepositoryNodes); - if (node == null) - { - node = new RepositoryNode() - { - Id = normalized, - Name = Path.GetFileName(normalized), - Bookmark = 0, - IsRepository = true, - }; - - AddNode(node, parent, save); - } - else if (shouldMoveNode) - { - MoveNode(node, parent, save); - } - - return node; - } - - public void MoveNode(RepositoryNode node, RepositoryNode to, bool save) - { - if (to == null && RepositoryNodes.Contains(node)) - return; - if (to != null && to.SubNodes.Contains(node)) - return; - - RemoveNode(node, false); - AddNode(node, to, false); - - if (save) - Save(); - } - - public void RemoveNode(RepositoryNode node, bool save) - { - RemoveNodeRecursive(node, RepositoryNodes); - - if (save) - Save(); - } - - public void SortByRenamedNode(RepositoryNode node) - { - var container = FindNodeContainer(node, RepositoryNodes); - SortNodes(container); - Save(); - } - - public void AutoRemoveInvalidNode() - { - RemoveInvalidRepositoriesRecursive(RepositoryNodes); - } - - public void Save() - { - if (_isLoading || _isReadonly) - return; - - var file = Path.Combine(Native.OS.DataDir, "preference.json"); - var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preferences); - File.WriteAllText(file, data); - } - - private static Preferences Load() - { - var path = Path.Combine(Native.OS.DataDir, "preference.json"); - if (!File.Exists(path)) - return new Preferences(); - - try - { - return JsonSerializer.Deserialize(File.ReadAllText(path), JsonCodeGen.Default.Preferences); - } - catch - { - return new Preferences(); - } - } - - private void PrepareGit() - { - var path = Native.OS.GitExecutable; - if (string.IsNullOrEmpty(path) || !File.Exists(path)) - GitInstallPath = Native.OS.FindGitExecutable(); - } - - private void PrepareShellOrTerminal() - { - if (_shellOrTerminal >= 0) - return; - - for (int i = 0; i < Models.ShellOrTerminal.Supported.Count; i++) - { - var shell = Models.ShellOrTerminal.Supported[i]; - if (Native.OS.TestShellOrTerminal(shell)) - { - ShellOrTerminal = i; - break; - } - } - } - - private void PrepareWorkspaces() - { - if (Workspaces.Count == 0) - { - Workspaces.Add(new Workspace() { Name = "Default" }); - return; - } - - foreach (var workspace in Workspaces) - { - if (!workspace.RestoreOnStartup) - { - workspace.Repositories.Clear(); - workspace.ActiveIdx = 0; - } - } - } - - private void SortNodesRecursive(List collection) - { - SortNodes(collection); - foreach (var node in collection) - SortNodesRecursive(node.SubNodes); - } - - private RepositoryNode FindNodeRecursive(string id, List collection) - { - foreach (var node in collection) - { - if (node.Id == id) - return node; - - var sub = FindNodeRecursive(id, node.SubNodes); - if (sub != null) - return sub; - } - - return null; - } - - private List FindNodeContainer(RepositoryNode node, List collection) - { - foreach (var sub in collection) - { - if (node == sub) - return collection; - - var subCollection = FindNodeContainer(node, sub.SubNodes); - if (subCollection != null) - return subCollection; - } - - return null; - } - - private bool RemoveNodeRecursive(RepositoryNode node, List collection) - { - if (collection.Contains(node)) - { - collection.Remove(node); - return true; - } - - foreach (var one in collection) - { - if (RemoveNodeRecursive(node, one.SubNodes)) - return true; - } - - return false; - } - - private bool RemoveInvalidRepositoriesRecursive(List collection) - { - bool changed = false; - - for (int i = collection.Count - 1; i >= 0; i--) - { - var node = collection[i]; - if (node.IsInvalid) - { - collection.RemoveAt(i); - changed = true; - } - else if (!node.IsRepository) - { - changed |= RemoveInvalidRepositoriesRecursive(node.SubNodes); - } - } - - return changed; - } - - private static Preferences _instance = null; - - private bool _isLoading = true; - private bool _isReadonly = true; - private string _locale = "en_US"; - private string _theme = "Default"; - private string _themeOverrides = string.Empty; - private string _defaultFontFamily = string.Empty; - private string _monospaceFontFamily = string.Empty; - private bool _onlyUseMonoFontInEditor = true; - private double _defaultFontSize = 13; - private double _editorFontSize = 13; - private int _editorTabWidth = 4; - private LayoutInfo _layout = new LayoutInfo(); - - private int _maxHistoryCommits = 20000; - private int _subjectGuideLength = 50; - private bool _useFixedTabWidth = true; - private bool _showAuthorTimeInGraph = false; - private bool _showChildren = false; - - private bool _check4UpdatesOnStartup = true; - private double _lastCheckUpdateTime = 0; - private string _ignoreUpdateTag = string.Empty; - - private bool _showTagsInGraph = true; - private bool _useTwoColumnsLayoutInHistories = false; - private bool _displayTimeAsPeriodInHistories = false; - private bool _useSideBySideDiff = false; - private bool _ignoreWhitespaceChangesInDiff = false; - private bool _useSyntaxHighlighting = false; - private bool _enableDiffViewWordWrap = false; - private bool _showHiddenSymbolsInDiffView = false; - private bool _useFullTextDiff = false; - private bool _useBlockNavigationInDiffView = false; - private int _lfsImageActiveIdx = 0; - - private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List; - private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List; - private Models.ChangeViewMode _commitChangeViewMode = Models.ChangeViewMode.List; - - private string _gitDefaultCloneDir = string.Empty; - - private int _shellOrTerminal = -1; - private int _externalMergeToolType = 0; - private string _externalMergeToolPath = string.Empty; - - private uint _statisticsSampleColor = 0xFF00FF00; - } -} diff --git a/src/ViewModels/PruneRemote.cs b/src/ViewModels/PruneRemote.cs index 007bcab8..12835761 100644 --- a/src/ViewModels/PruneRemote.cs +++ b/src/ViewModels/PruneRemote.cs @@ -7,12 +7,14 @@ namespace SourceGit.ViewModels public Models.Remote Remote { get; + private set; } public PruneRemote(Repository repo, Models.Remote remote) { _repo = repo; Remote = remote; + View = new Views.PruneRemote() { DataContext = this }; } public override Task Sure() @@ -20,13 +22,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Run `prune` on remote ..."; - var log = _repo.CreateLog($"Prune Remote '{Remote.Name}'"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Remote(_repo.FullPath).Use(log).Prune(Remote.Name); - log.Complete(); + var succ = new Commands.Remote(_repo.FullPath).Prune(Remote.Name); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); diff --git a/src/ViewModels/PruneWorktrees.cs b/src/ViewModels/PruneWorktrees.cs deleted file mode 100644 index 3cb884dc..00000000 --- a/src/ViewModels/PruneWorktrees.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class PruneWorktrees : Popup - { - public PruneWorktrees(Repository repo) - { - _repo = repo; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Prune worktrees ..."; - - var log = _repo.CreateLog("Prune Worktrees"); - Use(log); - - return Task.Run(() => - { - new Commands.Worktree(_repo.FullPath).Use(log).Prune(); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs index 1a6f2e01..6461e1b3 100644 --- a/src/ViewModels/Pull.cs +++ b/src/ViewModels/Pull.cs @@ -21,7 +21,16 @@ namespace SourceGit.ViewModels set { if (SetProperty(ref _selectedRemote, value)) - PostRemoteSelected(); + { + var branches = new List(); + foreach (var branch in _repo.Branches) + { + if (branch.Remote == value.Name) + branches.Add(branch); + } + RemoteBranches = branches; + SelectedBranch = branches.Count > 0 ? branches[0] : null; + } } } @@ -35,190 +44,111 @@ namespace SourceGit.ViewModels public Models.Branch SelectedBranch { get => _selectedBranch; - set => SetProperty(ref _selectedBranch, value, true); + set => SetProperty(ref _selectedBranch, value); } - public bool DiscardLocalChanges - { - get; - set; - } = false; - public bool UseRebase { - get => _repo.Settings.PreferRebaseInsteadOfMerge; - set => _repo.Settings.PreferRebaseInsteadOfMerge = value; - } + get; + set; + } = true; - public bool IsRecurseSubmoduleVisible + public bool AutoStash { - get => _repo.Submodules.Count > 0; - } - - public bool RecurseSubmodules - { - get => _repo.Settings.UpdateSubmodulesOnCheckoutBranch; - set => _repo.Settings.UpdateSubmodulesOnCheckoutBranch = value; - } + get; + set; + } = true; public Pull(Repository repo, Models.Branch specifiedRemoteBranch) { _repo = repo; - _current = repo.CurrentBranch; + _current = repo.Branches.Find(x => x.IsCurrent); if (specifiedRemoteBranch != null) { _selectedRemote = repo.Remotes.Find(x => x.Name == specifiedRemoteBranch.Remote); _selectedBranch = specifiedRemoteBranch; - - var branches = new List(); - foreach (var branch in _repo.Branches) - { - if (branch.Remote == specifiedRemoteBranch.Remote) - branches.Add(branch); - } - - _remoteBranches = branches; HasSpecifiedRemoteBranch = true; } else { - var autoSelectedRemote = null as Models.Remote; if (!string.IsNullOrEmpty(_current.Upstream)) { - var remoteNameEndIdx = _current.Upstream.IndexOf('/', 13); - if (remoteNameEndIdx > 0) + foreach (var branch in repo.Branches) { - var remoteName = _current.Upstream.Substring(13, remoteNameEndIdx - 13); - autoSelectedRemote = _repo.Remotes.Find(x => x.Name == remoteName); + if (!branch.IsLocal && _current.Upstream == branch.FullName) + { + _selectedRemote = repo.Remotes.Find(x => x.Name == branch.Remote); + _selectedBranch = branch; + break; + } } } - if (autoSelectedRemote == null) - { - var remote = null as Models.Remote; - if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote)) - remote = _repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote); - _selectedRemote = remote ?? _repo.Remotes[0]; - } - else - { - _selectedRemote = autoSelectedRemote; - } - - PostRemoteSelected(); HasSpecifiedRemoteBranch = false; } + + // Make sure remote is exists. + if (_selectedRemote == null) + { + _selectedRemote = repo.Remotes[0]; + _selectedBranch = null; + HasSpecifiedRemoteBranch = false; + } + + _remoteBranches = new List(); + foreach (var branch in _repo.Branches) + { + if (branch.Remote == _selectedRemote.Name) + _remoteBranches.Add(branch); + } + + if (_selectedBranch == null && _remoteBranches.Count > 0) + { + _selectedBranch = _remoteBranches[0]; + } + + View = new Views.Pull() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - - var log = _repo.CreateLog("Pull"); - Use(log); - - var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules; return Task.Run(() => { - var changes = new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).Result(); var needPopStash = false; - if (changes > 0) + if (AutoStash && _repo.WorkingCopyChangesCount > 0) { - if (DiscardLocalChanges) + SetProgressDescription("Adding untracked changes..."); + var succ = new Commands.Add(_repo.FullPath).Exec(); + if (succ) { - Commands.Discard.All(_repo.FullPath, false, log); + SetProgressDescription("Stash local changes..."); + succ = new Commands.Stash(_repo.FullPath).Push("PULL_AUTO_STASH"); } - else - { - var succ = new Commands.Stash(_repo.FullPath).Use(log).Push("PULL_AUTO_STASH"); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } - needPopStash = true; + if (!succ) + { + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return false; } + + needPopStash = true; } - bool rs = new Commands.Pull( - _repo.FullPath, - _selectedRemote.Name, - !string.IsNullOrEmpty(_current.Upstream) && _current.Upstream.Equals(_selectedBranch.FullName) ? string.Empty : _selectedBranch.Name, - UseRebase).Use(log).Exec(); - - if (rs) + SetProgressDescription($"Pull {_selectedRemote.Name}/{_selectedBranch.Name}..."); + var rs = new Commands.Pull(_repo.FullPath, _selectedRemote.Name, _selectedBranch.Name, UseRebase, SetProgressDescription).Exec(); + if (rs && needPopStash) { - if (updateSubmodules) - { - var submodules = new Commands.QueryUpdatableSubmodules(_repo.FullPath).Result(); - if (submodules.Count > 0) - new Commands.Submodule(_repo.FullPath).Use(log).Update(submodules, true, true); - } - - if (needPopStash) - new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}"); + SetProgressDescription("Re-apply local changes..."); + rs = new Commands.Stash(_repo.FullPath).Pop("stash@{0}"); } - log.Complete(); - - var head = new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").Result(); - CallUIThread(() => - { - _repo.NavigateToCommit(head, true); - _repo.SetWatcherEnabled(true); - }); - + CallUIThread(() => _repo.SetWatcherEnabled(true)); return rs; }); } - private void PostRemoteSelected() - { - var remoteName = _selectedRemote.Name; - var branches = new List(); - foreach (var branch in _repo.Branches) - { - if (branch.Remote == remoteName) - branches.Add(branch); - } - - RemoteBranches = branches; - - var autoSelectedBranch = false; - if (!string.IsNullOrEmpty(_current.Upstream) && - _current.Upstream.StartsWith($"refs/remotes/{remoteName}/", System.StringComparison.Ordinal)) - { - foreach (var branch in branches) - { - if (_current.Upstream == branch.FullName) - { - SelectedBranch = branch; - autoSelectedBranch = true; - break; - } - } - } - - if (!autoSelectedBranch) - { - foreach (var branch in branches) - { - if (_current.Name == branch.Name) - { - SelectedBranch = branch; - autoSelectedBranch = true; - break; - } - } - } - - if (!autoSelectedBranch) - SelectedBranch = null; - } - private readonly Repository _repo = null; private readonly Models.Branch _current = null; private Models.Remote _selectedRemote = null; diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs index 917935b0..4036d030 100644 --- a/src/ViewModels/Push.cs +++ b/src/ViewModels/Push.cs @@ -18,14 +18,33 @@ namespace SourceGit.ViewModels get => _selectedLocalBranch; set { - if (SetProperty(ref _selectedLocalBranch, value, true)) + if (SetProperty(ref _selectedLocalBranch, value)) + { + // If selected local branch has upstream branch. Try to find it's remote. + if (!string.IsNullOrEmpty(value.Upstream)) + { + var branch = _repo.Branches.Find(x => x.FullName == value.Upstream); + if (branch != null) + { + var remote = _repo.Remotes.Find(x => x.Name == branch.Remote); + if (remote != null && remote != _selectedRemote) + { + SelectedRemote = remote; + return; + } + } + } + + // Re-generate remote branches and auto-select remote branches. AutoSelectBranchByRemote(); + } } } public List LocalBranches { get; + private set; } public List Remotes @@ -39,7 +58,7 @@ namespace SourceGit.ViewModels get => _selectedRemote; set { - if (SetProperty(ref _selectedRemote, value, true)) + if (SetProperty(ref _selectedRemote, value)) AutoSelectBranchByRemote(); } } @@ -54,40 +73,13 @@ namespace SourceGit.ViewModels public Models.Branch SelectedRemoteBranch { get => _selectedRemoteBranch; - set - { - if (SetProperty(ref _selectedRemoteBranch, value, true)) - IsSetTrackOptionVisible = value != null && _selectedLocalBranch.Upstream != value.FullName; - } + set => SetProperty(ref _selectedRemoteBranch, value); } - public bool IsSetTrackOptionVisible - { - get => _isSetTrackOptionVisible; - private set => SetProperty(ref _isSetTrackOptionVisible, value); - } - - public bool Tracking - { - get; - set; - } = true; - - public bool IsCheckSubmodulesVisible - { - get => _repo.Submodules.Count > 0; - } - - public bool CheckSubmodules - { - get; - set; - } = true; - public bool PushAllTags { - get => _repo.Settings.PushAllTags; - set => _repo.Settings.PushAllTags = value; + get; + set; } public bool ForcePush @@ -114,9 +106,6 @@ namespace SourceGit.ViewModels // Set default selected local branch. if (localBranch != null) { - if (LocalBranches.Count == 0) - LocalBranches.Add(localBranch); - _selectedLocalBranch = localBranch; HasSpecifiedLocalBranch = true; } @@ -127,7 +116,7 @@ namespace SourceGit.ViewModels } // Find preferred remote if selected local branch has upstream. - if (!string.IsNullOrEmpty(_selectedLocalBranch?.Upstream)) + if (!string.IsNullOrEmpty(_selectedLocalBranch.Upstream)) { foreach (var branch in repo.Branches) { @@ -139,35 +128,23 @@ namespace SourceGit.ViewModels } } - // Set default remote to the first if it has not been set. + // Set default remote to the first if haven't been set. if (_selectedRemote == null) - { - var remote = null as Models.Remote; - if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote)) - remote = repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote); - - _selectedRemote = remote ?? repo.Remotes[0]; - } + _selectedRemote = repo.Remotes[0]; // Auto select preferred remote branch. AutoSelectBranchByRemote(); - } - public override bool CanStartDirectly() - { - return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head); + View = new Views.Push() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - var remoteBranchName = _selectedRemoteBranch.Name; + var remoteBranchName = _selectedRemoteBranch.Name.Replace(" (new)", ""); ProgressDescription = $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ..."; - var log = _repo.CreateLog("Push"); - Use(log); - return Task.Run(() => { var succ = new Commands.Push( @@ -176,11 +153,9 @@ namespace SourceGit.ViewModels _selectedRemote.Name, remoteBranchName, PushAllTags, - _repo.Submodules.Count > 0 && CheckSubmodules, - _isSetTrackOptionVisible && Tracking, - ForcePush).Use(log).Exec(); - - log.Complete(); + ForcePush, + string.IsNullOrEmpty(_selectedLocalBranch.Upstream), + SetProgressDescription).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); @@ -196,7 +171,7 @@ namespace SourceGit.ViewModels branches.Add(branch); } - // If selected local branch has upstream. Try to find it in current remote branches. + // If selected local branch has upstream branch. Try to find it in current remote branches. if (!string.IsNullOrEmpty(_selectedLocalBranch.Upstream)) { foreach (var branch in branches) @@ -210,7 +185,7 @@ namespace SourceGit.ViewModels } } - // Try to find a remote branch with the same name of selected local branch. + // Find best remote branch by name. foreach (var branch in branches) { if (_selectedLocalBranch.Name == branch.Name) @@ -224,7 +199,7 @@ namespace SourceGit.ViewModels // Add a fake new branch. var fake = new Models.Branch() { - Name = _selectedLocalBranch.Name, + Name = $"{_selectedLocalBranch.Name} (new)", Remote = _selectedRemote.Name, }; branches.Add(fake); @@ -235,8 +210,7 @@ namespace SourceGit.ViewModels private readonly Repository _repo = null; private Models.Branch _selectedLocalBranch = null; private Models.Remote _selectedRemote = null; - private List _remoteBranches = []; + private List _remoteBranches = new List(); private Models.Branch _selectedRemoteBranch = null; - private bool _isSetTrackOptionVisible = false; } } diff --git a/src/ViewModels/PushTag.cs b/src/ViewModels/PushTag.cs index 8cdf9767..da8980a9 100644 --- a/src/ViewModels/PushTag.cs +++ b/src/ViewModels/PushTag.cs @@ -8,6 +8,7 @@ namespace SourceGit.ViewModels public Models.Tag Target { get; + private set; } public List Remotes @@ -21,52 +22,27 @@ namespace SourceGit.ViewModels set; } - public bool PushAllRemotes - { - get => _pushAllRemotes; - set => SetProperty(ref _pushAllRemotes, value); - } - public PushTag(Repository repo, Models.Tag target) { _repo = repo; Target = target; SelectedRemote = _repo.Remotes[0]; + View = new Views.PushTag() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - ProgressDescription = $"Pushing tag ..."; - - var log = _repo.CreateLog("Push Tag"); - Use(log); + ProgressDescription = $"Pushing tag '{Target.Name}' to remote '{SelectedRemote.Name}' ..."; return Task.Run(() => { - var succ = true; - var tag = $"refs/tags/{Target.Name}"; - if (_pushAllRemotes) - { - foreach (var remote in _repo.Remotes) - { - succ = new Commands.Push(_repo.FullPath, remote.Name, tag, false).Use(log).Exec(); - if (!succ) - break; - } - } - else - { - succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, tag, false).Use(log).Exec(); - } - - log.Complete(); + var succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, Target.Name, false).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } private readonly Repository _repo = null; - private bool _pushAllRemotes = false; } } diff --git a/src/ViewModels/Rebase.cs b/src/ViewModels/Rebase.cs index 0fc8ec89..79dd9fab 100644 --- a/src/ViewModels/Rebase.cs +++ b/src/ViewModels/Rebase.cs @@ -29,6 +29,7 @@ namespace SourceGit.ViewModels Current = current; On = on; AutoStash = true; + View = new Views.Rebase() { DataContext = this }; } public Rebase(Repository repo, Models.Branch current, Models.Commit on) @@ -38,27 +39,23 @@ namespace SourceGit.ViewModels Current = current; On = on; AutoStash = true; + View = new Views.Rebase() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - _repo.ClearCommitMessage(); ProgressDescription = "Rebasing ..."; - var log = _repo.CreateLog("Rebase"); - Use(log); - return Task.Run(() => { - new Commands.Rebase(_repo.FullPath, _revision, AutoStash).Use(log).Exec(); - log.Complete(); + var succ = new Commands.Rebase(_repo.FullPath, _revision, AutoStash).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; + return succ; }); } - private readonly Repository _repo; - private readonly string _revision; + private readonly Repository _repo = null; + private readonly string _revision = string.Empty; } } diff --git a/src/ViewModels/RemoveWorktree.cs b/src/ViewModels/RemoveWorktree.cs deleted file mode 100644 index d5de8533..00000000 --- a/src/ViewModels/RemoveWorktree.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class RemoveWorktree : Popup - { - public Models.Worktree Target - { - get; - } - - public bool Force - { - get; - set; - } = false; - - public RemoveWorktree(Repository repo, Models.Worktree target) - { - _repo = repo; - Target = target; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = "Remove worktree ..."; - - var log = _repo.CreateLog("Remove worktree"); - Use(log); - - return Task.Run(() => - { - var succ = new Commands.Worktree(_repo.FullPath).Use(log).Remove(Target.FullPath, Force); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private readonly Repository _repo = null; - } -} diff --git a/src/ViewModels/RenameBranch.cs b/src/ViewModels/RenameBranch.cs index 22cd2688..401be24e 100644 --- a/src/ViewModels/RenameBranch.cs +++ b/src/ViewModels/RenameBranch.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; namespace SourceGit.ViewModels @@ -9,10 +8,11 @@ namespace SourceGit.ViewModels public Models.Branch Target { get; + private set; } [Required(ErrorMessage = "Branch name is required!!!")] - [RegularExpression(@"^[\w \-/\.#\+]+$", ErrorMessage = "Bad branch name format!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] [CustomValidation(typeof(RenameBranch), nameof(ValidateBranchName))] public string Name { @@ -25,16 +25,16 @@ namespace SourceGit.ViewModels _repo = repo; _name = target.Name; Target = target; + View = new Views.RenameBranch() { DataContext = this }; } public static ValidationResult ValidateBranchName(string name, ValidationContext ctx) { if (ctx.ObjectInstance is RenameBranch rename) { - var fixedName = rename.FixName(name); foreach (var b in rename._repo.Branches) { - if (b.IsLocal && b != rename.Target && b.Name == fixedName) + if (b != rename.Target && b.Name == name) { return new ValidationResult("A branch with same name already exists!!!"); } @@ -46,61 +46,21 @@ namespace SourceGit.ViewModels public override Task Sure() { - var fixedName = FixName(_name); - if (fixedName == Target.Name) + if (_name == Target.Name) return null; _repo.SetWatcherEnabled(false); ProgressDescription = $"Rename '{Target.Name}'"; - var log = _repo.CreateLog($"Rename Branch '{Target.Name}'"); - Use(log); - return Task.Run(() => { - var isCurrent = Target.IsCurrent; - var oldName = Target.FullName; - var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, fixedName, log); - log.Complete(); - - CallUIThread(() => - { - ProgressDescription = "Waiting for branch updated..."; - - if (succ) - { - foreach (var filter in _repo.Settings.HistoriesFilters) - { - if (filter.Type == Models.FilterType.LocalBranch && - filter.Pattern.Equals(oldName, StringComparison.Ordinal)) - { - filter.Pattern = $"refs/heads/{fixedName}"; - break; - } - } - } - - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - }); - - if (isCurrent) - Task.Delay(400).Wait(); - + var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, _name); + CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private string FixName(string name) - { - if (!name.Contains(' ')) - return name; - - var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries); - return string.Join("-", parts); - } - - private readonly Repository _repo; - private string _name; + private readonly Repository _repo = null; + private string _name = string.Empty; } } diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index 742d3634..43665925 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -1,15 +1,14 @@ using System; using System.Collections.Generic; using System.IO; -using System.Text; -using System.Text.Json; -using System.Threading; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Avalonia.Collections; using Avalonia.Controls; using Avalonia.Media; using Avalonia.Media.Imaging; +using Avalonia.Platform; using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; @@ -18,11 +17,6 @@ namespace SourceGit.ViewModels { public class Repository : ObservableObject, Models.IRepository { - public bool IsBare - { - get; - } - public string FullPath { get => _fullpath; @@ -30,7 +24,7 @@ namespace SourceGit.ViewModels { if (value != null) { - var normalized = value.Replace('\\', '/').TrimEnd('/'); + var normalized = value.Replace('\\', '/'); SetProperty(ref _fullpath, normalized); } else @@ -46,28 +40,26 @@ namespace SourceGit.ViewModels set => SetProperty(ref _gitDir, value); } - public Models.RepositorySettings Settings - { - get => _settings; - } - - public Models.GitFlow GitFlow + public AvaloniaList Filters { get; set; - } = new Models.GitFlow(); + } = new AvaloniaList(); - public Models.FilterMode HistoriesFilterMode + public AvaloniaList CommitMessages { - get => _historiesFilterMode; - private set => SetProperty(ref _historiesFilterMode, value); - } - - public bool HasAllowedSignersFile - { - get => _hasAllowedSignersFile; + get; + set; + } = new AvaloniaList(); + + [JsonIgnore] + public Models.GitFlow GitFlow + { + get => _gitflow; + set => SetProperty(ref _gitflow, value); } + [JsonIgnore] public int SelectedViewIndex { get => _selectedViewIndex; @@ -91,197 +83,88 @@ namespace SourceGit.ViewModels } } + [JsonIgnore] public object SelectedView { get => _selectedView; set => SetProperty(ref _selectedView, value); } - public bool EnableReflog - { - get => _settings.EnableReflog; - set - { - if (value != _settings.EnableReflog) - { - _settings.EnableReflog = value; - OnPropertyChanged(); - Task.Run(RefreshCommits); - } - } - } - - public bool EnableFirstParentInHistories - { - get => _settings.EnableFirstParentInHistories; - set - { - if (value != _settings.EnableFirstParentInHistories) - { - _settings.EnableFirstParentInHistories = value; - OnPropertyChanged(); - Task.Run(RefreshCommits); - } - } - } - - public bool OnlyHighlightCurrentBranchInHistories - { - get => _settings.OnlyHighlightCurrentBranchInHistories; - set - { - if (value != _settings.OnlyHighlightCurrentBranchInHistories) - { - _settings.OnlyHighlightCurrentBranchInHistories = value; - OnPropertyChanged(); - } - } - } - - public string Filter - { - get => _filter; - set - { - if (SetProperty(ref _filter, value)) - { - var builder = BuildBranchTree(_branches, _remotes); - LocalBranchTrees = builder.Locals; - RemoteBranchTrees = builder.Remotes; - VisibleTags = BuildVisibleTags(); - VisibleSubmodules = BuildVisibleSubmodules(); - } - } - } - + [JsonIgnore] public List Remotes { get => _remotes; private set => SetProperty(ref _remotes, value); } + [JsonIgnore] public List Branches { get => _branches; private set => SetProperty(ref _branches, value); } - public Models.Branch CurrentBranch - { - get => _currentBranch; - private set - { - var oldHead = _currentBranch?.Head; - if (SetProperty(ref _currentBranch, value)) - { - if (oldHead != _currentBranch.Head && _workingCopy is { UseAmend: true }) - _workingCopy.UseAmend = false; - } - } - } - - public List LocalBranchTrees + [JsonIgnore] + public List LocalBranchTrees { get => _localBranchTrees; private set => SetProperty(ref _localBranchTrees, value); } - public List RemoteBranchTrees + [JsonIgnore] + public List RemoteBranchTrees { get => _remoteBranchTrees; private set => SetProperty(ref _remoteBranchTrees, value); } - public List Worktrees - { - get => _worktrees; - private set => SetProperty(ref _worktrees, value); - } - + [JsonIgnore] public List Tags { get => _tags; private set => SetProperty(ref _tags, value); } - public bool ShowTagsAsTree - { - get => Preferences.Instance.ShowTagsAsTree; - set - { - if (value != Preferences.Instance.ShowTagsAsTree) - { - Preferences.Instance.ShowTagsAsTree = value; - VisibleTags = BuildVisibleTags(); - OnPropertyChanged(); - } - } - } - - public object VisibleTags - { - get => _visibleTags; - private set => SetProperty(ref _visibleTags, value); - } - - public List Submodules + [JsonIgnore] + public List Submodules { get => _submodules; private set => SetProperty(ref _submodules, value); } - public bool ShowSubmodulesAsTree + [JsonIgnore] + public int WorkingCopyChangesCount { - get => Preferences.Instance.ShowSubmodulesAsTree; - set - { - if (value != Preferences.Instance.ShowSubmodulesAsTree) - { - Preferences.Instance.ShowSubmodulesAsTree = value; - VisibleSubmodules = BuildVisibleSubmodules(); - OnPropertyChanged(); - } - } - } - - public object VisibleSubmodules - { - get => _visibleSubmodules; - private set => SetProperty(ref _visibleSubmodules, value); - } - - public int LocalChangesCount - { - get => _localChangesCount; - private set => SetProperty(ref _localChangesCount, value); + get => _workingCopy == null ? 0 : _workingCopy.Count; } + [JsonIgnore] public int StashesCount { - get => _stashesCount; - private set => SetProperty(ref _stashesCount, value); + get => _stashesPage == null ? 0 : _stashesPage.Count; } - public int LocalBranchesCount + [JsonIgnore] + public bool CanCommitWithPush { - get => _localBranchesCount; - private set => SetProperty(ref _localBranchesCount, value); + get => _canCommitWithPush; + private set => SetProperty(ref _canCommitWithPush, value); } + [JsonIgnore] public bool IncludeUntracked { - get => _settings.IncludeUntrackedInLocalChanges; + get => _includeUntracked; set { - if (value != _settings.IncludeUntrackedInLocalChanges) + if (SetProperty(ref _includeUntracked, value)) { - _settings.IncludeUntrackedInLocalChanges = value; - OnPropertyChanged(); Task.Run(RefreshWorkingCopyChanges); } } } + [JsonIgnore] public bool IsSearching { get => _isSearching; @@ -289,552 +172,216 @@ namespace SourceGit.ViewModels { if (SetProperty(ref _isSearching, value)) { + SearchedCommits = new List(); + SearchCommitFilter = string.Empty; if (value) - { SelectedViewIndex = 0; - CalcWorktreeFilesForSearching(); - } - else - { - SearchedCommits = new List(); - SelectedSearchedCommit = null; - SearchCommitFilter = string.Empty; - MatchedFilesForSearching = null; - _requestingWorktreeFiles = false; - _worktreeFiles = null; - } - } - } - } - - public bool IsSearchLoadingVisible - { - get => _isSearchLoadingVisible; - private set => SetProperty(ref _isSearchLoadingVisible, value); - } - - public bool OnlySearchCommitsInCurrentBranch - { - get => _onlySearchCommitsInCurrentBranch; - set - { - if (SetProperty(ref _onlySearchCommitsInCurrentBranch, value) && !string.IsNullOrEmpty(_searchCommitFilter)) - StartSearchCommits(); - } - } - - public int SearchCommitFilterType - { - get => _searchCommitFilterType; - set - { - if (SetProperty(ref _searchCommitFilterType, value)) - { - CalcWorktreeFilesForSearching(); - if (!string.IsNullOrEmpty(_searchCommitFilter)) - StartSearchCommits(); } } } + [JsonIgnore] public string SearchCommitFilter { get => _searchCommitFilter; - set - { - if (SetProperty(ref _searchCommitFilter, value) && IsSearchingCommitsByFilePath()) - CalcMatchedFilesForSearching(); - } - } - - public List MatchedFilesForSearching - { - get => _matchedFilesForSearching; - private set => SetProperty(ref _matchedFilesForSearching, value); + set => SetProperty(ref _searchCommitFilter, value); } + [JsonIgnore] public List SearchedCommits { get => _searchedCommits; set => SetProperty(ref _searchedCommits, value); } - public Models.Commit SelectedSearchedCommit - { - get => _selectedSearchedCommit; - set - { - if (SetProperty(ref _selectedSearchedCommit, value) && value != null) - NavigateToCommit(value.SHA); - } - } - - public bool IsLocalBranchGroupExpanded - { - get => _settings.IsLocalBranchesExpandedInSideBar; - set - { - if (value != _settings.IsLocalBranchesExpandedInSideBar) - { - _settings.IsLocalBranchesExpandedInSideBar = value; - OnPropertyChanged(); - } - } - } - - public bool IsRemoteGroupExpanded - { - get => _settings.IsRemotesExpandedInSideBar; - set - { - if (value != _settings.IsRemotesExpandedInSideBar) - { - _settings.IsRemotesExpandedInSideBar = value; - OnPropertyChanged(); - } - } - } - + [JsonIgnore] public bool IsTagGroupExpanded { - get => _settings.IsTagsExpandedInSideBar; - set - { - if (value != _settings.IsTagsExpandedInSideBar) - { - _settings.IsTagsExpandedInSideBar = value; - OnPropertyChanged(); - } - } + get => _isTagGroupExpanded; + set => SetProperty(ref _isTagGroupExpanded, value); } + [JsonIgnore] public bool IsSubmoduleGroupExpanded { - get => _settings.IsSubmodulesExpandedInSideBar; - set - { - if (value != _settings.IsSubmodulesExpandedInSideBar) - { - _settings.IsSubmodulesExpandedInSideBar = value; - OnPropertyChanged(); - } - } - } - - public bool IsWorktreeGroupExpanded - { - get => _settings.IsWorktreeExpandedInSideBar; - set - { - if (value != _settings.IsWorktreeExpandedInSideBar) - { - _settings.IsWorktreeExpandedInSideBar = value; - OnPropertyChanged(); - } - } - } - - public bool IsSortingLocalBranchByName - { - get => _settings.LocalBranchSortMode == Models.BranchSortMode.Name; - } - - public bool IsSortingRemoteBranchByName - { - get => _settings.RemoteBranchSortMode == Models.BranchSortMode.Name; - } - - public bool IsSortingTagsByName - { - get => _settings.TagSortMode == Models.TagSortMode.Name; + get => _isSubmoduleGroupExpanded; + set => SetProperty(ref _isSubmoduleGroupExpanded, value); } + [JsonIgnore] public InProgressContext InProgressContext { - get => _workingCopy?.InProgressContext; + get => _inProgressContext; + private set => SetProperty(ref _inProgressContext, value); } - public Models.BisectState BisectState + [JsonIgnore] + public bool HasUnsolvedConflicts { - get => _bisectState; - private set => SetProperty(ref _bisectState, value); - } - - public bool IsBisectCommandRunning - { - get => _isBisectCommandRunning; - private set => SetProperty(ref _isBisectCommandRunning, value); - } - - public bool IsAutoFetching - { - get => _isAutoFetching; - private set => SetProperty(ref _isAutoFetching, value); - } - - public int CommitDetailActivePageIndex - { - get; - set; - } = 0; - - public AvaloniaList Logs - { - get; - private set; - } = new AvaloniaList(); - - public Repository(bool isBare, string path, string gitDir) - { - IsBare = isBare; - FullPath = path; - GitDir = gitDir; + get => _hasUnsolvedConflicts; + private set => SetProperty(ref _hasUnsolvedConflicts, value); } public void Open() { - var settingsFile = Path.Combine(_gitDir, "sourcegit.settings"); - if (File.Exists(settingsFile)) - { - try - { - _settings = JsonSerializer.Deserialize(File.ReadAllText(settingsFile), JsonCodeGen.Default.RepositorySettings); - } - catch - { - _settings = new Models.RepositorySettings(); - } - } - else - { - _settings = new Models.RepositorySettings(); - } - - try - { - // For worktrees, we need to watch the $GIT_COMMON_DIR instead of the $GIT_DIR. - var gitDirForWatcher = _gitDir; - if (_gitDir.Replace('\\', '/').IndexOf("/worktrees/", StringComparison.Ordinal) > 0) - { - var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result(); - if (!string.IsNullOrEmpty(commonDir)) - gitDirForWatcher = commonDir; - } - - _watcher = new Models.Watcher(this, _fullpath, gitDirForWatcher); - } - catch (Exception ex) - { - App.RaiseException(string.Empty, $"Failed to start watcher for repository: '{_fullpath}'. You may need to press 'F5' to refresh repository manually!\n\nReason: {ex.Message}"); - } - - if (_settings.HistoriesFilters.Count > 0) - _historiesFilterMode = _settings.HistoriesFilters[0].Mode; - else - _historiesFilterMode = Models.FilterMode.None; - + _watcher = new Models.Watcher(this); _histories = new Histories(this); _workingCopy = new WorkingCopy(this); _stashesPage = new StashesPage(this); _selectedView = _histories; _selectedViewIndex = 0; + _inProgressContext = null; + _hasUnsolvedConflicts = false; - _workingCopy.CommitMessage = _settings.LastCommitMessage; - _autoFetchTimer = new Timer(AutoFetchImpl, null, 5000, 5000); - RefreshAll(); + Task.Run(() => + { + RefreshBranches(); + RefreshTags(); + RefreshCommits(); + }); + + Task.Run(RefreshSubmodules); + Task.Run(RefreshWorkingCopyChanges); + Task.Run(RefreshStashes); + Task.Run(RefreshGitFlow); } public void Close() { - SelectedView = null; // Do NOT modify. Used to remove exists widgets for GC.Collect - Logs.Clear(); + SelectedView = 0.0; // Do NOT modify. Used to remove exists widgets for GC.Collect - _settings.LastCommitMessage = _workingCopy.CommitMessage; - - var settingsSerialized = JsonSerializer.Serialize(_settings, JsonCodeGen.Default.RepositorySettings); - try - { - File.WriteAllText(Path.Combine(_gitDir, "sourcegit.settings"), settingsSerialized); - } - catch - { - // Ignore - } - _autoFetchTimer.Dispose(); - _autoFetchTimer = null; - - _settings = null; - _historiesFilterMode = Models.FilterMode.None; - - _watcher?.Dispose(); - _histories.Dispose(); - _workingCopy.Dispose(); - _stashesPage.Dispose(); + _watcher.Dispose(); + _histories.Cleanup(); + _workingCopy.Cleanup(); + _stashesPage.Cleanup(); _watcher = null; _histories = null; _workingCopy = null; _stashesPage = null; + _isSearching = false; + _searchCommitFilter = string.Empty; - _localChangesCount = 0; - _stashesCount = 0; + _isTagGroupExpanded = false; + _isSubmoduleGroupExpanded = false; + + _inProgressContext = null; + _hasUnsolvedConflicts = false; _remotes.Clear(); _branches.Clear(); _localBranchTrees.Clear(); _remoteBranchTrees.Clear(); _tags.Clear(); - _visibleTags = null; _submodules.Clear(); - _visibleSubmodules = null; _searchedCommits.Clear(); - _selectedSearchedCommit = null; - - _requestingWorktreeFiles = false; - _worktreeFiles = null; - _matchedFilesForSearching = null; } - public bool CanCreatePopup() + public void OpenInFileManager() { - var page = GetOwnerPage(); - if (page == null) - return false; - - return !_isAutoFetching && page.CanCreatePopup(); + Native.OS.OpenInFileManager(_fullpath); } - public void ShowPopup(Popup popup) + public void OpenInTerminal() { - var page = GetOwnerPage(); - if (page != null) - page.Popup = popup; - } - - public void ShowAndStartPopup(Popup popup) - { - GetOwnerPage()?.StartPopup(popup); - } - - public bool IsGitFlowEnabled() - { - return GitFlow is { IsValid: true } && - _branches.Find(x => x.IsLocal && x.Name.Equals(GitFlow.Master, StringComparison.Ordinal)) != null && - _branches.Find(x => x.IsLocal && x.Name.Equals(GitFlow.Develop, StringComparison.Ordinal)) != null; - } - - public Models.GitFlowBranchType GetGitFlowType(Models.Branch b) - { - if (!IsGitFlowEnabled()) - return Models.GitFlowBranchType.None; - - var name = b.Name; - if (name.StartsWith(GitFlow.FeaturePrefix, StringComparison.Ordinal)) - return Models.GitFlowBranchType.Feature; - if (name.StartsWith(GitFlow.ReleasePrefix, StringComparison.Ordinal)) - return Models.GitFlowBranchType.Release; - if (name.StartsWith(GitFlow.HotfixPrefix, StringComparison.Ordinal)) - return Models.GitFlowBranchType.Hotfix; - return Models.GitFlowBranchType.None; - } - - public CommandLog CreateLog(string name) - { - var log = new CommandLog(name); - Logs.Insert(0, log); - return log; - } - - public void RefreshAll() - { - Task.Run(RefreshCommits); - Task.Run(RefreshBranches); - Task.Run(RefreshTags); - Task.Run(RefreshSubmodules); - Task.Run(RefreshWorktrees); - Task.Run(RefreshWorkingCopyChanges); - Task.Run(RefreshStashes); - - Task.Run(() => - { - var config = new Commands.Config(_fullpath).ListAll(); - _hasAllowedSignersFile = config.TryGetValue("gpg.ssh.allowedSignersFile", out var allowedSignersFile) && !string.IsNullOrEmpty(allowedSignersFile); - - if (config.TryGetValue("gitflow.branch.master", out var masterName)) - GitFlow.Master = masterName; - if (config.TryGetValue("gitflow.branch.develop", out var developName)) - GitFlow.Develop = developName; - if (config.TryGetValue("gitflow.prefix.feature", out var featurePrefix)) - GitFlow.FeaturePrefix = featurePrefix; - if (config.TryGetValue("gitflow.prefix.release", out var releasePrefix)) - GitFlow.ReleasePrefix = releasePrefix; - if (config.TryGetValue("gitflow.prefix.hotfix", out var hotfixPrefix)) - GitFlow.HotfixPrefix = hotfixPrefix; - }); + Native.OS.OpenTerminal(_fullpath); } public ContextMenu CreateContextMenuForExternalTools() { + var tools = Native.OS.ExternalTools; + if (tools.Count == 0) + { + App.RaiseException(_fullpath, "No available external editors found!"); + return null; + } + var menu = new ContextMenu(); menu.Placement = PlacementMode.BottomEdgeAlignedLeft; - RenderOptions.SetBitmapInterpolationMode(menu, BitmapInterpolationMode.HighQuality); - RenderOptions.SetEdgeMode(menu, EdgeMode.Antialias); - RenderOptions.SetTextRenderingMode(menu, TextRenderingMode.Antialias); - var explore = new MenuItem(); - explore.Header = App.Text("Repository.Explore"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.Click += (_, e) => + foreach (var tool in tools) { - Native.OS.OpenInFileManager(_fullpath); - e.Handled = true; - }; + var dupTool = tool; - var terminal = new MenuItem(); - terminal.Header = App.Text("Repository.Terminal"); - terminal.Icon = App.CreateMenuIcon("Icons.Terminal"); - terminal.Click += (_, e) => - { - Native.OS.OpenTerminal(_fullpath); - e.Handled = true; - }; - - menu.Items.Add(explore); - menu.Items.Add(terminal); - - var tools = Native.OS.ExternalTools; - if (tools.Count > 0) - { - menu.Items.Add(new MenuItem() { Header = "-" }); - - foreach (var tool in Native.OS.ExternalTools) + var item = new MenuItem(); + item.Header = App.Text("Repository.OpenIn", dupTool.Name); + item.Icon = new Image { Width = 16, Height = 16, Source = dupTool.IconImage }; + item.Click += (o, e) => { - var dupTool = tool; + dupTool.Open(_fullpath); + e.Handled = true; + }; - var item = new MenuItem(); - item.Header = App.Text("Repository.OpenIn", dupTool.Name); - item.Icon = new Image { Width = 16, Height = 16, Source = dupTool.IconImage }; - item.Click += (_, e) => - { - dupTool.Open(_fullpath); - e.Handled = true; - }; - - menu.Items.Add(item); - } - } - - var urls = new Dictionary(); - foreach (var r in _remotes) - { - if (r.TryGetVisitURL(out var visit)) - urls.Add(r.Name, visit); - } - - if (urls.Count > 0) - { - menu.Items.Add(new MenuItem() { Header = "-" }); - - foreach (var (name, addr) in urls) - { - var item = new MenuItem(); - item.Header = App.Text("Repository.Visit", name); - item.Icon = App.CreateMenuIcon("Icons.Remotes"); - item.Click += (_, e) => - { - Native.OS.OpenBrowser(addr); - e.Handled = true; - }; - - menu.Items.Add(item); - } + menu.Items.Add(item); } return menu; } - public void Fetch(bool autoStart) + public void Fetch() { - if (!CanCreatePopup()) + if (!PopupHost.CanCreatePopup()) return; - if (_remotes.Count == 0) + if (Remotes.Count == 0) { App.RaiseException(_fullpath, "No remotes added to this repository!!!"); return; } - if (autoStart) - ShowAndStartPopup(new Fetch(this)); - else - ShowPopup(new Fetch(this)); + PopupHost.ShowPopup(new Fetch(this)); } - public void Pull(bool autoStart) + public void Pull() { - if (!CanCreatePopup()) + if (!PopupHost.CanCreatePopup()) return; - if (_remotes.Count == 0) + if (Remotes.Count == 0) { App.RaiseException(_fullpath, "No remotes added to this repository!!!"); return; } - if (_currentBranch == null) - { - App.RaiseException(_fullpath, "Can NOT find current branch!!!"); - return; - } - - var pull = new Pull(this, null); - if (autoStart && pull.SelectedBranch != null) - ShowAndStartPopup(pull); - else - ShowPopup(pull); + PopupHost.ShowPopup(new Pull(this, null)); } - public void Push(bool autoStart) + public void Push() { - if (!CanCreatePopup()) + if (!PopupHost.CanCreatePopup()) return; - if (_remotes.Count == 0) + if (Remotes.Count == 0) { App.RaiseException(_fullpath, "No remotes added to this repository!!!"); return; } - if (_currentBranch == null) - { - App.RaiseException(_fullpath, "Can NOT find current branch!!!"); - return; - } - - if (autoStart) - ShowAndStartPopup(new Push(this, null)); - else - ShowPopup(new Push(this, null)); + if (Branches.Find(x => x.IsCurrent) == null) + App.RaiseException(_fullpath, "Can NOT found current branch!!!"); + PopupHost.ShowPopup(new Push(this, null)); } public void ApplyPatch() { - if (!CanCreatePopup()) + if (!PopupHost.CanCreatePopup()) return; - ShowPopup(new Apply(this)); + PopupHost.ShowPopup(new Apply(this)); } public void Cleanup() { - if (!CanCreatePopup()) + if (!PopupHost.CanCreatePopup()) return; - ShowAndStartPopup(new Cleanup(this)); + PopupHost.ShowAndStartPopup(new Cleanup(this)); } - public void ClearFilter() + public void OpenConfigure() { - Filter = string.Empty; + if (!PopupHost.CanCreatePopup()) + return; + PopupHost.ShowPopup(new RepositoryConfigure(this)); } public void ClearSearchCommitFilter() @@ -842,326 +389,163 @@ namespace SourceGit.ViewModels SearchCommitFilter = string.Empty; } - public void ClearMatchedFilesForSearching() - { - MatchedFilesForSearching = null; - } - public void StartSearchCommits() { if (_histories == null) return; - IsSearchLoadingVisible = true; - SelectedSearchedCommit = null; - MatchedFilesForSearching = null; - - Task.Run(() => + var visible = new List(); + foreach (var c in _histories.Commits) { - var visible = null as List; - var method = (Models.CommitSearchMethod)_searchCommitFilterType; - - if (method == Models.CommitSearchMethod.BySHA) + if (c.SHA.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Subject.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Message.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Author.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Committer.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Author.Email.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Committer.Email.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)) { - var commit = new Commands.QuerySingleCommit(_fullpath, _searchCommitFilter).Result(); - visible = commit == null ? [] : [commit]; - } - else - { - visible = new Commands.QueryCommits(_fullpath, _searchCommitFilter, method, _onlySearchCommitsInCurrentBranch).Result(); + visible.Add(c); } + } - Dispatcher.UIThread.Invoke(() => - { - SearchedCommits = visible; - IsSearchLoadingVisible = false; - }); - }); + SearchedCommits = visible; } public void SetWatcherEnabled(bool enabled) { - _watcher?.SetEnabled(enabled); + if (_watcher != null) + _watcher.SetEnabled(enabled); } public void MarkBranchesDirtyManually() { - if (_watcher == null) - { - Task.Run(RefreshBranches); - Task.Run(RefreshCommits); - Task.Run(RefreshWorkingCopyChanges); - Task.Run(RefreshWorktrees); - } - else - { + if (_watcher != null) _watcher.MarkBranchDirtyManually(); - } - } - - public void MarkTagsDirtyManually() - { - if (_watcher == null) - { - Task.Run(RefreshTags); - Task.Run(RefreshCommits); - } - else - { - _watcher.MarkTagDirtyManually(); - } } public void MarkWorkingCopyDirtyManually() { - if (_watcher == null) - Task.Run(RefreshWorkingCopyChanges); - else + if (_watcher != null) _watcher.MarkWorkingCopyDirtyManually(); } - public void MarkFetched() + public void NavigateToCommit(string sha) { - _lastFetchTime = DateTime.Now; - } - - public void NavigateToCommit(string sha, bool isDelayMode = false) - { - if (isDelayMode) - { - _navigateToCommitDelayed = sha; - } - else if (_histories != null) + if (_histories != null) { SelectedViewIndex = 0; _histories.NavigateTo(sha); } } - public void ClearCommitMessage() + public void NavigateToCurrentHead() { - if (_workingCopy is not null) - _workingCopy.CommitMessage = string.Empty; + var cur = Branches.Find(x => x.IsCurrent); + if (cur != null) + NavigateToCommit(cur.Head); } - public void ClearHistoriesFilter() + public void UpdateFilter(string filter, bool toggle) { - _settings.HistoriesFilters.Clear(); - HistoriesFilterMode = Models.FilterMode.None; - - ResetBranchTreeFilterMode(LocalBranchTrees); - ResetBranchTreeFilterMode(RemoteBranchTrees); - ResetTagFilterMode(); - Task.Run(RefreshCommits); - } - - public void RemoveHistoriesFilter(Models.Filter filter) - { - if (_settings.HistoriesFilters.Remove(filter)) + var changed = false; + if (toggle) { - HistoriesFilterMode = _settings.HistoriesFilters.Count > 0 ? _settings.HistoriesFilters[0].Mode : Models.FilterMode.None; - RefreshHistoriesFilters(true); - } - } - - public void UpdateBranchNodeIsExpanded(BranchTreeNode node) - { - if (_settings == null || !string.IsNullOrWhiteSpace(_filter)) - return; - - if (node.IsExpanded) - { - if (!_settings.ExpandedBranchNodesInSideBar.Contains(node.Path)) - _settings.ExpandedBranchNodesInSideBar.Add(node.Path); - } - else - { - _settings.ExpandedBranchNodesInSideBar.Remove(node.Path); - } - } - - public void SetTagFilterMode(Models.Tag tag, Models.FilterMode mode) - { - var changed = _settings.UpdateHistoriesFilter(tag.Name, Models.FilterType.Tag, mode); - if (changed) - RefreshHistoriesFilters(true); - } - - public void SetBranchFilterMode(Models.Branch branch, Models.FilterMode mode, bool clearExists, bool refresh) - { - var node = FindBranchNode(branch.IsLocal ? _localBranchTrees : _remoteBranchTrees, branch.FullName); - if (node != null) - SetBranchFilterMode(node, mode, clearExists, refresh); - } - - public void SetBranchFilterMode(BranchTreeNode node, Models.FilterMode mode, bool clearExists, bool refresh) - { - var isLocal = node.Path.StartsWith("refs/heads/", StringComparison.Ordinal); - var tree = isLocal ? _localBranchTrees : _remoteBranchTrees; - - if (clearExists) - { - _settings.HistoriesFilters.Clear(); - HistoriesFilterMode = Models.FilterMode.None; - } - - if (node.Backend is Models.Branch branch) - { - var type = isLocal ? Models.FilterType.LocalBranch : Models.FilterType.RemoteBranch; - var changed = _settings.UpdateHistoriesFilter(node.Path, type, mode); - if (!changed) - return; - - if (isLocal && !string.IsNullOrEmpty(branch.Upstream) && !branch.IsUpstreamGone) - _settings.UpdateHistoriesFilter(branch.Upstream, Models.FilterType.RemoteBranch, mode); - } - else - { - var type = isLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder; - var changed = _settings.UpdateHistoriesFilter(node.Path, type, mode); - if (!changed) - return; - - _settings.RemoveChildrenBranchFilters(node.Path); - } - - var parentType = isLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder; - var cur = node; - do - { - var lastSepIdx = cur.Path.LastIndexOf('/'); - if (lastSepIdx <= 0) - break; - - var parentPath = cur.Path.Substring(0, lastSepIdx); - var parent = FindBranchNode(tree, parentPath); - if (parent == null) - break; - - _settings.UpdateHistoriesFilter(parent.Path, parentType, Models.FilterMode.None); - cur = parent; - } while (true); - - RefreshHistoriesFilters(refresh); - } - - public void StashAll(bool autoStart) - { - _workingCopy?.StashAll(autoStart); - } - - public void SkipMerge() - { - _workingCopy?.SkipMerge(); - } - - public void AbortMerge() - { - _workingCopy?.AbortMerge(); - } - - public List GetCustomActions(Models.CustomActionScope scope) - { - var actions = new List(); - - foreach (var act in Preferences.Instance.CustomActions) - { - if (act.Scope == scope) - actions.Add(act); - } - - foreach (var act in _settings.CustomActions) - { - if (act.Scope == scope) - actions.Add(act); - } - - return actions; - } - - public void Bisect(string subcmd) - { - IsBisectCommandRunning = true; - SetWatcherEnabled(false); - - var log = CreateLog($"Bisect({subcmd})"); - Task.Run(() => - { - var succ = new Commands.Bisect(_fullpath, subcmd).Use(log).Exec(); - log.Complete(); - - Dispatcher.UIThread.Invoke(() => + if (!Filters.Contains(filter)) { - if (!succ) - App.RaiseException(_fullpath, log.Content.Substring(log.Content.IndexOf('\n')).Trim()); - else if (log.Content.Contains("is the first bad commit")) - App.SendNotification(_fullpath, log.Content.Substring(log.Content.IndexOf('\n')).Trim()); + Filters.Add(filter); + changed = true; + } + } + else + { + changed = Filters.Remove(filter); + } - MarkBranchesDirtyManually(); - SetWatcherEnabled(true); - IsBisectCommandRunning = false; - }); - }); + if (changed) + Task.Run(RefreshCommits); } - public bool MayHaveSubmodules() + public void StashAll() { - var modulesFile = Path.Combine(_fullpath, ".gitmodules"); - var info = new FileInfo(modulesFile); - return info.Exists && info.Length > 20; + if (PopupHost.CanCreatePopup()) + { + var changes = new List(); + changes.AddRange(_workingCopy.Unstaged); + changes.AddRange(_workingCopy.Staged); + PopupHost.ShowPopup(new StashChanges(this, changes, true)); + } + } + + public void GotoResolve() + { + if (_workingCopy != null) + SelectedViewIndex = 1; + } + + public async void ContinueMerge() + { + if (_inProgressContext != null) + { + SetWatcherEnabled(false); + var succ = await Task.Run(_inProgressContext.Continue); + if (succ && _workingCopy != null) + { + _workingCopy.CommitMessage = string.Empty; + } + SetWatcherEnabled(true); + } + else + { + MarkWorkingCopyDirtyManually(); + } + } + + public async void AbortMerge() + { + if (_inProgressContext != null) + { + SetWatcherEnabled(false); + await Task.Run(_inProgressContext.Abort); + SetWatcherEnabled(true); + } + else + { + MarkWorkingCopyDirtyManually(); + } } public void RefreshBranches() { - var branches = new Commands.QueryBranches(_fullpath).Result(out var localBranchesCount); - var remotes = new Commands.QueryRemotes(_fullpath).Result(); - var builder = BuildBranchTree(branches, remotes); + var branches = new Commands.QueryBranches(FullPath).Result(); + var remotes = new Commands.QueryRemotes(FullPath).Result(); + + var builder = new Models.BranchTreeNode.Builder(); + builder.SetFilters(Filters); + builder.CollectExpandedNodes(_localBranchTrees, true); + builder.CollectExpandedNodes(_remoteBranchTrees, false); + builder.Run(branches, remotes); Dispatcher.UIThread.Invoke(() => { - lock (_lockRemotes) - Remotes = remotes; - + Remotes = remotes; Branches = branches; - CurrentBranch = branches.Find(x => x.IsCurrent); LocalBranchTrees = builder.Locals; RemoteBranchTrees = builder.Remotes; - LocalBranchesCount = localBranchesCount; - if (_workingCopy != null) - _workingCopy.HasRemotes = remotes.Count > 0; - - var hasPendingPullOrPush = CurrentBranch?.TrackStatus.IsVisible ?? false; - GetOwnerPage()?.ChangeDirtyState(Models.DirtyState.HasPendingPullOrPush, !hasPendingPullOrPush); - }); - } - - public void RefreshWorktrees() - { - var worktrees = new Commands.Worktree(_fullpath).List(); - var cleaned = new List(); - - foreach (var worktree in worktrees) - { - if (worktree.IsBare || worktree.FullPath.Equals(_fullpath)) - continue; - - cleaned.Add(worktree); - } - - Dispatcher.UIThread.Invoke(() => - { - Worktrees = cleaned; + var cur = Branches.Find(x => x.IsCurrent); + CanCommitWithPush = cur != null && !string.IsNullOrEmpty(cur.Upstream); }); } public void RefreshTags() { - var tags = new Commands.QueryTags(_fullpath).Result(); + var tags = new Commands.QueryTags(FullPath).Result(); + foreach (var tag in tags) + tag.IsFiltered = Filters.Contains(tag.Name); Dispatcher.UIThread.Invoke(() => { Tags = tags; - VisibleTags = BuildVisibleTags(); }); } @@ -1169,325 +553,157 @@ namespace SourceGit.ViewModels { Dispatcher.UIThread.Invoke(() => _histories.IsLoading = true); - var builder = new StringBuilder(); - builder.Append($"-{Preferences.Instance.MaxHistoryCommits} "); - - if (_settings.EnableTopoOrderInHistories) - builder.Append("--topo-order "); + var limits = $"-{Preference.Instance.MaxHistoryCommits} "; + var validFilters = new List(); + foreach (var filter in Filters) + { + if (filter.StartsWith("refs/", StringComparison.Ordinal)) + { + if (_branches.FindIndex(x => x.FullName == filter) >= 0) + validFilters.Add(filter); + } + else + { + if (_tags.FindIndex(t => t.Name == filter) >= 0) + validFilters.Add(filter); + } + } + if (validFilters.Count > 0) + { + limits += string.Join(" ", validFilters); + } else - builder.Append("--date-order "); - - if (_settings.EnableReflog) - builder.Append("--reflog "); - if (_settings.EnableFirstParentInHistories) - builder.Append("--first-parent "); - - var filters = _settings.BuildHistoriesFilter(); - if (string.IsNullOrEmpty(filters)) - builder.Append("--branches --remotes --tags HEAD"); - else - builder.Append(filters); - - var commits = new Commands.QueryCommits(_fullpath, builder.ToString()).Result(); - var graph = Models.CommitGraph.Parse(commits, _settings.EnableFirstParentInHistories); + { + limits += "--branches --remotes --tags"; + } + var commits = new Commands.QueryCommits(FullPath, limits).Result(); Dispatcher.UIThread.Invoke(() => { if (_histories != null) { _histories.IsLoading = false; _histories.Commits = commits; - _histories.Graph = graph; - - BisectState = _histories.UpdateBisectInfo(); - - if (!string.IsNullOrEmpty(_navigateToCommitDelayed)) - NavigateToCommit(_navigateToCommitDelayed); } - - _navigateToCommitDelayed = string.Empty; }); } public void RefreshSubmodules() { - if (!MayHaveSubmodules()) - { - if (_submodules.Count > 0) - { - Dispatcher.UIThread.Invoke(() => - { - Submodules = []; - VisibleSubmodules = BuildVisibleSubmodules(); - }); - } - - return; - } - - var submodules = new Commands.QuerySubmodules(_fullpath).Result(); - _watcher?.SetSubmodules(submodules); - + var submodules = new Commands.QuerySubmodules(FullPath).Result(); Dispatcher.UIThread.Invoke(() => { - bool hasChanged = _submodules.Count != submodules.Count; - if (!hasChanged) - { - var old = new Dictionary(); - foreach (var module in _submodules) - old.Add(module.Path, module); - - foreach (var module in submodules) - { - if (!old.TryGetValue(module.Path, out var exist)) - { - hasChanged = true; - break; - } - - hasChanged = !exist.SHA.Equals(module.SHA, StringComparison.Ordinal) || - !exist.URL.Equals(module.URL, StringComparison.Ordinal) || - exist.Status != module.Status; - - if (hasChanged) - break; - } - } - - if (hasChanged) - { - Submodules = submodules; - VisibleSubmodules = BuildVisibleSubmodules(); - } + Submodules = submodules; }); } public void RefreshWorkingCopyChanges() { - if (IsBare) - return; - - var changes = new Commands.QueryLocalChanges(_fullpath, _settings.IncludeUntrackedInLocalChanges).Result(); + var changes = new Commands.QueryLocalChanges(FullPath, _includeUntracked).Result(); if (_workingCopy == null) return; - changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path)); - _workingCopy.SetData(changes); + var hasUnsolvedConflict = _workingCopy.SetData(changes); + var inProgress = null as InProgressContext; + + var rebaseMergeFolder = Path.Combine(_gitDir, "rebase-merge"); + var rebaseApplyFolder = Path.Combine(_gitDir, "rebase-apply"); + if (File.Exists(Path.Combine(_gitDir, "CHERRY_PICK_HEAD"))) + { + inProgress = new CherryPickInProgress(_fullpath); + } + else if (File.Exists(Path.Combine(_gitDir, "REBASE_HEAD")) && Directory.Exists(rebaseMergeFolder)) + { + inProgress = new RebaseInProgress(this); + } + else if (File.Exists(Path.Combine(_gitDir, "REVERT_HEAD"))) + { + inProgress = new RevertInProgress(_fullpath); + } + else if (File.Exists(Path.Combine(_gitDir, "MERGE_HEAD"))) + { + inProgress = new MergeInProgress(_fullpath); + } + else + { + if (Directory.Exists(rebaseMergeFolder)) + Directory.Delete(rebaseMergeFolder, true); + + if (Directory.Exists(rebaseApplyFolder)) + Directory.Delete(rebaseApplyFolder, true); + } Dispatcher.UIThread.Invoke(() => { - LocalChangesCount = changes.Count; - OnPropertyChanged(nameof(InProgressContext)); - GetOwnerPage()?.ChangeDirtyState(Models.DirtyState.HasLocalChanges, changes.Count == 0); + InProgressContext = inProgress; + HasUnsolvedConflicts = hasUnsolvedConflict; + OnPropertyChanged(nameof(WorkingCopyChangesCount)); }); } public void RefreshStashes() { - if (IsBare) - return; - - var stashes = new Commands.QueryStashes(_fullpath).Result(); + var stashes = new Commands.QueryStashes(FullPath).Result(); Dispatcher.UIThread.Invoke(() => { if (_stashesPage != null) _stashesPage.Stashes = stashes; + OnPropertyChanged(nameof(StashesCount)); + }); + } - StashesCount = stashes.Count; + public void RefreshGitFlow() + { + var config = new Commands.Config(_fullpath).ListAll(); + var gitFlow = new Models.GitFlow(); + if (config.TryGetValue("gitflow.prefix.feature", out var feature)) + gitFlow.Feature = feature; + if (config.TryGetValue("gitflow.prefix.release", out var release)) + gitFlow.Release = release; + if (config.TryGetValue("gitflow.prefix.hotfix", out var hotfix)) + gitFlow.Hotfix = hotfix; + Dispatcher.UIThread.Invoke(() => + { + GitFlow = gitFlow; }); } public void CreateNewBranch() { - if (_currentBranch == null) + var current = Branches.Find(x => x.IsCurrent); + if (current == null) { - App.RaiseException(_fullpath, "Git cannot create a branch before your first commit."); + App.RaiseException(_fullpath, "Git do not hold any branch until you do first commit."); return; } - if (CanCreatePopup()) - ShowPopup(new CreateBranch(this, _currentBranch)); - } - - public void CheckoutBranch(Models.Branch branch) - { - if (branch.IsLocal) - { - var worktree = _worktrees.Find(x => x.Branch.Equals(branch.FullName, StringComparison.Ordinal)); - if (worktree != null) - { - OpenWorktree(worktree); - return; - } - } - - if (IsBare) - return; - - if (!CanCreatePopup()) - return; - - if (branch.IsLocal) - { - if (_localChangesCount > 0 || _submodules.Count > 0) - ShowPopup(new Checkout(this, branch.Name)); - else - ShowAndStartPopup(new Checkout(this, branch.Name)); - } - else - { - foreach (var b in _branches) - { - if (b.IsLocal && - b.Upstream.Equals(branch.FullName, StringComparison.Ordinal) && - b.TrackStatus.Ahead.Count == 0) - { - if (b.TrackStatus.Behind.Count > 0) - ShowPopup(new CheckoutAndFastForward(this, b, branch)); - else if (!b.IsCurrent) - CheckoutBranch(b); - - return; - } - } - - ShowPopup(new CreateBranch(this, branch)); - } - } - - public void DeleteBranch(Models.Branch branch) - { - if (CanCreatePopup()) - ShowPopup(new DeleteBranch(this, branch)); - } - - public void DeleteMultipleBranches(List branches, bool isLocal) - { - if (CanCreatePopup()) - ShowPopup(new DeleteMultipleBranches(this, branches, isLocal)); - } - - public void MergeMultipleBranches(List branches) - { - if (CanCreatePopup()) - ShowPopup(new MergeMultiple(this, branches)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(this, current)); } public void CreateNewTag() { - if (_currentBranch == null) + var current = Branches.Find(x => x.IsCurrent); + if (current == null) { - App.RaiseException(_fullpath, "Git cannot create a branch before your first commit."); + App.RaiseException(_fullpath, "Git do not hold any branch until you do first commit."); return; } - if (CanCreatePopup()) - ShowPopup(new CreateTag(this, _currentBranch)); - } - - public void DeleteTag(Models.Tag tag) - { - if (CanCreatePopup()) - ShowPopup(new DeleteTag(this, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateTag(this, current)); } public void AddRemote() { - if (CanCreatePopup()) - ShowPopup(new AddRemote(this)); - } - - public void DeleteRemote(Models.Remote remote) - { - if (CanCreatePopup()) - ShowPopup(new DeleteRemote(this, remote)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new AddRemote(this)); } public void AddSubmodule() { - if (CanCreatePopup()) - ShowPopup(new AddSubmodule(this)); - } - - public void UpdateSubmodules() - { - if (CanCreatePopup()) - ShowPopup(new UpdateSubmodules(this)); - } - - public void OpenSubmodule(string submodule) - { - var selfPage = GetOwnerPage(); - if (selfPage == null) - return; - - var root = Path.GetFullPath(Path.Combine(_fullpath, submodule)); - var normalizedPath = root.Replace('\\', '/').TrimEnd('/'); - - var node = Preferences.Instance.FindNode(normalizedPath); - if (node == null) - { - node = new RepositoryNode() - { - Id = normalizedPath, - Name = Path.GetFileName(normalizedPath), - Bookmark = selfPage.Node.Bookmark, - IsRepository = true, - }; - } - - App.GetLauncher().OpenRepositoryInTab(node, null); - } - - public void AddWorktree() - { - if (CanCreatePopup()) - ShowPopup(new AddWorktree(this)); - } - - public void PruneWorktrees() - { - if (CanCreatePopup()) - ShowAndStartPopup(new PruneWorktrees(this)); - } - - public void OpenWorktree(Models.Worktree worktree) - { - var node = Preferences.Instance.FindNode(worktree.FullPath); - if (node == null) - { - node = new RepositoryNode() - { - Id = worktree.FullPath, - Name = Path.GetFileName(worktree.FullPath), - Bookmark = 0, - IsRepository = true, - }; - } - - App.GetLauncher()?.OpenRepositoryInTab(node, null); - } - - public List GetPreferredOpenAIServices() - { - var services = Preferences.Instance.OpenAIServices; - if (services == null || services.Count == 0) - return []; - - if (services.Count == 1) - return [services[0]]; - - var preferred = _settings.PreferredOpenAIService; - var all = new List(); - foreach (var service in services) - { - if (service.Name.Equals(preferred, StringComparison.Ordinal)) - return [service]; - - all.Add(service); - } - - return all; + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new AddSubmodule(this)); } public ContextMenu CreateContextMenuForGitFlow() @@ -1495,35 +711,32 @@ namespace SourceGit.ViewModels var menu = new ContextMenu(); menu.Placement = PlacementMode.BottomEdgeAlignedLeft; - if (IsGitFlowEnabled()) + if (GitFlow.IsEnabled) { var startFeature = new MenuItem(); startFeature.Header = App.Text("GitFlow.StartFeature"); - startFeature.Icon = App.CreateMenuIcon("Icons.GitFlow.Feature"); - startFeature.Click += (_, e) => + startFeature.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Feature)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Feature)); e.Handled = true; }; var startRelease = new MenuItem(); startRelease.Header = App.Text("GitFlow.StartRelease"); - startRelease.Icon = App.CreateMenuIcon("Icons.GitFlow.Release"); - startRelease.Click += (_, e) => + startRelease.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Release)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Release)); e.Handled = true; }; var startHotfix = new MenuItem(); startHotfix.Header = App.Text("GitFlow.StartHotfix"); - startHotfix.Icon = App.CreateMenuIcon("Icons.GitFlow.Hotfix"); - startHotfix.Click += (_, e) => + startHotfix.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Hotfix)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Hotfix)); e.Handled = true; }; @@ -1535,18 +748,10 @@ namespace SourceGit.ViewModels { var init = new MenuItem(); init.Header = App.Text("GitFlow.Init"); - init.Icon = App.CreateMenuIcon("Icons.Init"); - init.Click += (_, e) => + init.Click += (o, e) => { - if (_currentBranch == null) - { - App.RaiseException(_fullpath, "Git flow init failed: No branch found!!!"); - } - else if (CanCreatePopup()) - { - ShowPopup(new InitGitFlow(this)); - } - + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new InitGitFlow(this)); e.Handled = true; }; menu.Items.Add(init); @@ -1554,502 +759,181 @@ namespace SourceGit.ViewModels return menu; } - public ContextMenu CreateContextMenuForGitLFS() - { - var menu = new ContextMenu(); - menu.Placement = PlacementMode.BottomEdgeAlignedLeft; - - var lfs = new Commands.LFS(_fullpath); - if (lfs.IsEnabled()) - { - var addPattern = new MenuItem(); - addPattern.Header = App.Text("GitLFS.AddTrackPattern"); - addPattern.Icon = App.CreateMenuIcon("Icons.File.Add"); - addPattern.Click += (_, e) => - { - if (CanCreatePopup()) - ShowPopup(new LFSTrackCustomPattern(this)); - - e.Handled = true; - }; - menu.Items.Add(addPattern); - menu.Items.Add(new MenuItem() { Header = "-" }); - - var fetch = new MenuItem(); - fetch.Header = App.Text("GitLFS.Fetch"); - fetch.Icon = App.CreateMenuIcon("Icons.Fetch"); - fetch.IsEnabled = _remotes.Count > 0; - fetch.Click += (_, e) => - { - if (CanCreatePopup()) - { - if (_remotes.Count == 1) - ShowAndStartPopup(new LFSFetch(this)); - else - ShowPopup(new LFSFetch(this)); - } - - e.Handled = true; - }; - menu.Items.Add(fetch); - - var pull = new MenuItem(); - pull.Header = App.Text("GitLFS.Pull"); - pull.Icon = App.CreateMenuIcon("Icons.Pull"); - pull.IsEnabled = _remotes.Count > 0; - pull.Click += (_, e) => - { - if (CanCreatePopup()) - { - if (_remotes.Count == 1) - ShowAndStartPopup(new LFSPull(this)); - else - ShowPopup(new LFSPull(this)); - } - - e.Handled = true; - }; - menu.Items.Add(pull); - - var push = new MenuItem(); - push.Header = App.Text("GitLFS.Push"); - push.Icon = App.CreateMenuIcon("Icons.Push"); - push.IsEnabled = _remotes.Count > 0; - push.Click += (_, e) => - { - if (CanCreatePopup()) - { - if (_remotes.Count == 1) - ShowAndStartPopup(new LFSPush(this)); - else - ShowPopup(new LFSPush(this)); - } - - e.Handled = true; - }; - menu.Items.Add(push); - - var prune = new MenuItem(); - prune.Header = App.Text("GitLFS.Prune"); - prune.Icon = App.CreateMenuIcon("Icons.Clean"); - prune.Click += (_, e) => - { - if (CanCreatePopup()) - ShowAndStartPopup(new LFSPrune(this)); - - e.Handled = true; - }; - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(prune); - - var locks = new MenuItem(); - locks.Header = App.Text("GitLFS.Locks"); - locks.Icon = App.CreateMenuIcon("Icons.Lock"); - locks.IsEnabled = _remotes.Count > 0; - if (_remotes.Count == 1) - { - locks.Click += (_, e) => - { - App.ShowWindow(new LFSLocks(this, _remotes[0].Name), true); - e.Handled = true; - }; - } - else - { - foreach (var remote in _remotes) - { - var remoteName = remote.Name; - var lockRemote = new MenuItem(); - lockRemote.Header = remoteName; - lockRemote.Click += (_, e) => - { - App.ShowWindow(new LFSLocks(this, remoteName), true); - e.Handled = true; - }; - locks.Items.Add(lockRemote); - } - } - - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(locks); - } - else - { - var install = new MenuItem(); - install.Header = App.Text("GitLFS.Install"); - install.Icon = App.CreateMenuIcon("Icons.Init"); - install.Click += (_, e) => - { - var log = CreateLog("Install LFS"); - var succ = new Commands.LFS(_fullpath).Install(log); - if (succ) - App.SendNotification(_fullpath, $"LFS enabled successfully!"); - - log.Complete(); - e.Handled = true; - }; - menu.Items.Add(install); - } - - return menu; - } - - public ContextMenu CreateContextMenuForCustomAction() - { - var menu = new ContextMenu(); - menu.Placement = PlacementMode.BottomEdgeAlignedLeft; - - var actions = GetCustomActions(Models.CustomActionScope.Repository); - if (actions.Count > 0) - { - foreach (var action in actions) - { - var dup = action; - var item = new MenuItem(); - item.Icon = App.CreateMenuIcon("Icons.Action"); - item.Header = dup.Name; - item.Click += (_, e) => - { - if (CanCreatePopup()) - ShowAndStartPopup(new ExecuteCustomAction(this, dup)); - - e.Handled = true; - }; - - menu.Items.Add(item); - } - } - else - { - menu.Items.Add(new MenuItem() { Header = App.Text("Repository.CustomActions.Empty") }); - } - - return menu; - } - - public ContextMenu CreateContextMenuForHistoriesPage() - { - var layout = new MenuItem(); - layout.Header = App.Text("Repository.HistoriesLayout"); - layout.IsEnabled = false; - - var isHorizontal = Preferences.Instance.UseTwoColumnsLayoutInHistories; - var horizontal = new MenuItem(); - horizontal.Header = App.Text("Repository.HistoriesLayout.Horizontal"); - if (isHorizontal) - horizontal.Icon = App.CreateMenuIcon("Icons.Check"); - horizontal.Click += (_, ev) => - { - Preferences.Instance.UseTwoColumnsLayoutInHistories = true; - ev.Handled = true; - }; - - var vertical = new MenuItem(); - vertical.Header = App.Text("Repository.HistoriesLayout.Vertical"); - if (!isHorizontal) - vertical.Icon = App.CreateMenuIcon("Icons.Check"); - vertical.Click += (_, ev) => - { - Preferences.Instance.UseTwoColumnsLayoutInHistories = false; - ev.Handled = true; - }; - - var order = new MenuItem(); - order.Header = App.Text("Repository.HistoriesOrder"); - order.IsEnabled = false; - - var dateOrder = new MenuItem(); - dateOrder.Header = App.Text("Repository.HistoriesOrder.ByDate"); - dateOrder.SetValue(Views.MenuItemExtension.CommandProperty, "--date-order"); - if (!_settings.EnableTopoOrderInHistories) - dateOrder.Icon = App.CreateMenuIcon("Icons.Check"); - dateOrder.Click += (_, ev) => - { - if (_settings.EnableTopoOrderInHistories) - { - _settings.EnableTopoOrderInHistories = false; - Task.Run(RefreshCommits); - } - - ev.Handled = true; - }; - - var topoOrder = new MenuItem(); - topoOrder.Header = App.Text("Repository.HistoriesOrder.Topo"); - topoOrder.SetValue(Views.MenuItemExtension.CommandProperty, "--top-order"); - if (_settings.EnableTopoOrderInHistories) - topoOrder.Icon = App.CreateMenuIcon("Icons.Check"); - topoOrder.Click += (_, ev) => - { - if (!_settings.EnableTopoOrderInHistories) - { - _settings.EnableTopoOrderInHistories = true; - Task.Run(RefreshCommits); - } - - ev.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Items.Add(layout); - menu.Items.Add(horizontal); - menu.Items.Add(vertical); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(order); - menu.Items.Add(dateOrder); - menu.Items.Add(topoOrder); - return menu; - } - - public void DiscardAllChanges() - { - if (CanCreatePopup()) - ShowPopup(new Discard(this)); - } - - public void ClearStashes() - { - if (CanCreatePopup()) - ShowPopup(new ClearStashes(this)); - } - public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch) { var menu = new ContextMenu(); var push = new MenuItem(); - push.Header = App.Text("BranchCM.Push", branch.Name); + push.Header = new Views.NameHighlightedTextBlock("BranchCM.Push", branch.Name); push.Icon = App.CreateMenuIcon("Icons.Push"); - push.IsEnabled = _remotes.Count > 0; + push.IsEnabled = Remotes.Count > 0; push.Click += (_, e) => { - if (CanCreatePopup()) - ShowPopup(new Push(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Push(this, branch)); e.Handled = true; }; if (branch.IsCurrent) { - if (!IsBare) + var discard = new MenuItem(); + discard.Header = App.Text("BranchCM.DiscardAll"); + discard.Icon = App.CreateMenuIcon("Icons.Undo"); + discard.IsEnabled = _workingCopy.Count > 0; + discard.Click += (o, e) => { - if (!string.IsNullOrEmpty(branch.Upstream)) + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Discard(this)); + e.Handled = true; + }; + + menu.Items.Add(discard); + menu.Items.Add(new MenuItem() { Header = "-" }); + + if (!string.IsNullOrEmpty(branch.Upstream)) + { + var upstream = branch.Upstream.Substring(13); + var fastForward = new MenuItem(); + fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream); + fastForward.Icon = App.CreateMenuIcon("Icons.FastForward"); + fastForward.IsEnabled = !string.IsNullOrEmpty(branch.UpstreamTrackStatus) && branch.UpstreamTrackStatus.IndexOf('↑') < 0; + fastForward.Click += (o, e) => { - var upstream = branch.Upstream.Substring(13); - var fastForward = new MenuItem(); - fastForward.Header = App.Text("BranchCM.FastForward", upstream); - fastForward.Icon = App.CreateMenuIcon("Icons.FastForward"); - fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0; - fastForward.Click += (_, e) => - { - var b = _branches.Find(x => x.FriendlyName == upstream); - if (b == null) - return; + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Merge(this, upstream, branch.Name)); + e.Handled = true; + }; - if (CanCreatePopup()) - ShowAndStartPopup(new Merge(this, b, branch.Name, true)); + var pull = new MenuItem(); + pull.Header = new Views.NameHighlightedTextBlock("BranchCM.Pull", upstream); + pull.Icon = App.CreateMenuIcon("Icons.Pull"); + pull.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Pull(this, null)); + e.Handled = true; + }; - e.Handled = true; - }; - - var pull = new MenuItem(); - pull.Header = App.Text("BranchCM.Pull", upstream); - pull.Icon = App.CreateMenuIcon("Icons.Pull"); - pull.Click += (_, e) => - { - if (CanCreatePopup()) - ShowPopup(new Pull(this, null)); - e.Handled = true; - }; - - menu.Items.Add(fastForward); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(pull); - } + menu.Items.Add(fastForward); + menu.Items.Add(pull); } menu.Items.Add(push); } else { - if (!IsBare) - { - var checkout = new MenuItem(); - checkout.Header = App.Text("BranchCM.Checkout", branch.Name); - checkout.Icon = App.CreateMenuIcon("Icons.Check"); - checkout.Click += (_, e) => - { - CheckoutBranch(branch); - e.Handled = true; - }; - menu.Items.Add(checkout); - menu.Items.Add(new MenuItem() { Header = "-" }); - } + var current = Branches.Find(x => x.IsCurrent); - var worktree = _worktrees.Find(x => x.Branch == branch.FullName); - var upstream = _branches.Find(x => x.FullName == branch.Upstream); - if (upstream != null && worktree == null) + var checkout = new MenuItem(); + checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name); + checkout.Icon = App.CreateMenuIcon("Icons.Check"); + checkout.Click += (o, e) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Checkout(this, branch.Name)); + e.Handled = true; + }; + menu.Items.Add(checkout); + + var upstream = Branches.Find(x => x.FullName == branch.Upstream); + if (upstream != null) { var fastForward = new MenuItem(); - fastForward.Header = App.Text("BranchCM.FastForward", upstream.FriendlyName); + fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", $"{upstream.Remote}/{upstream.Name}"); fastForward.Icon = App.CreateMenuIcon("Icons.FastForward"); - fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0; - fastForward.Click += (_, e) => + fastForward.IsEnabled = !string.IsNullOrEmpty(branch.UpstreamTrackStatus) && branch.UpstreamTrackStatus.IndexOf('↑') < 0; + fastForward.Click += (o, e) => { - if (CanCreatePopup()) - ShowAndStartPopup(new ResetWithoutCheckout(this, branch, upstream)); - e.Handled = true; - }; - menu.Items.Add(fastForward); - - var fetchInto = new MenuItem(); - fetchInto.Header = App.Text("BranchCM.FetchInto", upstream.FriendlyName, branch.Name); - fetchInto.Icon = App.CreateMenuIcon("Icons.Fetch"); - fetchInto.IsEnabled = branch.TrackStatus.Ahead.Count == 0; - fetchInto.Click += (_, e) => - { - if (CanCreatePopup()) - ShowAndStartPopup(new FetchInto(this, branch, upstream)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new FastForwardWithoutCheckout(this, branch, upstream)); e.Handled = true; }; menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(fetchInto); + menu.Items.Add(fastForward); } + menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(push); - if (!IsBare) + var merge = new MenuItem(); + merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, current.Name); + merge.Icon = App.CreateMenuIcon("Icons.Merge"); + merge.Click += (o, e) => { - var merge = new MenuItem(); - merge.Header = App.Text("BranchCM.Merge", branch.Name, _currentBranch.Name); - merge.Icon = App.CreateMenuIcon("Icons.Merge"); - merge.Click += (_, e) => - { - if (CanCreatePopup()) - ShowPopup(new Merge(this, branch, _currentBranch.Name, false)); - e.Handled = true; - }; - - var rebase = new MenuItem(); - rebase.Header = App.Text("BranchCM.Rebase", _currentBranch.Name, branch.Name); - rebase.Icon = App.CreateMenuIcon("Icons.Rebase"); - rebase.Click += (_, e) => - { - if (CanCreatePopup()) - ShowPopup(new Rebase(this, _currentBranch, branch)); - e.Handled = true; - }; - - menu.Items.Add(merge); - menu.Items.Add(rebase); - } - - if (worktree == null) - { - var selectedCommit = (_histories?.DetailContext as CommitDetail)?.Commit; - if (selectedCommit != null && !selectedCommit.SHA.Equals(branch.Head, StringComparison.Ordinal)) - { - var move = new MenuItem(); - move.Header = App.Text("BranchCM.ResetToSelectedCommit", branch.Name, selectedCommit.SHA.Substring(0, 10)); - move.Icon = App.CreateMenuIcon("Icons.Reset"); - move.Click += (_, e) => - { - if (CanCreatePopup()) - ShowPopup(new ResetWithoutCheckout(this, branch, selectedCommit)); - e.Handled = true; - }; - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(move); - } - } - - var compareWithCurrent = new MenuItem(); - compareWithCurrent.Header = App.Text("BranchCM.CompareWithCurrent", _currentBranch.Name); - compareWithCurrent.Icon = App.CreateMenuIcon("Icons.Compare"); - compareWithCurrent.Click += (_, _) => - { - App.ShowWindow(new BranchCompare(_fullpath, branch, _currentBranch), false); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Merge(this, branch.Name, current.Name)); + e.Handled = true; }; - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(compareWithCurrent); - if (_localChangesCount > 0) + var rebase = new MenuItem(); + rebase.Header = new Views.NameHighlightedTextBlock("BranchCM.Rebase", current.Name, branch.Name); + rebase.Icon = App.CreateMenuIcon("Icons.Rebase"); + rebase.Click += (o, e) => { - var compareWithWorktree = new MenuItem(); - compareWithWorktree.Header = App.Text("BranchCM.CompareWithWorktree"); - compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare"); - compareWithWorktree.Click += (_, _) => - { - SelectedSearchedCommit = null; + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Rebase(this, current, branch)); + e.Handled = true; + }; - if (_histories != null) - { - var target = new Commands.QuerySingleCommit(_fullpath, branch.Head).Result(); - _histories.AutoSelectedCommit = null; - _histories.DetailContext = new RevisionCompare(_fullpath, target, null); - } - }; - menu.Items.Add(compareWithWorktree); - } + menu.Items.Add(merge); + menu.Items.Add(rebase); } - if (!IsBare) + var type = GitFlow.GetBranchType(branch.Name); + if (type != Models.GitFlowBranchType.None) { - var type = GetGitFlowType(branch); - if (type != Models.GitFlowBranchType.None) + var finish = new MenuItem(); + finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name); + finish.Icon = App.CreateMenuIcon("Icons.Flow"); + finish.Click += (o, e) => { - var finish = new MenuItem(); - finish.Header = App.Text("BranchCM.Finish", branch.Name); - finish.Icon = App.CreateMenuIcon("Icons.GitFlow"); - finish.Click += (_, e) => - { - if (CanCreatePopup()) - ShowPopup(new GitFlowFinish(this, branch, type)); - e.Handled = true; - }; - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(finish); - } + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new GitFlowFinish(this, branch, type)); + e.Handled = true; + }; + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(finish); } var rename = new MenuItem(); - rename.Header = App.Text("BranchCM.Rename", branch.Name); + rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name); rename.Icon = App.CreateMenuIcon("Icons.Rename"); - rename.Click += (_, e) => + rename.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new RenameBranch(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new RenameBranch(this, branch)); e.Handled = true; }; var delete = new MenuItem(); - delete.Header = App.Text("BranchCM.Delete", branch.Name); + delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", branch.Name); delete.Icon = App.CreateMenuIcon("Icons.Clear"); delete.IsEnabled = !branch.IsCurrent; - delete.Click += (_, e) => + delete.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new DeleteBranch(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteBranch(this, branch)); e.Handled = true; }; var createBranch = new MenuItem(); createBranch.Icon = App.CreateMenuIcon("Icons.Branch.Add"); createBranch.Header = App.Text("CreateBranch"); - createBranch.Click += (_, e) => + createBranch.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new CreateBranch(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(this, branch)); e.Handled = true; }; var createTag = new MenuItem(); createTag.Icon = App.CreateMenuIcon("Icons.Tag.Add"); createTag.Header = App.Text("CreateTag"); - createTag.Click += (_, e) => + createTag.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new CreateTag(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateTag(this, branch)); e.Handled = true; }; @@ -2060,39 +944,63 @@ namespace SourceGit.ViewModels menu.Items.Add(createBranch); menu.Items.Add(createTag); menu.Items.Add(new MenuItem() { Header = "-" }); - TryToAddCustomActionsToBranchContextMenu(menu, branch); - if (!IsBare) + var remoteBranches = new List(); + foreach (var b in Branches) { - var remoteBranches = new List(); - foreach (var b in _branches) - { - if (!b.IsLocal) - remoteBranches.Add(b); - } + if (!b.IsLocal) + remoteBranches.Add(b); + } - if (remoteBranches.Count > 0) + if (remoteBranches.Count > 0) + { + var tracking = new MenuItem(); + tracking.Header = App.Text("BranchCM.Tracking"); + tracking.Icon = App.CreateMenuIcon("Icons.Branch"); + + foreach (var b in remoteBranches) { - var tracking = new MenuItem(); - tracking.Header = App.Text("BranchCM.Tracking"); - tracking.Icon = App.CreateMenuIcon("Icons.Track"); - tracking.Click += (_, e) => + var upstream = b.FullName.Replace("refs/remotes/", ""); + var target = new MenuItem(); + target.Header = upstream; + if (branch.Upstream == b.FullName) + target.Icon = App.CreateMenuIcon("Icons.Check"); + + target.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new SetUpstream(this, branch, remoteBranches)); + if (Commands.Branch.SetUpstream(_fullpath, branch.Name, upstream)) + { + Task.Run(RefreshBranches); + } e.Handled = true; }; - menu.Items.Add(tracking); + + tracking.Items.Add(target); } + + var unsetUpstream = new MenuItem(); + unsetUpstream.Header = App.Text("BranchCM.UnsetUpstream"); + unsetUpstream.Click += (_, e) => + { + if (Commands.Branch.SetUpstream(_fullpath, branch.Name, string.Empty)) + { + Task.Run(RefreshBranches); + } + e.Handled = true; + }; + tracking.Items.Add(new MenuItem() { Header = "-" }); + tracking.Items.Add(unsetUpstream); + + menu.Items.Add(tracking); } var archive = new MenuItem(); archive.Icon = App.CreateMenuIcon("Icons.Archive"); archive.Header = App.Text("Archive"); - archive.Click += (_, e) => + archive.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new Archive(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Archive(this, branch)); e.Handled = true; }; menu.Items.Add(archive); @@ -2101,7 +1009,7 @@ namespace SourceGit.ViewModels var copy = new MenuItem(); copy.Header = App.Text("BranchCM.CopyName"); copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => + copy.Click += (o, e) => { App.CopyText(branch.Name); e.Handled = true; @@ -2115,65 +1023,50 @@ namespace SourceGit.ViewModels { var menu = new ContextMenu(); - if (remote.TryGetVisitURL(out string visitURL)) - { - var visit = new MenuItem(); - visit.Header = App.Text("RemoteCM.OpenInBrowser"); - visit.Icon = App.CreateMenuIcon("Icons.OpenWith"); - visit.Click += (_, e) => - { - Native.OS.OpenBrowser(visitURL); - e.Handled = true; - }; - - menu.Items.Add(visit); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - var fetch = new MenuItem(); fetch.Header = App.Text("RemoteCM.Fetch"); fetch.Icon = App.CreateMenuIcon("Icons.Fetch"); - fetch.Click += (_, e) => + fetch.Click += (o, e) => { - if (CanCreatePopup()) - ShowAndStartPopup(new Fetch(this, remote)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Fetch(this, remote)); e.Handled = true; }; var prune = new MenuItem(); prune.Header = App.Text("RemoteCM.Prune"); - prune.Icon = App.CreateMenuIcon("Icons.Clean"); - prune.Click += (_, e) => + prune.Icon = App.CreateMenuIcon("Icons.Clear2"); + prune.Click += (o, e) => { - if (CanCreatePopup()) - ShowAndStartPopup(new PruneRemote(this, remote)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new PruneRemote(this, remote)); e.Handled = true; }; var edit = new MenuItem(); edit.Header = App.Text("RemoteCM.Edit"); edit.Icon = App.CreateMenuIcon("Icons.Edit"); - edit.Click += (_, e) => + edit.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new EditRemote(this, remote)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new EditRemote(this, remote)); e.Handled = true; }; var delete = new MenuItem(); delete.Header = App.Text("RemoteCM.Delete"); delete.Icon = App.CreateMenuIcon("Icons.Clear"); - delete.Click += (_, e) => + delete.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new DeleteRemote(this, remote)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteRemote(this, remote)); e.Handled = true; }; var copy = new MenuItem(); copy.Header = App.Text("RemoteCM.CopyURL"); copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => + copy.Click += (o, e) => { App.CopyText(remote.URL); e.Handled = true; @@ -2192,48 +1085,61 @@ namespace SourceGit.ViewModels public ContextMenu CreateContextMenuForRemoteBranch(Models.Branch branch) { var menu = new ContextMenu(); - var name = branch.FriendlyName; + var current = Branches.Find(x => x.IsCurrent); var checkout = new MenuItem(); - checkout.Header = App.Text("BranchCM.Checkout", name); + checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", $"{branch.Remote}/{branch.Name}"); checkout.Icon = App.CreateMenuIcon("Icons.Check"); - checkout.Click += (_, e) => + checkout.Click += (o, e) => { - CheckoutBranch(branch); + foreach (var b in Branches) + { + if (b.IsLocal && b.Upstream == branch.FullName) + { + if (b.IsCurrent) + return; + if (PopupHost.CanCreatePopup()) + PopupHost.ShowAndStartPopup(new Checkout(this, b.Name)); + return; + } + } + + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(this, branch)); e.Handled = true; }; menu.Items.Add(checkout); menu.Items.Add(new MenuItem() { Header = "-" }); - if (_currentBranch != null) + if (current != null) { var pull = new MenuItem(); - pull.Header = App.Text("BranchCM.PullInto", name, _currentBranch.Name); + pull.Header = new Views.NameHighlightedTextBlock("BranchCM.PullInto", $"{branch.Remote}/{branch.Name}", current.Name); pull.Icon = App.CreateMenuIcon("Icons.Pull"); - pull.Click += (_, e) => + pull.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new Pull(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Pull(this, branch)); e.Handled = true; }; var merge = new MenuItem(); - merge.Header = App.Text("BranchCM.Merge", name, _currentBranch.Name); + merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", $"{branch.Remote}/{branch.Name}", current.Name); merge.Icon = App.CreateMenuIcon("Icons.Merge"); - merge.Click += (_, e) => + merge.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new Merge(this, branch, _currentBranch.Name, false)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Merge(this, $"{branch.Remote}/{branch.Name}", current.Name)); e.Handled = true; }; var rebase = new MenuItem(); - rebase.Header = App.Text("BranchCM.Rebase", _currentBranch.Name, name); + rebase.Header = new Views.NameHighlightedTextBlock("BranchCM.Rebase", current.Name, $"{branch.Remote}/{branch.Name}"); rebase.Icon = App.CreateMenuIcon("Icons.Rebase"); - rebase.Click += (_, e) => + rebase.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new Rebase(this, _currentBranch, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Rebase(this, current, branch)); e.Handled = true; }; @@ -2243,81 +1149,52 @@ namespace SourceGit.ViewModels menu.Items.Add(new MenuItem() { Header = "-" }); } - var compareWithHead = new MenuItem(); - compareWithHead.Header = App.Text("BranchCM.CompareWithHead"); - compareWithHead.Icon = App.CreateMenuIcon("Icons.Compare"); - compareWithHead.Click += (_, _) => - { - App.ShowWindow(new BranchCompare(_fullpath, branch, _currentBranch), false); - }; - menu.Items.Add(compareWithHead); - - if (_localChangesCount > 0) - { - var compareWithWorktree = new MenuItem(); - compareWithWorktree.Header = App.Text("BranchCM.CompareWithWorktree"); - compareWithWorktree.Icon = App.CreateMenuIcon("Icons.Compare"); - compareWithWorktree.Click += (_, _) => - { - SelectedSearchedCommit = null; - - if (_histories != null) - { - var target = new Commands.QuerySingleCommit(_fullpath, branch.Head).Result(); - _histories.AutoSelectedCommit = null; - _histories.DetailContext = new RevisionCompare(_fullpath, target, null); - } - }; - menu.Items.Add(compareWithWorktree); - } - menu.Items.Add(new MenuItem() { Header = "-" }); - var delete = new MenuItem(); - delete.Header = App.Text("BranchCM.Delete", name); + delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", $"{branch.Remote}/{branch.Name}"); delete.Icon = App.CreateMenuIcon("Icons.Clear"); - delete.Click += (_, e) => + delete.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new DeleteBranch(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteBranch(this, branch)); e.Handled = true; }; var createBranch = new MenuItem(); createBranch.Icon = App.CreateMenuIcon("Icons.Branch.Add"); createBranch.Header = App.Text("CreateBranch"); - createBranch.Click += (_, e) => + createBranch.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new CreateBranch(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(this, branch)); e.Handled = true; }; var createTag = new MenuItem(); createTag.Icon = App.CreateMenuIcon("Icons.Tag.Add"); createTag.Header = App.Text("CreateTag"); - createTag.Click += (_, e) => + createTag.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new CreateTag(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateTag(this, branch)); e.Handled = true; }; var archive = new MenuItem(); archive.Icon = App.CreateMenuIcon("Icons.Archive"); archive.Header = App.Text("Archive"); - archive.Click += (_, e) => + archive.Click += (o, e) => { - if (CanCreatePopup()) - ShowPopup(new Archive(this, branch)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Archive(this, branch)); e.Handled = true; }; var copy = new MenuItem(); copy.Header = App.Text("BranchCM.CopyName"); copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => + copy.Click += (o, e) => { - App.CopyText(name); + App.CopyText(branch.Remote + "/" + branch.Name); e.Handled = true; }; @@ -2328,9 +1205,7 @@ namespace SourceGit.ViewModels menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(archive); menu.Items.Add(new MenuItem() { Header = "-" }); - TryToAddCustomActionsToBranchContextMenu(menu, branch); menu.Items.Add(copy); - return menu; } @@ -2339,63 +1214,53 @@ namespace SourceGit.ViewModels var createBranch = new MenuItem(); createBranch.Icon = App.CreateMenuIcon("Icons.Branch.Add"); createBranch.Header = App.Text("CreateBranch"); - createBranch.Click += (_, ev) => + createBranch.Click += (o, ev) => { - if (CanCreatePopup()) - ShowPopup(new CreateBranch(this, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateBranch(this, tag)); ev.Handled = true; }; var pushTag = new MenuItem(); - pushTag.Header = App.Text("TagCM.Push", tag.Name); + pushTag.Header = new Views.NameHighlightedTextBlock("TagCM.Push", tag.Name); pushTag.Icon = App.CreateMenuIcon("Icons.Push"); - pushTag.IsEnabled = _remotes.Count > 0; - pushTag.Click += (_, ev) => + pushTag.IsEnabled = Remotes.Count > 0; + pushTag.Click += (o, ev) => { - if (CanCreatePopup()) - ShowPopup(new PushTag(this, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new PushTag(this, tag)); ev.Handled = true; }; var deleteTag = new MenuItem(); - deleteTag.Header = App.Text("TagCM.Delete", tag.Name); + deleteTag.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name); deleteTag.Icon = App.CreateMenuIcon("Icons.Clear"); - deleteTag.Click += (_, ev) => + deleteTag.Click += (o, ev) => { - if (CanCreatePopup()) - ShowPopup(new DeleteTag(this, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteTag(this, tag)); ev.Handled = true; }; var archive = new MenuItem(); archive.Icon = App.CreateMenuIcon("Icons.Archive"); archive.Header = App.Text("Archive"); - archive.Click += (_, ev) => + archive.Click += (o, ev) => { - if (CanCreatePopup()) - ShowPopup(new Archive(this, tag)); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new Archive(this, tag)); ev.Handled = true; }; var copy = new MenuItem(); copy.Header = App.Text("TagCM.Copy"); copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, ev) => + copy.Click += (o, ev) => { App.CopyText(tag.Name); ev.Handled = true; }; - var copyMessage = new MenuItem(); - copyMessage.Header = App.Text("TagCM.CopyMessage"); - copyMessage.Icon = App.CreateMenuIcon("Icons.Copy"); - copyMessage.IsEnabled = !string.IsNullOrEmpty(tag.Message); - copyMessage.Click += (_, ev) => - { - App.CopyText(tag.Message); - ev.Handled = true; - }; - var menu = new ContextMenu(); menu.Items.Add(createBranch); menu.Items.Add(new MenuItem() { Header = "-" }); @@ -2405,519 +1270,65 @@ namespace SourceGit.ViewModels menu.Items.Add(archive); menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(copy); - menu.Items.Add(copyMessage); return menu; } - public ContextMenu CreateContextMenuForBranchSortMode(bool local) - { - var mode = local ? _settings.LocalBranchSortMode : _settings.RemoteBranchSortMode; - var changeMode = new Action(m => - { - if (local) - { - _settings.LocalBranchSortMode = m; - OnPropertyChanged(nameof(IsSortingLocalBranchByName)); - } - else - { - _settings.RemoteBranchSortMode = m; - OnPropertyChanged(nameof(IsSortingRemoteBranchByName)); - } - - var builder = BuildBranchTree(_branches, _remotes); - LocalBranchTrees = builder.Locals; - RemoteBranchTrees = builder.Remotes; - }); - - var byNameAsc = new MenuItem(); - byNameAsc.Header = App.Text("Repository.BranchSort.ByName"); - if (mode == Models.BranchSortMode.Name) - byNameAsc.Icon = App.CreateMenuIcon("Icons.Check"); - byNameAsc.Click += (_, ev) => - { - if (mode != Models.BranchSortMode.Name) - changeMode(Models.BranchSortMode.Name); - - ev.Handled = true; - }; - - var byCommitterDate = new MenuItem(); - byCommitterDate.Header = App.Text("Repository.BranchSort.ByCommitterDate"); - if (mode == Models.BranchSortMode.CommitterDate) - byCommitterDate.Icon = App.CreateMenuIcon("Icons.Check"); - byCommitterDate.Click += (_, ev) => - { - if (mode != Models.BranchSortMode.CommitterDate) - changeMode(Models.BranchSortMode.CommitterDate); - - ev.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Placement = PlacementMode.BottomEdgeAlignedLeft; - menu.Items.Add(byNameAsc); - menu.Items.Add(byCommitterDate); - return menu; - } - - public ContextMenu CreateContextMenuForTagSortMode() - { - var mode = _settings.TagSortMode; - var changeMode = new Action(m => - { - if (_settings.TagSortMode != m) - { - _settings.TagSortMode = m; - OnPropertyChanged(nameof(IsSortingTagsByName)); - VisibleTags = BuildVisibleTags(); - } - }); - - var byCreatorDate = new MenuItem(); - byCreatorDate.Header = App.Text("Repository.Tags.OrderByCreatorDate"); - if (mode == Models.TagSortMode.CreatorDate) - byCreatorDate.Icon = App.CreateMenuIcon("Icons.Check"); - byCreatorDate.Click += (_, ev) => - { - changeMode(Models.TagSortMode.CreatorDate); - ev.Handled = true; - }; - - var byName = new MenuItem(); - byName.Header = App.Text("Repository.Tags.OrderByName"); - if (mode == Models.TagSortMode.Name) - byName.Icon = App.CreateMenuIcon("Icons.Check"); - byName.Click += (_, ev) => - { - changeMode(Models.TagSortMode.Name); - ev.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Placement = PlacementMode.BottomEdgeAlignedLeft; - menu.Items.Add(byCreatorDate); - menu.Items.Add(byName); - return menu; - } - - public ContextMenu CreateContextMenuForSubmodule(Models.Submodule submodule) + public ContextMenu CreateContextMenuForSubmodule(string submodule) { var open = new MenuItem(); open.Header = App.Text("Submodule.Open"); open.Icon = App.CreateMenuIcon("Icons.Folder.Open"); - open.IsEnabled = submodule.Status != Models.SubmoduleStatus.NotInited; - open.Click += (_, ev) => + open.Click += (o, ev) => { - OpenSubmodule(submodule.Path); - ev.Handled = true; - }; + var root = Path.GetFullPath(Path.Combine(_fullpath, submodule)); + var gitDir = new Commands.QueryGitDir(root).Result(); + var repo = Preference.AddRepository(root, gitDir); + var node = new RepositoryNode() + { + Id = repo.FullPath, + Name = Path.GetFileName(repo.FullPath), + Bookmark = 0, + IsRepository = true, + }; - var deinit = new MenuItem(); - deinit.Header = App.Text("Submodule.Deinit"); - deinit.Icon = App.CreateMenuIcon("Icons.Undo"); - deinit.IsEnabled = submodule.Status != Models.SubmoduleStatus.NotInited; - deinit.Click += (_, ev) => - { - if (CanCreatePopup()) - ShowPopup(new DeinitSubmodule(this, submodule.Path)); - ev.Handled = true; - }; + var launcher = App.GetTopLevel().DataContext as Launcher; + if (launcher != null) + { + launcher.OpenRepositoryInTab(node, null); + } - var rm = new MenuItem(); - rm.Header = App.Text("Submodule.Remove"); - rm.Icon = App.CreateMenuIcon("Icons.Clear"); - rm.Click += (_, ev) => - { - if (CanCreatePopup()) - ShowPopup(new DeleteSubmodule(this, submodule.Path)); ev.Handled = true; }; var copy = new MenuItem(); copy.Header = App.Text("Submodule.CopyPath"); copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, ev) => + copy.Click += (o, ev) => { - App.CopyText(submodule.Path); + App.CopyText(submodule); + ev.Handled = true; + }; + + var rm = new MenuItem(); + rm.Header = App.Text("Submodule.Remove"); + rm.Icon = App.CreateMenuIcon("Icons.Clear"); + rm.Click += (o, ev) => + { + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteSubmodule(this, submodule)); ev.Handled = true; }; var menu = new ContextMenu(); menu.Items.Add(open); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(deinit); + menu.Items.Add(copy); menu.Items.Add(rm); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(copy); return menu; } - public ContextMenu CreateContextMenuForWorktree(Models.Worktree worktree) - { - var menu = new ContextMenu(); - - if (worktree.IsLocked) - { - var unlock = new MenuItem(); - unlock.Header = App.Text("Worktree.Unlock"); - unlock.Icon = App.CreateMenuIcon("Icons.Unlock"); - unlock.Click += (_, ev) => - { - SetWatcherEnabled(false); - var log = CreateLog("Unlock Worktree"); - var succ = new Commands.Worktree(_fullpath).Use(log).Unlock(worktree.FullPath); - if (succ) - worktree.IsLocked = false; - log.Complete(); - SetWatcherEnabled(true); - ev.Handled = true; - }; - menu.Items.Add(unlock); - } - else - { - var loc = new MenuItem(); - loc.Header = App.Text("Worktree.Lock"); - loc.Icon = App.CreateMenuIcon("Icons.Lock"); - loc.Click += (_, ev) => - { - SetWatcherEnabled(false); - var log = CreateLog("Lock Worktree"); - var succ = new Commands.Worktree(_fullpath).Use(log).Lock(worktree.FullPath); - if (succ) - worktree.IsLocked = true; - log.Complete(); - SetWatcherEnabled(true); - ev.Handled = true; - }; - menu.Items.Add(loc); - } - - var remove = new MenuItem(); - remove.Header = App.Text("Worktree.Remove"); - remove.Icon = App.CreateMenuIcon("Icons.Clear"); - remove.Click += (_, ev) => - { - if (CanCreatePopup()) - ShowPopup(new RemoveWorktree(this, worktree)); - ev.Handled = true; - }; - menu.Items.Add(remove); - - var copy = new MenuItem(); - copy.Header = App.Text("Worktree.CopyPath"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, e) => - { - App.CopyText(worktree.FullPath); - e.Handled = true; - }; - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(copy); - - return menu; - } - - private LauncherPage GetOwnerPage() - { - var launcher = App.GetLauncher(); - if (launcher == null) - return null; - - foreach (var page in launcher.Pages) - { - if (page.Node.Id.Equals(_fullpath)) - return page; - } - - return null; - } - - private BranchTreeNode.Builder BuildBranchTree(List branches, List remotes) - { - var builder = new BranchTreeNode.Builder(_settings.LocalBranchSortMode, _settings.RemoteBranchSortMode); - if (string.IsNullOrEmpty(_filter)) - { - builder.SetExpandedNodes(_settings.ExpandedBranchNodesInSideBar); - builder.Run(branches, remotes, false); - - foreach (var invalid in builder.InvalidExpandedNodes) - _settings.ExpandedBranchNodesInSideBar.Remove(invalid); - } - else - { - var visibles = new List(); - foreach (var b in branches) - { - if (b.FullName.Contains(_filter, StringComparison.OrdinalIgnoreCase)) - visibles.Add(b); - } - - builder.Run(visibles, remotes, true); - } - - var historiesFilters = _settings.CollectHistoriesFilters(); - UpdateBranchTreeFilterMode(builder.Locals, historiesFilters); - UpdateBranchTreeFilterMode(builder.Remotes, historiesFilters); - return builder; - } - - private object BuildVisibleTags() - { - switch (_settings.TagSortMode) - { - case Models.TagSortMode.CreatorDate: - _tags.Sort((l, r) => r.CreatorDate.CompareTo(l.CreatorDate)); - break; - default: - _tags.Sort((l, r) => Models.NumericSort.Compare(l.Name, r.Name)); - break; - } - - var visible = new List(); - if (string.IsNullOrEmpty(_filter)) - { - visible.AddRange(_tags); - } - else - { - foreach (var t in _tags) - { - if (t.Name.Contains(_filter, StringComparison.OrdinalIgnoreCase)) - visible.Add(t); - } - } - - var historiesFilters = _settings.CollectHistoriesFilters(); - UpdateTagFilterMode(historiesFilters); - - if (Preferences.Instance.ShowTagsAsTree) - return TagCollectionAsTree.Build(visible, _visibleTags as TagCollectionAsTree); - else - return new TagCollectionAsList() { Tags = visible }; - } - - private object BuildVisibleSubmodules() - { - var visible = new List(); - if (string.IsNullOrEmpty(_filter)) - { - visible.AddRange(_submodules); - } - else - { - foreach (var s in _submodules) - { - if (s.Path.Contains(_filter, StringComparison.OrdinalIgnoreCase)) - visible.Add(s); - } - } - - if (Preferences.Instance.ShowSubmodulesAsTree) - return SubmoduleCollectionAsTree.Build(visible, _visibleSubmodules as SubmoduleCollectionAsTree); - else - return new SubmoduleCollectionAsList() { Submodules = visible }; - } - - private void RefreshHistoriesFilters(bool refresh) - { - if (_settings.HistoriesFilters.Count > 0) - HistoriesFilterMode = _settings.HistoriesFilters[0].Mode; - else - HistoriesFilterMode = Models.FilterMode.None; - - if (!refresh) - return; - - var filters = _settings.CollectHistoriesFilters(); - UpdateBranchTreeFilterMode(LocalBranchTrees, filters); - UpdateBranchTreeFilterMode(RemoteBranchTrees, filters); - UpdateTagFilterMode(filters); - - Task.Run(RefreshCommits); - } - - private void UpdateBranchTreeFilterMode(List nodes, Dictionary filters) - { - foreach (var node in nodes) - { - node.FilterMode = filters.GetValueOrDefault(node.Path, Models.FilterMode.None); - - if (!node.IsBranch) - UpdateBranchTreeFilterMode(node.Children, filters); - } - } - - private void UpdateTagFilterMode(Dictionary filters) - { - foreach (var tag in _tags) - { - tag.FilterMode = filters.GetValueOrDefault(tag.Name, Models.FilterMode.None); - } - } - - private void ResetBranchTreeFilterMode(List nodes) - { - foreach (var node in nodes) - { - node.FilterMode = Models.FilterMode.None; - if (!node.IsBranch) - ResetBranchTreeFilterMode(node.Children); - } - } - - private void ResetTagFilterMode() - { - foreach (var tag in _tags) - tag.FilterMode = Models.FilterMode.None; - } - - private BranchTreeNode FindBranchNode(List nodes, string path) - { - foreach (var node in nodes) - { - if (node.Path.Equals(path, StringComparison.Ordinal)) - return node; - - if (path.StartsWith(node.Path, StringComparison.Ordinal)) - { - var founded = FindBranchNode(node.Children, path); - if (founded != null) - return founded; - } - } - - return null; - } - - private void TryToAddCustomActionsToBranchContextMenu(ContextMenu menu, Models.Branch branch) - { - var actions = GetCustomActions(Models.CustomActionScope.Branch); - if (actions.Count == 0) - return; - - var custom = new MenuItem(); - custom.Header = App.Text("BranchCM.CustomAction"); - custom.Icon = App.CreateMenuIcon("Icons.Action"); - - foreach (var action in actions) - { - var dup = action; - var item = new MenuItem(); - item.Icon = App.CreateMenuIcon("Icons.Action"); - item.Header = dup.Name; - item.Click += (_, e) => - { - if (CanCreatePopup()) - ShowAndStartPopup(new ExecuteCustomAction(this, dup, branch)); - - e.Handled = true; - }; - - custom.Items.Add(item); - } - - menu.Items.Add(custom); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - private bool IsSearchingCommitsByFilePath() - { - return _isSearching && _searchCommitFilterType == (int)Models.CommitSearchMethod.ByFile; - } - - private void CalcWorktreeFilesForSearching() - { - if (!IsSearchingCommitsByFilePath()) - { - _requestingWorktreeFiles = false; - _worktreeFiles = null; - MatchedFilesForSearching = null; - GC.Collect(); - return; - } - - if (_requestingWorktreeFiles) - return; - - _requestingWorktreeFiles = true; - - Task.Run(() => - { - _worktreeFiles = new Commands.QueryRevisionFileNames(_fullpath, "HEAD").Result(); - Dispatcher.UIThread.Invoke(() => - { - if (IsSearchingCommitsByFilePath() && _requestingWorktreeFiles) - CalcMatchedFilesForSearching(); - - _requestingWorktreeFiles = false; - }); - }); - } - - private void CalcMatchedFilesForSearching() - { - if (_worktreeFiles == null || _worktreeFiles.Count == 0 || _searchCommitFilter.Length < 3) - { - MatchedFilesForSearching = null; - return; - } - - var matched = new List(); - foreach (var file in _worktreeFiles) - { - if (file.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) && file.Length != _searchCommitFilter.Length) - { - matched.Add(file); - if (matched.Count > 100) - break; - } - } - - MatchedFilesForSearching = matched; - } - - private void AutoFetchImpl(object sender) - { - try - { - if (!_settings.EnableAutoFetch || _isAutoFetching) - return; - - var lockFile = Path.Combine(_gitDir, "index.lock"); - if (File.Exists(lockFile)) - return; - - var now = DateTime.Now; - var desire = _lastFetchTime.AddMinutes(_settings.AutoFetchInterval); - if (desire > now) - return; - - var remotes = new List(); - lock (_lockRemotes) - { - foreach (var remote in _remotes) - remotes.Add(remote.Name); - } - - Dispatcher.UIThread.Invoke(() => IsAutoFetching = true); - foreach (var remote in remotes) - new Commands.Fetch(_fullpath, remote, false, false) { RaiseError = false }.Exec(); - _lastFetchTime = DateTime.Now; - Dispatcher.UIThread.Invoke(() => IsAutoFetching = false); - } - catch - { - // DO nothing, but prevent `System.AggregateException` - } - } - private string _fullpath = string.Empty; private string _gitDir = string.Empty; - private Models.RepositorySettings _settings = null; - private Models.FilterMode _historiesFilterMode = Models.FilterMode.None; - private bool _hasAllowedSignersFile = false; + private Models.GitFlow _gitflow = new Models.GitFlow(); private Models.Watcher _watcher = null; private Histories _histories = null; @@ -2926,41 +1337,23 @@ namespace SourceGit.ViewModels private int _selectedViewIndex = 0; private object _selectedView = null; - private int _localBranchesCount = 0; - private int _localChangesCount = 0; - private int _stashesCount = 0; - private bool _isSearching = false; - private bool _isSearchLoadingVisible = false; - private int _searchCommitFilterType = (int)Models.CommitSearchMethod.ByMessage; - private bool _onlySearchCommitsInCurrentBranch = false; private string _searchCommitFilter = string.Empty; private List _searchedCommits = new List(); - private Models.Commit _selectedSearchedCommit = null; - private bool _requestingWorktreeFiles = false; - private List _worktreeFiles = null; - private List _matchedFilesForSearching = null; - private string _filter = string.Empty; - private readonly Lock _lockRemotes = new(); + private bool _isTagGroupExpanded = false; + private bool _isSubmoduleGroupExpanded = false; + private List _remotes = new List(); private List _branches = new List(); - private Models.Branch _currentBranch = null; - private List _localBranchTrees = new List(); - private List _remoteBranchTrees = new List(); - private List _worktrees = new List(); + private List _localBranchTrees = new List(); + private List _remoteBranchTrees = new List(); private List _tags = new List(); - private object _visibleTags = null; - private List _submodules = new List(); - private object _visibleSubmodules = null; + private List _submodules = new List(); + private bool _canCommitWithPush = false; + private bool _includeUntracked = true; - private bool _isAutoFetching = false; - private Timer _autoFetchTimer = null; - private DateTime _lastFetchTime = DateTime.MinValue; - - private Models.BisectState _bisectState = Models.BisectState.None; - private bool _isBisectCommandRunning = false; - - private string _navigateToCommitDelayed = string.Empty; + private InProgressContext _inProgressContext = null; + private bool _hasUnsolvedConflicts = false; } } diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs index d69ff711..7af0c83f 100644 --- a/src/ViewModels/RepositoryConfigure.cs +++ b/src/ViewModels/RepositoryConfigure.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; -using Avalonia.Collections; -using CommunityToolkit.Mvvm.ComponentModel; +using System.Threading.Tasks; namespace SourceGit.ViewModels { - public class RepositoryConfigure : ObservableObject + public class RepositoryConfigure : Popup { public string UserName { @@ -18,44 +17,7 @@ namespace SourceGit.ViewModels set; } - public List Remotes - { - get; - } - - public string DefaultRemote - { - get => _repo.Settings.DefaultRemote; - set - { - if (_repo.Settings.DefaultRemote != value) - { - _repo.Settings.DefaultRemote = value; - OnPropertyChanged(); - } - } - } - - public int PreferredMergeMode - { - get => _repo.Settings.PreferredMergeMode; - set - { - if (_repo.Settings.PreferredMergeMode != value) - { - _repo.Settings.PreferredMergeMode = value; - OnPropertyChanged(); - } - } - } - - public bool GPGCommitSigningEnabled - { - get; - set; - } - - public bool GPGTagSigningEnabled + public bool GPGSigningEnabled { get; set; @@ -68,273 +30,48 @@ namespace SourceGit.ViewModels } public string HttpProxy - { - get => _httpProxy; - set => SetProperty(ref _httpProxy, value); - } - - public bool EnablePruneOnFetch { get; set; } - public bool EnableAutoFetch - { - get => _repo.Settings.EnableAutoFetch; - set => _repo.Settings.EnableAutoFetch = value; - } - - public int? AutoFetchInterval - { - get => _repo.Settings.AutoFetchInterval; - set - { - if (value is null || value < 1) - return; - - var interval = (int)value; - if (_repo.Settings.AutoFetchInterval != interval) - _repo.Settings.AutoFetchInterval = interval; - } - } - - public AvaloniaList CommitTemplates - { - get => _repo.Settings.CommitTemplates; - } - - public Models.CommitTemplate SelectedCommitTemplate - { - get => _selectedCommitTemplate; - set => SetProperty(ref _selectedCommitTemplate, value); - } - - public AvaloniaList IssueTrackerRules - { - get => _repo.Settings.IssueTrackerRules; - } - - public Models.IssueTrackerRule SelectedIssueTrackerRule - { - get => _selectedIssueTrackerRule; - set => SetProperty(ref _selectedIssueTrackerRule, value); - } - - public List AvailableOpenAIServices - { - get; - private set; - } - - public string PreferredOpenAIService - { - get => _repo.Settings.PreferredOpenAIService; - set => _repo.Settings.PreferredOpenAIService = value; - } - - public AvaloniaList CustomActions - { - get => _repo.Settings.CustomActions; - } - - public Models.CustomAction SelectedCustomAction - { - get => _selectedCustomAction; - set => SetProperty(ref _selectedCustomAction, value); - } - public RepositoryConfigure(Repository repo) { _repo = repo; - Remotes = new List(); - foreach (var remote in _repo.Remotes) - Remotes.Add(remote.Name); - - AvailableOpenAIServices = new List() { "---" }; - foreach (var service in Preferences.Instance.OpenAIServices) - AvailableOpenAIServices.Add(service.Name); - - if (!AvailableOpenAIServices.Contains(PreferredOpenAIService)) - PreferredOpenAIService = "---"; - _cached = new Commands.Config(repo.FullPath).ListAll(); if (_cached.TryGetValue("user.name", out var name)) UserName = name; if (_cached.TryGetValue("user.email", out var email)) UserEmail = email; - if (_cached.TryGetValue("commit.gpgsign", out var gpgCommitSign)) - GPGCommitSigningEnabled = gpgCommitSign == "true"; - if (_cached.TryGetValue("tag.gpgsign", out var gpgTagSign)) - GPGTagSigningEnabled = gpgTagSign == "true"; + if (_cached.TryGetValue("commit.gpgsign", out var gpgsign)) + GPGSigningEnabled = gpgsign == "true"; if (_cached.TryGetValue("user.signingkey", out var signingKey)) GPGUserSigningKey = signingKey; if (_cached.TryGetValue("http.proxy", out var proxy)) HttpProxy = proxy; - if (_cached.TryGetValue("fetch.prune", out var prune)) - EnablePruneOnFetch = (prune == "true"); + + View = new Views.RepositoryConfigure() { DataContext = this }; } - public void ClearHttpProxy() + public override Task Sure() { - HttpProxy = string.Empty; + SetIfChanged("user.name", UserName); + SetIfChanged("user.email", UserEmail); + SetIfChanged("commit.gpgsign", GPGSigningEnabled ? "true" : "false"); + SetIfChanged("user.signingkey", GPGUserSigningKey); + SetIfChanged("http.proxy", HttpProxy); + return null; } - public void AddCommitTemplate() - { - var template = new Models.CommitTemplate() { Name = "New Template" }; - _repo.Settings.CommitTemplates.Add(template); - SelectedCommitTemplate = template; - } - - public void RemoveSelectedCommitTemplate() - { - if (_selectedCommitTemplate != null) - _repo.Settings.CommitTemplates.Remove(_selectedCommitTemplate); - SelectedCommitTemplate = null; - } - - public void AddSampleGithubIssueTracker() - { - var link = "https://github.com/username/repository/issues/$1"; - foreach (var remote in _repo.Remotes) - { - if (remote.URL.Contains("github.com", System.StringComparison.Ordinal) && - remote.TryGetVisitURL(out string url)) - { - link = $"{url}/issues/$1"; - break; - } - } - - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Github ISSUE", "#(\\d+)", link); - } - - public void AddSampleJiraIssueTracker() - { - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Jira Tracker", "PROJ-(\\d+)", "https://jira.yourcompany.com/browse/PROJ-$1"); - } - - public void AddSampleAzureWorkItemTracker() - { - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Azure DevOps Tracker", "#(\\d+)", "https://dev.azure.com/yourcompany/workspace/_workitems/edit/$1"); - } - - public void AddSampleGitLabIssueTracker() - { - var link = "https://gitlab.com/username/repository/-/issues/$1"; - foreach (var remote in _repo.Remotes) - { - if (remote.TryGetVisitURL(out string url)) - { - link = $"{url}/-/issues/$1"; - break; - } - } - - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("GitLab ISSUE", "#(\\d+)", link); - } - - public void AddSampleGitLabMergeRequestTracker() - { - var link = "https://gitlab.com/username/repository/-/merge_requests/$1"; - foreach (var remote in _repo.Remotes) - { - if (remote.TryGetVisitURL(out string url)) - { - link = $"{url}/-/merge_requests/$1"; - break; - } - } - - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("GitLab MR", "!(\\d+)", link); - } - - public void AddSampleGiteeIssueTracker() - { - var link = "https://gitee.com/username/repository/issues/$1"; - foreach (var remote in _repo.Remotes) - { - if (remote.URL.Contains("gitee.com", System.StringComparison.Ordinal) && - remote.TryGetVisitURL(out string url)) - { - link = $"{url}/issues/$1"; - break; - } - } - - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Gitee ISSUE", "#([0-9A-Z]{6,10})", link); - } - - public void AddSampleGiteePullRequestTracker() - { - var link = "https://gitee.com/username/repository/pulls/$1"; - foreach (var remote in _repo.Remotes) - { - if (remote.URL.Contains("gitee.com", System.StringComparison.Ordinal) && - remote.TryGetVisitURL(out string url)) - { - link = $"{url}/pulls/$1"; - } - } - - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("Gitee Pull Request", "!(\\d+)", link); - } - - public void NewIssueTracker() - { - SelectedIssueTrackerRule = _repo.Settings.AddIssueTracker("New Issue Tracker", "#(\\d+)", "https://xxx/$1"); - } - - public void RemoveSelectedIssueTracker() - { - _repo.Settings.RemoveIssueTracker(_selectedIssueTrackerRule); - SelectedIssueTrackerRule = null; - } - - public void AddNewCustomAction() - { - SelectedCustomAction = _repo.Settings.AddNewCustomAction(); - } - - public void RemoveSelectedCustomAction() - { - _repo.Settings.RemoveCustomAction(_selectedCustomAction); - SelectedCustomAction = null; - } - - public void MoveSelectedCustomActionUp() - { - if (_selectedCustomAction != null) - _repo.Settings.MoveCustomActionUp(_selectedCustomAction); - } - - public void MoveSelectedCustomActionDown() - { - if (_selectedCustomAction != null) - _repo.Settings.MoveCustomActionDown(_selectedCustomAction); - } - - public void Save() - { - SetIfChanged("user.name", UserName, ""); - SetIfChanged("user.email", UserEmail, ""); - SetIfChanged("commit.gpgsign", GPGCommitSigningEnabled ? "true" : "false", "false"); - SetIfChanged("tag.gpgsign", GPGTagSigningEnabled ? "true" : "false", "false"); - SetIfChanged("user.signingkey", GPGUserSigningKey, ""); - SetIfChanged("http.proxy", HttpProxy, ""); - SetIfChanged("fetch.prune", EnablePruneOnFetch ? "true" : "false", "false"); - } - - private void SetIfChanged(string key, string value, string defValue) + private void SetIfChanged(string key, string value) { bool changed = false; if (_cached.TryGetValue(key, out var old)) { changed = old != value; } - else if (!string.IsNullOrEmpty(value) && value != defValue) + else if (!string.IsNullOrEmpty(value)) { changed = true; } @@ -347,9 +84,5 @@ namespace SourceGit.ViewModels private readonly Repository _repo = null; private readonly Dictionary _cached = null; - private string _httpProxy; - private Models.CommitTemplate _selectedCommitTemplate = null; - private Models.IssueTrackerRule _selectedIssueTrackerRule = null; - private Models.CustomAction _selectedCustomAction = null; } } diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs index c65d1dbd..b0b6e73e 100644 --- a/src/ViewModels/RepositoryNode.cs +++ b/src/ViewModels/RepositoryNode.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; -using System.IO; -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; + +using Avalonia.Collections; using CommunityToolkit.Mvvm.ComponentModel; @@ -13,7 +13,7 @@ namespace SourceGit.ViewModels get => _id; set { - var normalized = value.Replace('\\', '/').TrimEnd('/'); + var normalized = value.Replace('\\', '/'); SetProperty(ref _id, normalized); } } @@ -49,37 +49,22 @@ namespace SourceGit.ViewModels set => SetProperty(ref _isVisible, value); } - [JsonIgnore] - public bool IsInvalid + public AvaloniaList SubNodes { - get => _isRepository && !Directory.Exists(_id); + get => _subNodes; + set => SetProperty(ref _subNodes, value); } - [JsonIgnore] - public int Depth - { - get; - set; - } = 0; - - public List SubNodes - { - get; - set; - } = []; - public void Edit() { - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new EditRepositoryNode(this); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new EditRepositoryNode(this)); } public void AddSubFolder() { - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new CreateGroup(this); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateGroup(this)); } public void OpenInFileManager() @@ -98,9 +83,8 @@ namespace SourceGit.ViewModels public void Delete() { - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new DeleteRepositoryNode(this); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new DeleteRepositoryNode(this)); } private string _id = string.Empty; @@ -109,5 +93,6 @@ namespace SourceGit.ViewModels private int _bookmark = 0; private bool _isExpanded = false; private bool _isVisible = true; + private AvaloniaList _subNodes = new AvaloniaList(); } } diff --git a/src/ViewModels/Reset.cs b/src/ViewModels/Reset.cs index d3377a99..30b89137 100644 --- a/src/ViewModels/Reset.cs +++ b/src/ViewModels/Reset.cs @@ -1,20 +1,47 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; + +using Avalonia.Media; namespace SourceGit.ViewModels { + public class ResetMode + { + public string Name { get; set; } + public string Desc { get; set; } + public string Arg { get; set; } + public IBrush Color { get; set; } + + public ResetMode(string n, string d, string a, IBrush b) + { + Name = n; + Desc = d; + Arg = a; + Color = b; + } + } + public class Reset : Popup { public Models.Branch Current { get; + private set; } public Models.Commit To { get; + private set; } - public Models.ResetMode SelectedMode + public List Modes + { + get; + private set; + } + + public ResetMode SelectedMode { get; set; @@ -25,7 +52,13 @@ namespace SourceGit.ViewModels _repo = repo; Current = current; To = to; - SelectedMode = Models.ResetMode.Supported[1]; + Modes = new List() { + new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", Brushes.Green), + new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Orange), + new ResetMode("Hard", "Discard all changes", "--hard", Brushes.Red), + }; + SelectedMode = Modes[0]; + View = new Views.Reset() { DataContext = this }; } public override Task Sure() @@ -33,13 +66,9 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = $"Reset current branch to {To.SHA} ..."; - var log = _repo.CreateLog($"Reset HEAD to '{To.SHA}'"); - Use(log); - return Task.Run(() => { - var succ = new Commands.Reset(_repo.FullPath, To.SHA, SelectedMode.Arg).Use(log).Exec(); - log.Complete(); + var succ = new Commands.Reset(_repo.FullPath, To.SHA, SelectedMode.Arg).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); diff --git a/src/ViewModels/ResetWithoutCheckout.cs b/src/ViewModels/ResetWithoutCheckout.cs deleted file mode 100644 index 3a9582ef..00000000 --- a/src/ViewModels/ResetWithoutCheckout.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class ResetWithoutCheckout : Popup - { - public Models.Branch Target - { - get; - } - - public object To - { - get; - } - - public ResetWithoutCheckout(Repository repo, Models.Branch target, Models.Branch to) - { - _repo = repo; - _revision = to.Head; - Target = target; - To = to; - } - - public ResetWithoutCheckout(Repository repo, Models.Branch target, Models.Commit to) - { - _repo = repo; - _revision = to.SHA; - Target = target; - To = to; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - ProgressDescription = $"Reset {Target.Name} to {_revision} ..."; - - var log = _repo.CreateLog($"Reset '{Target.Name}' to '{_revision}'"); - Use(log); - - return Task.Run(() => - { - var succ = Commands.Branch.Create(_repo.FullPath, Target.Name, _revision, true, log); - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return succ; - }); - } - - private readonly Repository _repo = null; - private readonly string _revision = string.Empty; - } -} diff --git a/src/ViewModels/Revert.cs b/src/ViewModels/Revert.cs index bb07e2ff..bbe1d9e9 100644 --- a/src/ViewModels/Revert.cs +++ b/src/ViewModels/Revert.cs @@ -7,6 +7,7 @@ namespace SourceGit.ViewModels public Models.Commit Target { get; + private set; } public bool AutoCommit @@ -20,23 +21,19 @@ namespace SourceGit.ViewModels _repo = repo; Target = target; AutoCommit = true; + View = new Views.Revert() { DataContext = this }; } public override Task Sure() { _repo.SetWatcherEnabled(false); - _repo.ClearCommitMessage(); ProgressDescription = $"Revert commit '{Target.SHA}' ..."; - var log = _repo.CreateLog($"Revert '{Target.SHA}'"); - Use(log); - return Task.Run(() => { - new Commands.Revert(_repo.FullPath, Target.SHA, AutoCommit).Use(log).Exec(); - log.Complete(); + var succ = new Commands.Revert(_repo.FullPath, Target.SHA, AutoCommit).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; + return succ; }); } diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs index 39400aa3..1ed85c9e 100644 --- a/src/ViewModels/RevisionCompare.cs +++ b/src/ViewModels/RevisionCompare.cs @@ -10,23 +10,18 @@ using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class RevisionCompare : ObservableObject, IDisposable + public class RevisionCompare : ObservableObject { - public object StartPoint + public Models.Commit StartPoint { - get => _startPoint; - private set => SetProperty(ref _startPoint, value); + get; + private set; } - public object EndPoint + public Models.Commit EndPoint { - get => _endPoint; - private set => SetProperty(ref _endPoint, value); - } - - public bool CanSaveAsPatch - { - get => _canSaveAsPatch; + get; + private set; } public List VisibleChanges @@ -35,21 +30,47 @@ namespace SourceGit.ViewModels private set => SetProperty(ref _visibleChanges, value); } - public List SelectedChanges + public List ChangeTree { - get => _selectedChanges; + get => _changeTree; + private set => SetProperty(ref _changeTree, value); + } + + public Models.Change SelectedChange + { + get => _selectedChange; set { - if (SetProperty(ref _selectedChanges, value)) + if (SetProperty(ref _selectedChange, value)) { - if (value != null && value.Count == 1) + if (value == null) { - var option = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), value[0]); - DiffContext = new DiffContext(_repo, option, _diffContext); + SelectedNode = null; + DiffContext = null; } else { - DiffContext = null; + SelectedNode = FileTreeNode.SelectByPath(_changeTree, value.Path); + DiffContext = new DiffContext(_repo, new Models.DiffOption(StartPoint.SHA, EndPoint.SHA, value), _diffContext); + } + } + } + } + + public FileTreeNode SelectedNode + { + get => _selectedNode; + set + { + if (SetProperty(ref _selectedNode, value)) + { + if (value == null) + { + SelectedChange = null; + } + else + { + SelectedChange = value.Backend as Models.Change; } } } @@ -76,59 +97,55 @@ namespace SourceGit.ViewModels public RevisionCompare(string repo, Models.Commit startPoint, Models.Commit endPoint) { _repo = repo; - _startPoint = (object)startPoint ?? new Models.Null(); - _endPoint = (object)endPoint ?? new Models.Null(); - _canSaveAsPatch = startPoint != null && endPoint != null; + StartPoint = startPoint; + EndPoint = endPoint; - Task.Run(Refresh); + Task.Run(() => + { + _changes = new Commands.CompareRevisions(_repo, startPoint.SHA, endPoint.SHA).Result(); + + var visible = _changes; + if (!string.IsNullOrWhiteSpace(_searchFilter)) + { + visible = new List(); + foreach (var c in _changes) + { + if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) + { + visible.Add(c); + } + } + } + + var tree = FileTreeNode.Build(visible); + Dispatcher.UIThread.Invoke(() => + { + VisibleChanges = visible; + ChangeTree = tree; + }); + }); } - public void Dispose() + public void Cleanup() { _repo = null; - _startPoint = null; - _endPoint = null; if (_changes != null) _changes.Clear(); if (_visibleChanges != null) _visibleChanges.Clear(); - if (_selectedChanges != null) - _selectedChanges.Clear(); + if (_changeTree != null) + _changeTree.Clear(); + _selectedChange = null; + _selectedNode = null; _searchFilter = null; _diffContext = null; } public void NavigateTo(string commitSHA) { - var launcher = App.GetLauncher(); - if (launcher == null) - return; - - foreach (var page in launcher.Pages) - { - if (page.Data is Repository repo && repo.FullPath.Equals(_repo)) - { - repo.NavigateToCommit(commitSHA); - break; - } - } - } - - public void Swap() - { - (StartPoint, EndPoint) = (_endPoint, _startPoint); - SelectedChanges = []; - Task.Run(Refresh); - } - - public void SaveAsPatch(string saveTo) - { - Task.Run(() => - { - var succ = Commands.SaveChangesAsPatch.ProcessRevisionCompareChanges(_repo, _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo); - if (succ) - Dispatcher.UIThread.Invoke(() => App.SendNotification(_repo, App.Text("SaveAsPatchSuccess"))); - }); + var repo = Preference.FindRepository(_repo); + if (repo != null) + repo.NavigateToCommit(commitSHA); } public void ClearSearchFilter() @@ -136,24 +153,28 @@ namespace SourceGit.ViewModels SearchFilter = string.Empty; } - public ContextMenu CreateChangeContextMenu() + public ContextMenu CreateChangeContextMenu(Models.Change change) { - if (_selectedChanges == null || _selectedChanges.Count != 1) - return null; - - var change = _selectedChanges[0]; var menu = new ContextMenu(); var diffWithMerger = new MenuItem(); diffWithMerger.Header = App.Text("DiffWithMerger"); - diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); + diffWithMerger.Icon = App.CreateMenuIcon("Icons.Diff"); diffWithMerger.Click += (_, ev) => { - var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change); - var toolType = Preferences.Instance.ExternalMergeToolType; - var toolPath = Preferences.Instance.ExternalMergeToolPath; + var opt = new Models.DiffOption(StartPoint.SHA, EndPoint.SHA, change); + var type = Preference.Instance.ExternalMergeToolType; + var exec = Preference.Instance.ExternalMergeToolPath; - Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, opt)); + var tool = Models.ExternalMerger.Supported.Find(x => x.Type == type); + if (tool == null || !File.Exists(exec)) + { + App.RaiseException(_repo, "Invalid merge tool in preference setting!"); + return; + } + + var args = tool.Type != 0 ? tool.DiffCmd : Preference.Instance.ExternalMergeToolDiffCmd; + Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, opt)); ev.Handled = true; }; menu.Items.Add(diffWithMerger); @@ -163,7 +184,7 @@ namespace SourceGit.ViewModels var full = Path.GetFullPath(Path.Combine(_repo, change.Path)); var explore = new MenuItem(); explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); + explore.Icon = App.CreateMenuIcon("Icons.Folder.Open"); explore.IsEnabled = File.Exists(full); explore.Click += (_, ev) => { @@ -181,18 +202,8 @@ namespace SourceGit.ViewModels App.CopyText(change.Path); ev.Handled = true; }; + menu.Items.Add(copyPath); - - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(Native.OS.GetAbsPath(_repo, change.Path)); - e.Handled = true; - }; - menu.Items.Add(copyFullPath); - return menu; } @@ -211,43 +222,23 @@ namespace SourceGit.ViewModels foreach (var c in _changes) { if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) + { visible.Add(c); + } } VisibleChanges = visible; } + + ChangeTree = FileTreeNode.Build(_visibleChanges); } - private void Refresh() - { - _changes = new Commands.CompareRevisions(_repo, GetSHA(_startPoint), GetSHA(_endPoint)).Result(); - - var visible = _changes; - if (!string.IsNullOrWhiteSpace(_searchFilter)) - { - visible = []; - foreach (var c in _changes) - { - if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) - visible.Add(c); - } - } - - Dispatcher.UIThread.Invoke(() => VisibleChanges = visible); - } - - private string GetSHA(object obj) - { - return obj is Models.Commit commit ? commit.SHA : string.Empty; - } - - private string _repo; - private object _startPoint = null; - private object _endPoint = null; - private bool _canSaveAsPatch = false; + private string _repo = string.Empty; private List _changes = null; private List _visibleChanges = null; - private List _selectedChanges = null; + private List _changeTree = null; + private Models.Change _selectedChange = null; + private FileTreeNode _selectedNode = null; private string _searchFilter = string.Empty; private DiffContext _diffContext = null; } diff --git a/src/ViewModels/RevisionFileTreeNode.cs b/src/ViewModels/RevisionFileTreeNode.cs deleted file mode 100644 index 083e9d33..00000000 --- a/src/ViewModels/RevisionFileTreeNode.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections.Generic; -using System.IO; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class RevisionFileTreeNode : ObservableObject - { - public Models.Object Backend { get; set; } = null; - public int Depth { get; set; } = 0; - public List Children { get; set; } = new List(); - - public string Name - { - get => Backend == null ? string.Empty : Path.GetFileName(Backend.Path); - } - - public bool IsFolder - { - get => Backend != null && Backend.Type == Models.ObjectType.Tree; - } - - public bool IsExpanded - { - get => _isExpanded; - set => SetProperty(ref _isExpanded, value); - } - - private bool _isExpanded = false; - } -} diff --git a/src/ViewModels/RevisionLFSImage.cs b/src/ViewModels/RevisionLFSImage.cs deleted file mode 100644 index e0b9a348..00000000 --- a/src/ViewModels/RevisionLFSImage.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Threading.Tasks; -using Avalonia.Threading; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class RevisionLFSImage : ObservableObject - { - public Models.RevisionLFSObject LFS - { - get; - } - - public Models.RevisionImageFile Image - { - get => _image; - private set => SetProperty(ref _image, value); - } - - public RevisionLFSImage(string repo, string file, Models.LFSObject lfs, Models.ImageDecoder decoder) - { - LFS = new Models.RevisionLFSObject() { Object = lfs }; - - Task.Run(() => - { - var source = ImageSource.FromLFSObject(repo, lfs, decoder); - var img = new Models.RevisionImageFile(file, source.Bitmap, source.Size); - Dispatcher.UIThread.Invoke(() => Image = img); - }); - } - - private Models.RevisionImageFile _image = null; - } -} diff --git a/src/ViewModels/Reword.cs b/src/ViewModels/Reword.cs index 72dd9e58..dc67a095 100644 --- a/src/ViewModels/Reword.cs +++ b/src/ViewModels/Reword.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; namespace SourceGit.ViewModels @@ -9,6 +8,7 @@ namespace SourceGit.ViewModels public Models.Commit Head { get; + private set; } [Required(ErrorMessage = "Commit message is required!!!")] @@ -21,35 +21,28 @@ namespace SourceGit.ViewModels public Reword(Repository repo, Models.Commit head) { _repo = repo; - _oldMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, head.SHA).Result(); - _message = _oldMessage; Head = head; + Message = head.FullMessage; + View = new Views.Reword() { DataContext = this }; } public override Task Sure() { - if (string.Compare(_message, _oldMessage, StringComparison.Ordinal) == 0) + if (_message == Head.FullMessage) return null; _repo.SetWatcherEnabled(false); ProgressDescription = $"Editing head commit message ..."; - var log = _repo.CreateLog("Reword HEAD"); - Use(log); - - var signOff = _repo.Settings.EnableSignOffForCommit; return Task.Run(() => { - // For reword (only changes the commit message), disable `--reset-author` - var succ = new Commands.Commit(_repo.FullPath, _message, signOff, true, false).Use(log).Run(); - log.Complete(); + var succ = new Commands.Commit(_repo.FullPath, _message, true, true).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private readonly Repository _repo; - private readonly string _oldMessage; - private string _message; + private readonly Repository _repo = null; + private string _message = string.Empty; } } diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs deleted file mode 100644 index 4d05a996..00000000 --- a/src/ViewModels/ScanRepositories.cs +++ /dev/null @@ -1,163 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Threading.Tasks; - -using Avalonia.Threading; - -namespace SourceGit.ViewModels -{ - public class ScanRepositories : Popup - { - public string RootDir - { - get; - } - - public ScanRepositories(string rootDir) - { - GetManagedRepositories(Preferences.Instance.RepositoryNodes, _managed); - RootDir = rootDir; - } - - public override Task Sure() - { - ProgressDescription = $"Scan repositories under '{RootDir}' ..."; - - return Task.Run(() => - { - var watch = new Stopwatch(); - watch.Start(); - - var rootDir = new DirectoryInfo(RootDir); - var found = new List(); - GetUnmanagedRepositories(rootDir, found, new EnumerationOptions() - { - AttributesToSkip = FileAttributes.Hidden | FileAttributes.System, - IgnoreInaccessible = true, - }); - - // Make sure this task takes at least 0.5s to avoid that the popup panel do not disappear very quickly. - var remain = 500 - (int)watch.Elapsed.TotalMilliseconds; - watch.Stop(); - if (remain > 0) - Task.Delay(remain).Wait(); - - Dispatcher.UIThread.Invoke(() => - { - var normalizedRoot = rootDir.FullName.Replace('\\', '/').TrimEnd('/'); - - foreach (var f in found) - { - var parent = new DirectoryInfo(f).Parent!.FullName.Replace('\\', '/').TrimEnd('/'); - if (parent.Equals(normalizedRoot, StringComparison.Ordinal)) - { - Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false, false); - } - else if (parent.StartsWith(normalizedRoot, StringComparison.Ordinal)) - { - var relative = parent.Substring(normalizedRoot.Length).TrimStart('/'); - var group = FindOrCreateGroupRecursive(Preferences.Instance.RepositoryNodes, relative); - Preferences.Instance.FindOrAddNodeByRepositoryPath(f, group, false, false); - } - } - - Preferences.Instance.AutoRemoveInvalidNode(); - Preferences.Instance.Save(); - - Welcome.Instance.Refresh(); - }); - - return true; - }); - } - - private void GetManagedRepositories(List group, HashSet repos) - { - foreach (var node in group) - { - if (node.IsRepository) - repos.Add(node.Id); - else - GetManagedRepositories(node.SubNodes, repos); - } - } - - private void GetUnmanagedRepositories(DirectoryInfo dir, List outs, EnumerationOptions opts, int depth = 0) - { - var subdirs = dir.GetDirectories("*", opts); - foreach (var subdir in subdirs) - { - if (subdir.Name.StartsWith(".", StringComparison.Ordinal) || - subdir.Name.Equals("node_modules", StringComparison.Ordinal)) - continue; - - CallUIThread(() => ProgressDescription = $"Scanning {subdir.FullName}..."); - - var normalizedSelf = subdir.FullName.Replace('\\', '/').TrimEnd('/'); - if (_managed.Contains(normalizedSelf)) - continue; - - var gitDir = Path.Combine(subdir.FullName, ".git"); - if (Directory.Exists(gitDir) || File.Exists(gitDir)) - { - var test = new Commands.QueryRepositoryRootPath(subdir.FullName).ReadToEnd(); - if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut)) - { - var normalized = test.StdOut.Trim().Replace('\\', '/').TrimEnd('/'); - if (!_managed.Contains(normalized)) - outs.Add(normalized); - } - - continue; - } - - var isBare = new Commands.IsBareRepository(subdir.FullName).Result(); - if (isBare) - { - outs.Add(normalizedSelf); - continue; - } - - if (depth < 5) - GetUnmanagedRepositories(subdir, outs, opts, depth + 1); - } - } - - private RepositoryNode FindOrCreateGroupRecursive(List collection, string path) - { - RepositoryNode node = null; - foreach (var name in path.Split('/')) - { - node = FindOrCreateGroup(collection, name); - collection = node.SubNodes; - } - - return node; - } - - private RepositoryNode FindOrCreateGroup(List collection, string name) - { - foreach (var node in collection) - { - if (node.Name.Equals(name, StringComparison.Ordinal)) - return node; - } - - var added = new RepositoryNode() - { - Id = Guid.NewGuid().ToString(), - Name = name, - IsRepository = false, - IsExpanded = true, - }; - collection.Add(added); - - Preferences.Instance.SortNodes(collection); - return added; - } - - private HashSet _managed = new(); - } -} diff --git a/src/ViewModels/SetUpstream.cs b/src/ViewModels/SetUpstream.cs deleted file mode 100644 index a51586e6..00000000 --- a/src/ViewModels/SetUpstream.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class SetUpstream : Popup - { - public Models.Branch Local - { - get; - } - - public List RemoteBranches - { - get; - private set; - } - - public Models.Branch SelectedRemoteBranch - { - get; - set; - } - - public bool Unset - { - get => _unset; - set => SetProperty(ref _unset, value); - } - - public SetUpstream(Repository repo, Models.Branch local, List remoteBranches) - { - _repo = repo; - Local = local; - RemoteBranches = remoteBranches; - Unset = false; - - if (!string.IsNullOrEmpty(local.Upstream)) - { - var upstream = remoteBranches.Find(x => x.FullName == local.Upstream); - if (upstream != null) - SelectedRemoteBranch = upstream; - } - - if (SelectedRemoteBranch == null) - { - var upstream = remoteBranches.Find(x => x.Name == local.Name); - if (upstream != null) - SelectedRemoteBranch = upstream; - } - } - - public override Task Sure() - { - ProgressDescription = "Setting upstream..."; - - var upstream = (_unset || SelectedRemoteBranch == null) ? string.Empty : SelectedRemoteBranch.FullName; - if (upstream == Local.Upstream) - return null; - - var log = _repo.CreateLog("Set Upstream"); - Use(log); - - return Task.Run(() => - { - var succ = Commands.Branch.SetUpstream(_repo.FullPath, Local.Name, upstream.Replace("refs/remotes/", ""), log); - if (succ) - _repo.RefreshBranches(); - - log.Complete(); - return true; - }); - } - - private readonly Repository _repo; - private bool _unset = false; - } -} diff --git a/src/ViewModels/Squash.cs b/src/ViewModels/Squash.cs index 8e9bae8b..bcf6e101 100644 --- a/src/ViewModels/Squash.cs +++ b/src/ViewModels/Squash.cs @@ -5,9 +5,16 @@ namespace SourceGit.ViewModels { public class Squash : Popup { - public Models.Commit Target + public Models.Commit Head { get; + private set; + } + + public Models.Commit Parent + { + get; + private set; } [Required(ErrorMessage = "Commit message is required!!!")] @@ -17,11 +24,13 @@ namespace SourceGit.ViewModels set => SetProperty(ref _message, value, true); } - public Squash(Repository repo, Models.Commit target, string shaToGetPreferMessage) + public Squash(Repository repo, Models.Commit head, Models.Commit parent) { _repo = repo; - _message = new Commands.QueryCommitFullMessage(_repo.FullPath, shaToGetPreferMessage).Result(); - Target = target; + _message = parent.FullMessage; + Head = head; + Parent = parent; + View = new Views.Squash() { DataContext = this }; } public override Task Sure() @@ -29,42 +38,17 @@ namespace SourceGit.ViewModels _repo.SetWatcherEnabled(false); ProgressDescription = "Squashing ..."; - var log = _repo.CreateLog("Squash"); - Use(log); - return Task.Run(() => { - var signOff = _repo.Settings.EnableSignOffForCommit; - var autoStashed = false; - var succ = false; - - if (_repo.LocalChangesCount > 0) - { - succ = new Commands.Stash(_repo.FullPath).Use(log).Push("SQUASH_AUTO_STASH"); - if (!succ) - { - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return false; - } - - autoStashed = true; - } - - succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Use(log).Exec(); + var succ = new Commands.Reset(_repo.FullPath, Parent.SHA, "--soft").Exec(); if (succ) - succ = new Commands.Commit(_repo.FullPath, _message, signOff, true, false).Use(log).Run(); - - if (succ && autoStashed) - new Commands.Stash(_repo.FullPath).Use(log).Pop("stash@{0}"); - - log.Complete(); + succ = new Commands.Commit(_repo.FullPath, _message, true).Exec(); CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); } - private readonly Repository _repo; - private string _message; + private readonly Repository _repo = null; + private string _message = string.Empty; } } diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs index 11e449fb..32b07900 100644 --- a/src/ViewModels/StashChanges.cs +++ b/src/ViewModels/StashChanges.cs @@ -1,140 +1,66 @@ -using System; -using System.Collections.Generic; -using System.IO; +using System.Collections.Generic; using System.Threading.Tasks; namespace SourceGit.ViewModels { public class StashChanges : Popup { + public string Message { get; set; } - public bool HasSelectedFiles + public bool CanIgnoreUntracked { get; + private set; } public bool IncludeUntracked { - get => _repo.Settings.IncludeUntrackedWhenStash; - set => _repo.Settings.IncludeUntrackedWhenStash = value; + get; + set; } - public bool OnlyStaged - { - get => _repo.Settings.OnlyStagedWhenStash; - set => _repo.Settings.OnlyStagedWhenStash = value; - } - - public bool KeepIndex - { - get => _repo.Settings.KeepIndexWhenStash; - set => _repo.Settings.KeepIndexWhenStash = value; - } - - public bool AutoRestore - { - get => _repo.Settings.AutoRestoreAfterStash; - set => _repo.Settings.AutoRestoreAfterStash = value; - } - - public StashChanges(Repository repo, List changes, bool hasSelectedFiles) + public StashChanges(Repository repo, List changes, bool canIgnoreUntracked) { _repo = repo; _changes = changes; - HasSelectedFiles = hasSelectedFiles; + + CanIgnoreUntracked = canIgnoreUntracked; + IncludeUntracked = true; + View = new Views.StashChanges() { DataContext = this }; } public override Task Sure() { + var jobs = _changes; + if (CanIgnoreUntracked && !IncludeUntracked) + { + jobs = new List(); + foreach (var job in _changes) + { + if (job.WorkTree != Models.ChangeState.Untracked && job.WorkTree != Models.ChangeState.Added) + { + jobs.Add(job); + } + } + } + + if (jobs.Count == 0) + return null; + _repo.SetWatcherEnabled(false); ProgressDescription = $"Stash changes ..."; - var log = _repo.CreateLog("Stash Local Changes"); - Use(log); - return Task.Run(() => { - var succ = false; - - if (!HasSelectedFiles) - { - if (OnlyStaged) - { - if (Native.OS.GitVersion >= Models.GitVersions.STASH_PUSH_ONLY_STAGED) - { - succ = new Commands.Stash(_repo.FullPath).Use(log).PushOnlyStaged(Message, KeepIndex); - } - else - { - var staged = new List(); - foreach (var c in _changes) - { - if (c.Index != Models.ChangeState.None && c.Index != Models.ChangeState.Untracked) - staged.Add(c); - } - - succ = StashWithChanges(staged, log); - } - } - else - { - succ = new Commands.Stash(_repo.FullPath).Use(log).Push(Message, IncludeUntracked, KeepIndex); - } - } - else - { - succ = StashWithChanges(_changes, log); - } - - if (AutoRestore && succ) - succ = new Commands.Stash(_repo.FullPath).Use(log).Apply("stash@{0}", true); - - log.Complete(); - CallUIThread(() => - { - _repo.MarkWorkingCopyDirtyManually(); - _repo.SetWatcherEnabled(true); - }); - - return succ; - }); - } - - private bool StashWithChanges(List changes, CommandLog log) - { - if (changes.Count == 0) + new Commands.Stash(_repo.FullPath).Push(jobs, Message); + CallUIThread(() => _repo.SetWatcherEnabled(true)); return true; - - var succ = false; - if (Native.OS.GitVersion >= Models.GitVersions.STASH_PUSH_WITH_PATHSPECFILE) - { - var paths = new List(); - foreach (var c in changes) - paths.Add(c.Path); - - var pathSpecFile = Path.GetTempFileName(); - File.WriteAllLines(pathSpecFile, paths); - succ = new Commands.Stash(_repo.FullPath).Use(log).Push(Message, pathSpecFile, KeepIndex); - File.Delete(pathSpecFile); - } - else - { - for (int i = 0; i < changes.Count; i += 32) - { - var count = Math.Min(32, changes.Count - i); - var step = changes.GetRange(i, count); - succ = new Commands.Stash(_repo.FullPath).Use(log).Push(Message, step, KeepIndex); - if (!succ) - break; - } - } - - return succ; + }); } private readonly Repository _repo = null; diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs index f039d54e..bae81012 100644 --- a/src/ViewModels/StashesPage.cs +++ b/src/ViewModels/StashesPage.cs @@ -1,45 +1,28 @@ -using System; -using System.Collections.Generic; -using System.IO; +using System.Collections.Generic; using System.Threading.Tasks; -using Avalonia.Controls; -using Avalonia.Platform.Storage; using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class StashesPage : ObservableObject, IDisposable + public class StashesPage : ObservableObject { + public int Count + { + get => _stashes == null ? 0 : _stashes.Count; + } + public List Stashes { get => _stashes; set { if (SetProperty(ref _stashes, value)) - RefreshVisible(); - } - } - - public List VisibleStashes - { - get => _visibleStashes; - private set - { - if (SetProperty(ref _visibleStashes, value)) + { SelectedStash = null; - } - } - - public string SearchFilter - { - get => _searchFilter; - set - { - if (SetProperty(ref _searchFilter, value)) - RefreshVisible(); + } } } @@ -53,30 +36,14 @@ namespace SourceGit.ViewModels if (value == null) { Changes = null; - _untracked.Clear(); } else { Task.Run(() => { - var changes = new Commands.CompareRevisions(_repo.FullPath, $"{value.SHA}^", value.SHA).Result(); - var untracked = new List(); - - if (value.Parents.Count == 3) - { - untracked = new Commands.CompareRevisions(_repo.FullPath, Models.Commit.EmptyTreeSHA1, value.Parents[2]).Result(); - var needSort = changes.Count > 0 && untracked.Count > 0; - - foreach (var c in untracked) - changes.Add(c); - - if (needSort) - changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path)); - } - + var changes = new Commands.QueryStashChanges(_repo.FullPath, value.SHA).Result(); Dispatcher.UIThread.Invoke(() => { - _untracked = untracked; Changes = changes; }); }); @@ -91,7 +58,9 @@ namespace SourceGit.ViewModels private set { if (SetProperty(ref _changes, value)) - SelectedChange = value is { Count: > 0 } ? value[0] : null; + { + SelectedChange = null; + } } } @@ -103,11 +72,13 @@ namespace SourceGit.ViewModels if (SetProperty(ref _selectedChange, value)) { if (value == null) + { DiffContext = null; - else if (_untracked.Contains(value)) - DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(Models.Commit.EmptyTreeSHA1, _selectedStash.Parents[2], value), _diffContext); + } else - DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, value), _diffContext); + { + DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, value), _diffContext); + } } } } @@ -123,210 +94,60 @@ namespace SourceGit.ViewModels _repo = repo; } - public void Dispose() + public void Cleanup() { - _stashes?.Clear(); - _changes?.Clear(); - _untracked.Clear(); - _repo = null; + if (_stashes != null) + _stashes.Clear(); _selectedStash = null; + if (_changes != null) + _changes.Clear(); _selectedChange = null; _diffContext = null; } - public ContextMenu MakeContextMenu(Models.Stash stash) + public void Apply(object param) { - if (stash == null) - return null; - - var apply = new MenuItem(); - apply.Header = App.Text("StashCM.Apply"); - apply.Click += (_, ev) => + if (param is Models.Stash stash) { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new ApplyStash(_repo, stash)); - - ev.Handled = true; - }; - - var drop = new MenuItem(); - drop.Header = App.Text("StashCM.Drop"); - drop.Click += (_, ev) => - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new DropStash(_repo, stash)); - - ev.Handled = true; - }; - - var patch = new MenuItem(); - patch.Header = App.Text("StashCM.SaveAsPatch"); - patch.Icon = App.CreateMenuIcon("Icons.Diff"); - patch.Click += async (_, e) => - { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) - return; - - var options = new FilePickerSaveOptions(); - options.Title = App.Text("StashCM.SaveAsPatch"); - options.DefaultExtension = ".patch"; - options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - - var storageFile = await storageProvider.SaveFilePickerAsync(options); - if (storageFile != null) + Task.Run(() => { - var opts = new List(); - foreach (var c in _changes) - { - if (_untracked.Contains(c)) - opts.Add(new Models.DiffOption(Models.Commit.EmptyTreeSHA1, _selectedStash.Parents[2], c)); - else - opts.Add(new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, c)); - } - - var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessStashChanges(_repo.FullPath, opts, storageFile.Path.LocalPath)); - if (succ) - App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); - } - - e.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Items.Add(apply); - menu.Items.Add(drop); - menu.Items.Add(new MenuItem { Header = "-" }); - menu.Items.Add(patch); - return menu; - } - - public ContextMenu MakeContextMenuForChange(Models.Change change) - { - if (change == null) - return null; - - var diffWithMerger = new MenuItem(); - diffWithMerger.Header = App.Text("DiffWithMerger"); - diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith"); - diffWithMerger.Click += (_, ev) => - { - var toolType = Preferences.Instance.ExternalMergeToolType; - var toolPath = Preferences.Instance.ExternalMergeToolPath; - var opt = new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, change); - - Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt)); - ev.Handled = true; - }; - - var fullPath = Path.Combine(_repo.FullPath, change.Path); - var explore = new MenuItem(); - explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.IsEnabled = File.Exists(fullPath); - explore.Click += (_, ev) => - { - Native.OS.OpenInFileManager(fullPath, true); - ev.Handled = true; - }; - - var resetToThisRevision = new MenuItem(); - resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision"); - resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout"); - resetToThisRevision.Click += async (_, ev) => - { - var log = _repo.CreateLog($"Reset File to '{_selectedStash.SHA}'"); - - await Task.Run(() => - { - if (_untracked.Contains(change)) - { - Commands.SaveRevisionFile.Run(_repo.FullPath, _selectedStash.Parents[2], change.Path, fullPath); - } - else if (change.Index == Models.ChangeState.Added) - { - Commands.SaveRevisionFile.Run(_repo.FullPath, _selectedStash.SHA, change.Path, fullPath); - } - else - { - new Commands.Checkout(_repo.FullPath) - .Use(log) - .FileWithRevision(change.Path, $"{_selectedStash.SHA}"); - } + new Commands.Stash(_repo.FullPath).Apply(stash.Name); }); - - log.Complete(); - ev.Handled = true; - }; - - var copyPath = new MenuItem(); - copyPath.Header = App.Text("CopyPath"); - copyPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyPath.Click += (_, ev) => - { - App.CopyText(change.Path); - ev.Handled = true; - }; - - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path)); - e.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Items.Add(diffWithMerger); - menu.Items.Add(explore); - menu.Items.Add(new MenuItem { Header = "-" }); - menu.Items.Add(resetToThisRevision); - menu.Items.Add(new MenuItem { Header = "-" }); - menu.Items.Add(copyPath); - menu.Items.Add(copyFullPath); - - return menu; - } - - public void ClearSearchFilter() - { - SearchFilter = string.Empty; - } - - public void Drop(Models.Stash stash) - { - if (stash != null && _repo.CanCreatePopup()) - _repo.ShowPopup(new DropStash(_repo, stash)); - } - - private void RefreshVisible() - { - if (string.IsNullOrEmpty(_searchFilter)) - { - VisibleStashes = _stashes; } - else - { - var visible = new List(); - foreach (var s in _stashes) - { - if (s.Message.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) - visible.Add(s); - } + } - VisibleStashes = visible; + public void Pop(object param) + { + if (param is Models.Stash stash) + { + Task.Run(() => + { + new Commands.Stash(_repo.FullPath).Pop(stash.Name); + }); + } + } + + public void Drop(object param) + { + if (param is Models.Stash stash && PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new DropStash(_repo.FullPath, stash)); + } + } + + public void Clear() + { + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new ClearStashes(_repo)); } } private Repository _repo = null; - private List _stashes = []; - private List _visibleStashes = []; - private string _searchFilter = string.Empty; + private List _stashes = null; private Models.Stash _selectedStash = null; private List _changes = null; - private List _untracked = []; private Models.Change _selectedChange = null; private DiffContext _diffContext = null; } diff --git a/src/ViewModels/Statistics.cs b/src/ViewModels/Statistics.cs index 3a87607e..c01f2833 100644 --- a/src/ViewModels/Statistics.cs +++ b/src/ViewModels/Statistics.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; -using Avalonia.Media; using Avalonia.Threading; using CommunityToolkit.Mvvm.ComponentModel; @@ -28,37 +27,16 @@ namespace SourceGit.ViewModels public Models.StatisticsReport SelectedReport { get => _selectedReport; - private set - { - value?.ChangeAuthor(null); - SetProperty(ref _selectedReport, value); - } - } - - public uint SampleColor - { - get => Preferences.Instance.StatisticsSampleColor; - set - { - if (value != Preferences.Instance.StatisticsSampleColor) - { - Preferences.Instance.StatisticsSampleColor = value; - OnPropertyChanged(nameof(SampleBrush)); - _selectedReport?.ChangeColor(value); - } - } - } - - public IBrush SampleBrush - { - get => new SolidColorBrush(SampleColor); + private set => SetProperty(ref _selectedReport, value); } public Statistics(string repo) { + _repo = repo; + Task.Run(() => { - var result = new Commands.Statistics(repo, Preferences.Instance.MaxHistoryCommits).Result(); + var result = new Commands.Statistics(_repo).Result(); Dispatcher.UIThread.Invoke(() => { _data = result; @@ -73,17 +51,21 @@ namespace SourceGit.ViewModels if (_data == null) return; - var report = _selectedIndex switch + switch (_selectedIndex) { - 0 => _data.All, - 1 => _data.Month, - _ => _data.Week, - }; - - report.ChangeColor(SampleColor); - SelectedReport = report; + case 0: + SelectedReport = _data.Year; + break; + case 1: + SelectedReport = _data.Month; + break; + default: + SelectedReport = _data.Week; + break; + } } + private readonly string _repo = string.Empty; private bool _isLoading = true; private Models.Statistics _data = null; private Models.StatisticsReport _selectedReport = null; diff --git a/src/ViewModels/SubmoduleCollection.cs b/src/ViewModels/SubmoduleCollection.cs deleted file mode 100644 index b3688366..00000000 --- a/src/ViewModels/SubmoduleCollection.cs +++ /dev/null @@ -1,212 +0,0 @@ -using System; -using System.Collections.Generic; - -using Avalonia.Collections; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class SubmoduleTreeNode : ObservableObject - { - public string FullPath { get; private set; } = string.Empty; - public int Depth { get; private set; } = 0; - public Models.Submodule Module { get; private set; } = null; - public List Children { get; private set; } = []; - public int Counter = 0; - - public bool IsFolder - { - get => Module == null; - } - - public bool IsExpanded - { - get => _isExpanded; - set => SetProperty(ref _isExpanded, value); - } - - public string ChildCounter - { - get => Counter > 0 ? $"({Counter})" : string.Empty; - } - - public bool IsDirty - { - get => Module?.IsDirty ?? false; - } - - public SubmoduleTreeNode(Models.Submodule module, int depth) - { - FullPath = module.Path; - Depth = depth; - Module = module; - IsExpanded = false; - } - - public SubmoduleTreeNode(string path, int depth, bool isExpanded) - { - FullPath = path; - Depth = depth; - IsExpanded = isExpanded; - Counter = 1; - } - - public static List Build(IList submodules, HashSet expanded) - { - var nodes = new List(); - var folders = new Dictionary(); - - foreach (var module in submodules) - { - var sepIdx = module.Path.IndexOf('/', StringComparison.Ordinal); - if (sepIdx == -1) - { - nodes.Add(new SubmoduleTreeNode(module, 0)); - } - else - { - SubmoduleTreeNode lastFolder = null; - int depth = 0; - - while (sepIdx != -1) - { - var folder = module.Path.Substring(0, sepIdx); - if (folders.TryGetValue(folder, out var value)) - { - lastFolder = value; - lastFolder.Counter++; - } - else if (lastFolder == null) - { - lastFolder = new SubmoduleTreeNode(folder, depth, expanded.Contains(folder)); - folders.Add(folder, lastFolder); - InsertFolder(nodes, lastFolder); - } - else - { - var cur = new SubmoduleTreeNode(folder, depth, expanded.Contains(folder)); - folders.Add(folder, cur); - InsertFolder(lastFolder.Children, cur); - lastFolder = cur; - } - - depth++; - sepIdx = module.Path.IndexOf('/', sepIdx + 1); - } - - lastFolder?.Children.Add(new SubmoduleTreeNode(module, depth)); - } - } - - folders.Clear(); - return nodes; - } - - private static void InsertFolder(List collection, SubmoduleTreeNode subFolder) - { - for (int i = 0; i < collection.Count; i++) - { - if (!collection[i].IsFolder) - { - collection.Insert(i, subFolder); - return; - } - } - - collection.Add(subFolder); - } - - private bool _isExpanded = false; - } - - public class SubmoduleCollectionAsTree - { - public List Tree - { - get; - set; - } = []; - - public AvaloniaList Rows - { - get; - set; - } = []; - - public static SubmoduleCollectionAsTree Build(List submodules, SubmoduleCollectionAsTree old) - { - var oldExpanded = new HashSet(); - if (old != null) - { - foreach (var row in old.Rows) - { - if (row.IsFolder && row.IsExpanded) - oldExpanded.Add(row.FullPath); - } - } - - var collection = new SubmoduleCollectionAsTree(); - collection.Tree = SubmoduleTreeNode.Build(submodules, oldExpanded); - - var rows = new List(); - MakeTreeRows(rows, collection.Tree); - collection.Rows.AddRange(rows); - - return collection; - } - - public void ToggleExpand(SubmoduleTreeNode node) - { - node.IsExpanded = !node.IsExpanded; - - var rows = Rows; - var depth = node.Depth; - var idx = rows.IndexOf(node); - if (idx == -1) - return; - - if (node.IsExpanded) - { - var subrows = new List(); - MakeTreeRows(subrows, node.Children); - rows.InsertRange(idx + 1, subrows); - } - else - { - var removeCount = 0; - for (int i = idx + 1; i < rows.Count; i++) - { - var row = rows[i]; - if (row.Depth <= depth) - break; - - removeCount++; - } - rows.RemoveRange(idx + 1, removeCount); - } - } - - private static void MakeTreeRows(List rows, List nodes) - { - foreach (var node in nodes) - { - rows.Add(node); - - if (!node.IsExpanded || !node.IsFolder) - continue; - - MakeTreeRows(rows, node.Children); - } - } - } - - public class SubmoduleCollectionAsList - { - public List Submodules - { - get; - set; - } = []; - } -} diff --git a/src/ViewModels/TagCollection.cs b/src/ViewModels/TagCollection.cs deleted file mode 100644 index 0f2cc5af..00000000 --- a/src/ViewModels/TagCollection.cs +++ /dev/null @@ -1,223 +0,0 @@ -using System; -using System.Collections.Generic; - -using Avalonia.Collections; - -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class TagTreeNodeToolTip - { - public string Name { get; private set; } - public bool IsAnnotated { get; private set; } - public string Message { get; private set; } - - public TagTreeNodeToolTip(Models.Tag t) - { - Name = t.Name; - IsAnnotated = t.IsAnnotated; - Message = t.Message; - } - } - - public class TagTreeNode : ObservableObject - { - public string FullPath { get; private set; } - public int Depth { get; private set; } = 0; - public Models.Tag Tag { get; private set; } = null; - public TagTreeNodeToolTip ToolTip { get; private set; } = null; - public List Children { get; private set; } = []; - public int Counter { get; set; } = 0; - - public bool IsFolder - { - get => Tag == null; - } - - public bool IsExpanded - { - get => _isExpanded; - set => SetProperty(ref _isExpanded, value); - } - - public string TagsCount - { - get => Counter > 0 ? $"({Counter})" : string.Empty; - } - - public TagTreeNode(Models.Tag t, int depth) - { - FullPath = t.Name; - Depth = depth; - Tag = t; - ToolTip = new TagTreeNodeToolTip(t); - IsExpanded = false; - } - - public TagTreeNode(string path, bool isExpanded, int depth) - { - FullPath = path; - Depth = depth; - IsExpanded = isExpanded; - Counter = 1; - } - - public static List Build(List tags, HashSet expanded) - { - var nodes = new List(); - var folders = new Dictionary(); - - foreach (var tag in tags) - { - var sepIdx = tag.Name.IndexOf('/', StringComparison.Ordinal); - if (sepIdx == -1) - { - nodes.Add(new TagTreeNode(tag, 0)); - } - else - { - TagTreeNode lastFolder = null; - int depth = 0; - - while (sepIdx != -1) - { - var folder = tag.Name.Substring(0, sepIdx); - if (folders.TryGetValue(folder, out var value)) - { - lastFolder = value; - lastFolder.Counter++; - } - else if (lastFolder == null) - { - lastFolder = new TagTreeNode(folder, expanded.Contains(folder), depth); - folders.Add(folder, lastFolder); - InsertFolder(nodes, lastFolder); - } - else - { - var cur = new TagTreeNode(folder, expanded.Contains(folder), depth); - folders.Add(folder, cur); - InsertFolder(lastFolder.Children, cur); - lastFolder = cur; - } - - depth++; - sepIdx = tag.Name.IndexOf('/', sepIdx + 1); - } - - lastFolder?.Children.Add(new TagTreeNode(tag, depth)); - } - } - - folders.Clear(); - return nodes; - } - - private static void InsertFolder(List collection, TagTreeNode subFolder) - { - for (int i = 0; i < collection.Count; i++) - { - if (!collection[i].IsFolder) - { - collection.Insert(i, subFolder); - return; - } - } - - collection.Add(subFolder); - } - - private bool _isExpanded = true; - } - - public class TagCollectionAsList - { - public List Tags - { - get; - set; - } = []; - } - - public class TagCollectionAsTree - { - public List Tree - { - get; - set; - } = []; - - public AvaloniaList Rows - { - get; - set; - } = []; - - public static TagCollectionAsTree Build(List tags, TagCollectionAsTree old) - { - var oldExpanded = new HashSet(); - if (old != null) - { - foreach (var row in old.Rows) - { - if (row.IsFolder && row.IsExpanded) - oldExpanded.Add(row.FullPath); - } - } - - var collection = new TagCollectionAsTree(); - collection.Tree = TagTreeNode.Build(tags, oldExpanded); - - var rows = new List(); - MakeTreeRows(rows, collection.Tree); - collection.Rows.AddRange(rows); - - return collection; - } - - public void ToggleExpand(TagTreeNode node) - { - node.IsExpanded = !node.IsExpanded; - - var rows = Rows; - var depth = node.Depth; - var idx = rows.IndexOf(node); - if (idx == -1) - return; - - if (node.IsExpanded) - { - var subrows = new List(); - MakeTreeRows(subrows, node.Children); - rows.InsertRange(idx + 1, subrows); - } - else - { - var removeCount = 0; - for (int i = idx + 1; i < rows.Count; i++) - { - var row = rows[i]; - if (row.Depth <= depth) - break; - - removeCount++; - } - rows.RemoveRange(idx + 1, removeCount); - } - } - - private static void MakeTreeRows(List rows, List nodes) - { - foreach (var node in nodes) - { - rows.Add(node); - - if (!node.IsExpanded || !node.IsFolder) - continue; - - MakeTreeRows(rows, node.Children); - } - } - } -} diff --git a/src/ViewModels/TwoSideTextDiff.cs b/src/ViewModels/TwoSideTextDiff.cs index 3fb1e63b..ad1b5478 100644 --- a/src/ViewModels/TwoSideTextDiff.cs +++ b/src/ViewModels/TwoSideTextDiff.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; - -using Avalonia; +using System.Collections.Generic; using CommunityToolkit.Mvvm.ComponentModel; @@ -9,18 +6,12 @@ namespace SourceGit.ViewModels { public class TwoSideTextDiff : ObservableObject { - public string File { get; set; } + public string File { get; set; } = string.Empty; public List Old { get; set; } = new List(); public List New { get; set; } = new List(); public int MaxLineNumber = 0; - public Vector SyncScrollOffset - { - get => _syncScrollOffset; - set => SetProperty(ref _syncScrollOffset, value); - } - - public TwoSideTextDiff(Models.TextDiff diff, TwoSideTextDiff previous = null) + public TwoSideTextDiff(Models.TextDiff diff) { File = diff.File; MaxLineNumber = diff.MaxLineNumber; @@ -44,48 +35,6 @@ namespace SourceGit.ViewModels } FillEmptyLines(); - - if (previous != null && previous.File == File) - _syncScrollOffset = previous._syncScrollOffset; - } - - public void ConvertsToCombinedRange(Models.TextDiff combined, ref int startLine, ref int endLine, bool isOldSide) - { - endLine = Math.Min(endLine, combined.Lines.Count - 1); - - var oneSide = isOldSide ? Old : New; - var firstContentLine = -1; - for (int i = startLine; i <= endLine; i++) - { - var line = oneSide[i]; - if (line.Type != Models.TextDiffLineType.None) - { - firstContentLine = i; - break; - } - } - - if (firstContentLine < 0) - return; - - var endContentLine = -1; - for (int i = Math.Min(endLine, oneSide.Count - 1); i >= startLine; i--) - { - var line = oneSide[i]; - if (line.Type != Models.TextDiffLineType.None) - { - endContentLine = i; - break; - } - } - - if (endContentLine < 0) - return; - - var firstContent = oneSide[firstContentLine]; - var endContent = oneSide[endContentLine]; - startLine = combined.Lines.IndexOf(firstContent); - endLine = combined.Lines.IndexOf(endContent); } private void FillEmptyLines() @@ -103,7 +52,5 @@ namespace SourceGit.ViewModels New.Add(new Models.TextDiffLine()); } } - - private Vector _syncScrollOffset = Vector.Zero; } } diff --git a/src/ViewModels/UpdateSubmodules.cs b/src/ViewModels/UpdateSubmodules.cs deleted file mode 100644 index df2d5565..00000000 --- a/src/ViewModels/UpdateSubmodules.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace SourceGit.ViewModels -{ - public class UpdateSubmodules : Popup - { - public List Submodules - { - get; - } = []; - - public string SelectedSubmodule - { - get; - set; - } - - public bool UpdateAll - { - get => _updateAll; - set => SetProperty(ref _updateAll, value); - } - - public bool EnableInit - { - get; - set; - } = true; - - public bool EnableRecursive - { - get; - set; - } = true; - - public bool EnableRemote - { - get; - set; - } = false; - - public UpdateSubmodules(Repository repo) - { - _repo = repo; - - foreach (var submodule in _repo.Submodules) - Submodules.Add(submodule.Path); - - SelectedSubmodule = Submodules.Count > 0 ? Submodules[0] : string.Empty; - } - - public override Task Sure() - { - _repo.SetWatcherEnabled(false); - - List targets; - if (_updateAll) - targets = Submodules; - else - targets = [SelectedSubmodule]; - - var log = _repo.CreateLog("Update Submodule"); - Use(log); - - return Task.Run(() => - { - new Commands.Submodule(_repo.FullPath) - .Use(log) - .Update(targets, EnableInit, EnableRecursive, EnableRemote); - - log.Complete(); - CallUIThread(() => _repo.SetWatcherEnabled(true)); - return true; - }); - } - - private readonly Repository _repo = null; - private bool _updateAll = true; - } -} diff --git a/src/ViewModels/ViewLogs.cs b/src/ViewModels/ViewLogs.cs deleted file mode 100644 index 21ab81ab..00000000 --- a/src/ViewModels/ViewLogs.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Avalonia.Collections; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class ViewLogs : ObservableObject - { - public AvaloniaList Logs - { - get => _repo.Logs; - } - - public CommandLog SelectedLog - { - get => _selectedLog; - set => SetProperty(ref _selectedLog, value); - } - - public ViewLogs(Repository repo) - { - _repo = repo; - } - - public void ClearAll() - { - SelectedLog = null; - Logs.Clear(); - } - - private Repository _repo = null; - private CommandLog _selectedLog = null; - } -} diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs index 069dcf38..75d7368b 100644 --- a/src/ViewModels/Welcome.cs +++ b/src/ViewModels/Welcome.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.IO; using Avalonia.Collections; -using Avalonia.Controls; using CommunityToolkit.Mvvm.ComponentModel; @@ -11,13 +8,15 @@ namespace SourceGit.ViewModels { public class Welcome : ObservableObject { - public static Welcome Instance => _instance; - - public AvaloniaList Rows + public bool IsClearSearchVisible { - get; - private set; - } = []; + get => !string.IsNullOrEmpty(_searchFilter); + } + + public AvaloniaList RepositoryNodes + { + get => Preference.Instance.RepositoryNodes; + } public string SearchFilter { @@ -25,147 +24,54 @@ namespace SourceGit.ViewModels set { if (SetProperty(ref _searchFilter, value)) - Refresh(); - } - } - - public Welcome() - { - Refresh(); - } - - public void Refresh() - { - if (string.IsNullOrWhiteSpace(_searchFilter)) - { - foreach (var node in Preferences.Instance.RepositoryNodes) - ResetVisibility(node); - } - else - { - foreach (var node in Preferences.Instance.RepositoryNodes) - SetVisibilityBySearch(node); - } - - var rows = new List(); - MakeTreeRows(rows, Preferences.Instance.RepositoryNodes); - Rows.Clear(); - Rows.AddRange(rows); - } - - public void ToggleNodeIsExpanded(RepositoryNode node) - { - node.IsExpanded = !node.IsExpanded; - - var depth = node.Depth; - var idx = Rows.IndexOf(node); - if (idx == -1) - return; - - if (node.IsExpanded) - { - var subrows = new List(); - MakeTreeRows(subrows, node.SubNodes, depth + 1); - Rows.InsertRange(idx + 1, subrows); - } - else - { - var removeCount = 0; - for (int i = idx + 1; i < Rows.Count; i++) { - var row = Rows[i]; - if (row.Depth <= depth) - break; - - removeCount++; + Referesh(); + OnPropertyChanged(nameof(IsClearSearchVisible)); } - Rows.RemoveRange(idx + 1, removeCount); } } - public void OpenOrInitRepository(string path, RepositoryNode parent, bool bMoveExistedNode) + public void InitRepository(string path) { - if (!Directory.Exists(path)) + if (!Preference.Instance.IsGitConfigured) { - if (File.Exists(path)) - path = Path.GetDirectoryName(path); - else - return; - } - - var isBare = new Commands.IsBareRepository(path).Result(); - var repoRoot = path; - if (!isBare) - { - var test = new Commands.QueryRepositoryRootPath(path).ReadToEnd(); - if (!test.IsSuccess || string.IsNullOrEmpty(test.StdOut)) - { - InitRepository(path, parent, test.StdErr); - return; - } - - repoRoot = test.StdOut.Trim(); - } - - var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(repoRoot, parent, bMoveExistedNode); - Refresh(); - - var launcher = App.GetLauncher(); - launcher?.OpenRepositoryInTab(node, launcher.ActivePage); - } - - public void InitRepository(string path, RepositoryNode parent, string reason) - { - if (!Preferences.Instance.IsGitConfigured()) - { - App.RaiseException(string.Empty, App.Text("NotConfigured")); + App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured")); return; } - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new Init(activePage.Node.Id, path, parent, reason); + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new Init(path)); + } } - public void Clone() + public void Clone(object param) { - if (!Preferences.Instance.IsGitConfigured()) + var launcher = param as Launcher; + var page = launcher.ActivePage; + + if (!Preference.Instance.IsGitConfigured) { - App.RaiseException(string.Empty, App.Text("NotConfigured")); + App.RaiseException(page.GetId(), App.Text("NotConfigured")); return; } - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new Clone(activePage.Node.Id); + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new Clone(launcher, page)); + } } public void OpenTerminal() { - if (!Preferences.Instance.IsGitConfigured()) - App.RaiseException(string.Empty, App.Text("NotConfigured")); + if (!Preference.Instance.IsGitConfigured) + { + App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured")); + } else + { Native.OS.OpenTerminal(null); - } - - public void ScanDefaultCloneDir() - { - var defaultCloneDir = Preferences.Instance.GitDefaultCloneDir; - if (string.IsNullOrEmpty(defaultCloneDir)) - { - App.RaiseException(string.Empty, "The default clone directory hasn't been configured!"); - return; } - - if (!Directory.Exists(defaultCloneDir)) - { - App.RaiseException(string.Empty, $"The default clone directory '{defaultCloneDir}' does not exist!"); - return; - } - - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.StartPopup(new ScanRepositories(defaultCloneDir)); } public void ClearSearchFilter() @@ -173,122 +79,29 @@ namespace SourceGit.ViewModels SearchFilter = string.Empty; } - public void AddRootNode() + public void AddFolder() { - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new CreateGroup(null); + if (PopupHost.CanCreatePopup()) + PopupHost.ShowPopup(new CreateGroup(null)); } public void MoveNode(RepositoryNode from, RepositoryNode to) { - Preferences.Instance.MoveNode(from, to, true); - Refresh(); + Preference.MoveNode(from, to); } - public ContextMenu CreateContextMenu(RepositoryNode node) + private void Referesh() { - var menu = new ContextMenu(); - - if (!node.IsRepository && node.SubNodes.Count > 0) + if (string.IsNullOrWhiteSpace(_searchFilter)) { - var openAll = new MenuItem(); - openAll.Header = App.Text("Welcome.OpenAllInNode"); - openAll.Icon = App.CreateMenuIcon("Icons.Folder.Open"); - openAll.Click += (_, e) => - { - OpenAllInNode(App.GetLauncher(), node); - e.Handled = true; - }; - - menu.Items.Add(openAll); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - if (node.IsRepository) - { - var open = new MenuItem(); - open.Header = App.Text("Welcome.OpenOrInit"); - open.Icon = App.CreateMenuIcon("Icons.Folder.Open"); - open.Click += (_, e) => - { - App.GetLauncher()?.OpenRepositoryInTab(node, null); - e.Handled = true; - }; - - var explore = new MenuItem(); - explore.Header = App.Text("Repository.Explore"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.Click += (_, e) => - { - node.OpenInFileManager(); - e.Handled = true; - }; - - var terminal = new MenuItem(); - terminal.Header = App.Text("Repository.Terminal"); - terminal.Icon = App.CreateMenuIcon("Icons.Terminal"); - terminal.Click += (_, e) => - { - node.OpenTerminal(); - e.Handled = true; - }; - - menu.Items.Add(open); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(explore); - menu.Items.Add(terminal); - menu.Items.Add(new MenuItem() { Header = "-" }); + foreach (var node in RepositoryNodes) + ResetVisibility(node); } else { - var addSubFolder = new MenuItem(); - addSubFolder.Header = App.Text("Welcome.AddSubFolder"); - addSubFolder.Icon = App.CreateMenuIcon("Icons.Folder.Add"); - addSubFolder.Click += (_, e) => - { - node.AddSubFolder(); - e.Handled = true; - }; - menu.Items.Add(addSubFolder); + foreach (var node in RepositoryNodes) + SetVisibilityBySearch(node); } - - var edit = new MenuItem(); - edit.Header = App.Text("Welcome.Edit"); - edit.Icon = App.CreateMenuIcon("Icons.Edit"); - edit.Click += (_, e) => - { - node.Edit(); - e.Handled = true; - }; - - var move = new MenuItem(); - move.Header = App.Text("Welcome.Move"); - move.Icon = App.CreateMenuIcon("Icons.MoveToAnotherGroup"); - move.Click += (_, e) => - { - var activePage = App.GetLauncher().ActivePage; - if (activePage != null && activePage.CanCreatePopup()) - activePage.Popup = new MoveRepositoryNode(node); - - e.Handled = true; - }; - - var delete = new MenuItem(); - delete.Header = App.Text("Welcome.Delete"); - delete.Icon = App.CreateMenuIcon("Icons.Clear"); - delete.Click += (_, e) => - { - node.Delete(); - e.Handled = true; - }; - - menu.Items.Add(edit); - menu.Items.Add(move); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(delete); - - return menu; } private void ResetVisibility(RepositoryNode node) @@ -321,40 +134,10 @@ namespace SourceGit.ViewModels } else { - node.IsVisible = node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase) || - node.Id.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase); + node.IsVisible = node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase); } } - private void MakeTreeRows(List rows, List nodes, int depth = 0) - { - foreach (var node in nodes) - { - if (!node.IsVisible) - continue; - - node.Depth = depth; - rows.Add(node); - - if (node.IsRepository || !node.IsExpanded) - continue; - - MakeTreeRows(rows, node.SubNodes, depth + 1); - } - } - - private void OpenAllInNode(Launcher launcher, RepositoryNode node) - { - foreach (var subNode in node.SubNodes) - { - if (subNode.IsRepository) - launcher.OpenRepositoryInTab(subNode, null); - else if (subNode.SubNodes.Count > 0) - OpenAllInNode(launcher, subNode); - } - } - - private static Welcome _instance = new Welcome(); private string _searchFilter = string.Empty; } } diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index 09ebc6f6..2a158242 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -1,8 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Threading.Tasks; +using Avalonia; using Avalonia.Controls; using Avalonia.Platform.Storage; using Avalonia.Threading; @@ -11,39 +12,13 @@ using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class WorkingCopy : ObservableObject, IDisposable + public class ConflictContext { - public bool IncludeUntracked - { - get => _repo.IncludeUntracked; - set - { - if (_repo.IncludeUntracked != value) - { - _repo.IncludeUntracked = value; - OnPropertyChanged(); - } - } - } - - public bool HasRemotes - { - get => _hasRemotes; - set => SetProperty(ref _hasRemotes, value); - } - - public bool HasUnsolvedConflicts - { - get => _hasUnsolvedConflicts; - set => SetProperty(ref _hasUnsolvedConflicts, value); - } - - public InProgressContext InProgressContext - { - get => _inProgressContext; - private set => SetProperty(ref _inProgressContext, value); - } + public Models.Change Change { get; set; } + } + public class WorkingCopy : ObservableObject + { public bool IsStaging { get => _isStaging; @@ -62,66 +37,10 @@ namespace SourceGit.ViewModels private set => SetProperty(ref _isCommitting, value); } - public bool EnableSignOff - { - get => _repo.Settings.EnableSignOffForCommit; - set => _repo.Settings.EnableSignOffForCommit = value; - } - public bool UseAmend { get => _useAmend; - set - { - if (SetProperty(ref _useAmend, value)) - { - if (value) - { - var currentBranch = _repo.CurrentBranch; - if (currentBranch == null) - { - App.RaiseException(_repo.FullPath, "No commits to amend!!!"); - _useAmend = false; - OnPropertyChanged(); - return; - } - - CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, currentBranch.Head).Result(); - } - else - { - CommitMessage = string.Empty; - ResetAuthor = false; - } - - Staged = GetStagedChanges(); - VisibleStaged = GetVisibleChanges(_staged); - SelectedStaged = []; - } - } - } - - public bool ResetAuthor - { - get => _resetAuthor; - set => SetProperty(ref _resetAuthor, value); - } - - public string Filter - { - get => _filter; - set - { - if (SetProperty(ref _filter, value)) - { - if (_isLoadingData) - return; - - VisibleUnstaged = GetVisibleChanges(_unstaged); - VisibleStaged = GetVisibleChanges(_staged); - SelectedUnstaged = []; - } - } + set => SetProperty(ref _useAmend, value); } public List Unstaged @@ -130,71 +49,104 @@ namespace SourceGit.ViewModels private set => SetProperty(ref _unstaged, value); } - public List VisibleUnstaged - { - get => _visibleUnstaged; - private set => SetProperty(ref _visibleUnstaged, value); - } - public List Staged { get => _staged; private set => SetProperty(ref _staged, value); } - public List VisibleStaged + public int Count { - get => _visibleStaged; - private set => SetProperty(ref _visibleStaged, value); + get => _count; } - public List SelectedUnstaged + public Models.Change SelectedUnstagedChange { - get => _selectedUnstaged; + get => _selectedUnstagedChange; set { - if (SetProperty(ref _selectedUnstaged, value)) + if (SetProperty(ref _selectedUnstagedChange, value) && value != null) { - if (value == null || value.Count == 0) + SelectedStagedChange = null; + SelectedStagedTreeNode = null; + SetDetail(value, true); + } + } + } + + public Models.Change SelectedStagedChange + { + get => _selectedStagedChange; + set + { + if (SetProperty(ref _selectedStagedChange, value) && value != null) + { + SelectedUnstagedChange = null; + SelectedUnstagedTreeNode = null; + SetDetail(value, false); + } + } + } + + public List UnstagedTree + { + get => _unstagedTree; + private set => SetProperty(ref _unstagedTree, value); + } + + public List StagedTree + { + get => _stagedTree; + private set => SetProperty(ref _stagedTree, value); + } + + public FileTreeNode SelectedUnstagedTreeNode + { + get => _selectedUnstagedTreeNode; + set + { + if (SetProperty(ref _selectedUnstagedTreeNode, value)) + { + if (value == null) { - if (_selectedStaged == null || _selectedStaged.Count == 0) - SetDetail(null, true); + SelectedUnstagedChange = null; } else { - if (_selectedStaged != null && _selectedStaged.Count > 0) - SelectedStaged = []; + SelectedUnstagedChange = value.Backend as Models.Change; + SelectedStagedTreeNode = null; + SelectedStagedChange = null; - if (value.Count == 1) - SetDetail(value[0], true); - else + if (value.IsFolder) + { SetDetail(null, true); + } } } } } - public List SelectedStaged + public FileTreeNode SelectedStagedTreeNode { - get => _selectedStaged; + get => _selectedStagedTreeNode; set { - if (SetProperty(ref _selectedStaged, value)) + if (SetProperty(ref _selectedStagedTreeNode, value)) { - if (value == null || value.Count == 0) + if (value == null) { - if (_selectedUnstaged == null || _selectedUnstaged.Count == 0) - SetDetail(null, false); + SelectedStagedChange = null; } else { - if (_selectedUnstaged != null && _selectedUnstaged.Count > 0) - SelectedUnstaged = []; + SelectedStagedChange = value.Backend as Models.Change; + SelectedUnstagedTreeNode = null; + SelectedUnstagedChange = null; - if (value.Count == 1) - SetDetail(value[0], false); - else + if (value.IsFolder) + { SetDetail(null, false); + } } } } @@ -217,384 +169,338 @@ namespace SourceGit.ViewModels _repo = repo; } - public void Dispose() + public void Cleanup() { _repo = null; - _inProgressContext = null; - - _selectedUnstaged.Clear(); - OnPropertyChanged(nameof(SelectedUnstaged)); - - _selectedStaged.Clear(); - OnPropertyChanged(nameof(SelectedStaged)); - - _visibleUnstaged.Clear(); - OnPropertyChanged(nameof(VisibleUnstaged)); - - _visibleStaged.Clear(); - OnPropertyChanged(nameof(VisibleStaged)); - - _unstaged.Clear(); - OnPropertyChanged(nameof(Unstaged)); - - _staged.Clear(); - OnPropertyChanged(nameof(Staged)); - + if (_unstaged != null) + _unstaged.Clear(); + if (_staged != null) + _staged.Clear(); + if (_unstagedTree != null) + _unstagedTree.Clear(); + if (_stagedTree != null) + _stagedTree.Clear(); + _selectedUnstagedChange = null; + _selectedStagedChange = null; + _selectedUnstagedTreeNode = null; + _selectedStagedTreeNode = null; _detailContext = null; _commitMessage = string.Empty; } - public void SetData(List changes) + public bool SetData(List changes) { - if (!IsChanged(_cached, changes)) - { - // Just force refresh selected changes. - Dispatcher.UIThread.Invoke(() => - { - HasUnsolvedConflicts = _cached.Find(x => x.IsConflicted) != null; - - UpdateDetail(); - UpdateInProgressState(); - }); - - return; - } - - _cached = changes; - _count = _cached.Count; - - var lastSelectedUnstaged = new HashSet(); - var lastSelectedStaged = new HashSet(); - if (_selectedUnstaged != null && _selectedUnstaged.Count > 0) - { - foreach (var c in _selectedUnstaged) - lastSelectedUnstaged.Add(c.Path); - } - else if (_selectedStaged != null && _selectedStaged.Count > 0) - { - foreach (var c in _selectedStaged) - lastSelectedStaged.Add(c.Path); - } - var unstaged = new List(); + var staged = new List(); + + var viewFile = string.Empty; + var lastSelectedIsUnstaged = false; + if (_selectedUnstagedChange != null) + { + viewFile = _selectedUnstagedChange.Path; + lastSelectedIsUnstaged = true; + } + else if (_selectedStagedChange != null) + { + viewFile = _selectedStagedChange.Path; + } + + var viewChange = null as Models.Change; var hasConflict = false; foreach (var c in changes) { + if (c.Index == Models.ChangeState.Modified + || c.Index == Models.ChangeState.Added + || c.Index == Models.ChangeState.Deleted + || c.Index == Models.ChangeState.Renamed) + { + staged.Add(c); + if (!lastSelectedIsUnstaged && c.Path == viewFile) + { + viewChange = c; + } + } + if (c.WorkTree != Models.ChangeState.None) { unstaged.Add(c); - hasConflict |= c.IsConflicted; + hasConflict |= c.IsConflit; + if (lastSelectedIsUnstaged && c.Path == viewFile) + { + viewChange = c; + } } } - var visibleUnstaged = GetVisibleChanges(unstaged); - var selectedUnstaged = new List(); - foreach (var c in visibleUnstaged) - { - if (lastSelectedUnstaged.Contains(c.Path)) - selectedUnstaged.Add(c); - } - - var staged = GetStagedChanges(); - - var visibleStaged = GetVisibleChanges(staged); - var selectedStaged = new List(); - foreach (var c in visibleStaged) - { - if (lastSelectedStaged.Contains(c.Path)) - selectedStaged.Add(c); - } + _count = changes.Count; + var unstagedTree = FileTreeNode.Build(unstaged); + var stagedTree = FileTreeNode.Build(staged); Dispatcher.UIThread.Invoke(() => { _isLoadingData = true; - HasUnsolvedConflicts = hasConflict; - VisibleUnstaged = visibleUnstaged; - VisibleStaged = visibleStaged; Unstaged = unstaged; Staged = staged; - SelectedUnstaged = selectedUnstaged; - SelectedStaged = selectedStaged; + UnstagedTree = unstagedTree; + StagedTree = stagedTree; _isLoadingData = false; - UpdateDetail(); - UpdateInProgressState(); + // Restore last selection states. + if (viewChange != null) + { + var scrollOffset = Vector.Zero; + if (_detailContext is DiffContext old) + scrollOffset = old.SyncScrollOffset; + + if (lastSelectedIsUnstaged) + { + SelectedUnstagedChange = viewChange; + SelectedUnstagedTreeNode = FileTreeNode.SelectByPath(_unstagedTree, viewFile); + } + else + { + SelectedStagedChange = viewChange; + SelectedStagedTreeNode = FileTreeNode.SelectByPath(_stagedTree, viewFile); + } + + if (_detailContext is DiffContext cur) + cur.SyncScrollOffset = scrollOffset; + } + else + { + SelectedUnstagedChange = null; + SelectedUnstagedTreeNode = null; + SelectedStagedChange = null; + SelectedStagedTreeNode = null; + SetDetail(null, false); + } }); + + return hasConflict; } - public void OpenExternalMergeToolAllConflicts() + public void SetDetail(Models.Change change, bool isUnstaged) { - // No arg, mergetool runs on all files with merge conflicts! - UseExternalMergeTool(null); - } - - public void OpenAssumeUnchanged() - { - App.ShowWindow(new AssumeUnchangedManager(_repo), true); - } - - public void StashAll(bool autoStart) - { - if (!_repo.CanCreatePopup()) + if (_isLoadingData) return; - if (autoStart) - _repo.ShowAndStartPopup(new StashChanges(_repo, _cached, false)); + if (change == null) + { + DetailContext = null; + } + else if (change.IsConflit) + { + DetailContext = new ConflictContext() { Change = change }; + } else - _repo.ShowPopup(new StashChanges(_repo, _cached, false)); + { + if (_detailContext is DiffContext previous) + { + DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), previous); + } + else + { + DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged)); + } + } } - public void StageSelected(Models.Change next) + public async void StageChanges(List changes) { - StageChanges(_selectedUnstaged, next); + if (_unstaged.Count == 0 || changes.Count == 0) + return; + + SetDetail(null, true); + IsStaging = true; + _repo.SetWatcherEnabled(false); + if (changes.Count == _unstaged.Count) + { + await Task.Run(() => new Commands.Add(_repo.FullPath).Exec()); + } + else + { + for (int i = 0; i < changes.Count; i += 10) + { + var count = Math.Min(10, changes.Count - i); + var step = changes.GetRange(i, count); + await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec()); + } + } + _repo.MarkWorkingCopyDirtyManually(); + _repo.SetWatcherEnabled(true); + IsStaging = false; } - public void StageAll() + public async void UnstageChanges(List changes) { - StageChanges(_visibleUnstaged, null); + if (_staged.Count == 0 || changes.Count == 0) + return; + + SetDetail(null, false); + IsUnstaging = true; + _repo.SetWatcherEnabled(false); + if (changes.Count == _staged.Count) + { + await Task.Run(() => new Commands.Reset(_repo.FullPath).Exec()); + } + else + { + for (int i = 0; i < changes.Count; i += 10) + { + var count = Math.Min(10, changes.Count - i); + var step = changes.GetRange(i, count); + await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec()); + } + } + _repo.MarkWorkingCopyDirtyManually(); + _repo.SetWatcherEnabled(true); + IsUnstaging = false; } - public void UnstageSelected(Models.Change next) + public void Discard(List changes, bool isUnstaged) { - UnstageChanges(_selectedStaged, next); - } - - public void UnstageAll() - { - UnstageChanges(_visibleStaged, null); - } - - public void Discard(List changes) - { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new Discard(_repo, changes)); - } - - public void ClearFilter() - { - Filter = string.Empty; + if (PopupHost.CanCreatePopup()) + { + if (isUnstaged) + { + if (changes.Count == _unstaged.Count && _staged.Count == 0) + { + PopupHost.ShowPopup(new Discard(_repo)); + } + else + { + PopupHost.ShowPopup(new Discard(_repo, changes, true)); + } + } + else + { + if (changes.Count == _staged.Count && _unstaged.Count == 0) + { + PopupHost.ShowPopup(new Discard(_repo)); + } + else + { + PopupHost.ShowPopup(new Discard(_repo, changes, false)); + } + } + } } public async void UseTheirs(List changes) { - _repo.SetWatcherEnabled(false); - var files = new List(); - var needStage = new List(); - var log = _repo.CreateLog("Use Theirs"); - foreach (var change in changes) { - if (!change.IsConflicted) - continue; - - if (change.ConflictReason == Models.ConflictReason.BothDeleted || - change.ConflictReason == Models.ConflictReason.DeletedByThem || - change.ConflictReason == Models.ConflictReason.AddedByUs) - { - var fullpath = Path.Combine(_repo.FullPath, change.Path); - if (File.Exists(fullpath)) - File.Delete(fullpath); - - needStage.Add(change.Path); - } - else - { + if (change.IsConflit) files.Add(change.Path); - } } - if (files.Count > 0) + _repo.SetWatcherEnabled(false); + var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).UseTheirs(files)); + if (succ) { - var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).Use(log).UseTheirs(files)); - if (succ) - needStage.AddRange(files); + await Task.Run(() => new Commands.Add(_repo.FullPath, changes).Exec()); } - - if (needStage.Count > 0) - { - var pathSpecFile = Path.GetTempFileName(); - await File.WriteAllLinesAsync(pathSpecFile, needStage); - await Task.Run(() => new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).Exec()); - File.Delete(pathSpecFile); - } - - log.Complete(); _repo.MarkWorkingCopyDirtyManually(); _repo.SetWatcherEnabled(true); } public async void UseMine(List changes) { - _repo.SetWatcherEnabled(false); - var files = new List(); - var needStage = new List(); - var log = _repo.CreateLog("Use Mine"); - foreach (var change in changes) { - if (!change.IsConflicted) - continue; - - if (change.ConflictReason == Models.ConflictReason.BothDeleted || - change.ConflictReason == Models.ConflictReason.DeletedByUs || - change.ConflictReason == Models.ConflictReason.AddedByThem) - { - var fullpath = Path.Combine(_repo.FullPath, change.Path); - if (File.Exists(fullpath)) - File.Delete(fullpath); - - needStage.Add(change.Path); - } - else - { + if (change.IsConflit) files.Add(change.Path); - } } - if (files.Count > 0) + _repo.SetWatcherEnabled(false); + var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).UseMine(files)); + if (succ) { - var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).Use(log).UseMine(files)); - if (succ) - needStage.AddRange(files); + await Task.Run(() => new Commands.Add(_repo.FullPath, changes).Exec()); } - - if (needStage.Count > 0) - { - var pathSpecFile = Path.GetTempFileName(); - await File.WriteAllLinesAsync(pathSpecFile, needStage); - await Task.Run(() => new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).Exec()); - File.Delete(pathSpecFile); - } - - log.Complete(); _repo.MarkWorkingCopyDirtyManually(); _repo.SetWatcherEnabled(true); } - public async void UseExternalMergeTool(Models.Change change) + public async void UseExternalMergeTool() { - var toolType = Preferences.Instance.ExternalMergeToolType; - var toolPath = Preferences.Instance.ExternalMergeToolPath; - var file = change?.Path; // NOTE: With no arg, mergetool runs on every file with merge conflicts! - await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, file)); - } - - public void ContinueMerge() - { - IsCommitting = true; - - if (_inProgressContext != null) + if (_detailContext is ConflictContext ctx) { - _repo.SetWatcherEnabled(false); - Task.Run(() => + var type = Preference.Instance.ExternalMergeToolType; + var exec = Preference.Instance.ExternalMergeToolPath; + + var tool = Models.ExternalMerger.Supported.Find(x => x.Type == type); + if (tool == null) { - var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG"); - if (File.Exists(mergeMsgFile) && !string.IsNullOrWhiteSpace(_commitMessage)) - File.WriteAllText(mergeMsgFile, _commitMessage); + App.RaiseException(_repo.FullPath, "Invalid merge tool in preference setting!"); + return; + } - var succ = _inProgressContext.Continue(); - Dispatcher.UIThread.Invoke(() => - { - if (succ) - CommitMessage = string.Empty; + var args = tool.Type != 0 ? tool.Cmd : Preference.Instance.ExternalMergeToolCmd; - _repo.SetWatcherEnabled(true); - IsCommitting = false; - }); - }); - } - else - { - _repo.MarkWorkingCopyDirtyManually(); - IsCommitting = false; - } - } - - public void SkipMerge() - { - IsCommitting = true; - - if (_inProgressContext != null) - { _repo.SetWatcherEnabled(false); - Task.Run(() => - { - var succ = _inProgressContext.Skip(); - Dispatcher.UIThread.Invoke(() => - { - if (succ) - CommitMessage = string.Empty; - - _repo.SetWatcherEnabled(true); - IsCommitting = false; - }); - }); - } - else - { - _repo.MarkWorkingCopyDirtyManually(); - IsCommitting = false; + await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, exec, args, ctx.Change.Path)); + _repo.SetWatcherEnabled(true); } } - public void AbortMerge() + public async void DoCommit(bool autoPush) { + if (!PopupHost.CanCreatePopup()) + { + App.RaiseException(_repo.FullPath, "Repository has unfinished job! Please wait!"); + return; + } + + if (_staged.Count == 0) + { + App.RaiseException(_repo.FullPath, "No files added to commit!"); + return; + } + + if (string.IsNullOrWhiteSpace(_commitMessage)) + { + App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!"); + return; + } + + PushCommitMessage(); + + SetDetail(null, false); IsCommitting = true; - - if (_inProgressContext != null) + _repo.SetWatcherEnabled(false); + var succ = await Task.Run(() => new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend).Exec()); + if (succ) { - _repo.SetWatcherEnabled(false); - Task.Run(() => + CommitMessage = string.Empty; + UseAmend = false; + + if (autoPush) { - var succ = _inProgressContext.Abort(); - Dispatcher.UIThread.Invoke(() => - { - if (succ) - CommitMessage = string.Empty; - - _repo.SetWatcherEnabled(true); - IsCommitting = false; - }); - }); - } - else - { - _repo.MarkWorkingCopyDirtyManually(); - IsCommitting = false; + PopupHost.ShowAndStartPopup(new Push(_repo, null)); + } } + _repo.MarkWorkingCopyDirtyManually(); + _repo.SetWatcherEnabled(true); + IsCommitting = false; } - public void Commit() + public ContextMenu CreateContextMenuForUnstagedChanges(List changes) { - DoCommit(false, false); - } - - public void CommitWithAutoStage() - { - DoCommit(true, false); - } - - public void CommitWithPush() - { - DoCommit(false, true); - } - - public ContextMenu CreateContextMenuForUnstagedChanges() - { - if (_selectedUnstaged == null || _selectedUnstaged.Count == 0) + if (changes.Count == 0) return null; var menu = new ContextMenu(); - if (_selectedUnstaged.Count == 1) + if (changes.Count == 1) { - var change = _selectedUnstaged[0]; + var change = changes[0]; var path = Path.GetFullPath(Path.Combine(_repo.FullPath, change.Path)); var explore = new MenuItem(); explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); + explore.Icon = App.CreateMenuIcon("Icons.Folder.Open"); explore.IsEnabled = File.Exists(path) || Directory.Exists(path); explore.Click += (_, e) => { @@ -615,14 +521,14 @@ namespace SourceGit.ViewModels menu.Items.Add(openWith); menu.Items.Add(new MenuItem() { Header = "-" }); - if (change.IsConflicted) + if (change.IsConflit) { var useTheirs = new MenuItem(); useTheirs.Icon = App.CreateMenuIcon("Icons.Incoming"); useTheirs.Header = App.Text("FileCM.UseTheirs"); useTheirs.Click += (_, e) => { - UseTheirs(_selectedUnstaged); + UseTheirs(changes); e.Handled = true; }; @@ -631,7 +537,7 @@ namespace SourceGit.ViewModels useMine.Header = App.Text("FileCM.UseMine"); useMine.Click += (_, e) => { - UseMine(_selectedUnstaged); + UseMine(changes); e.Handled = true; }; @@ -640,34 +546,12 @@ namespace SourceGit.ViewModels openMerger.Header = App.Text("FileCM.OpenWithExternalMerger"); openMerger.Click += (_, e) => { - UseExternalMergeTool(change); + UseExternalMergeTool(); e.Handled = true; }; - if (_inProgressContext is CherryPickInProgress cherryPick) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", cherryPick.HeadName); - useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name); - } - else if (_inProgressContext is RebaseInProgress rebase) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", rebase.HeadName); - useMine.Header = App.Text("FileCM.ResolveUsing", rebase.BaseName); - } - else if (_inProgressContext is RevertInProgress revert) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", $"{revert.Head.SHA.AsSpan(0, 10)} (revert)"); - useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name); - } - else if (_inProgressContext is MergeInProgress merge) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", merge.SourceName); - useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name); - } - menu.Items.Add(useTheirs); menu.Items.Add(useMine); - menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(openMerger); menu.Items.Add(new MenuItem() { Header = "-" }); } @@ -678,7 +562,7 @@ namespace SourceGit.ViewModels stage.Icon = App.CreateMenuIcon("Icons.File.Add"); stage.Click += (_, e) => { - StageChanges(_selectedUnstaged, null); + StageChanges(changes); e.Handled = true; }; @@ -687,18 +571,19 @@ namespace SourceGit.ViewModels discard.Icon = App.CreateMenuIcon("Icons.Undo"); discard.Click += (_, e) => { - Discard(_selectedUnstaged); + Discard(changes, true); e.Handled = true; }; var stash = new MenuItem(); stash.Header = App.Text("FileCM.Stash"); - stash.Icon = App.CreateMenuIcon("Icons.Stashes.Add"); + stash.Icon = App.CreateMenuIcon("Icons.Stashes"); stash.Click += (_, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new StashChanges(_repo, _selectedUnstaged, true)); - + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } e.Handled = true; }; @@ -707,8 +592,8 @@ namespace SourceGit.ViewModels patch.Icon = App.CreateMenuIcon("Icons.Diff"); patch.Click += async (_, e) => { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; var options = new FilePickerSaveOptions(); @@ -716,10 +601,10 @@ namespace SourceGit.ViewModels options.DefaultExtension = ".patch"; options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - var storageFile = await storageProvider.SaveFilePickerAsync(options); + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); if (storageFile != null) { - var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedUnstaged, true, storageFile.Path.LocalPath)); + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, true, storageFile.Path.LocalPath)); if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); } @@ -727,24 +612,23 @@ namespace SourceGit.ViewModels e.Handled = true; }; - var assumeUnchanged = new MenuItem(); - assumeUnchanged.Header = App.Text("FileCM.AssumeUnchanged"); - assumeUnchanged.Icon = App.CreateMenuIcon("Icons.File.Ignore"); - assumeUnchanged.IsVisible = change.WorkTree != Models.ChangeState.Untracked; - assumeUnchanged.Click += (_, e) => - { - var log = _repo.CreateLog("Assume File Unchanged"); - new Commands.AssumeUnchanged(_repo.FullPath, change.Path, true).Use(log).Exec(); - log.Complete(); - e.Handled = true; - }; - var history = new MenuItem(); history.Header = App.Text("FileHistory"); history.Icon = App.CreateMenuIcon("Icons.Histories"); history.Click += (_, e) => { - App.ShowWindow(new FileHistories(_repo, change.Path), false); + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo.FullPath, change.Path) }; + window.Show(); + e.Handled = true; + }; + + var assumeUnchanged = new MenuItem(); + assumeUnchanged.Header = App.Text("FileCM.AssumeUnchanged"); + assumeUnchanged.Icon = App.CreateMenuIcon("Icons.File.Ignore"); + assumeUnchanged.IsEnabled = change.WorkTree != Models.ChangeState.Untracked; + assumeUnchanged.Click += (_, e) => + { + new Commands.AssumeUnchanged(_repo.FullPath).Add(change.Path); e.Handled = true; }; @@ -752,196 +636,10 @@ namespace SourceGit.ViewModels menu.Items.Add(discard); menu.Items.Add(stash); menu.Items.Add(patch); - menu.Items.Add(assumeUnchanged); menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(history); + menu.Items.Add(assumeUnchanged); menu.Items.Add(new MenuItem() { Header = "-" }); - - var extension = Path.GetExtension(change.Path); - var hasExtra = false; - if (change.WorkTree == Models.ChangeState.Untracked) - { - var isRooted = change.Path.IndexOf('/', StringComparison.Ordinal) <= 0; - var addToIgnore = new MenuItem(); - addToIgnore.Header = App.Text("WorkingCopy.AddToGitIgnore"); - addToIgnore.Icon = App.CreateMenuIcon("Icons.GitIgnore"); - - var singleFile = new MenuItem(); - singleFile.Header = App.Text("WorkingCopy.AddToGitIgnore.SingleFile"); - singleFile.Click += (_, e) => - { - Commands.GitIgnore.Add(_repo.FullPath, change.Path); - e.Handled = true; - }; - addToIgnore.Items.Add(singleFile); - - var byParentFolder = new MenuItem(); - byParentFolder.Header = App.Text("WorkingCopy.AddToGitIgnore.InSameFolder"); - byParentFolder.IsVisible = !isRooted; - byParentFolder.Click += (_, e) => - { - var dir = Path.GetDirectoryName(change.Path)!.Replace('\\', '/').TrimEnd('/'); - Commands.GitIgnore.Add(_repo.FullPath, dir + "/"); - e.Handled = true; - }; - addToIgnore.Items.Add(byParentFolder); - - if (!string.IsNullOrEmpty(extension)) - { - var byExtension = new MenuItem(); - byExtension.Header = App.Text("WorkingCopy.AddToGitIgnore.Extension", extension); - byExtension.Click += (_, e) => - { - Commands.GitIgnore.Add(_repo.FullPath, $"*{extension}"); - e.Handled = true; - }; - addToIgnore.Items.Add(byExtension); - - var byExtensionInSameFolder = new MenuItem(); - byExtensionInSameFolder.Header = App.Text("WorkingCopy.AddToGitIgnore.ExtensionInSameFolder", extension); - byExtensionInSameFolder.IsVisible = !isRooted; - byExtensionInSameFolder.Click += (_, e) => - { - var dir = Path.GetDirectoryName(change.Path)!.Replace('\\', '/').TrimEnd('/'); - Commands.GitIgnore.Add(_repo.FullPath, $"{dir}/*{extension}"); - e.Handled = true; - }; - addToIgnore.Items.Add(byExtensionInSameFolder); - } - - menu.Items.Add(addToIgnore); - hasExtra = true; - } - - var lfsEnabled = new Commands.LFS(_repo.FullPath).IsEnabled(); - if (lfsEnabled) - { - var lfs = new MenuItem(); - lfs.Header = App.Text("GitLFS"); - lfs.Icon = App.CreateMenuIcon("Icons.LFS"); - - var isLFSFiltered = new Commands.IsLFSFiltered(_repo.FullPath, change.Path).Result(); - if (!isLFSFiltered) - { - var filename = Path.GetFileName(change.Path); - var lfsTrackThisFile = new MenuItem(); - lfsTrackThisFile.Header = App.Text("GitLFS.Track", filename); - lfsTrackThisFile.Click += async (_, e) => - { - var log = _repo.CreateLog("Track LFS"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Track(filename, true, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Tracking file named {filename} successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfs.Items.Add(lfsTrackThisFile); - - if (!string.IsNullOrEmpty(extension)) - { - var lfsTrackByExtension = new MenuItem(); - lfsTrackByExtension.Header = App.Text("GitLFS.TrackByExtension", extension); - lfsTrackByExtension.Click += async (_, e) => - { - var log = _repo.CreateLog("Track LFS"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Track($"*{extension}", false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Tracking all *{extension} files successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfs.Items.Add(lfsTrackByExtension); - } - - lfs.Items.Add(new MenuItem() { Header = "-" }); - } - - var lfsLock = new MenuItem(); - lfsLock.Header = App.Text("GitLFS.Locks.Lock"); - lfsLock.Icon = App.CreateMenuIcon("Icons.Lock"); - lfsLock.IsEnabled = _repo.Remotes.Count > 0; - if (_repo.Remotes.Count == 1) - { - lfsLock.Click += async (_, e) => - { - var log = _repo.CreateLog("Lock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Lock(_repo.Remotes[0].Name, change.Path, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Lock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - } - else - { - foreach (var remote in _repo.Remotes) - { - var remoteName = remote.Name; - var lockRemote = new MenuItem(); - lockRemote.Header = remoteName; - lockRemote.Click += async (_, e) => - { - var log = _repo.CreateLog("Lock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Lock(remoteName, change.Path, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Lock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfsLock.Items.Add(lockRemote); - } - } - lfs.Items.Add(lfsLock); - - var lfsUnlock = new MenuItem(); - lfsUnlock.Header = App.Text("GitLFS.Locks.Unlock"); - lfsUnlock.Icon = App.CreateMenuIcon("Icons.Unlock"); - lfsUnlock.IsEnabled = _repo.Remotes.Count > 0; - if (_repo.Remotes.Count == 1) - { - lfsUnlock.Click += async (_, e) => - { - var log = _repo.CreateLog("Unlock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Unlock(_repo.Remotes[0].Name, change.Path, false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Unlock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - } - else - { - foreach (var remote in _repo.Remotes) - { - var remoteName = remote.Name; - var unlockRemote = new MenuItem(); - unlockRemote.Header = remoteName; - unlockRemote.Click += async (_, e) => - { - var log = _repo.CreateLog("Unlock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Unlock(remoteName, change.Path, false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Unlock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfsUnlock.Items.Add(unlockRemote); - } - } - lfs.Items.Add(lfsUnlock); - - menu.Items.Add(lfs); - hasExtra = true; - } - - if (hasExtra) - menu.Items.Add(new MenuItem() { Header = "-" }); } var copy = new MenuItem(); @@ -953,34 +651,28 @@ namespace SourceGit.ViewModels e.Handled = true; }; menu.Items.Add(copy); - - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path)); - e.Handled = true; - }; - menu.Items.Add(copyFullPath); } else { var hasConflicts = false; - var hasNonConflicts = false; - foreach (var change in _selectedUnstaged) + var hasNoneConflicts = false; + foreach (var change in changes) { - if (change.IsConflicted) + if (change.IsConflit) + { hasConflicts = true; + } else - hasNonConflicts = true; + { + hasNoneConflicts = true; + } } if (hasConflicts) { - if (hasNonConflicts) + if (hasNoneConflicts) { - App.RaiseException(_repo.FullPath, "Selection contains both conflict and non-conflict changes!"); + App.RaiseException(_repo.FullPath, "You have selected both non-conflict changes with conflicts!"); return null; } @@ -989,7 +681,7 @@ namespace SourceGit.ViewModels useTheirs.Header = App.Text("FileCM.UseTheirs"); useTheirs.Click += (_, e) => { - UseTheirs(_selectedUnstaged); + UseTheirs(changes); e.Handled = true; }; @@ -998,72 +690,52 @@ namespace SourceGit.ViewModels useMine.Header = App.Text("FileCM.UseMine"); useMine.Click += (_, e) => { - UseMine(_selectedUnstaged); + UseMine(changes); e.Handled = true; }; - if (_inProgressContext is CherryPickInProgress cherryPick) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", cherryPick.HeadName); - useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name); - } - else if (_inProgressContext is RebaseInProgress rebase) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", rebase.HeadName); - useMine.Header = App.Text("FileCM.ResolveUsing", rebase.BaseName); - } - else if (_inProgressContext is RevertInProgress revert) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", $"{revert.Head.SHA.AsSpan(0, 10)} (revert)"); - useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name); - } - else if (_inProgressContext is MergeInProgress merge) - { - useTheirs.Header = App.Text("FileCM.ResolveUsing", merge.SourceName); - useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name); - } - menu.Items.Add(useTheirs); menu.Items.Add(useMine); return menu; } var stage = new MenuItem(); - stage.Header = App.Text("FileCM.StageMulti", _selectedUnstaged.Count); + stage.Header = App.Text("FileCM.StageMulti", changes.Count); stage.Icon = App.CreateMenuIcon("Icons.File.Add"); stage.Click += (_, e) => { - StageChanges(_selectedUnstaged, null); + StageChanges(changes); e.Handled = true; }; var discard = new MenuItem(); - discard.Header = App.Text("FileCM.DiscardMulti", _selectedUnstaged.Count); + discard.Header = App.Text("FileCM.DiscardMulti", changes.Count); discard.Icon = App.CreateMenuIcon("Icons.Undo"); discard.Click += (_, e) => { - Discard(_selectedUnstaged); + Discard(changes, true); e.Handled = true; }; var stash = new MenuItem(); - stash.Header = App.Text("FileCM.StashMulti", _selectedUnstaged.Count); - stash.Icon = App.CreateMenuIcon("Icons.Stashes.Add"); + stash.Header = App.Text("FileCM.StashMulti", changes.Count); + stash.Icon = App.CreateMenuIcon("Icons.Stashes"); stash.Click += (_, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new StashChanges(_repo, _selectedUnstaged, true)); - + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } e.Handled = true; }; var patch = new MenuItem(); patch.Header = App.Text("FileCM.SaveAsPatch"); patch.Icon = App.CreateMenuIcon("Icons.Diff"); - patch.Click += async (_, e) => + patch.Click += async (o, e) => { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; var options = new FilePickerSaveOptions(); @@ -1071,10 +743,10 @@ namespace SourceGit.ViewModels options.DefaultExtension = ".patch"; options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - var storageFile = await storageProvider.SaveFilePickerAsync(options); + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); if (storageFile != null) { - var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedUnstaged, true, storageFile.Path.LocalPath)); + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, true, storageFile.Path.LocalPath)); if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); } @@ -1091,58 +763,22 @@ namespace SourceGit.ViewModels return menu; } - public ContextMenu CreateContextMenuForStagedChanges() + public ContextMenu CreateContextMenuForStagedChanges(List changes) { - if (_selectedStaged == null || _selectedStaged.Count == 0) + if (changes.Count == 0) return null; var menu = new ContextMenu(); - - var ai = null as MenuItem; - var services = _repo.GetPreferredOpenAIServices(); - if (services.Count > 0) + if (changes.Count == 1) { - ai = new MenuItem(); - ai.Icon = App.CreateMenuIcon("Icons.AIAssist"); - ai.Header = App.Text("ChangeCM.GenerateCommitMessage"); - - if (services.Count == 1) - { - ai.Click += (_, e) => - { - App.ShowWindow(new AIAssistant(_repo, services[0], _selectedStaged, t => CommitMessage = t), true); - e.Handled = true; - }; - } - else - { - foreach (var service in services) - { - var dup = service; - - var item = new MenuItem(); - item.Header = service.Name; - item.Click += (_, e) => - { - App.ShowWindow(new AIAssistant(_repo, dup, _selectedStaged, t => CommitMessage = t), true); - e.Handled = true; - }; - - ai.Items.Add(item); - } - } - } - - if (_selectedStaged.Count == 1) - { - var change = _selectedStaged[0]; + var change = changes[0]; var path = Path.GetFullPath(Path.Combine(_repo.FullPath, change.Path)); var explore = new MenuItem(); explore.IsEnabled = File.Exists(path) || Directory.Exists(path); explore.Header = App.Text("RevealFile"); - explore.Icon = App.CreateMenuIcon("Icons.Explore"); - explore.Click += (_, e) => + explore.Icon = App.CreateMenuIcon("Icons.Folder.Open"); + explore.Click += (o, e) => { Native.OS.OpenInFileManager(path, true); e.Handled = true; @@ -1161,30 +797,40 @@ namespace SourceGit.ViewModels var unstage = new MenuItem(); unstage.Header = App.Text("FileCM.Unstage"); unstage.Icon = App.CreateMenuIcon("Icons.File.Remove"); - unstage.Click += (_, e) => + unstage.Click += (o, e) => { - UnstageChanges(_selectedStaged, null); + UnstageChanges(changes); + e.Handled = true; + }; + + var discard = new MenuItem(); + discard.Header = App.Text("FileCM.Discard"); + discard.Icon = App.CreateMenuIcon("Icons.Undo"); + discard.Click += (_, e) => + { + Discard(changes, false); e.Handled = true; }; var stash = new MenuItem(); stash.Header = App.Text("FileCM.Stash"); - stash.Icon = App.CreateMenuIcon("Icons.Stashes.Add"); + stash.Icon = App.CreateMenuIcon("Icons.Stashes"); stash.Click += (_, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new StashChanges(_repo, _selectedStaged, true)); - + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } e.Handled = true; }; var patch = new MenuItem(); patch.Header = App.Text("FileCM.SaveAsPatch"); patch.Icon = App.CreateMenuIcon("Icons.Diff"); - patch.Click += async (_, e) => + patch.Click += async (o, e) => { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; var options = new FilePickerSaveOptions(); @@ -1192,10 +838,10 @@ namespace SourceGit.ViewModels options.DefaultExtension = ".patch"; options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - var storageFile = await storageProvider.SaveFilePickerAsync(options); + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); if (storageFile != null) { - var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedStaged, false, storageFile.Path.LocalPath)); + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, false, storageFile.Path.LocalPath)); if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); } @@ -1203,12 +849,12 @@ namespace SourceGit.ViewModels e.Handled = true; }; - var history = new MenuItem(); - history.Header = App.Text("FileHistory"); - history.Icon = App.CreateMenuIcon("Icons.Histories"); - history.Click += (_, e) => + var copyPath = new MenuItem(); + copyPath.Header = App.Text("CopyPath"); + copyPath.Icon = App.CreateMenuIcon("Icons.Copy"); + copyPath.Click += (o, e) => { - App.ShowWindow(new FileHistories(_repo, change.Path), false); + App.CopyText(change.Path); e.Handled = true; }; @@ -1216,147 +862,41 @@ namespace SourceGit.ViewModels menu.Items.Add(openWith); menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(unstage); + menu.Items.Add(discard); menu.Items.Add(stash); menu.Items.Add(patch); menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(history); - menu.Items.Add(new MenuItem() { Header = "-" }); - - var lfsEnabled = new Commands.LFS(_repo.FullPath).IsEnabled(); - if (lfsEnabled) - { - var lfs = new MenuItem(); - lfs.Header = App.Text("GitLFS"); - lfs.Icon = App.CreateMenuIcon("Icons.LFS"); - - var lfsLock = new MenuItem(); - lfsLock.Header = App.Text("GitLFS.Locks.Lock"); - lfsLock.Icon = App.CreateMenuIcon("Icons.Lock"); - lfsLock.IsEnabled = _repo.Remotes.Count > 0; - if (_repo.Remotes.Count == 1) - { - lfsLock.Click += async (_, e) => - { - var log = _repo.CreateLog("Lock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Lock(_repo.Remotes[0].Name, change.Path, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Lock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - } - else - { - foreach (var remote in _repo.Remotes) - { - var remoteName = remote.Name; - var lockRemote = new MenuItem(); - lockRemote.Header = remoteName; - lockRemote.Click += async (_, e) => - { - var log = _repo.CreateLog("Lock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Lock(remoteName, change.Path, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Lock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfsLock.Items.Add(lockRemote); - } - } - lfs.Items.Add(lfsLock); - - var lfsUnlock = new MenuItem(); - lfsUnlock.Header = App.Text("GitLFS.Locks.Unlock"); - lfsUnlock.Icon = App.CreateMenuIcon("Icons.Unlock"); - lfsUnlock.IsEnabled = _repo.Remotes.Count > 0; - if (_repo.Remotes.Count == 1) - { - lfsUnlock.Click += async (_, e) => - { - var log = _repo.CreateLog("Unlock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Unlock(_repo.Remotes[0].Name, change.Path, false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Unlock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - } - else - { - foreach (var remote in _repo.Remotes) - { - var remoteName = remote.Name; - var unlockRemote = new MenuItem(); - unlockRemote.Header = remoteName; - unlockRemote.Click += async (_, e) => - { - var log = _repo.CreateLog("Unlock LFS File"); - var succ = await Task.Run(() => new Commands.LFS(_repo.FullPath).Unlock(remoteName, change.Path, false, log)); - if (succ) - App.SendNotification(_repo.FullPath, $"Unlock file \"{change.Path}\" successfully!"); - - log.Complete(); - e.Handled = true; - }; - lfsUnlock.Items.Add(unlockRemote); - } - } - lfs.Items.Add(lfsUnlock); - - menu.Items.Add(lfs); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - if (ai != null) - { - menu.Items.Add(ai); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - var copyPath = new MenuItem(); - copyPath.Header = App.Text("CopyPath"); - copyPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyPath.Click += (_, e) => - { - App.CopyText(change.Path); - e.Handled = true; - }; - - var copyFullPath = new MenuItem(); - copyFullPath.Header = App.Text("CopyFullPath"); - copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy"); - copyFullPath.Click += (_, e) => - { - App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path)); - e.Handled = true; - }; - menu.Items.Add(copyPath); - menu.Items.Add(copyFullPath); } else { var unstage = new MenuItem(); - unstage.Header = App.Text("FileCM.UnstageMulti", _selectedStaged.Count); + unstage.Header = App.Text("FileCM.UnstageMulti", changes.Count); unstage.Icon = App.CreateMenuIcon("Icons.File.Remove"); - unstage.Click += (_, e) => + unstage.Click += (o, e) => { - UnstageChanges(_selectedStaged, null); + UnstageChanges(changes); + e.Handled = true; + }; + + var discard = new MenuItem(); + discard.Header = App.Text("FileCM.DiscardMulti", changes.Count); + discard.Icon = App.CreateMenuIcon("Icons.Undo"); + discard.Click += (_, e) => + { + Discard(changes, false); e.Handled = true; }; var stash = new MenuItem(); - stash.Header = App.Text("FileCM.StashMulti", _selectedStaged.Count); - stash.Icon = App.CreateMenuIcon("Icons.Stashes.Add"); + stash.Header = App.Text("FileCM.StashMulti", changes.Count); + stash.Icon = App.CreateMenuIcon("Icons.Stashes"); stash.Click += (_, e) => { - if (_repo.CanCreatePopup()) - _repo.ShowPopup(new StashChanges(_repo, _selectedStaged, true)); - + if (PopupHost.CanCreatePopup()) + { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } e.Handled = true; }; @@ -1365,8 +905,8 @@ namespace SourceGit.ViewModels patch.Icon = App.CreateMenuIcon("Icons.Diff"); patch.Click += async (_, e) => { - var storageProvider = App.GetStorageProvider(); - if (storageProvider == null) + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; var options = new FilePickerSaveOptions(); @@ -1374,10 +914,10 @@ namespace SourceGit.ViewModels options.DefaultExtension = ".patch"; options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - var storageFile = await storageProvider.SaveFilePickerAsync(options); + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); if (storageFile != null) { - var succ = await Task.Run(() => Commands.SaveChangesAsPatch.ProcessLocalChanges(_repo.FullPath, _selectedStaged, false, storageFile.Path.LocalPath)); + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, false, storageFile.Path.LocalPath)); if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); } @@ -1386,14 +926,9 @@ namespace SourceGit.ViewModels }; menu.Items.Add(unstage); + menu.Items.Add(discard); menu.Items.Add(stash); menu.Items.Add(patch); - - if (ai != null) - { - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(ai); - } } return menu; @@ -1402,123 +937,30 @@ namespace SourceGit.ViewModels public ContextMenu CreateContextMenuForCommitMessages() { var menu = new ContextMenu(); - - var gitTemplate = new Commands.Config(_repo.FullPath).Get("commit.template"); - var templateCount = _repo.Settings.CommitTemplates.Count; - if (templateCount == 0 && string.IsNullOrEmpty(gitTemplate)) + if (_repo.CommitMessages.Count == 0) { - menu.Items.Add(new MenuItem() - { - Header = App.Text("WorkingCopy.NoCommitTemplates"), - Icon = App.CreateMenuIcon("Icons.Code"), - IsEnabled = false - }); - } - else - { - for (int i = 0; i < templateCount; i++) - { - var template = _repo.Settings.CommitTemplates[i]; - var item = new MenuItem(); - item.Header = App.Text("WorkingCopy.UseCommitTemplate", template.Name); - item.Icon = App.CreateMenuIcon("Icons.Code"); - item.Click += (_, e) => - { - CommitMessage = template.Apply(_repo.CurrentBranch, _staged); - e.Handled = true; - }; - menu.Items.Add(item); - } - - if (!string.IsNullOrEmpty(gitTemplate)) - { - var friendlyName = gitTemplate; - if (!OperatingSystem.IsWindows()) - { - var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length; - if (gitTemplate.StartsWith(home, StringComparison.Ordinal)) - friendlyName = $"~{gitTemplate.AsSpan(prefixLen)}"; - } - - var gitTemplateItem = new MenuItem(); - gitTemplateItem.Header = App.Text("WorkingCopy.UseCommitTemplate", friendlyName); - gitTemplateItem.Icon = App.CreateMenuIcon("Icons.Code"); - gitTemplateItem.Click += (_, e) => - { - if (File.Exists(gitTemplate)) - CommitMessage = File.ReadAllText(gitTemplate); - e.Handled = true; - }; - menu.Items.Add(gitTemplateItem); - } + var empty = new MenuItem(); + empty.Header = App.Text("WorkingCopy.NoCommitHistories"); + empty.IsEnabled = false; + menu.Items.Add(empty); + return menu; } + var tip = new MenuItem(); + tip.Header = App.Text("WorkingCopy.HasCommitHistories"); + tip.IsEnabled = false; + menu.Items.Add(tip); menu.Items.Add(new MenuItem() { Header = "-" }); - var historiesCount = _repo.Settings.CommitMessages.Count; - if (historiesCount == 0) + foreach (var message in _repo.CommitMessages) { - menu.Items.Add(new MenuItem() - { - Header = App.Text("WorkingCopy.NoCommitHistories"), - Icon = App.CreateMenuIcon("Icons.Histories"), - IsEnabled = false - }); - } - else - { - for (int i = 0; i < historiesCount; i++) - { - var message = _repo.Settings.CommitMessages[i].Trim().ReplaceLineEndings("\n"); - var subjectEndIdx = message.IndexOf('\n'); - var subject = subjectEndIdx > 0 ? message.Substring(0, subjectEndIdx) : message; - var item = new MenuItem(); - item.Header = subject; - item.Icon = App.CreateMenuIcon("Icons.Histories"); - item.Click += (_, e) => - { - CommitMessage = message; - e.Handled = true; - }; + var dump = message; - menu.Items.Add(item); - } - } - - return menu; - } - - public ContextMenu CreateContextForOpenAI() - { - if (_staged == null || _staged.Count == 0) - { - App.RaiseException(_repo.FullPath, "No files added to commit!"); - return null; - } - - var services = _repo.GetPreferredOpenAIServices(); - if (services.Count == 0) - { - App.RaiseException(_repo.FullPath, "Bad configuration for OpenAI"); - return null; - } - - if (services.Count == 1) - { - App.ShowWindow(new AIAssistant(_repo, services[0], _staged, t => CommitMessage = t), true); - return null; - } - - var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft }; - foreach (var service in services) - { - var dup = service; var item = new MenuItem(); - item.Header = service.Name; - item.Click += (_, e) => + item.Header = dump; + item.Click += (o, e) => { - App.ShowWindow(new AIAssistant(_repo, dup, _staged, t => CommitMessage = t), true); + CommitMessage = dump; e.Handled = true; }; @@ -1528,265 +970,25 @@ namespace SourceGit.ViewModels return menu; } - private List GetVisibleChanges(List changes) + private void PushCommitMessage() { - if (string.IsNullOrEmpty(_filter)) - return changes; - - var visible = new List(); - - foreach (var c in changes) + var existIdx = _repo.CommitMessages.IndexOf(CommitMessage); + if (existIdx == 0) { - if (c.Path.Contains(_filter, StringComparison.OrdinalIgnoreCase)) - visible.Add(c); - } - - return visible; - } - - private List GetStagedChanges() - { - if (_useAmend) - { - var head = new Commands.QuerySingleCommit(_repo.FullPath, "HEAD").Result(); - return new Commands.QueryStagedChangesWithAmend(_repo.FullPath, head.Parents.Count == 0 ? Models.Commit.EmptyTreeSHA1 : $"{head.SHA}^").Result(); - } - - var rs = new List(); - foreach (var c in _cached) - { - if (c.Index != Models.ChangeState.None) - rs.Add(c); - } - return rs; - } - - private void UpdateDetail() - { - if (_selectedUnstaged.Count == 1) - SetDetail(_selectedUnstaged[0], true); - else if (_selectedStaged.Count == 1) - SetDetail(_selectedStaged[0], false); - else - SetDetail(null, false); - } - - private void UpdateInProgressState() - { - if (string.IsNullOrEmpty(_commitMessage)) - { - var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG"); - if (File.Exists(mergeMsgFile)) - CommitMessage = File.ReadAllText(mergeMsgFile); - } - - if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD"))) - { - InProgressContext = new CherryPickInProgress(_repo); - } - else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply"))) - { - var rebasing = new RebaseInProgress(_repo); - InProgressContext = rebasing; - - if (string.IsNullOrEmpty(_commitMessage)) - { - var rebaseMsgFile = Path.Combine(_repo.GitDir, "rebase-merge", "message"); - if (File.Exists(rebaseMsgFile)) - CommitMessage = File.ReadAllText(rebaseMsgFile); - else if (rebasing.StoppedAt != null) - CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, rebasing.StoppedAt.SHA).Result(); - } - } - else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD"))) - { - InProgressContext = new RevertInProgress(_repo); - } - else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD"))) - { - InProgressContext = new MergeInProgress(_repo); - } - else - { - InProgressContext = null; - } - } - - private async void StageChanges(List changes, Models.Change next) - { - var count = changes.Count; - if (count == 0) return; - - // Use `_selectedUnstaged` instead of `SelectedUnstaged` to avoid UI refresh. - _selectedUnstaged = next != null ? [next] : []; - - IsStaging = true; - _repo.SetWatcherEnabled(false); - - var log = _repo.CreateLog("Stage"); - if (count == _unstaged.Count) - { - await Task.Run(() => new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Use(log).Exec()); } - else + else if (existIdx > 0) { - var paths = new List(); - foreach (var c in changes) - paths.Add(c.Path); - - var pathSpecFile = Path.GetTempFileName(); - await File.WriteAllLinesAsync(pathSpecFile, paths); - await Task.Run(() => new Commands.Add(_repo.FullPath, pathSpecFile).Use(log).Exec()); - File.Delete(pathSpecFile); - } - log.Complete(); - - _repo.MarkWorkingCopyDirtyManually(); - _repo.SetWatcherEnabled(true); - IsStaging = false; - } - - private async void UnstageChanges(List changes, Models.Change next) - { - var count = changes.Count; - if (count == 0) - return; - - // Use `_selectedStaged` instead of `SelectedStaged` to avoid UI refresh. - _selectedStaged = next != null ? [next] : []; - - IsUnstaging = true; - _repo.SetWatcherEnabled(false); - - var log = _repo.CreateLog("Unstage"); - if (_useAmend) - { - log.AppendLine("$ git update-index --index-info "); - await Task.Run(() => new Commands.UnstageChangesForAmend(_repo.FullPath, changes).Exec()); - } - else - { - var paths = new List(); - foreach (var c in changes) - { - paths.Add(c.Path); - if (c.Index == Models.ChangeState.Renamed) - paths.Add(c.OriginalPath); - } - - var pathSpecFile = Path.GetTempFileName(); - await File.WriteAllLinesAsync(pathSpecFile, paths); - await Task.Run(() => new Commands.Restore(_repo.FullPath, pathSpecFile, true).Use(log).Exec()); - File.Delete(pathSpecFile); - } - log.Complete(); - - _repo.MarkWorkingCopyDirtyManually(); - _repo.SetWatcherEnabled(true); - IsUnstaging = false; - } - - private void SetDetail(Models.Change change, bool isUnstaged) - { - if (_isLoadingData) - return; - - if (change == null) - DetailContext = null; - else if (change.IsConflicted) - DetailContext = new Conflict(_repo, this, change); - else - DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext); - } - - private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty = false, bool confirmWithFilter = false) - { - if (string.IsNullOrWhiteSpace(_commitMessage)) - return; - - if (!_repo.CanCreatePopup()) - { - App.RaiseException(_repo.FullPath, "Repository has an unfinished job! Please wait!"); + _repo.CommitMessages.Move(existIdx, 0); return; } - if (!string.IsNullOrEmpty(_filter) && _staged.Count > _visibleStaged.Count && !confirmWithFilter) + if (_repo.CommitMessages.Count > 9) { - var confirmMessage = App.Text("WorkingCopy.ConfirmCommitWithFilter", _staged.Count, _visibleStaged.Count, _staged.Count - _visibleStaged.Count); - App.ShowWindow(new ConfirmCommit(confirmMessage, () => DoCommit(autoStage, autoPush, allowEmpty, true)), true); - return; + _repo.CommitMessages.RemoveRange(9, _repo.CommitMessages.Count - 9); } - if (!_useAmend && !allowEmpty) - { - if ((autoStage && _count == 0) || (!autoStage && _staged.Count == 0)) - { - App.ShowWindow(new ConfirmEmptyCommit(_count > 0, stageAll => DoCommit(stageAll, autoPush, true, confirmWithFilter)), true); - return; - } - } - - IsCommitting = true; - _repo.Settings.PushCommitMessage(_commitMessage); - _repo.SetWatcherEnabled(false); - - var signOff = _repo.Settings.EnableSignOffForCommit; - var log = _repo.CreateLog("Commit"); - Task.Run(() => - { - var succ = true; - if (autoStage && _unstaged.Count > 0) - succ = new Commands.Add(_repo.FullPath, _repo.IncludeUntracked).Use(log).Exec(); - - if (succ) - succ = new Commands.Commit(_repo.FullPath, _commitMessage, signOff, _useAmend, _resetAuthor).Use(log).Run(); - - log.Complete(); - - Dispatcher.UIThread.Post(() => - { - if (succ) - { - CommitMessage = string.Empty; - UseAmend = false; - - if (autoPush && _repo.Remotes.Count > 0) - { - if (_repo.CurrentBranch == null) - { - var currentBranchName = Commands.Branch.ShowCurrent(_repo.FullPath); - var tmp = new Models.Branch() { Name = currentBranchName }; - _repo.ShowAndStartPopup(new Push(_repo, tmp)); - } - else - { - _repo.ShowAndStartPopup(new Push(_repo, null)); - } - } - } - - _repo.MarkBranchesDirtyManually(); - _repo.SetWatcherEnabled(true); - IsCommitting = false; - }); - }); - } - - private bool IsChanged(List old, List cur) - { - if (old.Count != cur.Count) - return true; - - for (int idx = 0; idx < old.Count; idx++) - { - var o = old[idx]; - var c = cur[idx]; - if (o.Path != c.Path || o.Index != c.Index || o.WorkTree != c.WorkTree) - return true; - } - - return false; + _repo.CommitMessages.Insert(0, CommitMessage); } private Repository _repo = null; @@ -1795,21 +997,16 @@ namespace SourceGit.ViewModels private bool _isUnstaging = false; private bool _isCommitting = false; private bool _useAmend = false; - private bool _resetAuthor = false; - private bool _hasRemotes = false; - private List _cached = []; - private List _unstaged = []; - private List _visibleUnstaged = []; - private List _staged = []; - private List _visibleStaged = []; - private List _selectedUnstaged = []; - private List _selectedStaged = []; + private List _unstaged = null; + private List _staged = null; + private Models.Change _selectedUnstagedChange = null; + private Models.Change _selectedStagedChange = null; private int _count = 0; + private List _unstagedTree = null; + private List _stagedTree = null; + private FileTreeNode _selectedUnstagedTreeNode = null; + private FileTreeNode _selectedStagedTreeNode = null; private object _detailContext = null; - private string _filter = string.Empty; private string _commitMessage = string.Empty; - - private bool _hasUnsolvedConflicts = false; - private InProgressContext _inProgressContext = null; } } diff --git a/src/ViewModels/Workspace.cs b/src/ViewModels/Workspace.cs deleted file mode 100644 index 3ae935c7..00000000 --- a/src/ViewModels/Workspace.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Collections.Generic; -using Avalonia.Media; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class Workspace : ObservableObject - { - public string Name - { - get => _name; - set => SetProperty(ref _name, value); - } - - public uint Color - { - get => _color; - set - { - if (SetProperty(ref _color, value)) - OnPropertyChanged(nameof(Brush)); - } - } - - public List Repositories - { - get; - set; - } = new List(); - - public int ActiveIdx - { - get; - set; - } = 0; - - public bool IsActive - { - get => _isActive; - set => SetProperty(ref _isActive, value); - } - - public bool RestoreOnStartup - { - get => _restoreOnStartup; - set => SetProperty(ref _restoreOnStartup, value); - } - - public string DefaultCloneDir - { - get => _defaultCloneDir; - set => SetProperty(ref _defaultCloneDir, value); - } - - public IBrush Brush - { - get => new SolidColorBrush(_color); - } - - private string _name = string.Empty; - private uint _color = 4278221015; - private bool _isActive = false; - private bool _restoreOnStartup = true; - private string _defaultCloneDir = string.Empty; - } -} diff --git a/src/ViewModels/WorkspaceSwitcher.cs b/src/ViewModels/WorkspaceSwitcher.cs deleted file mode 100644 index 7a2da9be..00000000 --- a/src/ViewModels/WorkspaceSwitcher.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using CommunityToolkit.Mvvm.ComponentModel; - -namespace SourceGit.ViewModels -{ - public class WorkspaceSwitcher : ObservableObject, IDisposable - { - public List VisibleWorkspaces - { - get => _visibleWorkspaces; - private set => SetProperty(ref _visibleWorkspaces, value); - } - - public string SearchFilter - { - get => _searchFilter; - set - { - if (SetProperty(ref _searchFilter, value)) - UpdateVisibleWorkspaces(); - } - } - - public Workspace SelectedWorkspace - { - get => _selectedWorkspace; - set => SetProperty(ref _selectedWorkspace, value); - } - - public WorkspaceSwitcher(Launcher launcher) - { - _launcher = launcher; - UpdateVisibleWorkspaces(); - } - - public void ClearFilter() - { - SearchFilter = string.Empty; - } - - public void Switch() - { - _launcher.SwitchWorkspace(_selectedWorkspace); - _launcher.CancelSwitcher(); - } - - public void Dispose() - { - _visibleWorkspaces.Clear(); - _selectedWorkspace = null; - _searchFilter = string.Empty; - } - - private void UpdateVisibleWorkspaces() - { - var visible = new List(); - if (string.IsNullOrEmpty(_searchFilter)) - { - visible.AddRange(Preferences.Instance.Workspaces); - } - else - { - foreach (var workspace in Preferences.Instance.Workspaces) - { - if (workspace.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) - visible.Add(workspace); - } - } - - VisibleWorkspaces = visible; - SelectedWorkspace = visible.Count == 0 ? null : visible[0]; - } - - private Launcher _launcher = null; - private List _visibleWorkspaces = null; - private string _searchFilter = string.Empty; - private Workspace _selectedWorkspace = null; - } -} diff --git a/src/Views/AIAssistant.axaml b/src/Views/AIAssistant.axaml deleted file mode 100644 index 96ce56ec..00000000 --- a/src/Views/AIAssistant.axaml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - + + + - + - + - - + + - - + + - + - - + - + + + + + + + + + + + + + + + + + - - - - - - - - + diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs index d393f94c..810f5205 100644 --- a/src/Views/About.axaml.cs +++ b/src/Views/About.axaml.cs @@ -1,31 +1,56 @@ using System.Reflection; + +using Avalonia.Controls; +using Avalonia.Input; using Avalonia.Interactivity; namespace SourceGit.Views { - public partial class About : ChromelessWindow + public partial class About : Window { - public About() + public string Version { - InitializeComponent(); - - var assembly = Assembly.GetExecutingAssembly(); - var ver = assembly.GetName().Version; - if (ver != null) - TxtVersion.Text = $"{ver.Major}.{ver.Minor:D2}"; - - var copyright = assembly.GetCustomAttribute(); - if (copyright != null) - TxtCopyright.Text = copyright.Copyright; + get; + private set; } - private void OnVisitWebsite(object _, RoutedEventArgs e) + public About() { - Native.OS.OpenBrowser("https://sourcegit-scm.github.io/"); + var ver = Assembly.GetExecutingAssembly().GetName().Version; + Version = $"{ver.Major}.{ver.Minor}"; + DataContext = this; + InitializeComponent(); + } + + private void BeginMoveWindow(object sender, PointerPressedEventArgs e) + { + BeginMoveDrag(e); + } + + private void CloseWindow(object sender, RoutedEventArgs e) + { + Close(); + } + + private void OnVisitAvaloniaUI(object sender, PointerPressedEventArgs e) + { + Native.OS.OpenBrowser("https://www.avaloniaui.net/"); e.Handled = true; } - private void OnVisitSourceCode(object _, RoutedEventArgs e) + private void OnVisitAvaloniaEdit(object sender, PointerPressedEventArgs e) + { + Native.OS.OpenBrowser("https://github.com/AvaloniaUI/AvaloniaEdit"); + e.Handled = true; + } + + private void OnVisitJetBrainsMonoFont(object sender, PointerPressedEventArgs e) + { + Native.OS.OpenBrowser("https://www.jetbrains.com/lp/mono/"); + e.Handled = true; + } + + private void OnVisitSourceCode(object sender, PointerPressedEventArgs e) { Native.OS.OpenBrowser("https://github.com/sourcegit-scm/sourcegit"); e.Handled = true; diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml index f42fbf1f..4123d501 100644 --- a/src/Views/AddRemote.axaml +++ b/src/Views/AddRemote.axaml @@ -2,8 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.AddRemote" x:DataType="vm:AddRemote"> @@ -12,7 +14,7 @@ Classes="bold" Text="{DynamicResource Text.Remote.AddTitle}"/> - + @@ -11,7 +13,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/AddWorktree.axaml.cs b/src/Views/AddWorktree.axaml.cs deleted file mode 100644 index dad947de..00000000 --- a/src/Views/AddWorktree.axaml.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Platform.Storage; - -namespace SourceGit.Views -{ - public partial class AddWorktree : UserControl - { - public AddWorktree() - { - InitializeComponent(); - } - - private async void SelectLocation(object _, RoutedEventArgs e) - { - var toplevel = TopLevel.GetTopLevel(this); - if (toplevel == null) - return; - - var options = new FolderPickerOpenOptions() { AllowMultiple = false }; - try - { - var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options); - if (selected.Count == 1) - { - var folder = selected[0]; - var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString(); - TxtLocation.Text = folderPath; - } - } - catch (Exception exception) - { - App.RaiseException(string.Empty, $"Failed to select location: {exception.Message}"); - } - - e.Handled = true; - } - } -} diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml index 6c2478bb..cb4fc6f1 100644 --- a/src/Views/Apply.axaml +++ b/src/Views/Apply.axaml @@ -5,6 +5,7 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Apply" x:DataType="vm:Apply"> @@ -13,13 +14,13 @@ Classes="bold" Text="{DynamicResource Text.Apply.Title}"/> - + + IsEnabled="{Binding !IgnoreWhiteSpace}"> - - - - - - - - - - - - + + + + + - - - - - - - - - + IsChecked="{Binding IgnoreWhiteSpace, Mode=TwoWay}"/> diff --git a/src/Views/Apply.axaml.cs b/src/Views/Apply.axaml.cs index bf8e4da4..d9445092 100644 --- a/src/Views/Apply.axaml.cs +++ b/src/Views/Apply.axaml.cs @@ -11,21 +11,18 @@ namespace SourceGit.Views InitializeComponent(); } - private async void SelectPatchFile(object _, RoutedEventArgs e) + private async void SelectPatchFile(object sender, RoutedEventArgs e) { var topLevel = TopLevel.GetTopLevel(this); if (topLevel == null) return; - var options = new FilePickerOpenOptions() - { - AllowMultiple = false, - FileTypeFilter = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }] - }; - + var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }] }; var selected = await topLevel.StorageProvider.OpenFilePickerAsync(options); if (selected.Count == 1) - TxtPatchFile.Text = selected[0].Path.LocalPath; + { + txtPatchFile.Text = selected[0].Path.LocalPath; + } e.Handled = true; } diff --git a/src/Views/ApplyStash.axaml b/src/Views/ApplyStash.axaml deleted file mode 100644 index 44a97f42..00000000 --- a/src/Views/ApplyStash.axaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml index e9d0ad02..8cb89d49 100644 --- a/src/Views/Archive.axaml +++ b/src/Views/Archive.axaml @@ -13,26 +13,26 @@ - - + - + - + - - - - - + + + + + @@ -49,7 +49,7 @@ Margin="0,0,8,0" Text="{DynamicResource Text.Archive.File}"/> - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - + - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - + diff --git a/src/Views/AssumeUnchangedManager.axaml.cs b/src/Views/AssumeUnchangedManager.axaml.cs index a0a5a352..7efc06a5 100644 --- a/src/Views/AssumeUnchangedManager.axaml.cs +++ b/src/Views/AssumeUnchangedManager.axaml.cs @@ -1,21 +1,24 @@ using Avalonia.Controls; +using Avalonia.Input; using Avalonia.Interactivity; namespace SourceGit.Views { - public partial class AssumeUnchangedManager : ChromelessWindow + public partial class AssumeUnchangedManager : Window { public AssumeUnchangedManager() { InitializeComponent(); } - private void OnRemoveButtonClicked(object sender, RoutedEventArgs e) + private void BeginMoveWindow(object sender, PointerPressedEventArgs e) { - if (DataContext is ViewModels.AssumeUnchangedManager vm && sender is Button button) - vm.Remove(button.DataContext as string); + BeginMoveDrag(e); + } - e.Handled = true; + private void CloseWindow(object sender, RoutedEventArgs e) + { + Close(); } } } diff --git a/src/Views/AutoFocusBehaviour.cs b/src/Views/AutoFocusBehaviour.cs index 57f07c88..d7423a49 100644 --- a/src/Views/AutoFocusBehaviour.cs +++ b/src/Views/AutoFocusBehaviour.cs @@ -1,5 +1,4 @@ using Avalonia; -using Avalonia.Controls; using Avalonia.Input; namespace SourceGit.Views @@ -7,11 +6,17 @@ namespace SourceGit.Views public class AutoFocusBehaviour : AvaloniaObject { public static readonly AttachedProperty IsEnabledProperty = - AvaloniaProperty.RegisterAttached("IsEnabled"); + AvaloniaProperty.RegisterAttached("IsEnabled", false, false); static AutoFocusBehaviour() { - IsEnabledProperty.Changed.AddClassHandler(OnIsEnabledChanged); + IsEnabledProperty.Changed.AddClassHandler((input, e) => + { + if (input.GetValue(IsEnabledProperty)) + { + input.AttachedToVisualTree += (o, _) => (o as InputElement).Focus(NavigationMethod.Directional); + } + }); } public static bool GetIsEnabled(AvaloniaObject elem) @@ -23,20 +28,5 @@ namespace SourceGit.Views { elem.SetValue(IsEnabledProperty, value); } - - private static void OnIsEnabledChanged(TextBox elem, AvaloniaPropertyChangedEventArgs e) - { - if (GetIsEnabled(elem)) - { - elem.AttachedToVisualTree += (o, _) => - { - if (o is TextBox box) - { - box.Focus(NavigationMethod.Directional); - box.CaretIndex = box.Text?.Length ?? 0; - } - }; - } - } } } diff --git a/src/Views/Avatar.cs b/src/Views/Avatar.cs index dcb3591d..6eaf828f 100644 --- a/src/Views/Avatar.cs +++ b/src/Views/Avatar.cs @@ -1,6 +1,5 @@ using System; using System.Globalization; -using System.IO; using System.Security.Cryptography; using System.Text; @@ -9,12 +8,19 @@ using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Media; using Avalonia.Media.Imaging; -using Avalonia.Platform.Storage; namespace SourceGit.Views { public class Avatar : Control, Models.IAvatarHost { + private static readonly GradientStops[] FALLBACK_GRADIENTS = [ + new GradientStops() { new GradientStop(Colors.Orange, 0), new GradientStop(Color.FromRgb(255, 213, 134), 1) }, + new GradientStops() { new GradientStop(Colors.DodgerBlue, 0), new GradientStop(Colors.LightSkyBlue, 1) }, + new GradientStops() { new GradientStop(Colors.LimeGreen, 0), new GradientStop(Color.FromRgb(124, 241, 124), 1) }, + new GradientStops() { new GradientStop(Colors.Orchid, 0), new GradientStop(Color.FromRgb(248, 161, 245), 1) }, + new GradientStops() { new GradientStop(Colors.Tomato, 0), new GradientStop(Color.FromRgb(252, 165, 150), 1) }, + ]; + public static readonly StyledProperty UserProperty = AvaloniaProperty.Register(nameof(User)); @@ -24,8 +30,26 @@ namespace SourceGit.Views set => SetValue(UserProperty, value); } + static Avatar() + { + UserProperty.Changed.AddClassHandler(OnUserPropertyChanged); + } + public Avatar() { + var refetch = new MenuItem() { Header = App.Text("RefetchAvatar") }; + refetch.Click += (o, e) => + { + if (User != null) + { + Models.AvatarManager.Request(_emailMD5, true); + InvalidateVisual(); + } + }; + + ContextMenu = new ContextMenu(); + ContextMenu.Items.Add(refetch); + RenderOptions.SetBitmapInterpolationMode(this, BitmapInterpolationMode.HighQuality); } @@ -35,70 +59,25 @@ namespace SourceGit.Views return; var corner = (float)Math.Max(2, Bounds.Width / 16); - var rect = new Rect(0, 0, Bounds.Width, Bounds.Height); - var clip = context.PushClip(new RoundedRect(rect, corner)); - - if (_img != null) + var img = Models.AvatarManager.Request(_emailMD5, false); + if (img != null) { - context.DrawImage(_img, rect); + var rect = new Rect(0, 0, Bounds.Width, Bounds.Height); + context.PushClip(new RoundedRect(rect, corner)); + context.DrawImage(img, rect); } else { - context.DrawRectangle(Brushes.White, new Pen(new SolidColorBrush(Colors.Black, 0.3f), 0.65f), rect, corner, corner); - - var offsetX = Bounds.Width / 10.0; - var offsetY = Bounds.Height / 10.0; - - var stepX = (Bounds.Width - offsetX * 2) / 5.0; - var stepY = (Bounds.Height - offsetY * 2) / 5.0; - - var user = User; - var lowered = user.Email.ToLower(CultureInfo.CurrentCulture).Trim(); - var hash = MD5.HashData(Encoding.Default.GetBytes(lowered)); - - var brush = new SolidColorBrush(new Color(255, hash[0], hash[1], hash[2])); - var switches = new bool[15]; - for (int i = 0; i < switches.Length; i++) - switches[i] = hash[i + 1] % 2 == 1; - - for (int row = 0; row < 5; row++) - { - var x = offsetX + stepX * 2; - var y = offsetY + stepY * row; - var idx = row * 3; - - if (switches[idx]) - context.FillRectangle(brush, new Rect(x, y, stepX, stepY)); - - if (switches[idx + 1]) - context.FillRectangle(brush, new Rect(x + stepX, y, stepX, stepY)); - - if (switches[idx + 2]) - context.FillRectangle(brush, new Rect(x + stepX * 2, y, stepX, stepY)); - } - - for (int row = 0; row < 5; row++) - { - var x = offsetX; - var y = offsetY + stepY * row; - var idx = row * 3 + 2; - - if (switches[idx]) - context.FillRectangle(brush, new Rect(x, y, stepX, stepY)); - - if (switches[idx - 1]) - context.FillRectangle(brush, new Rect(x + stepX, y, stepX, stepY)); - } + Point textOrigin = new Point((Bounds.Width - _fallbackLabel.Width) * 0.5, (Bounds.Height - _fallbackLabel.Height) * 0.5); + context.DrawRectangle(_fallbackBrush, null, new Rect(0, 0, Bounds.Width, Bounds.Height), corner, corner); + context.DrawText(_fallbackLabel, textOrigin); } - - clip.Dispose(); } - public void OnAvatarResourceChanged(string email, Bitmap image) + public void OnAvatarResourceChanged(string md5) { - if (User.Email.Equals(email, StringComparison.Ordinal)) + if (_emailMD5 == md5) { - _img = image; InvalidateVisual(); } } @@ -106,120 +85,60 @@ namespace SourceGit.Views protected override void OnLoaded(RoutedEventArgs e) { base.OnLoaded(e); - Models.AvatarManager.Instance.Subscribe(this); - ContextRequested += OnContextRequested; + Models.AvatarManager.Subscribe(this); } protected override void OnUnloaded(RoutedEventArgs e) { base.OnUnloaded(e); - ContextRequested -= OnContextRequested; - Models.AvatarManager.Instance.Unsubscribe(this); + Models.AvatarManager.Unsubscribe(this); } - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + private static void OnUserPropertyChanged(Avatar avatar, AvaloniaPropertyChangedEventArgs e) { - base.OnPropertyChanged(change); - - if (change.Property == UserProperty) + if (avatar.User == null) { - var user = User; - if (user == null) - return; - - _img = Models.AvatarManager.Instance.Request(User.Email, false); - InvalidateVisual(); - } - } - - private void OnContextRequested(object sender, ContextRequestedEventArgs e) - { - var toplevel = TopLevel.GetTopLevel(this); - if (toplevel == null) - { - e.Handled = true; + avatar._emailMD5 = null; return; } - var refetch = new MenuItem(); - refetch.Icon = App.CreateMenuIcon("Icons.Loading"); - refetch.Header = App.Text("Avatar.Refetch"); - refetch.Click += (_, ev) => - { - if (User != null) - Models.AvatarManager.Instance.Request(User.Email, true); + var placeholder = string.IsNullOrWhiteSpace(avatar.User.Name) ? "?" : avatar.User.Name.Substring(0, 1); + var chars = placeholder.ToCharArray(); + var sum = 0; + foreach (var c in chars) + sum += Math.Abs(c); - ev.Handled = true; + var lowered = avatar.User.Email.ToLower(CultureInfo.CurrentCulture).Trim(); + var hash = MD5.Create().ComputeHash(Encoding.Default.GetBytes(lowered)); + var builder = new StringBuilder(); + foreach (var c in hash) + builder.Append(c.ToString("x2")); + var md5 = builder.ToString(); + if (avatar._emailMD5 != md5) + avatar._emailMD5 = md5; + + avatar._fallbackBrush = new LinearGradientBrush + { + GradientStops = FALLBACK_GRADIENTS[sum % FALLBACK_GRADIENTS.Length], + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), }; - var load = new MenuItem(); - load.Icon = App.CreateMenuIcon("Icons.Folder.Open"); - load.Header = App.Text("Avatar.Load"); - load.Click += async (_, ev) => - { - var options = new FilePickerOpenOptions() - { - FileTypeFilter = [new FilePickerFileType("PNG") { Patterns = ["*.png"] }], - AllowMultiple = false, - }; + var typeface = new Typeface("fonts:SourceGit#JetBrains Mono"); - var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options); - if (selected.Count == 1) - { - var localFile = selected[0].Path.LocalPath; - Models.AvatarManager.Instance.SetFromLocal(User.Email, localFile); - } + avatar._fallbackLabel = new FormattedText( + placeholder, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + avatar.Width * 0.65, + Brushes.White); - ev.Handled = true; - }; - - var saveAs = new MenuItem(); - saveAs.Icon = App.CreateMenuIcon("Icons.Save"); - saveAs.Header = App.Text("SaveAs"); - saveAs.Click += async (_, ev) => - { - var options = new FilePickerSaveOptions(); - options.Title = App.Text("SaveAs"); - options.DefaultExtension = ".png"; - options.FileTypeChoices = [new FilePickerFileType("PNG") { Patterns = ["*.png"] }]; - - var storageFile = await toplevel.StorageProvider.SaveFilePickerAsync(options); - if (storageFile != null) - { - var saveTo = storageFile.Path.LocalPath; - await using (var writer = File.OpenWrite(saveTo)) - { - if (_img != null) - { - _img.Save(writer); - } - else - { - var pixelSize = new PixelSize((int)Bounds.Width, (int)Bounds.Height); - var dpi = new Vector(96, 96); - - using (var rt = new RenderTargetBitmap(pixelSize, dpi)) - using (var ctx = rt.CreateDrawingContext()) - { - Render(ctx); - rt.Save(writer); - } - } - } - } - - ev.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Items.Add(refetch); - menu.Items.Add(load); - menu.Items.Add(new MenuItem() { Header = "-" }); - menu.Items.Add(saveAs); - - menu.Open(this); + avatar.InvalidateVisual(); } - private Bitmap _img = null; + private FormattedText _fallbackLabel = null; + private LinearGradientBrush _fallbackBrush = null; + private string _emailMD5 = null; } } diff --git a/src/Views/BisectStateIndicator.cs b/src/Views/BisectStateIndicator.cs deleted file mode 100644 index 0a581f53..00000000 --- a/src/Views/BisectStateIndicator.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Media; - -namespace SourceGit.Views -{ - public class BisectStateIndicator : Control - { - public static readonly StyledProperty BackgroundProperty = - AvaloniaProperty.Register(nameof(Background), Brushes.Transparent); - - public IBrush Background - { - get => GetValue(BackgroundProperty); - set => SetValue(BackgroundProperty, value); - } - - public static readonly StyledProperty ForegroundProperty = - AvaloniaProperty.Register(nameof(Foreground), Brushes.White); - - public IBrush Foreground - { - get => GetValue(ForegroundProperty); - set => SetValue(ForegroundProperty, value); - } - - public static readonly StyledProperty BisectProperty = - AvaloniaProperty.Register(nameof(Bisect)); - - public Models.Bisect Bisect - { - get => GetValue(BisectProperty); - set => SetValue(BisectProperty, value); - } - - static BisectStateIndicator() - { - AffectsMeasure(BisectProperty); - AffectsRender(BackgroundProperty, ForegroundProperty); - } - - public override void Render(DrawingContext context) - { - if (_flags == Models.BisectCommitFlag.None) - return; - - if (_prefix == null) - { - _prefix = LoadIcon("Icons.Bisect"); - _good = LoadIcon("Icons.Check"); - _bad = LoadIcon("Icons.Bad"); - } - - var x = 0.0; - - if (_flags.HasFlag(Models.BisectCommitFlag.Good)) - { - RenderImpl(context, Brushes.Green, _good, x); - x += 36; - } - - if (_flags.HasFlag(Models.BisectCommitFlag.Bad)) - RenderImpl(context, Brushes.Red, _bad, x); - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - InvalidateMeasure(); - } - - protected override Size MeasureOverride(Size availableSize) - { - var desiredFlags = Models.BisectCommitFlag.None; - var desiredWidth = 0.0; - if (Bisect is { } bisect && DataContext is Models.Commit commit) - { - var sha = commit.SHA; - if (bisect.Goods.Contains(sha)) - { - desiredFlags |= Models.BisectCommitFlag.Good; - desiredWidth = 36; - } - - if (bisect.Bads.Contains(sha)) - { - desiredFlags |= Models.BisectCommitFlag.Bad; - desiredWidth += 36; - } - } - - if (desiredFlags != _flags) - { - _flags = desiredFlags; - InvalidateVisual(); - } - - return new Size(desiredWidth, desiredWidth > 0 ? 16 : 0); - } - - private Geometry LoadIcon(string key) - { - var geo = this.FindResource(key) as StreamGeometry; - var drawGeo = geo!.Clone(); - var iconBounds = drawGeo.Bounds; - var translation = Matrix.CreateTranslation(-(Vector)iconBounds.Position); - var scale = Math.Min(10.0 / iconBounds.Width, 10.0 / iconBounds.Height); - var transform = translation * Matrix.CreateScale(scale, scale); - if (drawGeo.Transform == null || drawGeo.Transform.Value == Matrix.Identity) - drawGeo.Transform = new MatrixTransform(transform); - else - drawGeo.Transform = new MatrixTransform(drawGeo.Transform.Value * transform); - - return drawGeo; - } - - private void RenderImpl(DrawingContext context, IBrush brush, Geometry icon, double x) - { - var entireRect = new RoundedRect(new Rect(x, 0, 32, 16), new CornerRadius(2)); - var stateRect = new RoundedRect(new Rect(x + 16, 0, 16, 16), new CornerRadius(0, 2, 2, 0)); - context.DrawRectangle(Background, new Pen(brush), entireRect); - using (context.PushOpacity(.2)) - context.DrawRectangle(brush, null, stateRect); - context.DrawLine(new Pen(brush), new Point(x + 16, 0), new Point(x + 16, 16)); - - using (context.PushTransform(Matrix.CreateTranslation(x + 3, 3))) - context.DrawGeometry(Foreground, null, _prefix); - - using (context.PushTransform(Matrix.CreateTranslation(x + 19, 3))) - context.DrawGeometry(Foreground, null, icon); - } - - private Geometry _prefix = null; - private Geometry _good = null; - private Geometry _bad = null; - private Models.BisectCommitFlag _flags = Models.BisectCommitFlag.None; - } -} diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml index 2f6f75c2..06bd43e0 100644 --- a/src/Views/Blame.axaml +++ b/src/Views/Blame.axaml @@ -1,112 +1,80 @@ - - + + - + + + + - + - - + + + + - + + + + + - + + + - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - + FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont}" + BlameData="{Binding Data}"/> + - + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs index 171d51d9..d8226487 100644 --- a/src/Views/Blame.axaml.cs +++ b/src/Views/Blame.axaml.cs @@ -4,6 +4,7 @@ using System.Globalization; using Avalonia; using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Media; @@ -33,17 +34,13 @@ namespace SourceGit.Views return; var view = TextView; - if (view is { VisualLinesValid: true }) + if (view != null && view.VisualLinesValid) { var typeface = view.CreateTypeface(); - var underlinePen = new Pen(Brushes.DarkOrange); - var width = Bounds.Width; + var underlinePen = new Pen(Brushes.DarkOrange, 1); foreach (var line in view.VisualLines) { - if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted) - continue; - var lineNumber = line.FirstDocumentLine.LineNumber; if (lineNumber > _editor.BlameData.LineInfos.Count) break; @@ -65,6 +62,16 @@ namespace SourceGit.Views context.DrawLine(underlinePen, new Point(x, y + shaLink.Baseline + 2), new Point(x + shaLink.Width, y + shaLink.Baseline + 2)); x += shaLink.Width + 8; + var time = new FormattedText( + info.Time, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + _editor.FontSize, + _editor.Foreground); + context.DrawText(time, new Point(x, y)); + x += time.Width + 8; + var author = new FormattedText( info.Author, CultureInfo.CurrentCulture, @@ -73,15 +80,6 @@ namespace SourceGit.Views _editor.FontSize, _editor.Foreground); context.DrawText(author, new Point(x, y)); - - var time = new FormattedText( - info.Time, - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - typeface, - _editor.FontSize, - _editor.Foreground); - context.DrawText(time, new Point(width - time.Width, y)); } } } @@ -102,8 +100,9 @@ namespace SourceGit.Views var info = _editor.BlameData.LineInfos[lineNumber - 1]; - if (!calculated.Add(info.CommitSHA)) + if (calculated.Contains(info.CommitSHA)) continue; + calculated.Add(info.CommitSHA); var x = 0.0; var shaLink = new FormattedText( @@ -115,15 +114,6 @@ namespace SourceGit.Views Brushes.DarkOrange); x += shaLink.Width + 8; - var author = new FormattedText( - info.Author, - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - typeface, - _editor.FontSize, - _editor.Foreground); - x += author.Width + 8; - var time = new FormattedText( info.Time, CultureInfo.CurrentCulture, @@ -131,7 +121,16 @@ namespace SourceGit.Views typeface, _editor.FontSize, _editor.Foreground); - x += time.Width; + x += time.Width + 8; + + var author = new FormattedText( + info.Author, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + _editor.FontSize, + _editor.Foreground); + x += author.Width; if (maxWidth < x) maxWidth = x; @@ -141,72 +140,20 @@ namespace SourceGit.Views return new Size(maxWidth, 0); } - protected override void OnPointerMoved(PointerEventArgs e) - { - base.OnPointerMoved(e); - - var view = TextView; - if (!e.Handled && view is { VisualLinesValid: true }) - { - var pos = e.GetPosition(this); - var typeface = view.CreateTypeface(); - - foreach (var line in view.VisualLines) - { - if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted) - continue; - - var lineNumber = line.FirstDocumentLine.LineNumber; - if (lineNumber > _editor.BlameData.LineInfos.Count) - break; - - var info = _editor.BlameData.LineInfos[lineNumber - 1]; - var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop) - view.VerticalOffset; - var shaLink = new FormattedText( - info.CommitSHA, - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - typeface, - _editor.FontSize, - Brushes.DarkOrange); - - var rect = new Rect(0, y, shaLink.Width, shaLink.Height); - if (rect.Contains(pos)) - { - Cursor = Cursor.Parse("Hand"); - - if (DataContext is ViewModels.Blame blame) - { - var msg = blame.GetCommitMessage(info.CommitSHA); - ToolTip.SetTip(this, msg); - } - - return; - } - } - - Cursor = Cursor.Default; - ToolTip.SetTip(this, null); - } - } - protected override void OnPointerPressed(PointerPressedEventArgs e) { base.OnPointerPressed(e); var view = TextView; - if (!e.Handled && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && view is { VisualLinesValid: true }) + if (!e.Handled && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && view != null && view.VisualLinesValid) { var pos = e.GetPosition(this); var typeface = view.CreateTypeface(); foreach (var line in view.VisualLines) { - if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted) - continue; - var lineNumber = line.FirstDocumentLine.LineNumber; - if (lineNumber > _editor.BlameData.LineInfos.Count) + if (lineNumber >= _editor.BlameData.LineInfos.Count) break; var info = _editor.BlameData.LineInfos[lineNumber - 1]; @@ -222,9 +169,7 @@ namespace SourceGit.Views var rect = new Rect(0, y, shaLink.Width, shaLink.Height); if (rect.Contains(pos)) { - if (DataContext is ViewModels.Blame blame) - blame.NavigateToCommit(info.CommitSHA); - + _editor.OnCommitSHAClicked(info.CommitSHA); e.Handled = true; break; } @@ -235,16 +180,16 @@ namespace SourceGit.Views private readonly BlameTextEditor _editor = null; } - public class VerticalSeparatorMargin : AbstractMargin + public class VerticalSeperatorMargin : AbstractMargin { - public VerticalSeparatorMargin(BlameTextEditor editor) + public VerticalSeperatorMargin(BlameTextEditor editor) { _editor = editor; } public override void Render(DrawingContext context) { - var pen = new Pen(_editor.BorderBrush); + var pen = new Pen(_editor.BorderBrush, 1); context.DrawLine(pen, new Point(0, 0), new Point(0, Bounds.Height)); } @@ -265,15 +210,6 @@ namespace SourceGit.Views set => SetValue(BlameDataProperty, value); } - public static readonly StyledProperty TabWidthProperty = - AvaloniaProperty.Register(nameof(TabWidth), 4); - - public int TabWidth - { - get => GetValue(TabWidthProperty); - set => SetValue(TabWidthProperty, value); - } - protected override Type StyleKeyOverride => typeof(TextEditor); public BlameTextEditor() : base(new TextArea(), new TextDocument()) @@ -282,51 +218,24 @@ namespace SourceGit.Views ShowLineNumbers = false; WordWrap = false; - Options.IndentationSize = TabWidth; - Options.EnableHyperlinks = false; - Options.EnableEmailHyperlinks = false; - _textMate = Models.TextMateHelper.CreateForEditor(this); TextArea.LeftMargins.Add(new LineNumberMargin() { Margin = new Thickness(8, 0) }); - TextArea.LeftMargins.Add(new VerticalSeparatorMargin(this)); + TextArea.LeftMargins.Add(new VerticalSeperatorMargin(this)); TextArea.LeftMargins.Add(new CommitInfoMargin(this) { Margin = new Thickness(8, 0) }); - TextArea.LeftMargins.Add(new VerticalSeparatorMargin(this)); - TextArea.Caret.PositionChanged += OnTextAreaCaretPositionChanged; + TextArea.LeftMargins.Add(new VerticalSeperatorMargin(this)); TextArea.TextView.ContextRequested += OnTextViewContextRequested; TextArea.TextView.VisualLinesChanged += OnTextViewVisualLinesChanged; TextArea.TextView.Margin = new Thickness(4, 0); + TextArea.TextView.Options.EnableHyperlinks = false; + TextArea.TextView.Options.EnableEmailHyperlinks = false; } - public override void Render(DrawingContext context) + public void OnCommitSHAClicked(string sha) { - base.Render(context); - - if (string.IsNullOrEmpty(_highlight)) - return; - - var view = TextArea.TextView; - if (view == null || !view.VisualLinesValid) - return; - - var color = (Color)this.FindResource("SystemAccentColor")!; - var brush = new SolidColorBrush(color, 0.4); - foreach (var line in view.VisualLines) + if (DataContext is ViewModels.Blame blame) { - if (line.IsDisposed || line.FirstDocumentLine == null || line.FirstDocumentLine.IsDeleted) - continue; - - var lineNumber = line.FirstDocumentLine.LineNumber; - if (lineNumber > BlameData.LineInfos.Count) - break; - - var info = BlameData.LineInfos[lineNumber - 1]; - if (info.CommitSHA != _highlight) - continue; - - var startY = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.LineTop) - view.VerticalOffset; - var endY = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.LineBottom) - view.VerticalOffset; - context.FillRectangle(brush, new Rect(0, startY, Bounds.Width, endY - startY)); + blame.NavigateToCommit(sha); } } @@ -335,7 +244,6 @@ namespace SourceGit.Views base.OnUnloaded(e); TextArea.LeftMargins.Clear(); - TextArea.Caret.PositionChanged -= OnTextAreaCaretPositionChanged; TextArea.TextView.ContextRequested -= OnTextViewContextRequested; TextArea.TextView.VisualLinesChanged -= OnTextViewVisualLinesChanged; @@ -362,39 +270,28 @@ namespace SourceGit.Views Text = string.Empty; } } - else if (change.Property == TabWidthProperty) - { - Options.IndentationSize = TabWidth; - } else if (change.Property.Name == "ActualThemeVariant" && change.NewValue != null) { Models.TextMateHelper.SetThemeByApp(_textMate); } } - private void OnTextAreaCaretPositionChanged(object sender, EventArgs e) - { - if (!TextArea.IsFocused) - return; - - var caret = TextArea.Caret; - if (caret == null || caret.Line > BlameData.LineInfos.Count) - return; - - _highlight = BlameData.LineInfos[caret.Line - 1].CommitSHA; - InvalidateVisual(); - } - private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e) { var selected = SelectedText; if (string.IsNullOrEmpty(selected)) return; + var icon = new Avalonia.Controls.Shapes.Path(); + icon.Width = 10; + icon.Height = 10; + icon.Stretch = Stretch.Uniform; + icon.Data = App.Current?.FindResource("Icons.Copy") as StreamGeometry; + var copy = new MenuItem(); copy.Header = App.Text("Copy"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, ev) => + copy.Icon = icon; + copy.Click += (o, ev) => { App.CopyText(selected); ev.Handled = true; @@ -403,7 +300,6 @@ namespace SourceGit.Views var menu = new ContextMenu(); menu.Items.Add(copy); menu.Open(TextArea.TextView); - e.Handled = true; } @@ -417,44 +313,66 @@ namespace SourceGit.Views break; } } - - InvalidateVisual(); } private TextMate.Installation _textMate = null; - private string _highlight = string.Empty; } - public partial class Blame : ChromelessWindow + public partial class Blame : Window { public Blame() { + if (App.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + Owner = desktop.MainWindow; + } + InitializeComponent(); } + private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e) + { + if (WindowState == WindowState.Maximized) + { + WindowState = WindowState.Normal; + } + else + { + WindowState = WindowState.Maximized; + } + e.Handled = true; + } + + private void CustomResizeWindow(object sender, PointerPressedEventArgs e) + { + if (sender is Border border) + { + if (border.Tag is WindowEdge edge) + { + BeginResizeDrag(edge, e); + } + } + } + + private void BeginMoveWindow(object sender, PointerPressedEventArgs e) + { + BeginMoveDrag(e); + } + protected override void OnClosed(EventArgs e) { base.OnClosed(e); GC.Collect(); } - protected override void OnPointerReleased(PointerReleasedEventArgs e) + private void OnCommitSHAPointerPressed(object sender, PointerPressedEventArgs e) { - base.OnPointerReleased(e); - - if (!e.Handled && DataContext is ViewModels.Blame blame) + if (DataContext is ViewModels.Blame blame) { - if (e.InitialPressMouseButton == MouseButton.XButton1) - { - blame.Back(); - e.Handled = true; - } - else if (e.InitialPressMouseButton == MouseButton.XButton2) - { - blame.Forward(); - e.Handled = true; - } + var txt = sender as TextBlock; + blame.NavigateToCommit(txt.Text); } + e.Handled = true; } } } diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml deleted file mode 100644 index 1fe66e9b..00000000 --- a/src/Views/BranchCompare.axaml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/BranchCompare.axaml.cs b/src/Views/BranchCompare.axaml.cs deleted file mode 100644 index ca90a180..00000000 --- a/src/Views/BranchCompare.axaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Input; - -namespace SourceGit.Views -{ - public partial class BranchCompare : ChromelessWindow - { - public BranchCompare() - { - InitializeComponent(); - } - - private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e) - { - if (DataContext is ViewModels.BranchCompare vm && sender is ChangeCollectionView view) - { - var menu = vm.CreateChangeContextMenu(); - menu?.Open(view); - } - - e.Handled = true; - } - - private void OnPressedSHA(object sender, PointerPressedEventArgs e) - { - if (DataContext is ViewModels.BranchCompare vm && sender is TextBlock block) - vm.NavigateTo(block.Text); - - e.Handled = true; - } - } -} diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml deleted file mode 100644 index 11434b8e..00000000 --- a/src/Views/BranchTree.axaml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs deleted file mode 100644 index 045e9d1b..00000000 --- a/src/Views/BranchTree.axaml.cs +++ /dev/null @@ -1,539 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; - -using Avalonia; -using Avalonia.Collections; -using Avalonia.Controls; -using Avalonia.Controls.Primitives; -using Avalonia.Controls.Shapes; -using Avalonia.Input; -using Avalonia.Interactivity; -using Avalonia.Layout; -using Avalonia.Media; -using Avalonia.VisualTree; - -namespace SourceGit.Views -{ - public class BranchTreeNodeIcon : UserControl - { - public static readonly StyledProperty IsExpandedProperty = - AvaloniaProperty.Register(nameof(IsExpanded)); - - public bool IsExpanded - { - get => GetValue(IsExpandedProperty); - set => SetValue(IsExpandedProperty, value); - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - UpdateContent(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == IsExpandedProperty) - UpdateContent(); - } - - private void UpdateContent() - { - if (DataContext is not ViewModels.BranchTreeNode node) - { - Content = null; - return; - } - - if (node.Backend is Models.Remote) - { - CreateContent(new Thickness(0, 0, 0, 0), "Icons.Remote", false); - } - else if (node.Backend is Models.Branch branch) - { - if (branch.IsCurrent) - CreateContent(new Thickness(0, 0, 0, 0), "Icons.CheckCircled", true); - else - CreateContent(new Thickness(2, 0, 0, 0), "Icons.Branch", false); - } - else - { - if (node.IsExpanded) - CreateContent(new Thickness(0, 2, 0, 0), "Icons.Folder.Open", false); - else - CreateContent(new Thickness(0, 2, 0, 0), "Icons.Folder", false); - } - } - - private void CreateContent(Thickness margin, string iconKey, bool highlight) - { - var geo = this.FindResource(iconKey) as StreamGeometry; - if (geo == null) - return; - - var path = new Path() - { - Width = 12, - Height = 12, - HorizontalAlignment = HorizontalAlignment.Left, - VerticalAlignment = VerticalAlignment.Center, - Margin = margin, - Data = geo, - }; - - if (highlight) - path.Fill = Brushes.Green; - - Content = path; - } - } - - public class BranchTreeNodeToggleButton : ToggleButton - { - protected override Type StyleKeyOverride => typeof(ToggleButton); - - protected override void OnPointerPressed(PointerPressedEventArgs e) - { - if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && - DataContext is ViewModels.BranchTreeNode { IsBranch: false } node) - { - var tree = this.FindAncestorOfType(); - tree?.ToggleNodeIsExpanded(node); - } - - e.Handled = true; - } - } - - public class BranchTreeNodeTrackStatusPresenter : Control - { - public static readonly StyledProperty FontFamilyProperty = - TextBlock.FontFamilyProperty.AddOwner(); - - public FontFamily FontFamily - { - get => GetValue(FontFamilyProperty); - set => SetValue(FontFamilyProperty, value); - } - - public static readonly StyledProperty FontSizeProperty = - TextBlock.FontSizeProperty.AddOwner(); - - public double FontSize - { - get => GetValue(FontSizeProperty); - set => SetValue(FontSizeProperty, value); - } - - public static readonly StyledProperty ForegroundProperty = - AvaloniaProperty.Register(nameof(Foreground), Brushes.White); - - public IBrush Foreground - { - get => GetValue(ForegroundProperty); - set => SetValue(ForegroundProperty, value); - } - - public static readonly StyledProperty BackgroundProperty = - AvaloniaProperty.Register(nameof(Background), Brushes.White); - - public IBrush Background - { - get => GetValue(BackgroundProperty); - set => SetValue(BackgroundProperty, value); - } - - static BranchTreeNodeTrackStatusPresenter() - { - AffectsMeasure( - FontSizeProperty, - FontFamilyProperty, - ForegroundProperty); - - AffectsRender( - ForegroundProperty, - BackgroundProperty); - } - - public override void Render(DrawingContext context) - { - base.Render(context); - - if (_label != null) - { - context.DrawRectangle(Background, null, new RoundedRect(new Rect(8, 0, _label.Width + 18, 18), new CornerRadius(9))); - context.DrawText(_label, new Point(17, 9 - _label.Height * 0.5)); - } - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - InvalidateMeasure(); - InvalidateVisual(); - } - - protected override Size MeasureOverride(Size availableSize) - { - _label = null; - - if (DataContext is ViewModels.BranchTreeNode { Backend: Models.Branch branch }) - { - var status = branch.TrackStatus.ToString(); - if (!string.IsNullOrEmpty(status)) - { - _label = new FormattedText( - status, - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - new Typeface(FontFamily), - FontSize, - Foreground); - } - } - - return _label != null ? new Size(_label.Width + 18 /* Padding */ + 16 /* Margin */, 18) : new Size(0, 0); - } - - private FormattedText _label = null; - } - - public partial class BranchTree : UserControl - { - public static readonly StyledProperty> NodesProperty = - AvaloniaProperty.Register>(nameof(Nodes)); - - public List Nodes - { - get => GetValue(NodesProperty); - set => SetValue(NodesProperty, value); - } - - public AvaloniaList Rows - { - get; - private set; - } = new AvaloniaList(); - - public static readonly RoutedEvent SelectionChangedEvent = - RoutedEvent.Register(nameof(SelectionChanged), RoutingStrategies.Tunnel | RoutingStrategies.Bubble); - - public event EventHandler SelectionChanged - { - add { AddHandler(SelectionChangedEvent, value); } - remove { RemoveHandler(SelectionChangedEvent, value); } - } - - public static readonly RoutedEvent RowsChangedEvent = - RoutedEvent.Register(nameof(RowsChanged), RoutingStrategies.Tunnel | RoutingStrategies.Bubble); - - public event EventHandler RowsChanged - { - add { AddHandler(RowsChangedEvent, value); } - remove { RemoveHandler(RowsChangedEvent, value); } - } - - public BranchTree() - { - InitializeComponent(); - } - - public void UnselectAll() - { - BranchesPresenter.SelectedItem = null; - } - - public void ToggleNodeIsExpanded(ViewModels.BranchTreeNode node) - { - _disableSelectionChangingEvent = true; - node.IsExpanded = !node.IsExpanded; - - var rows = Rows; - var depth = node.Depth; - var idx = rows.IndexOf(node); - if (idx == -1) - return; - - if (node.IsExpanded) - { - var subtree = new List(); - MakeRows(subtree, node.Children, depth + 1); - rows.InsertRange(idx + 1, subtree); - } - else - { - var removeCount = 0; - for (int i = idx + 1; i < rows.Count; i++) - { - var row = rows[i]; - if (row.Depth <= depth) - break; - - row.IsSelected = false; - removeCount++; - } - rows.RemoveRange(idx + 1, removeCount); - } - - var repo = DataContext as ViewModels.Repository; - repo?.UpdateBranchNodeIsExpanded(node); - - RaiseEvent(new RoutedEventArgs(RowsChangedEvent)); - _disableSelectionChangingEvent = false; - } - - protected override void OnSizeChanged(SizeChangedEventArgs e) - { - base.OnSizeChanged(e); - - if (Bounds.Height >= 23.0) - BranchesPresenter.Height = Bounds.Height; - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == NodesProperty) - { - Rows.Clear(); - - if (Nodes is { Count: > 0 }) - { - var rows = new List(); - MakeRows(rows, Nodes, 0); - Rows.AddRange(rows); - } - - RaiseEvent(new RoutedEventArgs(RowsChangedEvent)); - } - else if (change.Property == IsVisibleProperty) - { - RaiseEvent(new RoutedEventArgs(RowsChangedEvent)); - } - } - - private void OnNodePointerPressed(object sender, PointerPressedEventArgs e) - { - var p = e.GetCurrentPoint(this); - if (!p.Properties.IsLeftButtonPressed) - return; - - if (DataContext is not ViewModels.Repository repo) - return; - - if (sender is not Border { DataContext: ViewModels.BranchTreeNode node }) - return; - - if (node.Backend is not Models.Branch branch) - return; - - if (BranchesPresenter.SelectedItems is { Count: > 0 }) - { - var ctrl = OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control; - if (e.KeyModifiers.HasFlag(ctrl) || e.KeyModifiers.HasFlag(KeyModifiers.Shift)) - return; - } - - repo.NavigateToCommit(branch.Head); - } - - private void OnNodesSelectionChanged(object _, SelectionChangedEventArgs e) - { - if (_disableSelectionChangingEvent) - return; - - var repo = DataContext as ViewModels.Repository; - if (repo?.Settings == null) - return; - - foreach (var item in e.AddedItems) - { - if (item is ViewModels.BranchTreeNode node) - node.IsSelected = true; - } - - foreach (var item in e.RemovedItems) - { - if (item is ViewModels.BranchTreeNode node) - node.IsSelected = false; - } - - var selected = BranchesPresenter.SelectedItems; - if (selected == null || selected.Count == 0) - return; - - var prev = null as ViewModels.BranchTreeNode; - foreach (var row in Rows) - { - if (row.IsSelected) - { - if (prev is { IsSelected: true }) - { - var prevTop = prev.CornerRadius.TopLeft; - prev.CornerRadius = new CornerRadius(prevTop, 0); - row.CornerRadius = new CornerRadius(0, 4); - } - else - { - row.CornerRadius = new CornerRadius(4); - } - } - - prev = row; - } - - RaiseEvent(new RoutedEventArgs(SelectionChangedEvent)); - } - - private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2) - { - var repo = DataContext as ViewModels.Repository; - if (repo?.Settings == null) - return; - - var selected = BranchesPresenter.SelectedItems; - if (selected == null || selected.Count == 0) - return; - - if (selected.Count == 1 && selected[0] is ViewModels.BranchTreeNode { Backend: Models.Remote remote }) - { - var menu = repo.CreateContextMenuForRemote(remote); - menu?.Open(this); - return; - } - - var branches = new List(); - foreach (var item in selected) - { - if (item is ViewModels.BranchTreeNode node) - CollectBranchesInNode(branches, node); - } - - if (branches.Count == 1) - { - var branch = branches[0]; - var menu = branch.IsLocal ? - repo.CreateContextMenuForLocalBranch(branch) : - repo.CreateContextMenuForRemoteBranch(branch); - menu?.Open(this); - } - else if (branches.Find(x => x.IsCurrent) == null) - { - var menu = new ContextMenu(); - - var mergeMulti = new MenuItem(); - mergeMulti.Header = App.Text("BranchCM.MergeMultiBranches", branches.Count); - mergeMulti.Icon = App.CreateMenuIcon("Icons.Merge"); - mergeMulti.Click += (_, ev) => - { - repo.MergeMultipleBranches(branches); - ev.Handled = true; - }; - menu.Items.Add(mergeMulti); - menu.Items.Add(new MenuItem() { Header = "-" }); - - var deleteMulti = new MenuItem(); - deleteMulti.Header = App.Text("BranchCM.DeleteMultiBranches", branches.Count); - deleteMulti.Icon = App.CreateMenuIcon("Icons.Clear"); - deleteMulti.Click += (_, ev) => - { - repo.DeleteMultipleBranches(branches, branches[0].IsLocal); - ev.Handled = true; - }; - menu.Items.Add(deleteMulti); - - menu?.Open(this); - } - } - - private void OnTreeKeyDown(object _, KeyEventArgs e) - { - if (e.Key is not (Key.Delete or Key.Back)) - return; - - var repo = DataContext as ViewModels.Repository; - if (repo?.Settings == null) - return; - - var selected = BranchesPresenter.SelectedItems; - if (selected == null || selected.Count == 0) - return; - - if (selected.Count == 1 && selected[0] is ViewModels.BranchTreeNode { Backend: Models.Remote remote }) - { - repo.DeleteRemote(remote); - e.Handled = true; - return; - } - - var branches = new List(); - foreach (var item in selected) - { - if (item is ViewModels.BranchTreeNode node) - CollectBranchesInNode(branches, node); - } - - if (branches.Find(x => x.IsCurrent) != null) - return; - - if (branches.Count == 1) - repo.DeleteBranch(branches[0]); - else - repo.DeleteMultipleBranches(branches, branches[0].IsLocal); - - e.Handled = true; - } - - private void OnDoubleTappedBranchNode(object sender, TappedEventArgs _) - { - if (sender is Grid { DataContext: ViewModels.BranchTreeNode node }) - { - if (node.Backend is Models.Branch branch) - { - if (branch.IsCurrent) - return; - - if (DataContext is ViewModels.Repository { Settings: not null } repo) - repo.CheckoutBranch(branch); - } - else - { - ToggleNodeIsExpanded(node); - } - } - } - - private void MakeRows(List rows, List nodes, int depth) - { - foreach (var node in nodes) - { - node.Depth = depth; - node.IsSelected = false; - rows.Add(node); - - if (!node.IsExpanded || node.Backend is Models.Branch) - continue; - - MakeRows(rows, node.Children, depth + 1); - } - } - - private void CollectBranchesInNode(List outs, ViewModels.BranchTreeNode node) - { - if (node.Backend is Models.Branch branch && !outs.Contains(branch)) - { - outs.Add(branch); - return; - } - - foreach (var sub in node.Children) - CollectBranchesInNode(outs, sub); - } - - private bool _disableSelectionChangingEvent = false; - } -} diff --git a/src/Views/CaptionButtons.axaml b/src/Views/CaptionButtons.axaml index 4ac07880..53436340 100644 --- a/src/Views/CaptionButtons.axaml +++ b/src/Views/CaptionButtons.axaml @@ -2,18 +2,20 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:v="using:SourceGit.Views" + xmlns:c="using:SourceGit.Converters" + xmlns:vm="using:SourceGit.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="SourceGit.Views.CaptionButtons" - x:Name="ThisControl"> + x:Class="SourceGit.Views.CaptionButtons"> - - diff --git a/src/Views/CaptionButtons.axaml.cs b/src/Views/CaptionButtons.axaml.cs index 650ccef0..c5aa3718 100644 --- a/src/Views/CaptionButtons.axaml.cs +++ b/src/Views/CaptionButtons.axaml.cs @@ -1,4 +1,3 @@ -using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.VisualTree; @@ -7,45 +6,36 @@ namespace SourceGit.Views { public partial class CaptionButtons : UserControl { - public static readonly StyledProperty IsCloseButtonOnlyProperty = - AvaloniaProperty.Register(nameof(IsCloseButtonOnly)); - - public bool IsCloseButtonOnly - { - get => GetValue(IsCloseButtonOnlyProperty); - set => SetValue(IsCloseButtonOnlyProperty, value); - } - public CaptionButtons() { InitializeComponent(); } - private void MinimizeWindow(object _, RoutedEventArgs e) + private void MinimizeWindow(object sender, RoutedEventArgs e) { var window = this.FindAncestorOfType(); if (window != null) + { window.WindowState = WindowState.Minimized; - - e.Handled = true; + } } - private void MaximizeOrRestoreWindow(object _, RoutedEventArgs e) + private void MaximizeOrRestoreWindow(object sender, RoutedEventArgs e) { var window = this.FindAncestorOfType(); if (window != null) + { window.WindowState = window.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized; - - e.Handled = true; + } } - private void CloseWindow(object _, RoutedEventArgs e) + private void CloseWindow(object sender, RoutedEventArgs e) { var window = this.FindAncestorOfType(); if (window != null) + { window.Close(); - - e.Handled = true; + } } } } diff --git a/src/Views/CaptionButtonsMacOS.axaml b/src/Views/CaptionButtonsMacOS.axaml new file mode 100644 index 00000000..642c6262 --- /dev/null +++ b/src/Views/CaptionButtonsMacOS.axaml @@ -0,0 +1,32 @@ + + + + + + + + + diff --git a/src/Views/CaptionButtonsMacOS.axaml.cs b/src/Views/CaptionButtonsMacOS.axaml.cs new file mode 100644 index 00000000..d23c74c0 --- /dev/null +++ b/src/Views/CaptionButtonsMacOS.axaml.cs @@ -0,0 +1,41 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.VisualTree; + +namespace SourceGit.Views +{ + public partial class CaptionButtonsMacOS : UserControl + { + public CaptionButtonsMacOS() + { + InitializeComponent(); + } + + private void MinimizeWindow(object sender, RoutedEventArgs e) + { + var window = this.FindAncestorOfType(); + if (window != null) + { + window.WindowState = WindowState.Minimized; + } + } + + private void MaximizeOrRestoreWindow(object sender, RoutedEventArgs e) + { + var window = this.FindAncestorOfType(); + if (window != null) + { + window.WindowState = window.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized; + } + } + + private void CloseWindow(object sender, RoutedEventArgs e) + { + var window = this.FindAncestorOfType(); + if (window != null) + { + window.Close(); + } + } + } +} diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml deleted file mode 100644 index 43af3a9a..00000000 --- a/src/Views/ChangeCollectionView.axaml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs deleted file mode 100644 index 6623a60b..00000000 --- a/src/Views/ChangeCollectionView.axaml.cs +++ /dev/null @@ -1,510 +0,0 @@ -using System; -using System.Collections.Generic; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.Documents; -using Avalonia.Controls.Primitives; -using Avalonia.Input; -using Avalonia.Interactivity; -using Avalonia.Media; -using Avalonia.VisualTree; - -namespace SourceGit.Views -{ - public class ChangeTreeNodeToggleButton : ToggleButton - { - protected override Type StyleKeyOverride => typeof(ToggleButton); - - protected override void OnPointerPressed(PointerPressedEventArgs e) - { - if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && - DataContext is ViewModels.ChangeTreeNode { IsFolder: true } node) - { - var tree = this.FindAncestorOfType(); - tree?.ToggleNodeIsExpanded(node); - } - - e.Handled = true; - } - } - - public class ChangeCollectionContainer : ListBox - { - protected override Type StyleKeyOverride => typeof(ListBox); - - protected override void OnKeyDown(KeyEventArgs e) - { - if (SelectedItems is [ViewModels.ChangeTreeNode { IsFolder: true } node] && e.KeyModifiers == KeyModifiers.None) - { - if ((node.IsExpanded && e.Key == Key.Left) || (!node.IsExpanded && e.Key == Key.Right)) - { - this.FindAncestorOfType()?.ToggleNodeIsExpanded(node); - e.Handled = true; - } - } - - if (!e.Handled && e.Key != Key.Space && e.Key != Key.Enter) - base.OnKeyDown(e); - } - } - - public partial class ChangeCollectionView : UserControl - { - public static readonly StyledProperty IsUnstagedChangeProperty = - AvaloniaProperty.Register(nameof(IsUnstagedChange)); - - public bool IsUnstagedChange - { - get => GetValue(IsUnstagedChangeProperty); - set => SetValue(IsUnstagedChangeProperty, value); - } - - public static readonly StyledProperty SelectionModeProperty = - AvaloniaProperty.Register(nameof(SelectionMode)); - - public SelectionMode SelectionMode - { - get => GetValue(SelectionModeProperty); - set => SetValue(SelectionModeProperty, value); - } - - public static readonly StyledProperty ViewModeProperty = - AvaloniaProperty.Register(nameof(ViewMode), Models.ChangeViewMode.Tree); - - public Models.ChangeViewMode ViewMode - { - get => GetValue(ViewModeProperty); - set => SetValue(ViewModeProperty, value); - } - - public static readonly StyledProperty> ChangesProperty = - AvaloniaProperty.Register>(nameof(Changes)); - - public List Changes - { - get => GetValue(ChangesProperty); - set => SetValue(ChangesProperty, value); - } - - public static readonly StyledProperty AutoSelectFirstChangeProperty = - AvaloniaProperty.Register(nameof(AutoSelectFirstChange)); - - public bool AutoSelectFirstChange - { - get => GetValue(AutoSelectFirstChangeProperty); - set => SetValue(AutoSelectFirstChangeProperty, value); - } - - public static readonly StyledProperty> SelectedChangesProperty = - AvaloniaProperty.Register>(nameof(SelectedChanges)); - - public List SelectedChanges - { - get => GetValue(SelectedChangesProperty); - set => SetValue(SelectedChangesProperty, value); - } - - public static readonly RoutedEvent ChangeDoubleTappedEvent = - RoutedEvent.Register(nameof(ChangeDoubleTapped), RoutingStrategies.Tunnel | RoutingStrategies.Bubble); - - public event EventHandler ChangeDoubleTapped - { - add { AddHandler(ChangeDoubleTappedEvent, value); } - remove { RemoveHandler(ChangeDoubleTappedEvent, value); } - } - - public ChangeCollectionView() - { - InitializeComponent(); - } - - public void ToggleNodeIsExpanded(ViewModels.ChangeTreeNode node) - { - if (Content is ViewModels.ChangeCollectionAsTree tree) - { - node.IsExpanded = !node.IsExpanded; - - var depth = node.Depth; - var idx = tree.Rows.IndexOf(node); - if (idx == -1) - return; - - if (node.IsExpanded) - { - var subrows = new List(); - MakeTreeRows(subrows, node.Children); - tree.Rows.InsertRange(idx + 1, subrows); - } - else - { - var removeCount = 0; - for (int i = idx + 1; i < tree.Rows.Count; i++) - { - var row = tree.Rows[i]; - if (row.Depth <= depth) - break; - - removeCount++; - } - - tree.Rows.RemoveRange(idx + 1, removeCount); - } - } - } - - public Models.Change GetNextChangeWithoutSelection() - { - var selected = SelectedChanges; - var changes = Changes; - if (selected == null || selected.Count == 0) - return changes.Count > 0 ? changes[0] : null; - if (selected.Count == changes.Count) - return null; - - var set = new HashSet(); - foreach (var c in selected) - set.Add(c.Path); - - if (Content is ViewModels.ChangeCollectionAsTree tree) - { - var lastUnselected = -1; - for (int i = tree.Rows.Count - 1; i >= 0; i--) - { - var row = tree.Rows[i]; - if (!row.IsFolder) - { - if (set.Contains(row.FullPath)) - { - if (lastUnselected == -1) - continue; - - break; - } - - lastUnselected = i; - } - } - - if (lastUnselected != -1) - return tree.Rows[lastUnselected].Change; - } - else - { - var lastUnselected = -1; - for (int i = changes.Count - 1; i >= 0; i--) - { - if (set.Contains(changes[i].Path)) - { - if (lastUnselected == -1) - continue; - - break; - } - - lastUnselected = i; - } - - if (lastUnselected != -1) - return changes[lastUnselected]; - } - - return null; - } - - public void TakeFocus() - { - var container = this.FindDescendantOfType(); - if (container is { IsFocused: false }) - container.Focus(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == ViewModeProperty) - UpdateDataSource(true); - else if (change.Property == ChangesProperty) - UpdateDataSource(false); - else if (change.Property == SelectedChangesProperty) - UpdateSelection(); - } - - private void OnRowDataContextChanged(object sender, EventArgs e) - { - if (sender is not Control control) - return; - - if (control.DataContext is ViewModels.ChangeTreeNode node) - { - if (node.Change is { } c) - UpdateRowTips(control, c); - else - ToolTip.SetTip(control, node.FullPath); - } - else if (control.DataContext is Models.Change change) - { - UpdateRowTips(control, change); - } - else - { - ToolTip.SetTip(control, null); - } - } - - private void OnRowDoubleTapped(object sender, TappedEventArgs e) - { - var grid = sender as Grid; - if (grid?.DataContext is ViewModels.ChangeTreeNode node) - { - if (node.IsFolder) - { - var posX = e.GetPosition(this).X; - if (posX < node.Depth * 16 + 16) - return; - - ToggleNodeIsExpanded(node); - } - else - { - RaiseEvent(new RoutedEventArgs(ChangeDoubleTappedEvent)); - } - } - else if (grid?.DataContext is Models.Change) - { - RaiseEvent(new RoutedEventArgs(ChangeDoubleTappedEvent)); - } - } - - private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs _) - { - if (_disableSelectionChangingEvent) - return; - - _disableSelectionChangingEvent = true; - - var selected = new List(); - if (sender is ListBox { SelectedItems: { } selectedItems }) - { - foreach (var item in selectedItems) - { - if (item is Models.Change c) - selected.Add(c); - else if (item is ViewModels.ChangeTreeNode node) - CollectChangesInNode(selected, node); - } - } - - var old = SelectedChanges ?? []; - if (old.Count != selected.Count) - { - SetCurrentValue(SelectedChangesProperty, selected); - } - else - { - bool allEquals = true; - foreach (var c in old) - { - if (!selected.Contains(c)) - { - allEquals = false; - break; - } - } - - if (!allEquals) - SetCurrentValue(SelectedChangesProperty, selected); - } - - _disableSelectionChangingEvent = false; - } - - private void MakeTreeRows(List rows, List nodes) - { - foreach (var node in nodes) - { - rows.Add(node); - - if (!node.IsExpanded || !node.IsFolder) - continue; - - MakeTreeRows(rows, node.Children); - } - } - - private void UpdateDataSource(bool onlyViewModeChange) - { - _disableSelectionChangingEvent = !onlyViewModeChange; - - var changes = Changes; - if (changes == null || changes.Count == 0) - { - Content = null; - _disableSelectionChangingEvent = false; - return; - } - - var selected = SelectedChanges ?? []; - if (ViewMode == Models.ChangeViewMode.Tree) - { - HashSet oldFolded = new HashSet(); - if (Content is ViewModels.ChangeCollectionAsTree oldTree) - { - foreach (var row in oldTree.Rows) - { - if (row.IsFolder && !row.IsExpanded) - oldFolded.Add(row.FullPath); - } - } - - var tree = new ViewModels.ChangeCollectionAsTree(); - tree.Tree = ViewModels.ChangeTreeNode.Build(changes, oldFolded); - - var rows = new List(); - MakeTreeRows(rows, tree.Tree); - tree.Rows.AddRange(rows); - - if (!onlyViewModeChange && AutoSelectFirstChange) - { - foreach (var row in tree.Rows) - { - if (row.Change != null) - { - tree.SelectedRows.Add(row); - SetCurrentValue(SelectedChangesProperty, [row.Change]); - break; - } - } - } - else if (selected.Count > 0) - { - var sets = new HashSet(); - foreach (var c in selected) - sets.Add(c); - - var nodes = new List(); - foreach (var row in tree.Rows) - { - if (row.Change != null && sets.Contains(row.Change)) - nodes.Add(row); - } - - tree.SelectedRows.AddRange(nodes); - } - - Content = tree; - } - else if (ViewMode == Models.ChangeViewMode.Grid) - { - var grid = new ViewModels.ChangeCollectionAsGrid(); - grid.Changes.AddRange(changes); - - if (!onlyViewModeChange && AutoSelectFirstChange) - { - grid.SelectedChanges.Add(changes[0]); - SetCurrentValue(SelectedChangesProperty, [changes[0]]); - } - else if (selected.Count > 0) - { - grid.SelectedChanges.AddRange(selected); - } - - Content = grid; - } - else - { - var list = new ViewModels.ChangeCollectionAsList(); - list.Changes.AddRange(changes); - - if (!onlyViewModeChange && AutoSelectFirstChange) - { - list.SelectedChanges.Add(changes[0]); - SetCurrentValue(SelectedChangesProperty, [changes[0]]); - } - else if (selected.Count > 0) - { - list.SelectedChanges.AddRange(selected); - } - - Content = list; - } - - _disableSelectionChangingEvent = false; - } - - private void UpdateSelection() - { - if (_disableSelectionChangingEvent) - return; - - _disableSelectionChangingEvent = true; - - var selected = SelectedChanges ?? []; - if (Content is ViewModels.ChangeCollectionAsTree tree) - { - tree.SelectedRows.Clear(); - - if (selected.Count > 0) - { - var sets = new HashSet(); - foreach (var c in selected) - sets.Add(c); - - var nodes = new List(); - foreach (var row in tree.Rows) - { - if (row.Change != null && sets.Contains(row.Change)) - nodes.Add(row); - } - - tree.SelectedRows.AddRange(nodes); - } - } - else if (Content is ViewModels.ChangeCollectionAsGrid grid) - { - grid.SelectedChanges.Clear(); - if (selected.Count > 0) - grid.SelectedChanges.AddRange(selected); - } - else if (Content is ViewModels.ChangeCollectionAsList list) - { - list.SelectedChanges.Clear(); - if (selected.Count > 0) - list.SelectedChanges.AddRange(selected); - } - - _disableSelectionChangingEvent = false; - } - - private void CollectChangesInNode(List outs, ViewModels.ChangeTreeNode node) - { - if (node.IsFolder) - { - foreach (var child in node.Children) - CollectChangesInNode(outs, child); - } - else if (!outs.Contains(node.Change)) - { - outs.Add(node.Change); - } - } - - private void UpdateRowTips(Control control, Models.Change change) - { - var tip = new TextBlock() { TextWrapping = TextWrapping.Wrap }; - tip.Inlines!.Add(new Run(change.Path)); - tip.Inlines!.Add(new Run(" • ") { Foreground = Brushes.Gray }); - tip.Inlines!.Add(new Run(IsUnstagedChange ? change.WorkTreeDesc : change.IndexDesc) { Foreground = Brushes.Gray }); - if (change.IsConflicted) - { - tip.Inlines!.Add(new Run(" • ") { Foreground = Brushes.Gray }); - tip.Inlines!.Add(new Run(change.ConflictDesc) { Foreground = Brushes.Gray }); - } - - ToolTip.SetTip(control, tip); - } - - private bool _disableSelectionChangingEvent = false; - } -} diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs index d66ac11d..fdcb8640 100644 --- a/src/Views/ChangeStatusIcon.cs +++ b/src/Views/ChangeStatusIcon.cs @@ -9,7 +9,6 @@ namespace SourceGit.Views { public class ChangeStatusIcon : Control { - private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "★", "!"]; private static readonly IBrush[] BACKGROUNDS = [ Brushes.Transparent, new LinearGradientBrush @@ -19,12 +18,6 @@ namespace SourceGit.Views EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), }, new LinearGradientBrush - { - GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) }, - StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), - EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), - }, - new LinearGradientBrush { GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(47, 185, 47), 0), new GradientStop(Color.FromRgb(75, 189, 75), 1) }, StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), @@ -49,21 +42,28 @@ namespace SourceGit.Views EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), }, new LinearGradientBrush + { + GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(47, 185, 47), 0), new GradientStop(Color.FromRgb(75, 189, 75), 1) }, StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), }, - Brushes.OrangeRed, ]; - public static readonly StyledProperty IsUnstagedChangeProperty = - AvaloniaProperty.Register(nameof(IsUnstagedChange)); + private static readonly string[] INDICATOR = ["?", "±", "+", "−", "➜", "❏", "U", "★"]; - public bool IsUnstagedChange + public static readonly StyledProperty IsWorkingCopyChangeProperty = + AvaloniaProperty.Register(nameof(IsWorkingCopyChange)); + + public bool IsWorkingCopyChange { - get => GetValue(IsUnstagedChangeProperty); - set => SetValue(IsUnstagedChangeProperty, value); + get => GetValue(IsWorkingCopyChangeProperty); + set => SetValue(IsWorkingCopyChangeProperty, value); } public static readonly StyledProperty ChangeProperty = @@ -75,6 +75,11 @@ namespace SourceGit.Views set => SetValue(ChangeProperty, value); } + static ChangeStatusIcon() + { + AffectsRender(IsWorkingCopyChangeProperty, ChangeProperty); + } + public override void Render(DrawingContext context) { if (Change == null || Bounds.Width <= 0) @@ -82,12 +87,20 @@ namespace SourceGit.Views var typeface = new Typeface("fonts:SourceGit#JetBrains Mono"); - IBrush background; + IBrush background = null; string indicator; - if (IsUnstagedChange) + if (IsWorkingCopyChange) { - background = BACKGROUNDS[(int)Change.WorkTree]; - indicator = INDICATOR[(int)Change.WorkTree]; + if (Change.IsConflit) + { + background = Brushes.OrangeRed; + indicator = "!"; + } + else + { + background = BACKGROUNDS[(int)Change.WorkTree]; + indicator = INDICATOR[(int)Change.WorkTree]; + } } else { @@ -103,18 +116,10 @@ namespace SourceGit.Views Bounds.Width * 0.8, Brushes.White); - var corner = (float)Math.Max(2, Bounds.Width / 16); - var textOrigin = new Point((Bounds.Width - txt.Width) * 0.5, (Bounds.Height - txt.Height) * 0.5); + float corner = (float)Math.Max(2, Bounds.Width / 16); + Point textOrigin = new Point((Bounds.Width - txt.Width) * 0.5, (Bounds.Height - txt.Height) * 0.5); context.DrawRectangle(background, null, new Rect(0, 0, Bounds.Width, Bounds.Height), corner, corner); context.DrawText(txt, textOrigin); } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == IsUnstagedChangeProperty || change.Property == ChangeProperty) - InvalidateVisual(); - } } } diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml index 911fb41d..32d4f1e9 100644 --- a/src/Views/ChangeViewModeSwitcher.axaml +++ b/src/Views/ChangeViewModeSwitcher.axaml @@ -4,40 +4,32 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:v="using:SourceGit.Views" + xmlns:vm="using:SourceGit.ViewModels" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.ChangeViewModeSwitcher" - x:Name="ThisControl"> - diff --git a/src/Views/ChangeViewModeSwitcher.axaml.cs b/src/Views/ChangeViewModeSwitcher.axaml.cs index ed306619..0cb2c4a9 100644 --- a/src/Views/ChangeViewModeSwitcher.axaml.cs +++ b/src/Views/ChangeViewModeSwitcher.axaml.cs @@ -1,6 +1,5 @@ using Avalonia; using Avalonia.Controls; -using Avalonia.Interactivity; namespace SourceGit.Views { @@ -17,25 +16,13 @@ namespace SourceGit.Views public ChangeViewModeSwitcher() { + DataContext = this; InitializeComponent(); } - private void SwitchToList(object sender, RoutedEventArgs e) + public void SwitchMode(object param) { - ViewMode = Models.ChangeViewMode.List; - e.Handled = true; - } - - private void SwitchToGrid(object sender, RoutedEventArgs e) - { - ViewMode = Models.ChangeViewMode.Grid; - e.Handled = true; - } - - private void SwitchToTree(object sender, RoutedEventArgs e) - { - ViewMode = Models.ChangeViewMode.Tree; - e.Handled = true; + ViewMode = (Models.ChangeViewMode)param; } } } diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml index 42b9cec5..083190f8 100644 --- a/src/Views/Checkout.axaml +++ b/src/Views/Checkout.axaml @@ -2,9 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" - xmlns:ac="using:Avalonia.Controls.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Checkout" x:DataType="vm:Checkout"> @@ -12,42 +10,10 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/Views/CheckoutAndFastForward.axaml b/src/Views/CheckoutAndFastForward.axaml deleted file mode 100644 index 40ca3e14..00000000 --- a/src/Views/CheckoutAndFastForward.axaml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/CheckoutAndFastForward.axaml.cs b/src/Views/CheckoutAndFastForward.axaml.cs deleted file mode 100644 index c54f5a1f..00000000 --- a/src/Views/CheckoutAndFastForward.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class CheckoutAndFastForward : UserControl - { - public CheckoutAndFastForward() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/CheckoutCommit.axaml b/src/Views/CheckoutCommit.axaml deleted file mode 100644 index 11b4b5d0..00000000 --- a/src/Views/CheckoutCommit.axaml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/CheckoutCommit.axaml.cs b/src/Views/CheckoutCommit.axaml.cs deleted file mode 100644 index 375816c9..00000000 --- a/src/Views/CheckoutCommit.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class CheckoutCommit : UserControl - { - public CheckoutCommit() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/CherryPick.axaml b/src/Views/CherryPick.axaml index bf66864c..7dbd6cdb 100644 --- a/src/Views/CherryPick.axaml +++ b/src/Views/CherryPick.axaml @@ -12,84 +12,21 @@ - - + - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/ChromelessWindow.cs b/src/Views/ChromelessWindow.cs deleted file mode 100644 index 1662bcd7..00000000 --- a/src/Views/ChromelessWindow.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; - -using Avalonia.Controls; -using Avalonia.Controls.Primitives; -using Avalonia.Input; - -namespace SourceGit.Views -{ - public class ChromelessWindow : Window - { - public bool UseSystemWindowFrame - { - get => Native.OS.UseSystemWindowFrame; - } - - protected override Type StyleKeyOverride => typeof(Window); - - public ChromelessWindow() - { - Focusable = true; - Native.OS.SetupForWindow(this); - } - - public void BeginMoveWindow(object _, PointerPressedEventArgs e) - { - if (e.ClickCount == 1) - BeginMoveDrag(e); - - e.Handled = true; - } - - public void MaximizeOrRestoreWindow(object _, TappedEventArgs e) - { - if (WindowState == WindowState.Maximized) - WindowState = WindowState.Normal; - else - WindowState = WindowState.Maximized; - - e.Handled = true; - } - - protected override void OnApplyTemplate(TemplateAppliedEventArgs e) - { - base.OnApplyTemplate(e); - - if (Classes.Contains("custom_window_frame") && CanResize) - { - string[] borderNames = [ - "PART_BorderTopLeft", - "PART_BorderTop", - "PART_BorderTopRight", - "PART_BorderLeft", - "PART_BorderRight", - "PART_BorderBottomLeft", - "PART_BorderBottom", - "PART_BorderBottomRight", - ]; - - foreach (var name in borderNames) - { - var border = e.NameScope.Find(name); - if (border != null) - { - border.PointerPressed -= OnWindowBorderPointerPressed; - border.PointerPressed += OnWindowBorderPointerPressed; - } - } - } - } - - private void OnWindowBorderPointerPressed(object sender, PointerPressedEventArgs e) - { - if (sender is Border border && border.Tag is WindowEdge edge && CanResize) - BeginResizeDrag(edge, e); - } - } -} diff --git a/src/Views/Cleanup.axaml b/src/Views/Cleanup.axaml index d385712d..dc429420 100644 --- a/src/Views/Cleanup.axaml +++ b/src/Views/Cleanup.axaml @@ -2,7 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Cleanup" x:DataType="vm:Cleanup"> diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml index 8c7c9faf..627716b8 100644 --- a/src/Views/Clone.axaml +++ b/src/Views/Clone.axaml @@ -2,6 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -10,76 +11,46 @@ - - - - - - + + + + + + + Text="{Binding SSHKey, Mode=TwoWay}"> - - - - + + + - - - - - - - - - + + + + + + + + diff --git a/src/Views/Clone.axaml.cs b/src/Views/Clone.axaml.cs index 9316721a..af13412f 100644 --- a/src/Views/Clone.axaml.cs +++ b/src/Views/Clone.axaml.cs @@ -1,4 +1,3 @@ -using System; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Platform.Storage; @@ -12,46 +11,28 @@ namespace SourceGit.Views InitializeComponent(); } - private async void SelectParentFolder(object _, RoutedEventArgs e) + private async void SelectParentFolder(object sender, RoutedEventArgs e) { var options = new FolderPickerOpenOptions() { AllowMultiple = false }; var toplevel = TopLevel.GetTopLevel(this); - if (toplevel == null) - return; - - try + var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options); + if (selected.Count == 1) { - var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options); - if (selected.Count == 1) - { - var folder = selected[0]; - var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString(); - TxtParentFolder.Text = folderPath; - } - } - catch (Exception exception) - { - App.RaiseException(string.Empty, $"Failed to select parent folder: {exception.Message}"); + txtParentFolder.Text = selected[0].Path.LocalPath; } e.Handled = true; } - private async void SelectSSHKey(object _, RoutedEventArgs e) + private async void SelectSSHKey(object sender, RoutedEventArgs e) { + var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] }; var toplevel = TopLevel.GetTopLevel(this); - if (toplevel == null) - return; - - var options = new FilePickerOpenOptions() - { - AllowMultiple = false, - FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] - }; - var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options); if (selected.Count == 1) - TxtSshKey.Text = selected[0].Path.LocalPath; + { + txtSSHKey.Text = selected[0].Path.LocalPath; + } e.Handled = true; } diff --git a/src/Views/ColorPicker.cs b/src/Views/ColorPicker.cs deleted file mode 100644 index 5090af86..00000000 --- a/src/Views/ColorPicker.cs +++ /dev/null @@ -1,247 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Media; - -namespace SourceGit.Views -{ - public class ColorPicker : Control - { - public static readonly StyledProperty ValueProperty = - AvaloniaProperty.Register(nameof(Value), 0); - - public uint Value - { - get => GetValue(ValueProperty); - set => SetValue(ValueProperty, value); - } - - // Values are copied from Avalonia: src/Avalonia.Controls.ColorPicker/ColorPalettes/FluentColorPalette.cs - private static readonly Color[,] COLOR_TABLE = new[,] - { - { - Color.FromArgb(255, 255, 67, 67), /* #FF4343 */ - Color.FromArgb(255, 209, 52, 56), /* #D13438 */ - Color.FromArgb(255, 239, 105, 80), /* #EF6950 */ - Color.FromArgb(255, 218, 59, 1), /* #DA3B01 */ - Color.FromArgb(255, 202, 80, 16), /* #CA5010 */ - Color.FromArgb(255, 247, 99, 12), /* #F7630C */ - Color.FromArgb(255, 255, 140, 0), /* #FF8C00 */ - Color.FromArgb(255, 255, 185, 0), /* #FFB900 */ - }, - { - Color.FromArgb(255, 231, 72, 86), /* #E74856 */ - Color.FromArgb(255, 232, 17, 35), /* #E81123 */ - Color.FromArgb(255, 234, 0, 94), /* #EA005E */ - Color.FromArgb(255, 195, 0, 82), /* #C30052 */ - Color.FromArgb(255, 227, 0, 140), /* #E3008C */ - Color.FromArgb(255, 191, 0, 119), /* #BF0077 */ - Color.FromArgb(255, 194, 57, 179), /* #C239B3 */ - Color.FromArgb(255, 154, 0, 137), /* #9A0089 */ - }, - { - Color.FromArgb(255, 0, 120, 215), /* #0078D7 */ - Color.FromArgb(255, 0, 99, 177), /* #0063B1 */ - Color.FromArgb(255, 142, 140, 216), /* #8E8CD8 */ - Color.FromArgb(255, 107, 105, 214), /* #6B69D6 */ - Color.FromArgb(255, 135, 100, 184), /* #8764B8 */ - Color.FromArgb(255, 116, 77, 169), /* #744DA9 */ - Color.FromArgb(255, 177, 70, 194), /* #B146C2 */ - Color.FromArgb(255, 136, 23, 152), /* #881798 */ - }, - { - Color.FromArgb(255, 0, 153, 188), /* #0099BC */ - Color.FromArgb(255, 45, 125, 154), /* #2D7D9A */ - Color.FromArgb(255, 0, 183, 195), /* #00B7C3 */ - Color.FromArgb(255, 3, 131, 135), /* #038387 */ - Color.FromArgb(255, 0, 178, 148), /* #00B294 */ - Color.FromArgb(255, 1, 133, 116), /* #018574 */ - Color.FromArgb(255, 0, 204, 106), /* #00CC6A */ - Color.FromArgb(255, 16, 137, 62), /* #10893E */ - }, - { - Color.FromArgb(255, 122, 117, 116), /* #7A7574 */ - Color.FromArgb(255, 93, 90, 80), /* #5D5A58 */ - Color.FromArgb(255, 104, 118, 138), /* #68768A */ - Color.FromArgb(255, 81, 92, 107), /* #515C6B */ - Color.FromArgb(255, 86, 124, 115), /* #567C73 */ - Color.FromArgb(255, 72, 104, 96), /* #486860 */ - Color.FromArgb(255, 73, 130, 5), /* #498205 */ - Color.FromArgb(255, 16, 124, 16), /* #107C10 */ - }, - { - Color.FromArgb(255, 118, 118, 118), /* #767676 */ - Color.FromArgb(255, 76, 74, 72), /* #4C4A48 */ - Color.FromArgb(255, 105, 121, 126), /* #69797E */ - Color.FromArgb(255, 74, 84, 89), /* #4A5459 */ - Color.FromArgb(255, 100, 124, 100), /* #647C64 */ - Color.FromArgb(255, 82, 94, 84), /* #525E54 */ - Color.FromArgb(255, 132, 117, 69), /* #847545 */ - Color.FromArgb(255, 126, 115, 95), /* #7E735F */ - } - }; - - static ColorPicker() - { - ValueProperty.Changed.AddClassHandler((c, _) => c.UpdateColors()); - } - - public override void Render(DrawingContext context) - { - base.Render(context); - - // Color table. - { - // Colors - for (int i = 0; i < 6; i++) - { - for (int j = 0; j < 8; j++) - context.FillRectangle(new SolidColorBrush(COLOR_TABLE[i, j]), new Rect(j * 32, i * 32, 32, 32)); - } - - // Borders - var border = this.FindResource("Brush.Border0") as IBrush; - var pen = new Pen(border, 0.4); - for (int i = 1; i < 6; i++) - context.DrawLine(pen, new Point(0, i * 32), new Point(256, i * 32)); - for (int j = 1; j < 8; j++) - context.DrawLine(pen, new Point(j * 32, 0), new Point(j * 32, 192)); - - // Selected - if (_highlightedTableRect is { } rect) - context.DrawRectangle(new Pen(Brushes.White, 2), rect); - } - - // Palette picker - { - context.DrawRectangle(Brushes.Transparent, null, new Rect(0, 200, 256, 32), 4, 4, _shadow); - - context.DrawRectangle(new SolidColorBrush(_darkestColor), null, _darkestRect); - context.FillRectangle(new SolidColorBrush(_darkerColor), _darkerRect); - context.FillRectangle(new SolidColorBrush(_darkColor), _darkRect); - context.FillRectangle(new SolidColorBrush(_lightColor), _lightRect); - context.FillRectangle(new SolidColorBrush(_lighterColor), _lighterRect); - context.DrawRectangle(new SolidColorBrush(_lightestColor), null, _lightestRect); - - context.DrawRectangle(new SolidColorBrush(_color), null, new Rect(96, 200 - 4, 64, 40), 4, 4, _shadow); - } - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == ValueProperty) - { - UpdateColors(); - InvalidateVisual(); - } - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - _highlightedTableRect = null; - } - - protected override Size MeasureOverride(Size availableSize) - { - return new Size(256, 240); - } - - protected override void OnPointerPressed(PointerPressedEventArgs e) - { - base.OnPointerPressed(e); - - var p = e.GetPosition(this); - if (_colorTableRect.Contains(p)) - { - var col = (int)Math.Floor(p.X / 32.0); - var row = (int)Math.Floor(p.Y / 32.0); - var rect = new Rect(col * 32 + 2, row * 32 + 2, 28, 28); - if (!rect.Equals(_highlightedTableRect)) - { - _highlightedTableRect = rect; - SetCurrentValue(ValueProperty, COLOR_TABLE[row, col].ToUInt32()); - } - - return; - } - - if (_darkestRect.Rect.Contains(p)) - { - _highlightedTableRect = null; - SetCurrentValue(ValueProperty, _darkestColor.ToUInt32()); - } - else if (_darkerRect.Contains(p)) - { - _highlightedTableRect = null; - SetCurrentValue(ValueProperty, _darkerColor.ToUInt32()); - } - else if (_darkRect.Contains(p)) - { - _highlightedTableRect = null; - SetCurrentValue(ValueProperty, _darkColor.ToUInt32()); - } - else if (_lightRect.Contains(p)) - { - _highlightedTableRect = null; - SetCurrentValue(ValueProperty, _lightColor.ToUInt32()); - } - else if (_lighterRect.Contains(p)) - { - _highlightedTableRect = null; - SetCurrentValue(ValueProperty, _lighterColor.ToUInt32()); - } - else if (_lightestRect.Rect.Contains(p)) - { - _highlightedTableRect = null; - SetCurrentValue(ValueProperty, _lightestColor.ToUInt32()); - } - } - - private void UpdateColors() - { - _color = Color.FromUInt32(Value); - - var hsvColor = _color.ToHsv(); - _darkestColor = GetNextColor(hsvColor, -0.3); - _darkerColor = GetNextColor(hsvColor, -0.2); - _darkColor = GetNextColor(hsvColor, -0.1); - _lightColor = GetNextColor(hsvColor, 0.1); - _lighterColor = GetNextColor(hsvColor, 0.2); - _lightestColor = GetNextColor(hsvColor, 0.3); - } - - private Color GetNextColor(HsvColor c, double step) - { - var v = c.V; - v += step; - v = Math.Round(v, 2); - - var newColor = new HsvColor(c.A, c.H, c.S, v); - return newColor.ToRgb(); - } - - private BoxShadows _shadow = BoxShadows.Parse("0 0 6 0 #A9000000"); - - private Rect _colorTableRect = new Rect(0, 0, 32 * 8, 32 * 6); - private RoundedRect _darkestRect = new RoundedRect(new Rect(0, 200, 32, 32), new CornerRadius(4, 0, 0, 4)); - private Rect _darkerRect = new Rect(32, 200, 32, 32); - private Rect _darkRect = new Rect(64, 200, 32, 32); - private Rect _lightRect = new Rect(160, 200, 32, 32); - private Rect _lighterRect = new Rect(192, 200, 32, 32); - private RoundedRect _lightestRect = new RoundedRect(new Rect(224, 200, 32, 32), new CornerRadius(0, 4, 4, 0)); - private Rect? _highlightedTableRect = null; - - private Color _darkestColor; - private Color _darkerColor; - private Color _darkColor; - private Color _color; - private Color _lightColor; - private Color _lighterColor; - private Color _lightestColor; - } -} diff --git a/src/Views/CommandLogContentPresenter.cs b/src/Views/CommandLogContentPresenter.cs deleted file mode 100644 index a2499f8d..00000000 --- a/src/Views/CommandLogContentPresenter.cs +++ /dev/null @@ -1,152 +0,0 @@ -using System; -using System.Collections.Generic; - -using Avalonia; -using Avalonia.Controls.Primitives; -using Avalonia.Interactivity; -using Avalonia.Media; - -using AvaloniaEdit; -using AvaloniaEdit.Document; -using AvaloniaEdit.Editing; -using AvaloniaEdit.Rendering; -using AvaloniaEdit.TextMate; - -namespace SourceGit.Views -{ - public class CommandLogContentPresenter : TextEditor - { - public class LineStyleTransformer : DocumentColorizingTransformer - { - protected override void ColorizeLine(DocumentLine line) - { - var content = CurrentContext.Document.GetText(line); - if (content.StartsWith("$ git ", StringComparison.Ordinal)) - { - ChangeLinePart(line.Offset, line.Offset + 1, v => - { - v.TextRunProperties.SetForegroundBrush(Brushes.Orange); - }); - - ChangeLinePart(line.Offset + 2, line.EndOffset, v => - { - var old = v.TextRunProperties.Typeface; - v.TextRunProperties.SetTypeface(new Typeface(old.FontFamily, old.Style, FontWeight.Bold)); - }); - } - else if (content.StartsWith("remote: ", StringComparison.Ordinal)) - { - ChangeLinePart(line.Offset, line.Offset + 7, v => - { - v.TextRunProperties.SetForegroundBrush(Brushes.SeaGreen); - }); - } - else - { - foreach (var err in _errors) - { - var idx = content.IndexOf(err, StringComparison.Ordinal); - if (idx >= 0) - { - ChangeLinePart(line.Offset + idx, line.Offset + err.Length + 1, v => - { - v.TextRunProperties.SetForegroundBrush(Brushes.Red); - }); - } - } - } - } - - private readonly List _errors = ["! [rejected]", "! [remote rejected]"]; - } - - public static readonly StyledProperty LogProperty = - AvaloniaProperty.Register(nameof(Log)); - - public ViewModels.CommandLog Log - { - get => GetValue(LogProperty); - set => SetValue(LogProperty, value); - } - - public static readonly StyledProperty PureTextProperty = - AvaloniaProperty.Register(nameof(PureText)); - - public string PureText - { - get => GetValue(PureTextProperty); - set => SetValue(PureTextProperty, value); - } - - protected override Type StyleKeyOverride => typeof(TextEditor); - - public CommandLogContentPresenter() : base(new TextArea(), new TextDocument()) - { - IsReadOnly = true; - ShowLineNumbers = false; - WordWrap = false; - HorizontalScrollBarVisibility = ScrollBarVisibility.Auto; - VerticalScrollBarVisibility = ScrollBarVisibility.Auto; - - TextArea.TextView.Margin = new Thickness(4, 0); - TextArea.TextView.Options.EnableHyperlinks = false; - TextArea.TextView.Options.EnableEmailHyperlinks = false; - } - - protected override void OnLoaded(RoutedEventArgs e) - { - base.OnLoaded(e); - - if (_textMate == null) - { - _textMate = Models.TextMateHelper.CreateForEditor(this); - Models.TextMateHelper.SetGrammarByFileName(_textMate, "Log.log"); - TextArea.TextView.LineTransformers.Add(new LineStyleTransformer()); - } - } - - protected override void OnUnloaded(RoutedEventArgs e) - { - base.OnUnloaded(e); - - if (_textMate != null) - { - _textMate.Dispose(); - _textMate = null; - } - - GC.Collect(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == LogProperty) - { - if (change.NewValue is ViewModels.CommandLog log) - { - Text = log.Content; - log.Register(OnLogLineReceived); - } - else - { - Text = string.Empty; - } - } - else if (change.Property == PureTextProperty) - { - if (!string.IsNullOrEmpty(PureText)) - Text = PureText; - } - } - - private void OnLogLineReceived(string newline) - { - AppendText("\n"); - AppendText(newline); - } - - private TextMate.Installation _textMate = null; - } -} diff --git a/src/Views/CommandLogTime.cs b/src/Views/CommandLogTime.cs deleted file mode 100644 index 665e6e7b..00000000 --- a/src/Views/CommandLogTime.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Threading; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Threading; - -namespace SourceGit.Views -{ - public class CommandLogTime : TextBlock - { - public static readonly StyledProperty LogProperty = - AvaloniaProperty.Register(nameof(Log), null); - - public ViewModels.CommandLog Log - { - get => GetValue(LogProperty); - set => SetValue(LogProperty, value); - } - - protected override Type StyleKeyOverride => typeof(TextBlock); - - protected override void OnUnloaded(RoutedEventArgs e) - { - base.OnUnloaded(e); - StopTimer(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == LogProperty) - { - StopTimer(); - - if (change.NewValue is ViewModels.CommandLog log) - SetupCommandLog(log); - else - Text = string.Empty; - } - } - - private void SetupCommandLog(ViewModels.CommandLog log) - { - Text = GetDisplayText(log); - if (log.IsComplete) - return; - - _refreshTimer = new Timer(_ => - { - Dispatcher.UIThread.Invoke(() => - { - Text = GetDisplayText(log); - if (log.IsComplete) - StopTimer(); - }); - }, null, 0, 100); - } - - private void StopTimer() - { - if (_refreshTimer is not null) - { - _refreshTimer.Dispose(); - _refreshTimer = null; - } - } - - private string GetDisplayText(ViewModels.CommandLog log) - { - var endTime = log.IsComplete ? log.EndTime : DateTime.Now; - var duration = (endTime - log.StartTime).ToString(@"hh\:mm\:ss\.fff"); - return $"{log.StartTime:T} ({duration})"; - } - - private Timer _refreshTimer = null; - } -} diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml index 2d3b6ff4..40b1e036 100644 --- a/src/Views/CommitBaseInfo.axaml +++ b/src/Views/CommitBaseInfo.axaml @@ -7,96 +7,53 @@ xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="SourceGit.Views.CommitBaseInfo" - x:Name="ThisControl"> + x:Class="SourceGit.Views.CommitBaseInfo"> - + - - - - - - - - - + + + + + + - + + - - - - - - - - - + + + + + + - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + @@ -105,126 +62,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + PointerPressed="OnParentSHAPressed"/> - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/Views/CommitBaseInfo.axaml.cs b/src/Views/CommitBaseInfo.axaml.cs index ac9b53cc..1b873bb7 100644 --- a/src/Views/CommitBaseInfo.axaml.cs +++ b/src/Views/CommitBaseInfo.axaml.cs @@ -1,155 +1,21 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -using Avalonia; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Interactivity; -using Avalonia.Threading; namespace SourceGit.Views { public partial class CommitBaseInfo : UserControl { - public static readonly StyledProperty FullMessageProperty = - AvaloniaProperty.Register(nameof(FullMessage)); - - public Models.CommitFullMessage FullMessage - { - get => GetValue(FullMessageProperty); - set => SetValue(FullMessageProperty, value); - } - - public static readonly StyledProperty SignInfoProperty = - AvaloniaProperty.Register(nameof(SignInfo)); - - public Models.CommitSignInfo SignInfo - { - get => GetValue(SignInfoProperty); - set => SetValue(SignInfoProperty, value); - } - - public static readonly StyledProperty SupportsContainsInProperty = - AvaloniaProperty.Register(nameof(SupportsContainsIn)); - - public bool SupportsContainsIn - { - get => GetValue(SupportsContainsInProperty); - set => SetValue(SupportsContainsInProperty, value); - } - - public static readonly StyledProperty> WebLinksProperty = - AvaloniaProperty.Register>(nameof(WebLinks)); - - public List WebLinks - { - get => GetValue(WebLinksProperty); - set => SetValue(WebLinksProperty, value); - } - - public static readonly StyledProperty> ChildrenProperty = - AvaloniaProperty.Register>(nameof(Children)); - - public List Children - { - get => GetValue(ChildrenProperty); - set => SetValue(ChildrenProperty, value); - } - public CommitBaseInfo() { InitializeComponent(); } - private void OnCopyCommitSHA(object sender, RoutedEventArgs e) + private void OnParentSHAPressed(object sender, PointerPressedEventArgs e) { - if (sender is Button { DataContext: Models.Commit commit }) - App.CopyText(commit.SHA); - - e.Handled = true; - } - - private void OnOpenWebLink(object sender, RoutedEventArgs e) - { - if (DataContext is ViewModels.CommitDetail detail && sender is Control control) + if (DataContext is ViewModels.CommitDetail detail) { - var links = WebLinks; - if (links.Count > 1) - { - var menu = new ContextMenu(); - - foreach (var link in links) - { - var url = $"{link.URLPrefix}{detail.Commit.SHA}"; - var item = new MenuItem() { Header = link.Name }; - item.Click += (_, ev) => - { - Native.OS.OpenBrowser(url); - ev.Handled = true; - }; - - menu.Items.Add(item); - } - - menu.Open(control); - } - else if (links.Count == 1) - { - var url = $"{links[0].URLPrefix}{detail.Commit.SHA}"; - Native.OS.OpenBrowser(url); - } + detail.NavigateTo((sender as Control).DataContext as string); } - - e.Handled = true; - } - - private void OnOpenContainsIn(object sender, RoutedEventArgs e) - { - if (DataContext is ViewModels.CommitDetail detail && sender is Button button) - { - var tracking = new CommitRelationTracking(detail); - var flyout = new Flyout(); - flyout.Content = tracking; - flyout.ShowAt(button); - } - - e.Handled = true; - } - - private void OnSHAPointerEntered(object sender, PointerEventArgs e) - { - if (DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha } ctl) - { - var tooltip = ToolTip.GetTip(ctl); - if (tooltip is Models.Commit commit && commit.SHA == sha) - return; - - Task.Run(() => - { - var c = detail.GetParent(sha); - if (c == null) - return; - - Dispatcher.UIThread.Invoke(() => - { - if (ctl.IsEffectivelyVisible && ctl.DataContext is string newSHA && newSHA == sha) - ToolTip.SetTip(ctl, c); - }); - }); - } - - e.Handled = true; - } - - private void OnSHAPressed(object sender, PointerPressedEventArgs e) - { - var point = e.GetCurrentPoint(this); - - if (point.Properties.IsLeftButtonPressed && DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha }) - { - detail.NavigateTo(sha); - } - e.Handled = true; } } diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml index 4dafee37..3720590b 100644 --- a/src/Views/CommitChanges.axaml +++ b/src/Views/CommitChanges.axaml @@ -10,19 +10,18 @@ x:DataType="vm:CommitDetail"> - + - + - + - + @@ -40,28 +39,115 @@ + HorizontalAlignment="Right" + ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/> - - + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/CommitChanges.axaml.cs b/src/Views/CommitChanges.axaml.cs index c3d30018..0209092d 100644 --- a/src/Views/CommitChanges.axaml.cs +++ b/src/Views/CommitChanges.axaml.cs @@ -9,14 +9,38 @@ namespace SourceGit.Views InitializeComponent(); } - private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e) + private void OnDataGridSelectionChanged(object sender, SelectionChangedEventArgs e) { - if (sender is ChangeCollectionView { SelectedChanges: { } selected } view && - selected.Count == 1 && - DataContext is ViewModels.CommitDetail vm) + if (sender is DataGrid datagrid && datagrid.IsVisible && datagrid.SelectedItem != null) { - var menu = vm.CreateChangeContextMenu(selected[0]); - menu?.Open(view); + datagrid.ScrollIntoView(datagrid.SelectedItem, null); + } + e.Handled = true; + } + + private void OnDataGridContextRequested(object sender, ContextRequestedEventArgs e) + { + if (sender is DataGrid datagrid && datagrid.SelectedItem != null) + { + var detail = DataContext as ViewModels.CommitDetail; + var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change); + menu.Open(datagrid); + } + + e.Handled = true; + } + + private void OnTreeViewContextRequested(object sender, ContextRequestedEventArgs e) + { + if (sender is TreeView view && view.SelectedItem != null) + { + var detail = DataContext as ViewModels.CommitDetail; + var node = view.SelectedItem as ViewModels.FileTreeNode; + if (node != null && !node.IsFolder) + { + var menu = detail.CreateChangeContextMenu(node.Backend as Models.Change); + menu.Open(view); + } } e.Handled = true; diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml index d6ce74a1..04972c42 100644 --- a/src/Views/CommitDetail.axaml +++ b/src/Views/CommitDetail.axaml @@ -8,7 +8,8 @@ xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.CommitDetail" - x:DataType="vm:CommitDetail"> + x:DataType="vm:CommitDetail" + Background="{DynamicResource Brush.Window}"> @@ -16,67 +17,46 @@ - - - - + + + - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs index f0599c66..d3e03365 100644 --- a/src/Views/CommitDetail.axaml.cs +++ b/src/Views/CommitDetail.axaml.cs @@ -10,25 +10,31 @@ namespace SourceGit.Views InitializeComponent(); } - private void OnChangeDoubleTapped(object sender, TappedEventArgs e) + private void OnChangeListDoubleTapped(object sender, TappedEventArgs e) { - if (DataContext is ViewModels.CommitDetail detail && sender is Grid grid && grid.DataContext is Models.Change change) + if (DataContext is ViewModels.CommitDetail detail) { + var datagrid = sender as DataGrid; detail.ActivePageIndex = 1; - detail.SelectedChanges = new() { change }; + detail.SelectedChange = datagrid.SelectedItem as Models.Change; } - e.Handled = true; } - private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e) + private void OnChangeListContextRequested(object sender, ContextRequestedEventArgs e) { - if (DataContext is ViewModels.CommitDetail detail && sender is Grid grid && grid.DataContext is Models.Change change) + if (DataContext is ViewModels.CommitDetail detail) { - var menu = detail.CreateChangeContextMenu(change); - menu?.Open(grid); - } + var datagrid = sender as DataGrid; + if (datagrid.SelectedItem == null) + { + e.Handled = true; + return; + } + var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change); + menu.Open(datagrid); + } e.Handled = true; } } diff --git a/src/Views/CommitGraph.cs b/src/Views/CommitGraph.cs deleted file mode 100644 index 5db39300..00000000 --- a/src/Views/CommitGraph.cs +++ /dev/null @@ -1,245 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Media; -using Avalonia.VisualTree; - -namespace SourceGit.Views -{ - public class CommitGraph : Control - { - public static readonly StyledProperty GraphProperty = - AvaloniaProperty.Register(nameof(Graph)); - - public Models.CommitGraph Graph - { - get => GetValue(GraphProperty); - set => SetValue(GraphProperty, value); - } - - public static readonly StyledProperty DotBrushProperty = - AvaloniaProperty.Register(nameof(DotBrush), Brushes.Transparent); - - public IBrush DotBrush - { - get => GetValue(DotBrushProperty); - set => SetValue(DotBrushProperty, value); - } - - public static readonly StyledProperty OnlyHighlightCurrentBranchProperty = - AvaloniaProperty.Register(nameof(OnlyHighlightCurrentBranch), true); - - public bool OnlyHighlightCurrentBranch - { - get => GetValue(OnlyHighlightCurrentBranchProperty); - set => SetValue(OnlyHighlightCurrentBranchProperty, value); - } - - static CommitGraph() - { - AffectsRender(GraphProperty, DotBrushProperty, OnlyHighlightCurrentBranchProperty); - } - - public override void Render(DrawingContext context) - { - base.Render(context); - - var graph = Graph; - if (graph == null) - return; - - var histories = this.FindAncestorOfType(); - if (histories == null) - return; - - var list = histories.CommitListContainer; - if (list == null) - return; - - var container = list.ItemsPanelRoot as VirtualizingStackPanel; - if (container == null) - return; - - var item = list.ContainerFromIndex(container.FirstRealizedIndex); - if (item == null) - return; - - var width = histories.CommitListHeader.ColumnDefinitions[0].ActualWidth; - var height = Bounds.Height; - var rowHeight = item.Bounds.Height; - var startY = container.FirstRealizedIndex * rowHeight - item.TranslatePoint(new Point(0, 0), list).Value!.Y; - var endY = startY + height + 28; - - using (context.PushClip(new Rect(0, 0, width, height))) - using (context.PushTransform(Matrix.CreateTranslation(0, -startY))) - { - DrawCurves(context, graph, startY, endY, rowHeight); - DrawAnchors(context, graph, startY, endY, rowHeight); - } - } - - private void DrawCurves(DrawingContext context, Models.CommitGraph graph, double top, double bottom, double rowHeight) - { - var grayedPen = new Pen(new SolidColorBrush(Colors.Gray, 0.4), Models.CommitGraph.Pens[0].Thickness); - var onlyHighlightCurrentBranch = OnlyHighlightCurrentBranch; - - if (onlyHighlightCurrentBranch) - { - foreach (var link in graph.Links) - { - if (link.IsMerged) - continue; - - var startY = link.Start.Y * rowHeight; - var endY = link.End.Y * rowHeight; - - if (endY < top) - continue; - if (startY > bottom) - break; - - var geo = new StreamGeometry(); - using (var ctx = geo.Open()) - { - ctx.BeginFigure(new Point(link.Start.X, startY), false); - ctx.QuadraticBezierTo(new Point(link.Control.X, link.Control.Y * rowHeight), new Point(link.End.X, endY)); - } - - context.DrawGeometry(null, grayedPen, geo); - } - } - - foreach (var line in graph.Paths) - { - var last = new Point(line.Points[0].X, line.Points[0].Y * rowHeight); - var size = line.Points.Count; - var endY = line.Points[size - 1].Y * rowHeight; - - if (endY < top) - continue; - if (last.Y > bottom) - break; - - var geo = new StreamGeometry(); - var pen = Models.CommitGraph.Pens[line.Color]; - - using (var ctx = geo.Open()) - { - var started = false; - var ended = false; - for (int i = 1; i < size; i++) - { - var cur = new Point(line.Points[i].X, line.Points[i].Y * rowHeight); - if (cur.Y < top) - { - last = cur; - continue; - } - - if (!started) - { - ctx.BeginFigure(last, false); - started = true; - } - - if (cur.Y > bottom) - { - cur = new Point(cur.X, bottom); - ended = true; - } - - if (cur.X > last.X) - { - ctx.QuadraticBezierTo(new Point(cur.X, last.Y), cur); - } - else if (cur.X < last.X) - { - if (i < size - 1) - { - var midY = (last.Y + cur.Y) / 2; - ctx.CubicBezierTo(new Point(last.X, midY + 4), new Point(cur.X, midY - 4), cur); - } - else - { - ctx.QuadraticBezierTo(new Point(last.X, cur.Y), cur); - } - } - else - { - ctx.LineTo(cur); - } - - if (ended) - break; - last = cur; - } - } - - if (!line.IsMerged && onlyHighlightCurrentBranch) - context.DrawGeometry(null, grayedPen, geo); - else - context.DrawGeometry(null, pen, geo); - } - - foreach (var link in graph.Links) - { - if (onlyHighlightCurrentBranch && !link.IsMerged) - continue; - - var startY = link.Start.Y * rowHeight; - var endY = link.End.Y * rowHeight; - - if (endY < top) - continue; - if (startY > bottom) - break; - - var geo = new StreamGeometry(); - using (var ctx = geo.Open()) - { - ctx.BeginFigure(new Point(link.Start.X, startY), false); - ctx.QuadraticBezierTo(new Point(link.Control.X, link.Control.Y * rowHeight), new Point(link.End.X, endY)); - } - - context.DrawGeometry(null, Models.CommitGraph.Pens[link.Color], geo); - } - } - - private void DrawAnchors(DrawingContext context, Models.CommitGraph graph, double top, double bottom, double rowHeight) - { - var dotFill = DotBrush; - var dotFillPen = new Pen(dotFill, 2); - var grayedPen = new Pen(Brushes.Gray, Models.CommitGraph.Pens[0].Thickness); - var onlyHighlightCurrentBranch = OnlyHighlightCurrentBranch; - - foreach (var dot in graph.Dots) - { - var center = new Point(dot.Center.X, dot.Center.Y * rowHeight); - - if (center.Y < top) - continue; - if (center.Y > bottom) - break; - - var pen = Models.CommitGraph.Pens[dot.Color]; - if (!dot.IsMerged && onlyHighlightCurrentBranch) - pen = grayedPen; - - switch (dot.Type) - { - case Models.CommitGraph.DotType.Head: - context.DrawEllipse(dotFill, pen, center, 6, 6); - context.DrawEllipse(pen.Brush, null, center, 3, 3); - break; - case Models.CommitGraph.DotType.Merge: - context.DrawEllipse(pen.Brush, null, center, 6, 6); - context.DrawLine(dotFillPen, new Point(center.X, center.Y - 3), new Point(center.X, center.Y + 3)); - context.DrawLine(dotFillPen, new Point(center.X - 3, center.Y), new Point(center.X + 3, center.Y)); - break; - default: - context.DrawEllipse(dotFill, pen, center, 3, 3); - break; - } - } - } - } -} diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs deleted file mode 100644 index 61119991..00000000 --- a/src/Views/CommitMessagePresenter.cs +++ /dev/null @@ -1,305 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.Documents; -using Avalonia.Input; -using Avalonia.Threading; -using Avalonia.VisualTree; - -namespace SourceGit.Views -{ - public class CommitMessagePresenter : SelectableTextBlock - { - public static readonly StyledProperty FullMessageProperty = - AvaloniaProperty.Register(nameof(FullMessage)); - - public Models.CommitFullMessage FullMessage - { - get => GetValue(FullMessageProperty); - set => SetValue(FullMessageProperty, value); - } - - protected override Type StyleKeyOverride => typeof(SelectableTextBlock); - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == FullMessageProperty) - { - Inlines!.Clear(); - _inlineCommits.Clear(); - _lastHover = null; - ClearHoveredIssueLink(); - - var message = FullMessage?.Message; - if (string.IsNullOrEmpty(message)) - return; - - var links = FullMessage?.Inlines; - if (links == null || links.Count == 0) - { - Inlines.Add(new Run(message)); - return; - } - - var inlines = new List(); - var pos = 0; - for (var i = 0; i < links.Count; i++) - { - var link = links[i]; - if (link.Start > pos) - inlines.Add(new Run(message.Substring(pos, link.Start - pos))); - - var run = new Run(message.Substring(link.Start, link.Length)); - run.Classes.Add(link.Type == Models.InlineElementType.CommitSHA ? "commit_link" : "issue_link"); - inlines.Add(run); - - pos = link.Start + link.Length; - } - - if (pos < message.Length) - inlines.Add(new Run(message.Substring(pos))); - - Inlines.AddRange(inlines); - } - } - - protected override void OnPointerMoved(PointerEventArgs e) - { - base.OnPointerMoved(e); - - if (Equals(e.Pointer.Captured, this)) - { - var relativeSelfY = e.GetPosition(this).Y; - if (relativeSelfY <= 0 || relativeSelfY > Bounds.Height) - return; - - var scrollViewer = this.FindAncestorOfType(); - if (scrollViewer != null) - { - var relativeY = e.GetPosition(scrollViewer).Y; - if (relativeY <= 8) - scrollViewer.LineUp(); - else if (relativeY >= scrollViewer.Bounds.Height - 8) - scrollViewer.LineDown(); - } - } - else if (FullMessage is { Inlines: { Count: > 0 } links }) - { - var point = e.GetPosition(this) - new Point(Padding.Left, Padding.Top); - var x = Math.Min(Math.Max(point.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0)); - var y = Math.Min(Math.Max(point.Y, 0), Math.Max(TextLayout.Height, 0)); - point = new Point(x, y); - - var pos = TextLayout.HitTestPoint(point).TextPosition; - if (links.Intersect(pos, 1) is { } link) - SetHoveredIssueLink(link); - else - ClearHoveredIssueLink(); - } - } - - protected override void OnPointerPressed(PointerPressedEventArgs e) - { - var point = e.GetCurrentPoint(this); - - if (_lastHover != null) - { - var link = _lastHover.Link; - e.Pointer.Capture(null); - - if (_lastHover.Type == Models.InlineElementType.CommitSHA) - { - var parentView = this.FindAncestorOfType(); - if (parentView is { DataContext: ViewModels.CommitDetail detail }) - { - if (point.Properties.IsLeftButtonPressed) - { - detail.NavigateTo(_lastHover.Link); - } - else if (point.Properties.IsRightButtonPressed) - { - var open = new MenuItem(); - open.Header = App.Text("SHALinkCM.NavigateTo"); - open.Icon = App.CreateMenuIcon("Icons.Commit"); - open.Click += (_, ev) => - { - detail.NavigateTo(link); - ev.Handled = true; - }; - - var copy = new MenuItem(); - copy.Header = App.Text("SHALinkCM.CopySHA"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, ev) => - { - App.CopyText(link); - ev.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Items.Add(open); - menu.Items.Add(copy); - menu.Open(this); - } - } - } - else - { - if (point.Properties.IsLeftButtonPressed) - { - Native.OS.OpenBrowser(link); - } - else if (point.Properties.IsRightButtonPressed) - { - var open = new MenuItem(); - open.Header = App.Text("IssueLinkCM.OpenInBrowser"); - open.Icon = App.CreateMenuIcon("Icons.OpenWith"); - open.Click += (_, ev) => - { - Native.OS.OpenBrowser(link); - ev.Handled = true; - }; - - var copy = new MenuItem(); - copy.Header = App.Text("IssueLinkCM.CopyLink"); - copy.Icon = App.CreateMenuIcon("Icons.Copy"); - copy.Click += (_, ev) => - { - App.CopyText(link); - ev.Handled = true; - }; - - var menu = new ContextMenu(); - menu.Items.Add(open); - menu.Items.Add(copy); - menu.Open(this); - } - } - - e.Handled = true; - return; - } - - if (point.Properties.IsLeftButtonPressed && e.ClickCount == 3) - { - var text = Inlines?.Text; - if (string.IsNullOrEmpty(text)) - { - e.Handled = true; - return; - } - - var position = e.GetPosition(this) - new Point(Padding.Left, Padding.Top); - var x = Math.Min(Math.Max(position.X, 0), Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0)); - var y = Math.Min(Math.Max(position.Y, 0), Math.Max(TextLayout.Height, 0)); - position = new Point(x, y); - - var textPos = TextLayout.HitTestPoint(position).TextPosition; - var lineStart = 0; - var lineEnd = text.IndexOf('\n', lineStart); - if (lineEnd <= 0) - { - lineEnd = text.Length; - } - else - { - while (lineEnd < textPos) - { - lineStart = lineEnd + 1; - lineEnd = text.IndexOf('\n', lineStart); - if (lineEnd == -1) - { - lineEnd = text.Length; - break; - } - } - } - - SetCurrentValue(SelectionStartProperty, lineStart); - SetCurrentValue(SelectionEndProperty, lineEnd); - - e.Pointer.Capture(this); - e.Handled = true; - return; - } - - base.OnPointerPressed(e); - } - - protected override void OnPointerExited(PointerEventArgs e) - { - base.OnPointerExited(e); - ClearHoveredIssueLink(); - } - - private void ProcessHoverCommitLink(Models.InlineElement link) - { - var sha = link.Link; - - // If we have already queried this SHA, just use it. - if (_inlineCommits.TryGetValue(sha, out var exist)) - { - ToolTip.SetTip(this, exist); - return; - } - - var parentView = this.FindAncestorOfType(); - if (parentView is { DataContext: ViewModels.CommitDetail detail }) - { - // Record the SHA of current viewing commit in the CommitDetail panel to determine if it is changed after - // asynchronous queries. - var lastDetailCommit = detail.Commit.SHA; - Task.Run(() => - { - var c = detail.GetParent(sha); - Dispatcher.UIThread.Invoke(() => - { - // Make sure the DataContext of CommitBaseInfo is not changed. - var currentParent = this.FindAncestorOfType(); - if (currentParent is { DataContext: ViewModels.CommitDetail currentDetail } && - currentDetail.Commit.SHA == lastDetailCommit) - { - _inlineCommits.TryAdd(sha, c); - - // Make sure user still hovers the target SHA. - if (_lastHover == link && c != null) - ToolTip.SetTip(this, c); - } - }); - }); - } - } - - private void SetHoveredIssueLink(Models.InlineElement link) - { - if (link == _lastHover) - return; - - SetCurrentValue(CursorProperty, Cursor.Parse("Hand")); - - _lastHover = link; - if (link.Type == Models.InlineElementType.Link) - ToolTip.SetTip(this, link.Link); - else - ProcessHoverCommitLink(link); - } - - private void ClearHoveredIssueLink() - { - if (_lastHover != null) - { - ToolTip.SetTip(this, null); - SetCurrentValue(CursorProperty, Cursor.Parse("IBeam")); - _lastHover = null; - } - } - - private Models.InlineElement _lastHover = null; - private Dictionary _inlineCommits = new(); - } -} diff --git a/src/Views/CommitMessageTextBox.axaml b/src/Views/CommitMessageTextBox.axaml deleted file mode 100644 index 73c3a193..00000000 --- a/src/Views/CommitMessageTextBox.axaml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/CommitMessageTextBox.axaml.cs b/src/Views/CommitMessageTextBox.axaml.cs deleted file mode 100644 index 83d6f900..00000000 --- a/src/Views/CommitMessageTextBox.axaml.cs +++ /dev/null @@ -1,216 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Interactivity; - -namespace SourceGit.Views -{ - public class EnhancedTextBox : TextBox - { - public static readonly RoutedEvent PreviewKeyDownEvent = - RoutedEvent.Register(nameof(KeyEventArgs), RoutingStrategies.Tunnel | RoutingStrategies.Bubble); - - public event EventHandler PreviewKeyDown - { - add { AddHandler(PreviewKeyDownEvent, value); } - remove { RemoveHandler(PreviewKeyDownEvent, value); } - } - - protected override Type StyleKeyOverride => typeof(TextBox); - - public void Paste(string text) - { - OnTextInput(new TextInputEventArgs() { Text = text }); - } - - protected override void OnKeyDown(KeyEventArgs e) - { - var dump = new KeyEventArgs() - { - RoutedEvent = PreviewKeyDownEvent, - Route = RoutingStrategies.Direct, - Source = e.Source, - Key = e.Key, - KeyModifiers = e.KeyModifiers, - PhysicalKey = e.PhysicalKey, - KeySymbol = e.KeySymbol, - }; - - RaiseEvent(dump); - - if (dump.Handled) - e.Handled = true; - else - base.OnKeyDown(e); - } - } - - public partial class CommitMessageTextBox : UserControl - { - public enum TextChangeWay - { - None, - FromSource, - FromEditor, - } - - public static readonly StyledProperty ShowAdvancedOptionsProperty = - AvaloniaProperty.Register(nameof(ShowAdvancedOptions), false); - - public static readonly StyledProperty TextProperty = - AvaloniaProperty.Register(nameof(Text), string.Empty); - - public static readonly StyledProperty SubjectProperty = - AvaloniaProperty.Register(nameof(Subject), string.Empty); - - public static readonly StyledProperty DescriptionProperty = - AvaloniaProperty.Register(nameof(Description), string.Empty); - - public bool ShowAdvancedOptions - { - get => GetValue(ShowAdvancedOptionsProperty); - set => SetValue(ShowAdvancedOptionsProperty, value); - } - - public string Text - { - get => GetValue(TextProperty); - set => SetValue(TextProperty, value); - } - - public string Subject - { - get => GetValue(SubjectProperty); - set => SetValue(SubjectProperty, value); - } - - public string Description - { - get => GetValue(DescriptionProperty); - set => SetValue(DescriptionProperty, value); - } - - public CommitMessageTextBox() - { - InitializeComponent(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == TextProperty && _changingWay == TextChangeWay.None) - { - _changingWay = TextChangeWay.FromSource; - var normalized = Text.ReplaceLineEndings("\n"); - var subjectEnd = normalized.IndexOf("\n\n", StringComparison.Ordinal); - if (subjectEnd == -1) - { - SetCurrentValue(SubjectProperty, normalized.ReplaceLineEndings(" ")); - SetCurrentValue(DescriptionProperty, string.Empty); - } - else - { - SetCurrentValue(SubjectProperty, normalized.Substring(0, subjectEnd).ReplaceLineEndings(" ")); - SetCurrentValue(DescriptionProperty, normalized.Substring(subjectEnd + 2)); - } - _changingWay = TextChangeWay.None; - } - else if ((change.Property == SubjectProperty || change.Property == DescriptionProperty) && _changingWay == TextChangeWay.None) - { - _changingWay = TextChangeWay.FromEditor; - SetCurrentValue(TextProperty, $"{Subject}\n\n{Description}"); - _changingWay = TextChangeWay.None; - } - } - - private async void OnSubjectTextBoxPreviewKeyDown(object _, KeyEventArgs e) - { - if (e.Key == Key.Enter || (e.Key == Key.Right && SubjectEditor.CaretIndex == Subject.Length)) - { - DescriptionEditor.Focus(); - DescriptionEditor.CaretIndex = 0; - e.Handled = true; - } - else if (e.Key == Key.V && e.KeyModifiers == (OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control)) - { - e.Handled = true; - - var text = await App.GetClipboardTextAsync(); - if (!string.IsNullOrWhiteSpace(text)) - { - text = text.Trim(); - - if (SubjectEditor.CaretIndex == Subject.Length) - { - var idx = text.IndexOf('\n'); - if (idx == -1) - { - SubjectEditor.Paste(text); - } - else - { - SubjectEditor.Paste(text.Substring(0, idx)); - DescriptionEditor.Focus(); - DescriptionEditor.CaretIndex = 0; - DescriptionEditor.Paste(text.Substring(idx + 1).Trim()); - } - } - else - { - SubjectEditor.Paste(text.ReplaceLineEndings(" ")); - } - } - } - } - - private void OnDescriptionTextBoxPreviewKeyDown(object _, KeyEventArgs e) - { - if ((e.Key == Key.Back || e.Key == Key.Left) && DescriptionEditor.CaretIndex == 0) - { - SubjectEditor.Focus(); - SubjectEditor.CaretIndex = Subject.Length; - e.Handled = true; - } - } - - private void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e) - { - if (sender is Button button && DataContext is ViewModels.WorkingCopy vm) - { - var menu = vm.CreateContextMenuForCommitMessages(); - menu.Placement = PlacementMode.TopEdgeAlignedLeft; - menu?.Open(button); - } - - e.Handled = true; - } - - private void OnOpenOpenAIHelper(object sender, RoutedEventArgs e) - { - if (DataContext is ViewModels.WorkingCopy vm && sender is Control control) - { - var menu = vm.CreateContextForOpenAI(); - menu?.Open(control); - } - - e.Handled = true; - } - - private void OnOpenConventionalCommitHelper(object _, RoutedEventArgs e) - { - App.ShowWindow(new ViewModels.ConventionalCommitMessageBuilder(text => Text = text), true); - e.Handled = true; - } - - private void CopyAllText(object sender, RoutedEventArgs e) - { - App.CopyText(Text); - e.Handled = true; - } - - private TextChangeWay _changingWay = TextChangeWay.None; - } -} diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs deleted file mode 100644 index 507da1c2..00000000 --- a/src/Views/CommitRefsPresenter.cs +++ /dev/null @@ -1,263 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Media; - -namespace SourceGit.Views -{ - public class CommitRefsPresenter : Control - { - public class RenderItem - { - public Geometry Icon { get; set; } = null; - public FormattedText Label { get; set; } = null; - public IBrush Brush { get; set; } = null; - public bool IsHead { get; set; } = false; - public double Width { get; set; } = 0.0; - } - - public static readonly StyledProperty FontFamilyProperty = - TextBlock.FontFamilyProperty.AddOwner(); - - public FontFamily FontFamily - { - get => GetValue(FontFamilyProperty); - set => SetValue(FontFamilyProperty, value); - } - - public static readonly StyledProperty FontSizeProperty = - TextBlock.FontSizeProperty.AddOwner(); - - public double FontSize - { - get => GetValue(FontSizeProperty); - set => SetValue(FontSizeProperty, value); - } - - public static readonly StyledProperty BackgroundProperty = - AvaloniaProperty.Register(nameof(Background), Brushes.Transparent); - - public IBrush Background - { - get => GetValue(BackgroundProperty); - set => SetValue(BackgroundProperty, value); - } - - public static readonly StyledProperty ForegroundProperty = - AvaloniaProperty.Register(nameof(Foreground), Brushes.White); - - public IBrush Foreground - { - get => GetValue(ForegroundProperty); - set => SetValue(ForegroundProperty, value); - } - - public static readonly StyledProperty UseGraphColorProperty = - AvaloniaProperty.Register(nameof(UseGraphColor)); - - public bool UseGraphColor - { - get => GetValue(UseGraphColorProperty); - set => SetValue(UseGraphColorProperty, value); - } - - public static readonly StyledProperty AllowWrapProperty = - AvaloniaProperty.Register(nameof(AllowWrap)); - - public bool AllowWrap - { - get => GetValue(AllowWrapProperty); - set => SetValue(AllowWrapProperty, value); - } - - public static readonly StyledProperty ShowTagsProperty = - AvaloniaProperty.Register(nameof(ShowTags), true); - - public bool ShowTags - { - get => GetValue(ShowTagsProperty); - set => SetValue(ShowTagsProperty, value); - } - - static CommitRefsPresenter() - { - AffectsMeasure( - FontFamilyProperty, - FontSizeProperty, - ForegroundProperty, - UseGraphColorProperty, - BackgroundProperty, - ShowTagsProperty); - } - - public override void Render(DrawingContext context) - { - if (_items.Count == 0) - return; - - var useGraphColor = UseGraphColor; - var fg = Foreground; - var bg = Background; - var allowWrap = AllowWrap; - var x = 1.0; - var y = 0.0; - - foreach (var item in _items) - { - if (allowWrap && x > 1.0 && x + item.Width > Bounds.Width) - { - x = 1.0; - y += 20.0; - } - - var entireRect = new RoundedRect(new Rect(x, y, item.Width, 16), new CornerRadius(2)); - - if (item.IsHead) - { - if (useGraphColor) - { - if (bg != null) - context.DrawRectangle(bg, null, entireRect); - - using (context.PushOpacity(.6)) - context.DrawRectangle(item.Brush, null, entireRect); - } - - context.DrawText(item.Label, new Point(x + 16, y + 8.0 - item.Label.Height * 0.5)); - } - else - { - if (bg != null) - context.DrawRectangle(bg, null, entireRect); - - var labelRect = new RoundedRect(new Rect(x + 16, y, item.Label.Width + 8, 16), new CornerRadius(0, 2, 2, 0)); - using (context.PushOpacity(.2)) - context.DrawRectangle(item.Brush, null, labelRect); - - context.DrawLine(new Pen(item.Brush), new Point(x + 16, y), new Point(x + 16, y + 16)); - context.DrawText(item.Label, new Point(x + 20, y + 8.0 - item.Label.Height * 0.5)); - } - - context.DrawRectangle(null, new Pen(item.Brush), entireRect); - - using (context.PushTransform(Matrix.CreateTranslation(x + 3, y + 3))) - context.DrawGeometry(fg, null, item.Icon); - - x += item.Width + 4; - } - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - InvalidateMeasure(); - } - - protected override Size MeasureOverride(Size availableSize) - { - _items.Clear(); - - var commit = DataContext as Models.Commit; - if (commit == null) - return new Size(0, 0); - - var refs = commit.Decorators; - if (refs != null && refs.Count > 0) - { - var typeface = new Typeface(FontFamily); - var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold); - var fg = Foreground; - var normalBG = UseGraphColor ? commit.Brush : Brushes.Gray; - var labelSize = FontSize; - var requiredWidth = 0.0; - var requiredHeight = 16.0; - var x = 0.0; - var allowWrap = AllowWrap; - var showTags = ShowTags; - - foreach (var decorator in refs) - { - if (!showTags && decorator.Type == Models.DecoratorType.Tag) - continue; - - var isHead = decorator.Type == Models.DecoratorType.CurrentBranchHead || - decorator.Type == Models.DecoratorType.CurrentCommitHead; - - var label = new FormattedText( - decorator.Name, - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - isHead ? typefaceBold : typeface, - isHead ? labelSize + 1 : labelSize, - fg); - - var item = new RenderItem() - { - Label = label, - Brush = normalBG, - IsHead = isHead - }; - - StreamGeometry geo; - switch (decorator.Type) - { - case Models.DecoratorType.CurrentBranchHead: - case Models.DecoratorType.CurrentCommitHead: - geo = this.FindResource("Icons.Head") as StreamGeometry; - break; - case Models.DecoratorType.RemoteBranchHead: - geo = this.FindResource("Icons.Remote") as StreamGeometry; - break; - case Models.DecoratorType.Tag: - item.Brush = Brushes.Gray; - geo = this.FindResource("Icons.Tag") as StreamGeometry; - break; - default: - geo = this.FindResource("Icons.Branch") as StreamGeometry; - break; - } - - var drawGeo = geo!.Clone(); - var iconBounds = drawGeo.Bounds; - var translation = Matrix.CreateTranslation(-(Vector)iconBounds.Position); - var scale = Math.Min(10.0 / iconBounds.Width, 10.0 / iconBounds.Height); - var transform = translation * Matrix.CreateScale(scale, scale); - if (drawGeo.Transform == null || drawGeo.Transform.Value == Matrix.Identity) - drawGeo.Transform = new MatrixTransform(transform); - else - drawGeo.Transform = new MatrixTransform(drawGeo.Transform.Value * transform); - - item.Icon = drawGeo; - item.Width = 16 + (isHead ? 0 : 4) + label.Width + 4; - _items.Add(item); - - x += item.Width + 4; - if (allowWrap) - { - if (x > availableSize.Width) - { - requiredHeight += 20.0; - x = item.Width; - } - } - } - - if (allowWrap && requiredHeight > 16.0) - requiredWidth = availableSize.Width; - else - requiredWidth = x + 2; - - InvalidateVisual(); - return new Size(requiredWidth, requiredHeight); - } - - InvalidateVisual(); - return new Size(0, 0); - } - - private List _items = new List(); - } -} diff --git a/src/Views/CommitRelationTracking.axaml b/src/Views/CommitRelationTracking.axaml deleted file mode 100644 index 9d036e10..00000000 --- a/src/Views/CommitRelationTracking.axaml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/CommitRelationTracking.axaml.cs b/src/Views/CommitRelationTracking.axaml.cs deleted file mode 100644 index 1e436552..00000000 --- a/src/Views/CommitRelationTracking.axaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Threading.Tasks; - -using Avalonia.Controls; -using Avalonia.Threading; - -namespace SourceGit.Views -{ - public partial class CommitRelationTracking : UserControl - { - public CommitRelationTracking() - { - InitializeComponent(); - } - - public CommitRelationTracking(ViewModels.CommitDetail detail) - { - InitializeComponent(); - - LoadingIcon.IsVisible = true; - - Task.Run(() => - { - var containsIn = detail.GetRefsContainsThisCommit(); - Dispatcher.UIThread.Invoke(() => - { - Container.ItemsSource = containsIn; - LoadingIcon.IsVisible = false; - }); - }); - } - } -} diff --git a/src/Views/CommitStatusIndicator.cs b/src/Views/CommitStatusIndicator.cs deleted file mode 100644 index 7073011a..00000000 --- a/src/Views/CommitStatusIndicator.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Media; - -namespace SourceGit.Views -{ - public class CommitStatusIndicator : Control - { - public static readonly StyledProperty CurrentBranchProperty = - AvaloniaProperty.Register(nameof(CurrentBranch)); - - public Models.Branch CurrentBranch - { - get => GetValue(CurrentBranchProperty); - set => SetValue(CurrentBranchProperty, value); - } - - public static readonly StyledProperty AheadBrushProperty = - AvaloniaProperty.Register(nameof(AheadBrush)); - - public IBrush AheadBrush - { - get => GetValue(AheadBrushProperty); - set => SetValue(AheadBrushProperty, value); - } - - public static readonly StyledProperty BehindBrushProperty = - AvaloniaProperty.Register(nameof(BehindBrush)); - - public IBrush BehindBrush - { - get => GetValue(BehindBrushProperty); - set => SetValue(BehindBrushProperty, value); - } - - private enum Status - { - Normal, - Ahead, - Behind, - } - - public override void Render(DrawingContext context) - { - if (_status == Status.Normal) - return; - - context.DrawEllipse(_status == Status.Ahead ? AheadBrush : BehindBrush, null, new Rect(0, 0, 5, 5)); - } - - protected override Size MeasureOverride(Size availableSize) - { - if (DataContext is Models.Commit commit && CurrentBranch is not null) - { - var sha = commit.SHA; - var track = CurrentBranch.TrackStatus; - - if (track.Ahead.Contains(sha)) - _status = Status.Ahead; - else if (track.Behind.Contains(sha)) - _status = Status.Behind; - else - _status = Status.Normal; - } - else - { - _status = Status.Normal; - } - - return _status == Status.Normal ? new Size(0, 0) : new Size(9, 5); - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - InvalidateMeasure(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - if (change.Property == CurrentBranchProperty) - InvalidateMeasure(); - } - - private Status _status = Status.Normal; - } -} diff --git a/src/Views/CommitSubjectPresenter.cs b/src/Views/CommitSubjectPresenter.cs deleted file mode 100644 index bfeab34f..00000000 --- a/src/Views/CommitSubjectPresenter.cs +++ /dev/null @@ -1,363 +0,0 @@ -using System.Collections.Generic; -using System.Globalization; -using System.Text.RegularExpressions; - -using Avalonia; -using Avalonia.Collections; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Media; - -namespace SourceGit.Views -{ - public partial class CommitSubjectPresenter : Control - { - public static readonly StyledProperty FontFamilyProperty = - AvaloniaProperty.Register(nameof(FontFamily)); - - public FontFamily FontFamily - { - get => GetValue(FontFamilyProperty); - set => SetValue(FontFamilyProperty, value); - } - - public static readonly StyledProperty CodeFontFamilyProperty = - AvaloniaProperty.Register(nameof(CodeFontFamily)); - - public FontFamily CodeFontFamily - { - get => GetValue(CodeFontFamilyProperty); - set => SetValue(CodeFontFamilyProperty, value); - } - - public static readonly StyledProperty FontSizeProperty = - TextBlock.FontSizeProperty.AddOwner(); - - public double FontSize - { - get => GetValue(FontSizeProperty); - set => SetValue(FontSizeProperty, value); - } - - public static readonly StyledProperty FontWeightProperty = - TextBlock.FontWeightProperty.AddOwner(); - - public FontWeight FontWeight - { - get => GetValue(FontWeightProperty); - set => SetValue(FontWeightProperty, value); - } - - public static readonly StyledProperty InlineCodeBackgroundProperty = - AvaloniaProperty.Register(nameof(InlineCodeBackground), Brushes.Transparent); - - public IBrush InlineCodeBackground - { - get => GetValue(InlineCodeBackgroundProperty); - set => SetValue(InlineCodeBackgroundProperty, value); - } - - public static readonly StyledProperty ForegroundProperty = - AvaloniaProperty.Register(nameof(Foreground), Brushes.White); - - public IBrush Foreground - { - get => GetValue(ForegroundProperty); - set => SetValue(ForegroundProperty, value); - } - - public static readonly StyledProperty LinkForegroundProperty = - AvaloniaProperty.Register(nameof(LinkForeground), Brushes.White); - - public IBrush LinkForeground - { - get => GetValue(LinkForegroundProperty); - set => SetValue(LinkForegroundProperty, value); - } - - public static readonly StyledProperty SubjectProperty = - AvaloniaProperty.Register(nameof(Subject)); - - public string Subject - { - get => GetValue(SubjectProperty); - set => SetValue(SubjectProperty, value); - } - - public static readonly StyledProperty> IssueTrackerRulesProperty = - AvaloniaProperty.Register>(nameof(IssueTrackerRules)); - - public AvaloniaList IssueTrackerRules - { - get => GetValue(IssueTrackerRulesProperty); - set => SetValue(IssueTrackerRulesProperty, value); - } - - public override void Render(DrawingContext context) - { - if (_needRebuildInlines) - { - _needRebuildInlines = false; - GenerateFormattedTextElements(); - } - - if (_inlines.Count == 0) - return; - - var ro = new RenderOptions() - { - TextRenderingMode = TextRenderingMode.SubpixelAntialias, - EdgeMode = EdgeMode.Antialias - }; - - using (context.PushRenderOptions(ro)) - { - var height = Bounds.Height; - var width = Bounds.Width; - foreach (var inline in _inlines) - { - if (inline.X > width) - return; - - if (inline.Element is { Type: Models.InlineElementType.Code }) - { - var rect = new Rect(inline.X, (height - inline.Text.Height - 2) * 0.5, inline.Text.WidthIncludingTrailingWhitespace + 8, inline.Text.Height + 2); - var roundedRect = new RoundedRect(rect, new CornerRadius(4)); - context.DrawRectangle(InlineCodeBackground, null, roundedRect); - context.DrawText(inline.Text, new Point(inline.X + 4, (height - inline.Text.Height) * 0.5)); - } - else - { - context.DrawText(inline.Text, new Point(inline.X, (height - inline.Text.Height) * 0.5)); - } - } - } - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == SubjectProperty || change.Property == IssueTrackerRulesProperty) - { - _elements.Clear(); - ClearHoveredIssueLink(); - - var subject = Subject; - if (string.IsNullOrEmpty(subject)) - { - _needRebuildInlines = true; - InvalidateVisual(); - return; - } - - var rules = IssueTrackerRules ?? []; - foreach (var rule in rules) - rule.Matches(_elements, subject); - - var keywordMatch = REG_KEYWORD_FORMAT1().Match(subject); - if (!keywordMatch.Success) - keywordMatch = REG_KEYWORD_FORMAT2().Match(subject); - - if (keywordMatch.Success && _elements.Intersect(0, keywordMatch.Length) == null) - _elements.Add(new Models.InlineElement(Models.InlineElementType.Keyword, 0, keywordMatch.Length, string.Empty)); - - var codeMatches = REG_INLINECODE_FORMAT().Matches(subject); - for (var i = 0; i < codeMatches.Count; i++) - { - var match = codeMatches[i]; - if (!match.Success) - continue; - - var start = match.Index; - var len = match.Length; - if (_elements.Intersect(start, len) != null) - continue; - - _elements.Add(new Models.InlineElement(Models.InlineElementType.Code, start, len, string.Empty)); - } - - _elements.Sort(); - _needRebuildInlines = true; - InvalidateVisual(); - } - else if (change.Property == FontFamilyProperty || - change.Property == CodeFontFamilyProperty || - change.Property == FontSizeProperty || - change.Property == FontWeightProperty || - change.Property == ForegroundProperty || - change.Property == LinkForegroundProperty) - { - _needRebuildInlines = true; - InvalidateVisual(); - } - else if (change.Property == InlineCodeBackgroundProperty) - { - InvalidateVisual(); - } - } - - protected override void OnPointerMoved(PointerEventArgs e) - { - base.OnPointerMoved(e); - - var point = e.GetPosition(this); - foreach (var inline in _inlines) - { - if (inline.Element is not { Type: Models.InlineElementType.Link } link) - continue; - - if (inline.X > point.X || inline.X + inline.Text.WidthIncludingTrailingWhitespace < point.X) - continue; - - _lastHover = link; - SetCurrentValue(CursorProperty, Cursor.Parse("Hand")); - ToolTip.SetTip(this, link.Link); - e.Handled = true; - return; - } - - ClearHoveredIssueLink(); - } - - protected override void OnPointerPressed(PointerPressedEventArgs e) - { - base.OnPointerPressed(e); - - if (_lastHover != null) - Native.OS.OpenBrowser(_lastHover.Link); - } - - protected override void OnPointerExited(PointerEventArgs e) - { - base.OnPointerExited(e); - ClearHoveredIssueLink(); - } - - private void GenerateFormattedTextElements() - { - _inlines.Clear(); - - var subject = Subject; - if (string.IsNullOrEmpty(subject)) - return; - - var fontFamily = FontFamily; - var codeFontFamily = CodeFontFamily; - var fontSize = FontSize; - var foreground = Foreground; - var linkForeground = LinkForeground; - var typeface = new Typeface(fontFamily, FontStyle.Normal, FontWeight); - var codeTypeface = new Typeface(codeFontFamily, FontStyle.Normal, FontWeight); - var pos = 0; - var x = 0.0; - for (var i = 0; i < _elements.Count; i++) - { - var elem = _elements[i]; - if (elem.Start > pos) - { - var normal = new FormattedText( - subject.Substring(pos, elem.Start - pos), - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - typeface, - fontSize, - foreground); - - _inlines.Add(new Inline(x, normal, null)); - x += normal.WidthIncludingTrailingWhitespace; - } - - if (elem.Type == Models.InlineElementType.Keyword) - { - var keyword = new FormattedText( - subject.Substring(elem.Start, elem.Length), - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - new Typeface(fontFamily, FontStyle.Normal, FontWeight.Bold), - fontSize, - foreground); - _inlines.Add(new Inline(x, keyword, elem)); - x += keyword.WidthIncludingTrailingWhitespace; - } - else if (elem.Type == Models.InlineElementType.Link) - { - var link = new FormattedText( - subject.Substring(elem.Start, elem.Length), - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - typeface, - fontSize, - linkForeground); - _inlines.Add(new Inline(x, link, elem)); - x += link.WidthIncludingTrailingWhitespace; - } - else if (elem.Type == Models.InlineElementType.Code) - { - var link = new FormattedText( - subject.Substring(elem.Start + 1, elem.Length - 2), - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - codeTypeface, - fontSize - 0.5, - foreground); - _inlines.Add(new Inline(x, link, elem)); - x += link.WidthIncludingTrailingWhitespace + 8; - } - - pos = elem.Start + elem.Length; - } - - if (pos < subject.Length) - { - var normal = new FormattedText( - subject.Substring(pos), - CultureInfo.CurrentCulture, - FlowDirection.LeftToRight, - typeface, - fontSize, - foreground); - - _inlines.Add(new Inline(x, normal, null)); - } - } - - private void ClearHoveredIssueLink() - { - if (_lastHover != null) - { - ToolTip.SetTip(this, null); - SetCurrentValue(CursorProperty, Cursor.Parse("Arrow")); - _lastHover = null; - } - } - - [GeneratedRegex(@"`.*?`")] - private static partial Regex REG_INLINECODE_FORMAT(); - - [GeneratedRegex(@"^\[[\w\s]+\]")] - private static partial Regex REG_KEYWORD_FORMAT1(); - - [GeneratedRegex(@"^\S+([\<\(][\w\s_\-\*,]+[\>\)])?\!?\s?:\s")] - private static partial Regex REG_KEYWORD_FORMAT2(); - - private class Inline - { - public double X { get; set; } = 0; - public FormattedText Text { get; set; } = null; - public Models.InlineElement Element { get; set; } = null; - - public Inline(double x, FormattedText text, Models.InlineElement elem) - { - X = x; - Text = text; - Element = elem; - } - } - - private Models.InlineElementCollector _elements = new(); - private List _inlines = []; - private Models.InlineElement _lastHover = null; - private bool _needRebuildInlines = false; - } -} diff --git a/src/Views/CommitTimeTextBlock.cs b/src/Views/CommitTimeTextBlock.cs deleted file mode 100644 index db63e8a6..00000000 --- a/src/Views/CommitTimeTextBlock.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Threading; - -namespace SourceGit.Views -{ - public class CommitTimeTextBlock : TextBlock - { - public static readonly StyledProperty ShowAsDateTimeProperty = - AvaloniaProperty.Register(nameof(ShowAsDateTime), true); - - public bool ShowAsDateTime - { - get => GetValue(ShowAsDateTimeProperty); - set => SetValue(ShowAsDateTimeProperty, value); - } - - public static readonly StyledProperty DateTimeFormatProperty = - AvaloniaProperty.Register(nameof(DateTimeFormat), 0); - - public int DateTimeFormat - { - get => GetValue(DateTimeFormatProperty); - set => SetValue(DateTimeFormatProperty, value); - } - - public static readonly StyledProperty UseAuthorTimeProperty = - AvaloniaProperty.Register(nameof(UseAuthorTime), true); - - public bool UseAuthorTime - { - get => GetValue(UseAuthorTimeProperty); - set => SetValue(UseAuthorTimeProperty, value); - } - - protected override Type StyleKeyOverride => typeof(TextBlock); - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == UseAuthorTimeProperty) - { - SetCurrentValue(TextProperty, GetDisplayText()); - } - else if (change.Property == ShowAsDateTimeProperty) - { - SetCurrentValue(TextProperty, GetDisplayText()); - - if (ShowAsDateTime) - StopTimer(); - else - StartTimer(); - } - else if (change.Property == DateTimeFormatProperty) - { - if (ShowAsDateTime) - SetCurrentValue(TextProperty, GetDisplayText()); - } - } - - protected override void OnLoaded(RoutedEventArgs e) - { - base.OnLoaded(e); - - if (!ShowAsDateTime) - StartTimer(); - } - - protected override void OnUnloaded(RoutedEventArgs e) - { - base.OnUnloaded(e); - StopTimer(); - } - - protected override void OnDataContextChanged(EventArgs e) - { - base.OnDataContextChanged(e); - SetCurrentValue(TextProperty, GetDisplayText()); - } - - private void StartTimer() - { - if (_refreshTimer != null) - return; - - _refreshTimer = DispatcherTimer.Run(() => - { - Dispatcher.UIThread.Invoke(() => - { - var text = GetDisplayText(); - if (!text.Equals(Text, StringComparison.Ordinal)) - Text = text; - }); - - return true; - }, TimeSpan.FromSeconds(10)); - } - - private void StopTimer() - { - if (_refreshTimer != null) - { - _refreshTimer.Dispose(); - _refreshTimer = null; - } - } - - private string GetDisplayText() - { - var commit = DataContext as Models.Commit; - if (commit == null) - return string.Empty; - - if (ShowAsDateTime) - return UseAuthorTime ? commit.AuthorTimeStr : commit.CommitterTimeStr; - - var timestamp = UseAuthorTime ? commit.AuthorTime : commit.CommitterTime; - var now = DateTime.Now; - var localTime = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime(); - var span = now - localTime; - if (span.TotalMinutes < 1) - return App.Text("Period.JustNow"); - - if (span.TotalHours < 1) - return App.Text("Period.MinutesAgo", (int)span.TotalMinutes); - - if (span.TotalDays < 1) - { - var hours = (int)span.TotalHours; - return hours == 1 ? App.Text("Period.HourAgo") : App.Text("Period.HoursAgo", hours); - } - - var lastDay = now.AddDays(-1).Date; - if (localTime >= lastDay) - return App.Text("Period.Yesterday"); - - if ((localTime.Year == now.Year && localTime.Month == now.Month) || span.TotalDays < 28) - { - var diffDay = now.Date - localTime.Date; - return App.Text("Period.DaysAgo", (int)diffDay.TotalDays); - } - - var lastMonth = now.AddMonths(-1).Date; - if (localTime.Year == lastMonth.Year && localTime.Month == lastMonth.Month) - return App.Text("Period.LastMonth"); - - if (localTime.Year == now.Year || localTime > now.AddMonths(-11)) - { - var diffMonth = (12 + now.Month - localTime.Month) % 12; - return App.Text("Period.MonthsAgo", diffMonth); - } - - var diffYear = now.Year - localTime.Year; - if (diffYear == 1) - return App.Text("Period.LastYear"); - - return App.Text("Period.YearsAgo", diffYear); - } - - private IDisposable _refreshTimer = null; - } -} diff --git a/src/Views/ConfigureWorkspace.axaml b/src/Views/ConfigureWorkspace.axaml deleted file mode 100644 index b239399a..00000000 --- a/src/Views/ConfigureWorkspace.axaml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/ConfigureWorkspace.axaml.cs b/src/Views/ConfigureWorkspace.axaml.cs deleted file mode 100644 index 06294caf..00000000 --- a/src/Views/ConfigureWorkspace.axaml.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.Platform.Storage; - -namespace SourceGit.Views -{ - public partial class ConfigureWorkspace : ChromelessWindow - { - public ConfigureWorkspace() - { - InitializeComponent(); - } - - protected override void OnClosing(WindowClosingEventArgs e) - { - base.OnClosing(e); - - if (!Design.IsDesignMode) - ViewModels.Preferences.Instance.Save(); - } - - private async void SelectDefaultCloneDir(object _, RoutedEventArgs e) - { - var workspace = DataContext as ViewModels.ConfigureWorkspace; - if (workspace?.Selected == null) - return; - - var options = new FolderPickerOpenOptions() { AllowMultiple = false }; - try - { - var selected = await StorageProvider.OpenFolderPickerAsync(options); - if (selected.Count == 1) - { - var folder = selected[0]; - var folderPath = folder is { Path: { IsAbsoluteUri: true } path } ? path.LocalPath : folder?.Path.ToString(); - workspace.Selected.DefaultCloneDir = folderPath; - } - } - catch (Exception ex) - { - App.RaiseException(string.Empty, $"Failed to select default clone directory: {ex.Message}"); - } - - e.Handled = true; - } - } -} diff --git a/src/Views/ConfirmCommit.axaml b/src/Views/ConfirmCommit.axaml deleted file mode 100644 index a835f0b6..00000000 --- a/src/Views/ConfirmCommit.axaml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/Conflict.axaml.cs b/src/Views/Conflict.axaml.cs deleted file mode 100644 index 6121b5c8..00000000 --- a/src/Views/Conflict.axaml.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.VisualTree; - -namespace SourceGit.Views -{ - public partial class Conflict : UserControl - { - public Conflict() - { - InitializeComponent(); - } - - private void OnPressedSHA(object sender, PointerPressedEventArgs e) - { - var repoView = this.FindAncestorOfType(); - if (repoView is { DataContext: ViewModels.Repository repo } && sender is TextBlock text) - repo.NavigateToCommit(text.Text); - - e.Handled = true; - } - } -} diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml deleted file mode 100644 index a64037f8..00000000 --- a/src/Views/ConventionalCommitMessageBuilder.axaml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -206,18 +75,18 @@ - + - - + + - + - - + + @@ -233,117 +102,75 @@ - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - + - - - - + + + - - + + - - - - + + + + + - - - + + + 0,0,0,4 + 0 + 0 + 8 + 16 + 16 + + + - + - + diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs index 54f9617a..d03f9f91 100644 --- a/src/Views/DiffView.axaml.cs +++ b/src/Views/DiffView.axaml.cs @@ -1,64 +1,169 @@ +using System; + using Avalonia; using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.VisualTree; +using Avalonia.Media; +using Avalonia.Media.Imaging; +using Avalonia.Styling; namespace SourceGit.Views { + public class ImageDiffView : Control + { + public static readonly StyledProperty AlphaProperty = + AvaloniaProperty.Register(nameof(Alpha), 0.5); + + public double Alpha + { + get => GetValue(AlphaProperty); + set => SetValue(AlphaProperty, value); + } + + public static readonly StyledProperty OldImageProperty = + AvaloniaProperty.Register(nameof(OldImage), null); + + public Bitmap OldImage + { + get => GetValue(OldImageProperty); + set => SetValue(OldImageProperty, value); + } + + public static readonly StyledProperty NewImageProperty = + AvaloniaProperty.Register(nameof(NewImage), null); + + public Bitmap NewImage + { + get => GetValue(NewImageProperty); + set => SetValue(NewImageProperty, value); + } + + static ImageDiffView() + { + AffectsMeasure(OldImageProperty, NewImageProperty); + AffectsRender(AlphaProperty); + } + + public override void Render(DrawingContext context) + { + if (_bgBrush == null) + { + var maskBrush = new SolidColorBrush(ActualThemeVariant == ThemeVariant.Dark ? 0xFF404040 : 0xFFBBBBBB); + var bg = new DrawingGroup() + { + Children = + { + new GeometryDrawing() { Brush = maskBrush, Geometry = new RectangleGeometry(new Rect(0, 0, 12, 12)) }, + new GeometryDrawing() { Brush = maskBrush, Geometry = new RectangleGeometry(new Rect(12, 12, 12, 12)) }, + } + }; + + _bgBrush = new DrawingBrush(bg) + { + AlignmentX = AlignmentX.Left, + AlignmentY = AlignmentY.Top, + DestinationRect = new RelativeRect(new Size(24, 24), RelativeUnit.Absolute), + Stretch = Stretch.None, + TileMode = TileMode.Tile, + }; + } + + context.FillRectangle(_bgBrush, new Rect(Bounds.Size)); + + var alpha = Alpha; + var w = Bounds.Width - 16; + var h = Bounds.Height - 16; + var x = w * alpha; + var left = OldImage; + if (left != null && alpha > 0) + { + var src = new Rect(0, 0, left.Size.Width * alpha, left.Size.Height); + var dst = new Rect(8, 8, x, h); + context.DrawImage(left, src, dst); + } + + var right = NewImage; + if (right != null && alpha < 1) + { + var src = new Rect(right.Size.Width * alpha, 0, right.Size.Width * (1 - alpha), right.Size.Height); + var dst = new Rect(x + 8, 8, w - x, h); + context.DrawImage(right, src, dst); + } + + context.DrawLine(new Pen(Brushes.DarkGreen, 2), new Point(x + 8, 0), new Point(x + 8, Bounds.Height)); + } + + protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + { + base.OnPropertyChanged(change); + + if (change.Property.Name == "ActualThemeVariant") + { + _bgBrush = null; + InvalidateVisual(); + } + } + + protected override Size MeasureOverride(Size availableSize) + { + var left = OldImage; + var right = NewImage; + + if (left != null) + { + var lSize = GetDesiredSize(left.Size, availableSize); + if (right != null) + { + var rSize = GetDesiredSize(right.Size, availableSize); + if (rSize.Width > lSize.Width) + return rSize; + return lSize; + } + else + { + return lSize; + } + } + else if (right != null) + { + return GetDesiredSize(right.Size, availableSize); + } + else + { + return availableSize; + } + } + + private Size GetDesiredSize(Size img, Size available) + { + var w = available.Width - 16; + var h = available.Height - 16; + + if (img.Width <= w) + { + if (img.Height <= h) + { + return new Size(img.Width + 16, img.Height + 16); + } + else + { + return new Size(h * img.Width / img.Height + 16, available.Height); + } + } + else + { + var s = Math.Max(img.Width / w, img.Height / h); + return new Size(img.Width / s + 16, img.Height / s + 16); + } + } + + private DrawingBrush _bgBrush = null; + } + public partial class DiffView : UserControl { public DiffView() { InitializeComponent(); } - - private void OnGotoFirstChange(object _, RoutedEventArgs e) - { - this.FindDescendantOfType()?.GotoFirstChange(); - e.Handled = true; - } - - private void OnGotoPrevChange(object _, RoutedEventArgs e) - { - this.FindDescendantOfType()?.GotoPrevChange(); - e.Handled = true; - } - - private void OnGotoNextChange(object _, RoutedEventArgs e) - { - this.FindDescendantOfType()?.GotoNextChange(); - e.Handled = true; - } - - private void OnGotoLastChange(object _, RoutedEventArgs e) - { - this.FindDescendantOfType()?.GotoLastChange(); - e.Handled = true; - } - - private void OnBlockNavigationChanged(object sender, RoutedEventArgs e) - { - if (sender is TextDiffView textDiff) - BlockNavigationIndicator.Text = textDiff.BlockNavigation?.Indicator ?? string.Empty; - } - - private void OnUseFullTextDiffClicked(object sender, RoutedEventArgs e) - { - var textDiffView = this.FindDescendantOfType(); - if (textDiffView == null) - return; - - var presenter = textDiffView.FindDescendantOfType(); - if (presenter == null) - return; - - if (presenter.DataContext is Models.TextDiff combined) - combined.ScrollOffset = Vector.Zero; - else if (presenter.DataContext is ViewModels.TwoSideTextDiff twoSides) - twoSides.File = string.Empty; // Just to reset `SyncScrollOffset` without affect UI refresh. - - (DataContext as ViewModels.DiffContext)?.ToggleFullTextDiff(); - e.Handled = true; - } } } diff --git a/src/Views/Discard.axaml b/src/Views/Discard.axaml index 1699b051..7c066634 100644 --- a/src/Views/Discard.axaml +++ b/src/Views/Discard.axaml @@ -12,59 +12,34 @@ Classes="bold" Text="{DynamicResource Text.Discard}"/> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + - - - - + + - + - - - - + + + + + + + + + + + + + diff --git a/src/Views/DropStash.axaml b/src/Views/DropStash.axaml index 32685a2c..44cbee67 100644 --- a/src/Views/DropStash.axaml +++ b/src/Views/DropStash.axaml @@ -21,7 +21,7 @@ HorizontalAlignment="Left" VerticalAlignment="Center" Data="{StaticResource Icons.Stashes}"/> - + diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml index 7d64a53a..d719b585 100644 --- a/src/Views/EditRemote.axaml +++ b/src/Views/EditRemote.axaml @@ -2,15 +2,17 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.EditRemote" x:DataType="vm:EditRemote"> + Text="{DynamicResource Text.Remote.AddTitle}"/> - + diff --git a/src/Views/EnhancedSelectableTextBlock.cs b/src/Views/EnhancedSelectableTextBlock.cs deleted file mode 100644 index 183b7021..00000000 --- a/src/Views/EnhancedSelectableTextBlock.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public class EnhancedSelectableTextBlock : SelectableTextBlock - { - protected override Type StyleKeyOverride => typeof(SelectableTextBlock); - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == TextProperty) - UpdateLayout(); - } - } -} diff --git a/src/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml deleted file mode 100644 index 9ee2b55d..00000000 --- a/src/Views/ExecuteCustomAction.axaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - diff --git a/src/Views/ExecuteCustomAction.axaml.cs b/src/Views/ExecuteCustomAction.axaml.cs deleted file mode 100644 index e4f9cecf..00000000 --- a/src/Views/ExecuteCustomAction.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class ExecuteCustomAction : UserControl - { - public ExecuteCustomAction() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/FetchInto.axaml b/src/Views/FastForwardWithoutCheckout.axaml similarity index 72% rename from src/Views/FetchInto.axaml rename to src/Views/FastForwardWithoutCheckout.axaml index 4a0c0966..cb33c09e 100644 --- a/src/Views/FetchInto.axaml +++ b/src/Views/FastForwardWithoutCheckout.axaml @@ -3,19 +3,20 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" - x:Class="SourceGit.Views.FetchInto" - x:DataType="vm:FetchInto"> + x:Class="SourceGit.Views.FastForwardWithoutCheckout" + x:DataType="vm:FastForwardWithoutCheckout"> + Text="{DynamicResource Text.FastForwardWithoutCheck}"/> - + - + diff --git a/src/Views/ApplyStash.axaml.cs b/src/Views/FastForwardWithoutCheckout.axaml.cs similarity index 52% rename from src/Views/ApplyStash.axaml.cs rename to src/Views/FastForwardWithoutCheckout.axaml.cs index 7c8ba227..0e3ba20d 100644 --- a/src/Views/ApplyStash.axaml.cs +++ b/src/Views/FastForwardWithoutCheckout.axaml.cs @@ -2,9 +2,9 @@ using Avalonia.Controls; namespace SourceGit.Views { - public partial class ApplyStash : UserControl + public partial class FastForwardWithoutCheckout : UserControl { - public ApplyStash() + public FastForwardWithoutCheckout() { InitializeComponent(); } diff --git a/src/Views/Fetch.axaml b/src/Views/Fetch.axaml index 67669380..202a96fa 100644 --- a/src/Views/Fetch.axaml +++ b/src/Views/Fetch.axaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Fetch" x:DataType="vm:Fetch"> @@ -11,12 +12,12 @@ - - + - - + @@ -33,19 +34,12 @@ + Content="{DynamicResource Text.Fetch.AllRemotes}" + IsChecked="{Binding FetchAllRemotes, Mode=TwoWay}"/> - - + Content="{DynamicResource Text.Fetch.Prune}" + IsChecked="{Binding Prune, Mode=TwoWay}"/> diff --git a/src/Views/FetchInto.axaml.cs b/src/Views/FetchInto.axaml.cs deleted file mode 100644 index c61c052e..00000000 --- a/src/Views/FetchInto.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class FetchInto : UserControl - { - public FetchInto() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml index be0c91a0..436ca4b1 100644 --- a/src/Views/FileHistories.axaml +++ b/src/Views/FileHistories.axaml @@ -1,262 +1,208 @@ - - + + - + + + + - + - - + + + + - + + + + + - + + + - + - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + - - - - - + + + + + + BorderBrush="{DynamicResource Brush.Border2}"/> - - - - - - - - + - - - - + + + + + + + + - - - - - + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + - + diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs index 3e7d5dc6..0e5968ff 100644 --- a/src/Views/FileHistories.axaml.cs +++ b/src/Views/FileHistories.axaml.cs @@ -1,80 +1,42 @@ -using System; - using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Interactivity; -using Avalonia.Platform.Storage; namespace SourceGit.Views { - public partial class FileHistories : ChromelessWindow + public partial class FileHistories : Window { public FileHistories() { InitializeComponent(); } - private void OnPressCommitSHA(object sender, PointerPressedEventArgs e) + private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e) { - if (sender is TextBlock { DataContext: Models.Commit commit } && - DataContext is ViewModels.FileHistories vm) + if (WindowState == WindowState.Maximized) { - vm.NavigateToCommit(commit); + WindowState = WindowState.Normal; + } + else + { + WindowState = WindowState.Maximized; } - e.Handled = true; } - private async void OnResetToSelectedRevision(object sender, RoutedEventArgs e) - { - if (sender is Button { DataContext: ViewModels.FileHistoriesSingleRevision single }) - { - await single.ResetToSelectedRevision(); - NotifyDonePanel.IsVisible = true; - } - - e.Handled = true; - } - - private void OnCloseNotifyPanel(object _, PointerPressedEventArgs e) - { - NotifyDonePanel.IsVisible = false; - e.Handled = true; - } - - private async void OnSaveAsPatch(object sender, RoutedEventArgs e) - { - if (sender is Button { DataContext: ViewModels.FileHistoriesCompareRevisions compare }) - { - var options = new FilePickerSaveOptions(); - options.Title = App.Text("FileCM.SaveAsPatch"); - options.DefaultExtension = ".patch"; - options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; - - var storageFile = await StorageProvider.SaveFilePickerAsync(options); - if (storageFile != null) - await compare.SaveAsPatch(storageFile.Path.LocalPath); - - NotifyDonePanel.IsVisible = true; - e.Handled = true; - } - } - - private void OnCommitSubjectDataContextChanged(object sender, EventArgs e) + private void CustomResizeWindow(object sender, PointerPressedEventArgs e) { if (sender is Border border) - ToolTip.SetTip(border, null); + { + if (border.Tag is WindowEdge edge) + { + BeginResizeDrag(edge, e); + } + } } - private void OnCommitSubjectPointerMoved(object sender, PointerEventArgs e) + private void BeginMoveWindow(object sender, PointerPressedEventArgs e) { - if (sender is Border { DataContext: Models.Commit commit } border && - DataContext is ViewModels.FileHistories vm) - { - var tooltip = ToolTip.GetTip(border); - if (tooltip == null) - ToolTip.SetTip(border, vm.GetCommitFullMessage(commit)); - } + BeginMoveDrag(e); } } } diff --git a/src/Views/FilterModeInGraph.axaml b/src/Views/FilterModeInGraph.axaml deleted file mode 100644 index 520a3836..00000000 --- a/src/Views/FilterModeInGraph.axaml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/Views/FilterModeInGraph.axaml.cs b/src/Views/FilterModeInGraph.axaml.cs deleted file mode 100644 index c3987f91..00000000 --- a/src/Views/FilterModeInGraph.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class FilterModeInGraph : UserControl - { - public FilterModeInGraph() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/FilterModeSwitchButton.axaml b/src/Views/FilterModeSwitchButton.axaml deleted file mode 100644 index b202c434..00000000 --- a/src/Views/FilterModeSwitchButton.axaml +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/src/Views/FilterModeSwitchButton.axaml.cs b/src/Views/FilterModeSwitchButton.axaml.cs deleted file mode 100644 index b3b2c3da..00000000 --- a/src/Views/FilterModeSwitchButton.axaml.cs +++ /dev/null @@ -1,165 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Interactivity; -using Avalonia.VisualTree; - -namespace SourceGit.Views -{ - public partial class FilterModeSwitchButton : UserControl - { - public static readonly StyledProperty ModeProperty = - AvaloniaProperty.Register(nameof(Mode)); - - public Models.FilterMode Mode - { - get => GetValue(ModeProperty); - set => SetValue(ModeProperty, value); - } - - public static readonly StyledProperty IsNoneVisibleProperty = - AvaloniaProperty.Register(nameof(IsNoneVisible)); - - public bool IsNoneVisible - { - get => GetValue(IsNoneVisibleProperty); - set => SetValue(IsNoneVisibleProperty, value); - } - - public static readonly StyledProperty IsContextMenuOpeningProperty = - AvaloniaProperty.Register(nameof(IsContextMenuOpening)); - - public bool IsContextMenuOpening - { - get => GetValue(IsContextMenuOpeningProperty); - set => SetValue(IsContextMenuOpeningProperty, value); - } - - public FilterModeSwitchButton() - { - IsVisible = false; - InitializeComponent(); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == ModeProperty || - change.Property == IsNoneVisibleProperty || - change.Property == IsContextMenuOpeningProperty) - { - var visible = (Mode != Models.FilterMode.None || IsNoneVisible || IsContextMenuOpening); - SetCurrentValue(IsVisibleProperty, visible); - } - } - - private void OnChangeFilterModeButtonClicked(object sender, RoutedEventArgs e) - { - var repoView = this.FindAncestorOfType(); - if (repoView == null) - return; - - var repo = repoView.DataContext as ViewModels.Repository; - if (repo == null) - return; - - var button = sender as Button; - if (button == null) - return; - - var menu = new ContextMenu(); - var mode = Models.FilterMode.None; - if (DataContext is Models.Tag tag) - { - mode = tag.FilterMode; - - if (mode != Models.FilterMode.None) - { - var unset = new MenuItem(); - unset.Header = App.Text("Repository.FilterCommits.Default"); - unset.Click += (_, ev) => - { - repo.SetTagFilterMode(tag, Models.FilterMode.None); - ev.Handled = true; - }; - - menu.Items.Add(unset); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - var include = new MenuItem(); - include.Icon = App.CreateMenuIcon("Icons.Filter"); - include.Header = App.Text("Repository.FilterCommits.Include"); - include.IsEnabled = mode != Models.FilterMode.Included; - include.Click += (_, ev) => - { - repo.SetTagFilterMode(tag, Models.FilterMode.Included); - ev.Handled = true; - }; - - var exclude = new MenuItem(); - exclude.Icon = App.CreateMenuIcon("Icons.EyeClose"); - exclude.Header = App.Text("Repository.FilterCommits.Exclude"); - exclude.IsEnabled = mode != Models.FilterMode.Excluded; - exclude.Click += (_, ev) => - { - repo.SetTagFilterMode(tag, Models.FilterMode.Excluded); - ev.Handled = true; - }; - - menu.Items.Add(include); - menu.Items.Add(exclude); - } - else if (DataContext is ViewModels.BranchTreeNode node) - { - mode = node.FilterMode; - - if (mode != Models.FilterMode.None) - { - var unset = new MenuItem(); - unset.Header = App.Text("Repository.FilterCommits.Default"); - unset.Click += (_, ev) => - { - repo.SetBranchFilterMode(node, Models.FilterMode.None, false, true); - ev.Handled = true; - }; - - menu.Items.Add(unset); - menu.Items.Add(new MenuItem() { Header = "-" }); - } - - var include = new MenuItem(); - include.Icon = App.CreateMenuIcon("Icons.Filter"); - include.Header = App.Text("Repository.FilterCommits.Include"); - include.IsEnabled = mode != Models.FilterMode.Included; - include.Click += (_, ev) => - { - repo.SetBranchFilterMode(node, Models.FilterMode.Included, false, true); - ev.Handled = true; - }; - - var exclude = new MenuItem(); - exclude.Icon = App.CreateMenuIcon("Icons.EyeClose"); - exclude.Header = App.Text("Repository.FilterCommits.Exclude"); - exclude.IsEnabled = mode != Models.FilterMode.Excluded; - exclude.Click += (_, ev) => - { - repo.SetBranchFilterMode(node, Models.FilterMode.Excluded, false, true); - ev.Handled = true; - }; - - menu.Items.Add(include); - menu.Items.Add(exclude); - } - - if (mode == Models.FilterMode.None) - { - IsContextMenuOpening = true; - menu.Closed += (_, _) => IsContextMenuOpening = false; - } - - menu.Open(button); - e.Handled = true; - } - } -} diff --git a/src/Views/GitFlowFinish.axaml b/src/Views/GitFlowFinish.axaml index fa847bba..9690c22c 100644 --- a/src/Views/GitFlowFinish.axaml +++ b/src/Views/GitFlowFinish.axaml @@ -12,39 +12,28 @@ + IsVisible="{Binding IsFeature}"/> + IsVisible="{Binding IsRelease}"/> - - + + - + - - - - + IsChecked="{Binding KeepBranch, Mode=TwoWay}"/> diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml index aed970de..211d9fe8 100644 --- a/src/Views/GitFlowStart.axaml +++ b/src/Views/GitFlowStart.axaml @@ -13,16 +13,16 @@ + IsVisible="{Binding IsFeature}"/> + IsVisible="{Binding IsRelease}"/> - + IsVisible="{Binding IsHotfix}"/> + - - - - - - - - - - - - - + x:DataType="vm:Histories"> + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + @@ -257,22 +166,24 @@ - - - + + + + - - + + + - + diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs index 18630e4c..4a214784 100644 --- a/src/Views/Histories.axaml.cs +++ b/src/Views/Histories.axaml.cs @@ -1,18 +1,18 @@ using System; -using System.Text; using Avalonia; -using Avalonia.Collections; using Avalonia.Controls; -using Avalonia.Input; +using Avalonia.Controls.Primitives; +using Avalonia.Data; +using Avalonia.Media; using Avalonia.VisualTree; namespace SourceGit.Views { - public class HistoriesLayout : Grid + public class LayoutableGrid : Grid { public static readonly StyledProperty UseHorizontalProperty = - AvaloniaProperty.Register(nameof(UseHorizontal), false); + AvaloniaProperty.Register(nameof(UseHorizontal), false); public bool UseHorizontal { @@ -22,17 +22,14 @@ namespace SourceGit.Views protected override Type StyleKeyOverride => typeof(Grid); - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + static LayoutableGrid() { - base.OnPropertyChanged(change); - - if (change.Property == UseHorizontalProperty && IsLoaded) - RefreshLayout(); + UseHorizontalProperty.Changed.AddClassHandler((o, _) => o.RefreshLayout()); } - protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) + public override void ApplyTemplate() { - base.OnAttachedToVisualTree(e); + base.ApplyTemplate(); RefreshLayout(); } @@ -71,55 +68,199 @@ namespace SourceGit.Views } } + public class CommitGraph : Control + { + public static readonly Pen[] Pens = [ + new Pen(Brushes.Orange, 2), + new Pen(Brushes.ForestGreen, 2), + new Pen(Brushes.Gold, 2), + new Pen(Brushes.Magenta, 2), + new Pen(Brushes.Red, 2), + new Pen(Brushes.Gray, 2), + new Pen(Brushes.Turquoise, 2), + new Pen(Brushes.Olive, 2), + ]; + + public static readonly StyledProperty GraphProperty = + AvaloniaProperty.Register(nameof(Graph)); + + public Models.CommitGraph Graph + { + get => GetValue(GraphProperty); + set => SetValue(GraphProperty, value); + } + + public static readonly StyledProperty BindingDataGridProperty = + AvaloniaProperty.Register(nameof(BindingDataGrid)); + + public DataGrid BindingDataGrid + { + get => GetValue(BindingDataGridProperty); + set => SetValue(BindingDataGridProperty, value); + } + + static CommitGraph() + { + AffectsRender(BindingDataGridProperty, GraphProperty); + } + + protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + { + base.OnPropertyChanged(change); + + if (change.Property.Name == "ActualThemeVariant") + { + InvalidateVisual(); + } + } + + public override void Render(DrawingContext context) + { + base.Render(context); + + var graph = Graph; + var grid = BindingDataGrid; + if (graph == null || grid == null) + return; + + var rowsPresenter = grid.FindDescendantOfType(); + if (rowsPresenter == null) + return; + + // Find the content display offset Y of binding DataGrid. + double rowHeight = grid.RowHeight; + double startY = 0; + foreach (var child in rowsPresenter.Children) + { + var row = child as DataGridRow; + if (row.IsVisible && row.Bounds.Top <= 0 && row.Bounds.Top > -rowHeight) + { + var test = rowHeight * row.GetIndex() - row.Bounds.Top; + if (startY < test) + startY = test; + } + } + + // Apply scroll offset. + context.PushClip(new Rect(Bounds.Left, Bounds.Top, grid.Columns[0].ActualWidth, Bounds.Height)); + context.PushTransform(Matrix.CreateTranslation(0, -startY)); + + // Calculate bounds. + var top = startY; + var bottom = startY + grid.Bounds.Height + rowHeight * 2; + + // Draw all curves + DrawCurves(context, top, bottom); + + // Draw connect dots + Brush dotFill = null; + if (App.Current.TryGetResource("Brush.Contents", App.Current.ActualThemeVariant, out object res) && res is SolidColorBrush) + { + dotFill = res as SolidColorBrush; + } + foreach (var dot in graph.Dots) + { + if (dot.Center.Y < top) + continue; + if (dot.Center.Y > bottom) + break; + + context.DrawEllipse(dotFill, Pens[dot.Color], dot.Center, 3, 3); + } + } + + private void DrawCurves(DrawingContext context, double top, double bottom) + { + foreach (var line in Graph.Paths) + { + var last = line.Points[0]; + var size = line.Points.Count; + + if (line.Points[size - 1].Y < top) + continue; + if (last.Y > bottom) + continue; + + var geo = new StreamGeometry(); + var pen = Pens[line.Color]; + using (var ctx = geo.Open()) + { + var started = false; + var ended = false; + for (int i = 1; i < size; i++) + { + var cur = line.Points[i]; + if (cur.Y < top) + { + last = cur; + continue; + } + + if (!started) + { + ctx.BeginFigure(last, false); + started = true; + } + + if (cur.Y > bottom) + { + cur = new Point(cur.X, bottom); + ended = true; + } + + if (cur.X > last.X) + { + ctx.QuadraticBezierTo(new Point(cur.X, last.Y), cur); + } + else if (cur.X < last.X) + { + if (i < size - 1) + { + var midY = (last.Y + cur.Y) / 2; + ctx.CubicBezierTo(new Point(last.X, midY + 2), new Point(cur.X, midY - 2), cur); + } + else + { + ctx.QuadraticBezierTo(new Point(last.X, cur.Y), cur); + } + } + else + { + ctx.LineTo(cur); + } + + if (ended) + break; + last = cur; + } + } + + context.DrawGeometry(null, pen, geo); + } + + foreach (var link in Graph.Links) + { + if (link.End.Y < top) + continue; + if (link.Start.Y > bottom) + break; + + var geo = new StreamGeometry(); + using (var ctx = geo.Open()) + { + ctx.BeginFigure(link.Start, false); + ctx.QuadraticBezierTo(link.Control, link.End); + } + + context.DrawGeometry(null, Pens[link.Color], geo); + } + } + } + public partial class Histories : UserControl { - public static readonly StyledProperty AuthorNameColumnWidthProperty = - AvaloniaProperty.Register(nameof(AuthorNameColumnWidth), new GridLength(120)); - - public GridLength AuthorNameColumnWidth - { - get => GetValue(AuthorNameColumnWidthProperty); - set => SetValue(AuthorNameColumnWidthProperty, value); - } - - public static readonly StyledProperty CurrentBranchProperty = - AvaloniaProperty.Register(nameof(CurrentBranch)); - - public Models.Branch CurrentBranch - { - get => GetValue(CurrentBranchProperty); - set => SetValue(CurrentBranchProperty, value); - } - - public static readonly StyledProperty BisectProperty = - AvaloniaProperty.Register(nameof(Bisect)); - - public Models.Bisect Bisect - { - get => GetValue(BisectProperty); - set => SetValue(BisectProperty, value); - } - - public static readonly StyledProperty> IssueTrackerRulesProperty = - AvaloniaProperty.Register>(nameof(IssueTrackerRules)); - - public AvaloniaList IssueTrackerRules - { - get => GetValue(IssueTrackerRulesProperty); - set => SetValue(IssueTrackerRulesProperty, value); - } - - public static readonly StyledProperty OnlyHighlightCurrentBranchProperty = - AvaloniaProperty.Register(nameof(OnlyHighlightCurrentBranch), true); - - public bool OnlyHighlightCurrentBranch - { - get => GetValue(OnlyHighlightCurrentBranchProperty); - set => SetValue(OnlyHighlightCurrentBranchProperty, value); - } - public static readonly StyledProperty NavigationIdProperty = - AvaloniaProperty.Register(nameof(NavigationId)); + AvaloniaProperty.Register(nameof(NavigationId), 0); public long NavigationId { @@ -127,113 +268,46 @@ namespace SourceGit.Views set => SetValue(NavigationIdProperty, value); } + static Histories() + { + NavigationIdProperty.Changed.AddClassHandler((h, _) => + { + // Force scroll selected item (current head) into view. see issue #58 + var datagrid = h.commitDataGrid; + if (datagrid != null && datagrid.SelectedItems.Count == 1) + datagrid.ScrollIntoView(datagrid.SelectedItems[0], null); + }); + } + public Histories() { InitializeComponent(); + + this.Bind(NavigationIdProperty, new Binding("NavigationId", BindingMode.OneWay)); } - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + private void OnCommitDataGridLayoutUpdated(object sender, EventArgs e) { - base.OnPropertyChanged(change); - - if (change.Property == NavigationIdProperty) - { - if (DataContext is ViewModels.Histories) - { - var list = CommitListContainer; - if (list is { SelectedItems.Count: 1 }) - list.ScrollIntoView(list.SelectedIndex); - } - } + commitGraph.InvalidateVisual(); } - private void OnCommitListLayoutUpdated(object _1, EventArgs _2) - { - var y = CommitListContainer.Scroll?.Offset.Y ?? 0; - var authorNameColumnWidth = AuthorNameColumnWidth.Value; - if (y != _lastScrollY || authorNameColumnWidth != _lastAuthorNameColumnWidth) - { - _lastScrollY = y; - _lastAuthorNameColumnWidth = authorNameColumnWidth; - CommitGraph.InvalidateVisual(); - } - } - - private void OnCommitListSelectionChanged(object _, SelectionChangedEventArgs e) + private void OnCommitDataGridSelectionChanged(object sender, SelectionChangedEventArgs e) { if (DataContext is ViewModels.Histories histories) { - histories.Select(CommitListContainer.SelectedItems); + histories.Select(commitDataGrid.SelectedItems); } e.Handled = true; } - private void OnCommitListContextRequested(object sender, ContextRequestedEventArgs e) + private void OnCommitDataGridContextRequested(object sender, ContextRequestedEventArgs e) { - if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems.Count: > 0 } list) + if (DataContext is ViewModels.Histories histories) { - var menu = histories.MakeContextMenu(list); - menu?.Open(list); + var menu = histories.MakeContextMenu(); + menu?.Open(sender as Control); } e.Handled = true; } - - private void OnCommitListDoubleTapped(object sender, TappedEventArgs e) - { - if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems.Count: 1 }) - { - var source = e.Source as Control; - var item = source.FindAncestorOfType(); - if (item is { DataContext: Models.Commit commit }) - histories.DoubleTapped(commit); - } - e.Handled = true; - } - - private void OnCommitListKeyDown(object sender, KeyEventArgs e) - { - if (!e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control)) - return; - - // These shortcuts are not mentioned in the Shortcut Reference window. Is this expected? - if (sender is ListBox { SelectedItems: { Count: > 0 } selected }) - { - // CTRL/COMMAND + C -> Copy selected commit SHA and subject. - if (e.Key == Key.C) - { - var builder = new StringBuilder(); - foreach (var item in selected) - { - if (item is Models.Commit commit) - builder.AppendLine($"{commit.SHA.AsSpan(0, 10)} - {commit.Subject}"); - } - - App.CopyText(builder.ToString()); - e.Handled = true; - return; - } - - // CTRL/COMMAND + B -> shows Create Branch pop-up at selected commit. - if (e.Key == Key.B) - { - var repoView = this.FindAncestorOfType(); - if (repoView == null) - return; - - var repo = repoView.DataContext as ViewModels.Repository; - if (repo == null || !repo.CanCreatePopup()) - return; - - if (selected.Count == 1 && selected[0] is Models.Commit commit) - { - repo.ShowPopup(new ViewModels.CreateBranch(repo, commit)); - e.Handled = true; - } - } - } - } - - private double _lastScrollY = 0; - private double _lastAuthorNameColumnWidth = 0; } } diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml index d87ccd14..0a597601 100644 --- a/src/Views/Hotkeys.axaml +++ b/src/Views/Hotkeys.axaml @@ -1,158 +1,129 @@ - - + + + + + - - + - - - + + + + - + - + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + - + - + - - - - + - + diff --git a/src/Views/Hotkeys.axaml.cs b/src/Views/Hotkeys.axaml.cs index ea293b0a..c255a54a 100644 --- a/src/Views/Hotkeys.axaml.cs +++ b/src/Views/Hotkeys.axaml.cs @@ -1,20 +1,24 @@ +using Avalonia.Controls; using Avalonia.Input; +using Avalonia.Interactivity; namespace SourceGit.Views { - public partial class Hotkeys : ChromelessWindow + public partial class Hotkeys : Window { public Hotkeys() { InitializeComponent(); } - protected override void OnKeyDown(KeyEventArgs e) + private void BeginMoveWindow(object sender, PointerPressedEventArgs e) { - base.OnKeyDown(e); + BeginMoveDrag(e); + } - if (!e.Handled && e.Key == Key.Escape) - Close(); + private void CloseWindow(object sender, RoutedEventArgs e) + { + Close(); } } } diff --git a/src/Views/ImageContainer.cs b/src/Views/ImageContainer.cs deleted file mode 100644 index 995f269b..00000000 --- a/src/Views/ImageContainer.cs +++ /dev/null @@ -1,364 +0,0 @@ -using System; - -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; -using Avalonia.Media; -using Avalonia.Media.Imaging; -using Avalonia.Styling; - -namespace SourceGit.Views -{ - public class ImageContainer : Control - { - public override void Render(DrawingContext context) - { - if (_bgBrush == null) - { - var maskBrush = new SolidColorBrush(ActualThemeVariant == ThemeVariant.Dark ? 0xFF404040 : 0xFFBBBBBB); - var bg = new DrawingGroup() - { - Children = - { - new GeometryDrawing() { Brush = maskBrush, Geometry = new RectangleGeometry(new Rect(0, 0, 12, 12)) }, - new GeometryDrawing() { Brush = maskBrush, Geometry = new RectangleGeometry(new Rect(12, 12, 12, 12)) }, - } - }; - - _bgBrush = new DrawingBrush(bg) - { - AlignmentX = AlignmentX.Left, - AlignmentY = AlignmentY.Top, - DestinationRect = new RelativeRect(new Size(24, 24), RelativeUnit.Absolute), - Stretch = Stretch.None, - TileMode = TileMode.Tile, - }; - } - - context.FillRectangle(_bgBrush, new Rect(Bounds.Size)); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property.Name == "ActualThemeVariant") - { - _bgBrush = null; - InvalidateVisual(); - } - } - - private DrawingBrush _bgBrush = null; - } - - public class ImageView : ImageContainer - { - public static readonly StyledProperty ImageProperty = - AvaloniaProperty.Register(nameof(Image)); - - public Bitmap Image - { - get => GetValue(ImageProperty); - set => SetValue(ImageProperty, value); - } - - public override void Render(DrawingContext context) - { - base.Render(context); - - if (Image is { } image) - context.DrawImage(image, new Rect(0, 0, Bounds.Width, Bounds.Height)); - } - - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) - { - base.OnPropertyChanged(change); - - if (change.Property == ImageProperty) - InvalidateMeasure(); - } - - protected override Size MeasureOverride(Size availableSize) - { - if (Image is { } image) - { - var imageSize = image.Size; - var scaleW = availableSize.Width / imageSize.Width; - var scaleH = availableSize.Height / imageSize.Height; - var scale = Math.Min(1, Math.Min(scaleW, scaleH)); - return new Size(scale * imageSize.Width, scale * imageSize.Height); - } - - return availableSize; - } - } - - public class ImageSwipeControl : ImageContainer - { - public static readonly StyledProperty AlphaProperty = - AvaloniaProperty.Register(nameof(Alpha), 0.5); - - public double Alpha - { - get => GetValue(AlphaProperty); - set => SetValue(AlphaProperty, value); - } - - public static readonly StyledProperty OldImageProperty = - AvaloniaProperty.Register(nameof(OldImage)); - - public Bitmap OldImage - { - get => GetValue(OldImageProperty); - set => SetValue(OldImageProperty, value); - } - - public static readonly StyledProperty NewImageProperty = - AvaloniaProperty.Register(nameof(NewImage)); - - public Bitmap NewImage - { - get => GetValue(NewImageProperty); - set => SetValue(NewImageProperty, value); - } - - static ImageSwipeControl() - { - AffectsMeasure(OldImageProperty, NewImageProperty); - AffectsRender(AlphaProperty); - } - - public override void Render(DrawingContext context) - { - base.Render(context); - - var alpha = Alpha; - var w = Bounds.Width; - var h = Bounds.Height; - var x = w * alpha; - - if (OldImage is { } left && alpha > 0) - RenderSingleSide(context, left, new Rect(0, 0, x, h)); - - if (NewImage is { } right && alpha < 1) - RenderSingleSide(context, right, new Rect(x, 0, w - x, h)); - - context.DrawLine(new Pen(Brushes.DarkGreen, 2), new Point(x, 0), new Point(x, Bounds.Height)); - } - - protected override void OnPointerPressed(PointerPressedEventArgs e) - { - base.OnPointerPressed(e); - - var p = e.GetPosition(this); - var hitbox = new Rect(Math.Max(Bounds.Width * Alpha - 2, 0), 0, 4, Bounds.Height); - var pointer = e.GetCurrentPoint(this); - if (pointer.Properties.IsLeftButtonPressed && hitbox.Contains(p)) - { - _pressedOnSlider = true; - Cursor = new Cursor(StandardCursorType.SizeWestEast); - e.Pointer.Capture(this); - e.Handled = true; - } - } - - protected override void OnPointerReleased(PointerReleasedEventArgs e) - { - base.OnPointerReleased(e); - _pressedOnSlider = false; - } - - protected override void OnPointerMoved(PointerEventArgs e) - { - var w = Bounds.Width; - var p = e.GetPosition(this); - - if (_pressedOnSlider) - { - SetCurrentValue(AlphaProperty, Math.Clamp(p.X, 0, w) / w); - } - else - { - var hitbox = new Rect(Math.Max(w * Alpha - 2, 0), 0, 4, Bounds.Height); - if (hitbox.Contains(p)) - { - if (!_lastInSlider) - { - _lastInSlider = true; - Cursor = new Cursor(StandardCursorType.SizeWestEast); - } - } - else - { - if (_lastInSlider) - { - _lastInSlider = false; - Cursor = null; - } - } - } - } - - protected override Size MeasureOverride(Size availableSize) - { - var left = OldImage; - var right = NewImage; - - if (left == null) - return right == null ? availableSize : GetDesiredSize(right.Size, availableSize); - - if (right == null) - return GetDesiredSize(left.Size, availableSize); - - var ls = GetDesiredSize(left.Size, availableSize); - var rs = GetDesiredSize(right.Size, availableSize); - return ls.Width > rs.Width ? ls : rs; - } - - private Size GetDesiredSize(Size img, Size available) - { - var sw = available.Width / img.Width; - var sh = available.Height / img.Height; - var scale = Math.Min(1, Math.Min(sw, sh)); - return new Size(scale * img.Width, scale * img.Height); - } - - private void RenderSingleSide(DrawingContext context, Bitmap img, Rect clip) - { - var w = Bounds.Width; - var h = Bounds.Height; - - var imgW = img.Size.Width; - var imgH = img.Size.Height; - var scale = Math.Min(1, Math.Min(w / imgW, h / imgH)); - - var scaledW = img.Size.Width * scale; - var scaledH = img.Size.Height * scale; - - var src = new Rect(0, 0, imgW, imgH); - var dst = new Rect((w - scaledW) * 0.5, (h - scaledH) * 0.5, scaledW, scaledH); - - using (context.PushClip(clip)) - context.DrawImage(img, src, dst); - } - - private bool _pressedOnSlider = false; - private bool _lastInSlider = false; - } - - public class ImageBlendControl : ImageContainer - { - public static readonly StyledProperty AlphaProperty = - AvaloniaProperty.Register(nameof(Alpha), 1.0); - - public double Alpha - { - get => GetValue(AlphaProperty); - set => SetValue(AlphaProperty, value); - } - - public static readonly StyledProperty OldImageProperty = - AvaloniaProperty.Register(nameof(OldImage)); - - public Bitmap OldImage - { - get => GetValue(OldImageProperty); - set => SetValue(OldImageProperty, value); - } - - public static readonly StyledProperty NewImageProperty = - AvaloniaProperty.Register(nameof(NewImage)); - - public Bitmap NewImage - { - get => GetValue(NewImageProperty); - set => SetValue(NewImageProperty, value); - } - - static ImageBlendControl() - { - AffectsMeasure(OldImageProperty, NewImageProperty); - AffectsRender(AlphaProperty); - } - - public override void Render(DrawingContext context) - { - base.Render(context); - - var alpha = Alpha; - var left = OldImage; - var right = NewImage; - var drawLeft = left != null && alpha < 1.0; - var drawRight = right != null && alpha > 0; - - if (drawLeft && drawRight) - { - using (var rt = new RenderTargetBitmap(new PixelSize((int)Bounds.Width, (int)Bounds.Height), right.Dpi)) - { - using (var dc = rt.CreateDrawingContext()) - { - using (dc.PushRenderOptions(RO_SRC)) - RenderSingleSide(dc, left, rt.Size.Width, rt.Size.Height, 1 - alpha); - - using (dc.PushRenderOptions(RO_DST)) - RenderSingleSide(dc, right, rt.Size.Width, rt.Size.Height, alpha); - } - - context.DrawImage(rt, new Rect(0, 0, Bounds.Width, Bounds.Height)); - } - } - else if (drawLeft) - { - RenderSingleSide(context, left, Bounds.Width, Bounds.Height, 1 - alpha); - } - else if (drawRight) - { - RenderSingleSide(context, right, Bounds.Width, Bounds.Height, alpha); - } - } - - protected override Size MeasureOverride(Size availableSize) - { - var left = OldImage; - var right = NewImage; - - if (left == null) - return right == null ? availableSize : GetDesiredSize(right.Size, availableSize); - - if (right == null) - return GetDesiredSize(left.Size, availableSize); - - var ls = GetDesiredSize(left.Size, availableSize); - var rs = GetDesiredSize(right.Size, availableSize); - return ls.Width > rs.Width ? ls : rs; - } - - private Size GetDesiredSize(Size img, Size available) - { - var sw = available.Width / img.Width; - var sh = available.Height / img.Height; - var scale = Math.Min(1, Math.Min(sw, sh)); - return new Size(scale * img.Width, scale * img.Height); - } - - private void RenderSingleSide(DrawingContext context, Bitmap img, double w, double h, double alpha) - { - var imgW = img.Size.Width; - var imgH = img.Size.Height; - var scale = Math.Min(1, Math.Min(w / imgW, h / imgH)); - - var scaledW = img.Size.Width * scale; - var scaledH = img.Size.Height * scale; - - var src = new Rect(0, 0, imgW, imgH); - var dst = new Rect((w - scaledW) * 0.5, (h - scaledH) * 0.5, scaledW, scaledH); - - using (context.PushOpacity(alpha)) - context.DrawImage(img, src, dst); - } - - private static readonly RenderOptions RO_SRC = new RenderOptions() { BitmapBlendingMode = BitmapBlendingMode.Source, BitmapInterpolationMode = BitmapInterpolationMode.HighQuality }; - private static readonly RenderOptions RO_DST = new RenderOptions() { BitmapBlendingMode = BitmapBlendingMode.Plus, BitmapInterpolationMode = BitmapInterpolationMode.HighQuality }; - } -} diff --git a/src/Views/ImageDiffView.axaml b/src/Views/ImageDiffView.axaml deleted file mode 100644 index 54a20628..00000000 --- a/src/Views/ImageDiffView.axaml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/ImageDiffView.axaml.cs b/src/Views/ImageDiffView.axaml.cs deleted file mode 100644 index 7e32c91a..00000000 --- a/src/Views/ImageDiffView.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class ImageDiffView : UserControl - { - public ImageDiffView() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/Init.axaml b/src/Views/Init.axaml index 10aac9b0..6b35bc82 100644 --- a/src/Views/Init.axaml +++ b/src/Views/Init.axaml @@ -10,22 +10,16 @@ - - - - - - + + Text="{DynamicResource Text.Init.Path}" + HorizontalAlignment="Right" VerticalAlignment="Center" + Margin="0,0,8,0"/> + Text="{Binding TargetPath}"/> + Text="{DynamicResource Text.Init.Tip}" + Foreground="{DynamicResource Brush.FG2}"/> diff --git a/src/Views/InitGitFlow.axaml b/src/Views/InitGitFlow.axaml index 75fe696c..83faf66f 100644 --- a/src/Views/InitGitFlow.axaml +++ b/src/Views/InitGitFlow.axaml @@ -2,8 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:c="using:SourceGit.Converters" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.InitGitFlow" x:DataType="vm:InitGitFlow"> @@ -11,7 +13,7 @@ - + + Text="{Binding FeturePrefix, Mode=TwoWay}"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/LFSLocks.axaml.cs b/src/Views/LFSLocks.axaml.cs deleted file mode 100644 index 695341f4..00000000 --- a/src/Views/LFSLocks.axaml.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Interactivity; - -namespace SourceGit.Views -{ - public partial class LFSLocks : ChromelessWindow - { - public LFSLocks() - { - InitializeComponent(); - } - - private void OnUnlockButtonClicked(object sender, RoutedEventArgs e) - { - if (DataContext is ViewModels.LFSLocks vm && sender is Button button) - vm.Unlock(button.DataContext as Models.LFSLock, false); - - e.Handled = true; - } - - private void OnForceUnlockButtonClicked(object sender, RoutedEventArgs e) - { - if (DataContext is ViewModels.LFSLocks vm && sender is Button button) - vm.Unlock(button.DataContext as Models.LFSLock, true); - - e.Handled = true; - } - } -} diff --git a/src/Views/LFSPrune.axaml b/src/Views/LFSPrune.axaml deleted file mode 100644 index a8ada710..00000000 --- a/src/Views/LFSPrune.axaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/src/Views/LFSPrune.axaml.cs b/src/Views/LFSPrune.axaml.cs deleted file mode 100644 index dbb4a376..00000000 --- a/src/Views/LFSPrune.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class LFSPrune : UserControl - { - public LFSPrune() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/LFSPull.axaml b/src/Views/LFSPull.axaml deleted file mode 100644 index 39b92c4a..00000000 --- a/src/Views/LFSPull.axaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/LFSPull.axaml.cs b/src/Views/LFSPull.axaml.cs deleted file mode 100644 index db71afe6..00000000 --- a/src/Views/LFSPull.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class LFSPull : UserControl - { - public LFSPull() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/LFSPush.axaml b/src/Views/LFSPush.axaml deleted file mode 100644 index f67f4aca..00000000 --- a/src/Views/LFSPush.axaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/LFSPush.axaml.cs b/src/Views/LFSPush.axaml.cs deleted file mode 100644 index 5641dfef..00000000 --- a/src/Views/LFSPush.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class LFSPush : UserControl - { - public LFSPush() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/LFSTrackCustomPattern.axaml b/src/Views/LFSTrackCustomPattern.axaml deleted file mode 100644 index f60304d5..00000000 --- a/src/Views/LFSTrackCustomPattern.axaml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/src/Views/LFSTrackCustomPattern.axaml.cs b/src/Views/LFSTrackCustomPattern.axaml.cs deleted file mode 100644 index 2e66f55a..00000000 --- a/src/Views/LFSTrackCustomPattern.axaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Avalonia.Controls; - -namespace SourceGit.Views -{ - public partial class LFSTrackCustomPattern : UserControl - { - public LFSTrackCustomPattern() - { - InitializeComponent(); - } - } -} diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml index bfe03fd5..ab3e9dd0 100644 --- a/src/Views/Launcher.axaml +++ b/src/Views/Launcher.axaml @@ -1,128 +1,428 @@ - - + + + + + + - + + + + - + - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + 12,2,0,2 + 11,2,32,2 + 22 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - + + - - + + - - - - - - - - + + - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +