mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-22 04:34:59 +00:00
feat: add workspace-specific default clone directory functionality (#1183)
* refactor: improve diff handling for EOL changes and enhance text diff display - Updated `Diff.cs` to streamline whitespace handling in diff arguments. - Enhanced `DiffContext.cs` to check for EOL changes when old and new hashes differ, creating a text diff if necessary. - Added support for showing end-of-line symbols in `TextDiffView.axaml.cs` options. * localization: update translations to include EOF handling in ignore whitespace messages - Modified the ignore whitespace text in multiple language files to specify that EOF changes are also ignored. - Ensured consistency across all localization files for the patch application feature. * revert: Typo in DiffResult comment * revert: update diff arguments to ignore CR at EOL in whitespace handling (like before changes) * revert: update translations to remove EOF references in Text.Apply.IgnoreWS and fixed typo in Text.Diff.IgnoreWhitespace (EOF => EOL) * feat: add workspace-specific default clone directory functionality - Implemented logic in Clone.cs to set ParentFolder based on the active workspace's DefaultCloneDir if available, falling back to the global GitDefaultCloneDir. - Added DefaultCloneDir property to Workspace.cs to store the default clone directory for each workspace. - Updated ConfigureWorkspace.axaml to include a TextBox and Button for setting the DefaultCloneDir in the UI. - Implemented folder selection functionality in ConfigureWorkspace.axaml.cs to allow users to choose a directory for cloning. - This closes issue #1145 --------- Co-authored-by: mpagani <massimo.pagani@unitec-group.com>
This commit is contained in:
parent
e89dbd8f43
commit
f14a666091
4 changed files with 55 additions and 4 deletions
|
@ -64,6 +64,17 @@ namespace SourceGit.ViewModels
|
|||
_pageId = pageId;
|
||||
View = new Views.Clone() { DataContext = this };
|
||||
|
||||
// Use workspace-specific DefaultCloneDir if available
|
||||
var activeWorkspace = Preferences.Instance.GetActiveWorkspace();
|
||||
if (activeWorkspace != null && !string.IsNullOrEmpty(activeWorkspace.DefaultCloneDir))
|
||||
{
|
||||
ParentFolder = activeWorkspace.DefaultCloneDir;
|
||||
}
|
||||
else
|
||||
{
|
||||
ParentFolder = Preferences.Instance.GitDefaultCloneDir;
|
||||
}
|
||||
|
||||
Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
|
@ -170,7 +181,7 @@ namespace SourceGit.ViewModels
|
|||
private string _remote = string.Empty;
|
||||
private bool _useSSH = false;
|
||||
private string _sshKey = string.Empty;
|
||||
private string _parentFolder = Preferences.Instance.GitDefaultCloneDir;
|
||||
private string _parentFolder = string.Empty;
|
||||
private string _local = string.Empty;
|
||||
private string _extraArgs = string.Empty;
|
||||
}
|
||||
|
|
|
@ -46,6 +46,12 @@ namespace SourceGit.ViewModels
|
|||
set => SetProperty(ref _restoreOnStartup, value);
|
||||
}
|
||||
|
||||
public string DefaultCloneDir
|
||||
{
|
||||
get => _defaultCloneDir;
|
||||
set => SetProperty(ref _defaultCloneDir, value);
|
||||
}
|
||||
|
||||
public IBrush Brush
|
||||
{
|
||||
get => new SolidColorBrush(_color);
|
||||
|
@ -55,5 +61,6 @@ namespace SourceGit.ViewModels
|
|||
private uint _color = 4278221015;
|
||||
private bool _isActive = false;
|
||||
private bool _restoreOnStartup = true;
|
||||
private string _defaultCloneDir = string.Empty;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue