mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-06-01 01:14:59 +00:00
feature<SubTree>: supports git subtree feature
This commit is contained in:
leo
parent
6b602e70c5
commit
130b5a66ab
22 changed files with 784 additions and 10 deletions
|
|
@ -2,13 +2,15 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<Geometry x:Key="Icon.Git">M1004.8 466.4 557.7 19.3c-25.7-25.8-67.5-25.8-93.3 0L360.6 123.2l78.2 78.2c12.5-6 26.6-9.4 41.4-9.4c53 0 96 43 96 96c0 14.8-3.4 28.9-9.4 41.4l128 128c12.5-6 26.6-9.4 41.4-9.4c53 0 96 43 96 96s-43 96-96 96s-96-43-96-96c0-14.8 3.4-28.9 9.4-41.4L521.5 374.6a88.8 88.8 0 01-9.4 3.9v267c37.3 13.2 64 48.7 64 90.5c0 53-43 96-96 96s-96-43-96-96c0-41.8 26.7-77.3 64-90.5V378.5c-37.3-13.2-64-48.7-64-90.5c0-14.8 3.4-28.9 9.4-41.4l-78.2-78.2L19.4 464.3c-25.8 25.8-25.8 67.5 0 93.3l447.1 447.1c25.7 25.8 67.5 25.8 93.3 0l445-445c25.8-25.8 25.8-67.6 0-93.3z</Geometry>
|
||||
<Geometry x:Key="Icon.Submodule">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</Geometry>
|
||||
<Geometry x:Key="Icon.SubTree">M491 256h469c13 0 21-9 21-21v-171c0-13-9-21-21-21h-469c-13 0-21 9-21 21V128H256V64c0-13-9-21-21-21h-171c-13 0-21 9-21 21v171c0 13 9 21 21 21H128v597h341v64c0 13 9 21 21 21h469c13 0 21-9 21-21v-171c0-13-9-21-21-21h-469c-13 0-21 9-21 21V811H171v-299h299v64c0 13 9 21 21 21h469c13 0 21-9 21-21v-171c0-13-9-21-21-21h-469c-13 0-21 9-21 21V469H171V256h64c13 0 21-9 21-21V171h213v64c0 13 9 21 21 21z</Geometry>
|
||||
<Geometry x:Key="Icon.LFS">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</Geometry>
|
||||
<Geometry x:Key="Icon.NewPage">M853.3 960H170.7V64h469.3l213.3 213.3zM821.3 298.7H618.7V96z</Geometry>
|
||||
<Geometry x:Key="Icon.Bookmark">M192 0l0 1024 320-320 320 320 0-1024z</Geometry>
|
||||
<Geometry x:Key="Icon.Detail">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</Geometry>
|
||||
<Geometry x:Key="Icon.NewTab">M490.7 85.3l42.7 0 0 853.3-42.7 0 0-853.3zM85.3 490.7l853.3 0 0 42.7-853.3 0 0-42.7z</Geometry>
|
||||
<Geometry x:Key="Icon.Copy">M682.7 42.7H85.3v682.7h85.3V128h512V42.7zM256 213.3l4.5 768H896V213.3H256zm554.7 682.7H341.3V298.7h469.3v597.3z</Geometry>
|
||||
|
||||
<Geometry x:Key="Icon.TreeAddNode">M204 291c45-11 77-49 77-96c0-53-43-98-98-98c-53 0-98 45-98 98c0 47 34 87 77 96v91c0 13 9 21 21 21h236c2 38 32 68 70 68h372c41 0 73-32 73-73v-38c0-41-32-73-73-73h-370c-38 0-70 30-70 68H204V291zm258 74h2c0-15 13-30 30-30h372c15 0 30 13 30 30v38c0 15-13 30-30 30h-375c-15 0-30-13-30-30v-38zM183 250c-30 0-55-26-55-55s26-55 55-55s55 26 55 55s-26 55-55 55zM679 495c-134 0-244 109-244 244s109 244 244 244c134 0 244-109 244-244s-109-244-244-244zm159 268h-134v134h-50V764H521v-50h134v-134h50v134h134V764zM244 766H185c-13 0-23-11-23-23s11-23 23-23h59c13 0 23 11 23 23s-11 23-23 23zM368 766h-42c-9 0-17-8-17-17v-13c0-9 8-17 17-17h42c9 0 17 8 17 17v13c0 9-8 17-17 17zM183 766c-12 0-21-9-21-21V320c0-12 9-21 21-21c12 0 21 9 21 21v425c0 12-10 21-21 21z</Geometry>
|
||||
|
||||
<Geometry x:Key="Icon.Minimize">M256 811h512v85H256z</Geometry>
|
||||
<Geometry x:Key="Icon.Maximize">M922 205v614H154V205h768zm-51 51H205v512h666V256z</Geometry>
|
||||
<Geometry x:Key="Icon.Close">M899 203 821 125 512 434 203 125 125 203 434 512 125 821 203 899 512 590 821 899 899 821 590 512z</Geometry>
|
||||
|
|
|
|||
|
|
@ -128,6 +128,8 @@
|
|||
<sys:String x:Key="Text.Dashboard.Submodules">SUBMODULES</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Submodules.Add">ADD SUBMODULE</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Submodules.Update">UPDATE SUBMODULE</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.SubTrees">SUBTREES</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.SubTrees.Add">ADD/LINK SUBTREE</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Resolve">RESOLVE</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Continue">CONTINUE</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Abort">ABORT</sys:String>
|
||||
|
|
@ -425,7 +427,33 @@
|
|||
|
||||
<sys:String x:Key="Text.Restart.Title">NOTICE</sys:String>
|
||||
<sys:String x:Key="Text.Restart.Content">Restart required to apply changes in preference. Restart now?</sys:String>
|
||||
|
||||
|
||||
<sys:String x:Key="Text.AddSubTree">Add/Link SubTree</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Source">Source URL :</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Branch">Branch/Commit :</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Prefix">Local Relative Path :</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Squash">Squash commits?</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.EditSubTree">Edit SubTree</sys:String>
|
||||
<sys:String x:Key="Text.EditSubTree.Source">Source URL :</sys:String>
|
||||
<sys:String x:Key="Text.EditSubTree.Prefix">Local Relative Path :</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.UnlinkSubTree">Unlink SubTree</sys:String>
|
||||
<sys:String x:Key="Text.UnlinkSubTree.Prefix">Local Relative Path :</sys:String>
|
||||
<sys:String x:Key="Text.UnlinkSubTree.Tips">This will only remove links.</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Pull">Pull Changes Of SubTree</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Push">Push Changes Of SubTree</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Prefix">Local Relative Path :</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Source">Remote :</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Branch">Branch :</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Squash">Squash commits?</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.SubTree.Edit">Edit ...</sys:String>
|
||||
<sys:String x:Key="Text.SubTree.Unlink">Unlink ...</sys:String>
|
||||
<sys:String x:Key="Text.SubTree.Pull">Pull ...</sys:String>
|
||||
<sys:String x:Key="Text.SubTree.Push">Push ...</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.NotConfigured">Git has NOT been configured.\nPlease to go [Preference] and configure it first.</sys:String>
|
||||
<sys:String x:Key="Text.PathNotFound">Path[{0}] not exists!</sys:String>
|
||||
<sys:String x:Key="Text.MissingBash">Can NOT locate bash.exe. Make sure bash.exe exists under the same folder with git.exe</sys:String>
|
||||
|
|
@ -448,6 +476,7 @@
|
|||
<sys:String x:Key="Text.DuplicatedTagName">Duplicated tag name!</sys:String>
|
||||
<sys:String x:Key="Text.EmptyCommitMessage">Commit subject can NOT be empty</sys:String>
|
||||
<sys:String x:Key="Text.BadPatchFile">Invalid path for patch file</sys:String>
|
||||
<sys:String x:Key="Text.BadSubmodulePath">Invalid path for submodules</sys:String>
|
||||
<sys:String x:Key="Text.BadRelativePath">Invalid relative path</sys:String>
|
||||
<sys:String x:Key="Text.BadArchiveFile">Invalid path for archive file</sys:String>
|
||||
<sys:String x:Key="Text.Required">This field is required</sys:String>
|
||||
</ResourceDictionary>
|
||||
|
|
@ -128,6 +128,8 @@
|
|||
<sys:String x:Key="Text.Dashboard.Submodules">子模块列表</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Submodules.Add">添加子模块</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Submodules.Update">更新子模块</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.SubTrees">子树列表</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.SubTrees.Add">添加子树</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Resolve">解决冲突</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Continue">下一步</sys:String>
|
||||
<sys:String x:Key="Text.Dashboard.Abort">终止冲突解决</sys:String>
|
||||
|
|
@ -426,6 +428,32 @@
|
|||
<sys:String x:Key="Text.Restart.Title">系统提示</sys:String>
|
||||
<sys:String x:Key="Text.Restart.Content">本次配置变更需要在重启后生效，是否立即重启？</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.AddSubTree">添加子树</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Source">远程地址：</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Branch">分支或提交ID：</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Prefix">本地相对路径：</sys:String>
|
||||
<sys:String x:Key="Text.AddSubTree.Squash">合并提交为单一提交</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.EditSubTree">编辑子树信息</sys:String>
|
||||
<sys:String x:Key="Text.EditSubTree.Source">远程地址：</sys:String>
|
||||
<sys:String x:Key="Text.EditSubTree.Prefix">本地相对路径：</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.UnlinkSubTree">删除子树</sys:String>
|
||||
<sys:String x:Key="Text.UnlinkSubTree.Prefix">本地相对路径：</sys:String>
|
||||
<sys:String x:Key="Text.UnlinkSubTree.Tips">本操作仅将子树信息删除，相关文件及提交不会更改</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Pull">拉取子树更新</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Push">推送子树更新到远程</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Prefix">本地相对路径：</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Source">远程地址：</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Branch">远程分支：</sys:String>
|
||||
<sys:String x:Key="Text.SubTreePullOrPush.Squash">合并提交为单一提交</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.SubTree.Edit">编辑子树 ...</sys:String>
|
||||
<sys:String x:Key="Text.SubTree.Unlink">删除子树 ...</sys:String>
|
||||
<sys:String x:Key="Text.SubTree.Pull">拉取子树更新</sys:String>
|
||||
<sys:String x:Key="Text.SubTree.Push">推送子树变更</sys:String>
|
||||
|
||||
<sys:String x:Key="Text.NotConfigured">GIT尚未配置。请打开【偏好设置】配置GIT路径。</sys:String>
|
||||
<sys:String x:Key="Text.PathNotFound">路径（{0}）不存在或不可读取!</sys:String>
|
||||
<sys:String x:Key="Text.MissingBash">无法找到bash.exe，请确保其在git.exe同目录中！</sys:String>
|
||||
|
|
@ -448,6 +476,7 @@
|
|||
<sys:String x:Key="Text.DuplicatedTagName">标签名已存在!</sys:String>
|
||||
<sys:String x:Key="Text.EmptyCommitMessage">提交信息未填写!</sys:String>
|
||||
<sys:String x:Key="Text.BadPatchFile">补丁文件不存在或不可访问！</sys:String>
|
||||
<sys:String x:Key="Text.BadSubmodulePath">非法的子模块路径！</sys:String>
|
||||
<sys:String x:Key="Text.BadRelativePath">非法的子路径！</sys:String>
|
||||
<sys:String x:Key="Text.BadArchiveFile">非法的存档文件路径！</sys:String>
|
||||
<sys:String x:Key="Text.Required">内容未填写！</sys:String>
|
||||
</ResourceDictionary>
|
||||
Loading…
Add table
Add a link
Reference in a new issue