mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 12:15:00 +00:00
fix: update visible staged changes retrieval in WorkingCopy (#1187)
* doc: Update translation status and missing keys * fix: update visible staged changes retrieval in WorkingCopy * fix: prevent unintended amend behavior when changing current branch --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
parent
7d20f97f4e
commit
3b1018e0e2
3 changed files with 48 additions and 11 deletions
|
@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
|
|||
|
||||
### 
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in de_DE.axaml</summary>
|
||||
|
@ -31,10 +31,11 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
|
||||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in es_ES.axaml</summary>
|
||||
|
@ -49,10 +50,11 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
|
||||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in fr_FR.axaml</summary>
|
||||
|
@ -67,10 +69,11 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
|
||||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in it_IT.axaml</summary>
|
||||
|
@ -87,10 +90,11 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
|
||||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in ja_JP.axaml</summary>
|
||||
|
@ -107,10 +111,11 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
|
||||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in pt_BR.axaml</summary>
|
||||
|
@ -192,12 +197,20 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.WorkingCopy.SignOff
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
### 
|
||||
<details>
|
||||
<summary>Missing keys in ru_RU.axaml</summary>
|
||||
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in ta_IN.axaml</summary>
|
||||
|
@ -212,9 +225,24 @@ This document shows the translation status of each locale file in the repository
|
|||
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
|
||||
- Text.WorkingCopy.Conflicts.UseMine
|
||||
- Text.WorkingCopy.Conflicts.UseTheirs
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
### 
|
||||
|
||||
### 
|
||||
<details>
|
||||
<summary>Missing keys in zh_CN.axaml</summary>
|
||||
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
||||
|
||||
### 
|
||||
|
||||
<details>
|
||||
<summary>Missing keys in zh_TW.axaml</summary>
|
||||
|
||||
- Text.Preferences.General.OpenReposInNewTab
|
||||
|
||||
</details>
|
|
@ -162,7 +162,15 @@ namespace SourceGit.ViewModels
|
|||
public Models.Branch CurrentBranch
|
||||
{
|
||||
get => _currentBranch;
|
||||
private set => SetProperty(ref _currentBranch, value);
|
||||
private set
|
||||
{
|
||||
var oldHead = _currentBranch?.Head;
|
||||
if (SetProperty(ref _currentBranch, value))
|
||||
{
|
||||
if (oldHead != _currentBranch.Head && _workingCopy is { UseAmend: true })
|
||||
_workingCopy.UseAmend = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<BranchTreeNode> LocalBranchTrees
|
||||
|
|
|
@ -94,6 +94,7 @@ namespace SourceGit.ViewModels
|
|||
}
|
||||
|
||||
Staged = GetStagedChanges();
|
||||
VisibleStaged = GetVisibleChanges(_staged);
|
||||
SelectedStaged = [];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue