dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 10:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add bare-minimum support for multi-line stash-message

Browse source 
With these changes, a multi-line message cannow be copied-into, viewed and copied-out-of a Stash:
* Simplify parsing in QueryStashes, by passing the `-z` argument to `git stash list` for item separation.
* Query full Message (`%B`) from stash (list-item still shows only first (Subject) line, tooltip shows full Message).
* Add "Copy Message" command in stash-item context-menu.
* Make the "Message:" text-box in StashChanges dialog support multiple lines, without changing the layout.
This commit is contained in:
Göran W 2025-06-18 06:33:09 +02:00
parent ae46728bbc
commit 81e4541d43
4 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/Commands/QueryStashes.cs
View file

@ -9,7 +9,7 @@ namespace SourceGit.Commands
{
WorkingDirectory = repo;
Context = repo;
Args = "stash list --format=%H%n%P%n%ct%n%gd%n%s";
Args = "stash list -z --format=%H%n%P%n%ct%n%gd%n%B";
}
public List<Models.Stash> Result()
@ -19,55 +19,54 @@ namespace SourceGit.Commands
if (!rs.IsSuccess)
return outs;
var nextPartIdx = 0;
var start = 0;
var end = rs.StdOut.IndexOf('\n', start);
while (end > 0)
var stashes = rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries);
foreach (var stash in stashes)
{
var line = rs.StdOut.Substring(start, end - start);
var current = new Models.Stash();
switch (nextPartIdx)
var nextPartIdx = 0;
var start = 0;
var end = stash.IndexOf('\n', start);
while (end > 0 && nextPartIdx < 4)
{
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;
var line = stash.Substring(start, end - start);
switch (nextPartIdx)
{
case 0:
current = new Models.Stash() { SHA = line };
break;
case 1:
ParseParent(line, ref current);
break;
case 2:
current.Time = ulong.Parse(line);
break;
case 3:
current.Name = line;
break;
}
nextPartIdx++;
start = end + 1;
end = stash.IndexOf('\n', start);
}
nextPartIdx++;
if (nextPartIdx > 4)
nextPartIdx = 0;
if (start < stash.Length)
current.Message = stash.Substring(start);
start = end + 1;
end = rs.StdOut.IndexOf('\n', start);
outs.Add(current);
}
if (start < rs.StdOut.Length)
_current.Message = rs.StdOut.Substring(start);
return outs;
}
private void ParseParent(string data)
private void ParseParent(string data, ref Models.Stash current)
{
if (data.Length < 8)
return;
_current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
}
private Models.Stash _current = null;
}
}