github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-24 10:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: use regex to fix branch names (#1510)

Browse Source
This commit is contained in:
Nathan Baulch
2025-07-04 18:55:05 +10:00
committed by GitHub
parent 81fe7af19f
commit 71a743c80a
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ViewModels/CreateBranch.cs
View File

@@ -1,10 +1,11 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace SourceGit.ViewModels
{
public class CreateBranch : Popup
public partial class CreateBranch : Popup
{
[Required(ErrorMessage = "Branch name is required!")]
[RegularExpression(@"^[\w \-/\.#\+]+$", ErrorMessage = "Bad branch name format!")]
@@ -101,7 +102,7 @@ namespace SourceGit.ViewModels
{
if (!creator._allowOverwrite)
{
var fixedName = creator.FixName(name);
var fixedName = FixName(name);
foreach (var b in creator._repo.Branches)
{
if (b.FriendlyName == fixedName)
@@ -227,13 +228,12 @@ namespace SourceGit.ViewModels
return true;
}
private string FixName(string name)
{
if (!name.Contains(' '))
return name;
[GeneratedRegex(@"\s+")]
private static partial Regex REG_FIX_NAME();
var parts = name.Split(' ', System.StringSplitOptions.RemoveEmptyEntries);
return string.Join("-", parts);
private static string FixName(string name)
{
return REG_FIX_NAME().Replace(name, "-");
}
private readonly Repository _repo = null;

16
src/ViewModels/RenameBranch.cs
View File

@@ -1,10 +1,11 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace SourceGit.ViewModels
{
public class RenameBranch : Popup
public partial class RenameBranch : Popup
{
public Models.Branch Target
{
@@ -31,7 +32,7 @@ namespace SourceGit.ViewModels
{
if (ctx.ObjectInstance is RenameBranch rename)
{
var fixedName = rename.FixName(name);
var fixedName = FixName(name);
foreach (var b in rename._repo.Branches)
{
if (b.IsLocal && b != rename.Target && b.Name == fixedName)
@@ -87,13 +88,12 @@ namespace SourceGit.ViewModels
return succ;
}
private string FixName(string name)
{
if (!name.Contains(' '))
return name;
[GeneratedRegex(@"\s+")]
private static partial Regex REG_FIX_NAME();
var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries);
return string.Join("-", parts);
private static string FixName(string name)
{
return REG_FIX_NAME().Replace(name, "-");
}
private readonly Repository _repo;