View Issue Details

Related ChangesetsJump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0005662DarkRadiantGeneralpublic04.07.2021 11:1502.04.2022 05:55
Reportergreebo Assigned Togreebo  
PrioritynormalSeveritynormalReproducibilityhave not tried
Status closedResolutionfixed 
Product Version2.13.0 
Target Version2.13.0Fixed in Version2.13.0 
Summary0005662: Version Control Integration
DescriptionThis is a research issue to look into way of integrating VCS funcionality into DarkRadiant.
TagsNo tags attached.

Activities

There are no notes attached to this issue.

Related Changesets

DarkRadiant: vcs 318f5e20

04.07.2021 11:16

greebo


Details Diff		 0005662: Add empty plugin project Affected Issues
0005662
add - plugins/vcs/plugin.cpp Diff File
mod - tools/msvc/DarkRadiant.sln Diff File
add - tools/msvc/vcs.vcxproj Diff File
add - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 61ae4a9a

04.07.2021 11:41

greebo


Details Diff		 0005662: Add property sheet and empty module class Affected Issues
0005662
add - plugins/vcs/GitModule.cpp Diff File
add - plugins/vcs/GitModule.h Diff File
mod - plugins/vcs/plugin.cpp Diff File
add - tools/msvc/properties/libgit2.props Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs b0caa9ba

04.07.2021 13:56

greebo


Details Diff		 0005662: Set up linker options and install scripts Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
mod - tools/msvc/post_build_event.cmd Diff File
mod - tools/msvc/post_build_event_x64.cmd Diff File
mod - tools/msvc/properties/libgit2.props Diff File
mod - tools/msvc/vcs.vcxproj Diff File

DarkRadiant: vcs 60c47126

04.07.2021 14:52

greebo


Details Diff		 0005662: Try to open a repository at the mod path to see if there's a VCS repo set up Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
add - plugins/vcs/Repository.h Diff File
rm - plugins/vcs/plugin.cpp Diff
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 22375f37

04.07.2021 17:00

greebo


Details Diff		 0005662: Experimental GitFetch command added. Credential storage and retrieval needs to be more sophisticated than that. Affected Issues
0005662
mod - libs/string/encoding.h Diff File
add - plugins/vcs/CredentialManager.h Diff File
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/GitModule.h Diff File
add - plugins/vcs/Remote.h Diff File
add - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 48cf0d86

04.07.2021 17:41

greebo


Details Diff		 0005662: Getting the current branch name Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File

DarkRadiant: vcs 5f1704a5

04.07.2021 18:52

greebo


Details Diff		 0005662: Fetching the remote of the current branch is working now Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
add - plugins/vcs/Reference.h Diff File
mod - plugins/vcs/Remote.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 5fdbac64

04.07.2021 19:15

greebo


Details Diff		 0005662: Add status bar widget (empty) Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
add - plugins/vcs/ui/VcsStatus.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 5c746b56

05.07.2021 04:39

greebo


Details Diff		 0005662: Perform a fetch every other minute, PoC code Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/GitModule.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs ef045b7e

05.07.2021 04:46

greebo


Details Diff		 0005662: Extract UserInterfaceModule to allow plugins to dispatch code to the UI thread Affected Issues
0005662
add - include/iuserinterface.h Diff File
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File
mod - radiant/ui/UserInterfaceModule.cpp Diff File
mod - radiant/ui/UserInterfaceModule.h Diff File
mod - tools/msvc/include.vcxproj Diff File

DarkRadiant: vcs d28f089f

05.07.2021 19:08

greebo


Details Diff		 0005662: Add check whether the current branch is up to date with the tracked remote branch Affected Issues
0005662
rm - include/iuimanager.h Diff
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 92bc9642

06.07.2021 17:14

greebo


Details Diff		 0005662: Derive the resource/account identifier used to access the Windows CredentialManager. Affected Issues
0005662
mod - plugins/vcs/CredentialManager.h Diff File
mod - plugins/vcs/Remote.h Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File
mod - tools/msvc/post_build_event.cmd Diff File
mod - tools/msvc/post_build_event_x64.cmd Diff File

DarkRadiant: vcs 1bc2367f

09.07.2021 18:53

greebo


Details Diff		 0005662: Add preferences page Affected Issues
0005662
mod - install/user.xml Diff File
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/GitModule.h Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 7980f296

09.07.2021 19:19

greebo


Details Diff		 0005662: Move VcsStatus implementation Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
add - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs c3981246

10.07.2021 05:29

greebo


Details Diff		 0005662: Prepare checking the map file for uncommitted changes Affected Issues
0005662
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 2b9d7054

10.07.2021 06:02

greebo


Details Diff		 0005662: Working copy file modifications are detected Affected Issues
0005662
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs 4035114b

10.07.2021 08:07

greebo


Details Diff		 0005662: Check divergence of local vs tracked remote Affected Issues
0005662
mod - plugins/vcs/Reference.h Diff File
mod - plugins/vcs/Remote.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 84d88d47

10.07.2021 11:47

greebo


Details Diff		 0005662: Need to add additional flags to get the status of untracked files
(might be related to libgit2 issue 4315)		 Affected Issues
0005662
mod - plugins/vcs/Reference.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs 6d2e9001

11.07.2021 11:04

greebo


Details Diff		 0005662: Working on pre-merge analysis Affected Issues
0005662
add - plugins/vcs/Commit.h Diff File
add - plugins/vcs/Diff.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
add - plugins/vcs/Tree.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 1ec28b9a

11.07.2021 11:28

greebo


Details Diff		 0005662: The incoming remote commits are inspected to see in advance whether they can conflict with the active map Affected Issues
0005662
mod - plugins/vcs/Diff.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 5f2aeb43

11.07.2021 11:55

greebo


Details Diff		 0005662: Error handling Affected Issues
0005662
mod - plugins/vcs/Commit.h Diff File
add - plugins/vcs/GitException.h Diff File
mod - plugins/vcs/Reference.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs dab0dec3

11.07.2021 17:47

greebo


Details Diff		 0005662: Refactoring Affected Issues
0005662
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 6cbd6cb2

11.07.2021 19:01

greebo


Details Diff		 0005662: Detect whether remote changes need to be resolved against the local ones Affected Issues
0005662
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs de4ed505

11.07.2021 19:38

greebo


Details Diff		 0005662: Move status bar definition to XRC file Affected Issues
0005662
add - install/ui/vcsstatusbar.fbp Diff File
add - install/ui/vcsstatusbar.xrc Diff File
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/GitModule.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 244b1eba

15.07.2021 17:28

greebo


Details Diff		 0005662: Add some icons, and show commit count to be synced Affected Issues
0005662
add - install/bitmaps/incoming_commits.png Diff File
add - install/bitmaps/outgoing_commits.png Diff File
mod - install/ui/vcsstatusbar.fbp Diff File
mod - install/ui/vcsstatusbar.xrc Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs 28c77f8d

15.07.2021 17:43

greebo


Details Diff		 0005662: Add fly-out menu Affected Issues
0005662
mod - install/ui/vcsstatusbar.fbp Diff File
mod - install/ui/vcsstatusbar.xrc Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs abdb29e8

16.07.2021 04:34

greebo


Details Diff		 0005662: Refactoring to move algorithm out of UI classes Affected Issues
0005662
add - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 4121212a

16.07.2021 11:16

greebo


Details Diff		 0005662: More pre-merge analysis Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs f51e893a

16.07.2021 17:31

greebo


Details Diff		 0005662: Add push algorithm Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/Remote.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 496cbe95

17.07.2021 09:03

greebo


Details Diff		 0005662: Implement fast-forward to upstream. Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Reference.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs b346c5af

17.07.2021 14:49

greebo


Details Diff		 0005662: Add Index wrapper class Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Commit.h Diff File
add - plugins/vcs/Index.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 877b1a88

17.07.2021 15:17

greebo


Details Diff		 0005662: Add global version control interfaces Affected Issues
0005662
mod - include/imodule.h Diff File
add - include/iversioncontrol.h Diff File
mod - radiantcore/CMakeLists.txt Diff File
add - radiantcore/versioncontrol/VersionControlManager.cpp Diff File
add - radiantcore/versioncontrol/VersionControlManager.h Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/include.vcxproj Diff File

DarkRadiant: vcs ae463f25

17.07.2021 16:07

greebo


Details Diff		 0005662: Register the git module at startup Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/GitModule.h Diff File

DarkRadiant: vcs 8ae868e4

17.07.2021 16:27

greebo


Details Diff		 0005662: Start merge operation in case the map needs to be resolved Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Commit.h Diff File
mod - plugins/vcs/Reference.h Diff File

DarkRadiant: vcs 2b2f5a13

17.07.2021 16:44

greebo


Details Diff		 0005662: Scaffolding code to be able to load maps from VCS Affected Issues
0005662
add - libs/VersionControlLib.h Diff File
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/map/MapResourceManager.cpp Diff File
add - radiantcore/map/VcsMapResource.cpp Diff File
add - radiantcore/map/VcsMapResource.h Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/libs.vcxproj Diff File
mod - tools/msvc/libs.vcxproj.filters Diff File

DarkRadiant: vcs e21e2f11

17.07.2021 16:57

greebo


Details Diff		 0005662: More infrastructure code to request files from VCS Affected Issues
0005662
mod - libs/VersionControlLib.h Diff File
mod - radiantcore/map/VcsMapResource.cpp Diff File
mod - radiantcore/map/VcsMapResource.h Diff File

DarkRadiant: vcs f7b9da19

17.07.2021 18:29

greebo


Details Diff		 0005662: First implementation of loading maps from VCS Affected Issues
0005662
mod - include/iversioncontrol.h Diff File
add - libs/VcsMapResourceStream.h Diff File
mod - libs/VersionControlLib.h Diff File
mod - libs/stream/BufferInputStream.h Diff File
add - libs/stream/VcsMapResourceStream.h Diff File
mod - plugins/vcs/Algorithm.h Diff File
add - plugins/vcs/GitArchiveTextFile.h Diff File
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/GitModule.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/Tree.h Diff File
mod - radiantcore/map/Map.cpp Diff File
mod - radiantcore/map/VcsMapResource.cpp Diff File
mod - radiantcore/map/VcsMapResource.h Diff File
mod - tools/msvc/libs.vcxproj Diff File
mod - tools/msvc/libs.vcxproj.filters Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs a00a3476

17.07.2021 18:55

greebo


Details Diff		 0005662: Implementation fixup, VCS loading now working Affected Issues
0005662
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Tree.h Diff File

DarkRadiant: vcs 190209d7

18.07.2021 03:16

greebo


Details Diff		 0005662: EntityInspector needs to release any strong references to merge actions to not crash after aboorting the merge Affected Issues
0005662
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.h Diff File

DarkRadiant: vcs 5dacca81

18.07.2021 03:29

greebo


Details Diff		 0005662: Show the merge dialog once the map switches to merge mode Affected Issues
0005662
mod - radiant/ui/UserInterfaceModule.cpp Diff File
mod - radiant/ui/UserInterfaceModule.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - radiant/ui/merge/MergeControlDialog.h Diff File

DarkRadiant: vcs a7664797

18.07.2021 04:21

greebo


Details Diff		 0005662: Display the VCS revision in the merge dialog Affected Issues
0005662
mod - include/imapmerge.h Diff File
mod - libs/scene/merge/MergeOperation.cpp Diff File
mod - libs/scene/merge/MergeOperation.h Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.cpp Diff File
mod - libs/scene/merge/ThreeWayMergeOperation.h Diff File
mod - radiant/ui/merge/MergeControlDialog.cpp Diff File
mod - radiantcore/map/VcsMapResource.cpp Diff File
mod - radiantcore/map/VcsMapResource.h Diff File

DarkRadiant: vcs 5ac648b4

18.07.2021 04:43

greebo


Details Diff		 0005662: Detect whether a merge is already in progress Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 201fdbf1

18.07.2021 07:43

greebo


Details Diff		 0005662: More regular status updates Affected Issues
0005662
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: vcs 64bedf46

18.07.2021 12:20

greebo


Details Diff		 0005662: Add non-functional commit dialog Affected Issues
0005662
add - install/ui/vcscommitdialog.fbp Diff File
add - install/ui/vcscommitdialog.xrc Diff File
add - plugins/vcs/CommitMetadata.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
add - plugins/vcs/ui/CommitDialog.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs 7dfe9e22

18.07.2021 12:28

greebo


Details Diff		 0005662: Fill in the user name and email from git's config store Affected Issues
0005662
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs 4b9275ef

18.07.2021 14:56

greebo


Details Diff		 0005662: Committing is working now Affected Issues
0005662
mod - plugins/vcs/Commit.h Diff File
add - plugins/vcs/Index.cpp Diff File
mod - plugins/vcs/Index.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Tree.h Diff File
mod - plugins/vcs/ui/CommitDialog.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - tools/msvc/vcs.vcxproj Diff File
mod - tools/msvc/vcs.vcxproj.filters Diff File

DarkRadiant: vcs a6222a2c

18.07.2021 18:51

greebo


Details Diff		 0005662: Use Index::updateAll before committing, which should correspond to git add -u Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Index.cpp Diff File
mod - plugins/vcs/Index.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs e635e6d6

18.07.2021 19:15

greebo


Details Diff		 0005662: Fix crash during shutdown due to queued DispatchEvents that cannot be freed if their std::function targets reside in memory of unloaded modules Affected Issues
0005662
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - radiant/RadiantApp.cpp Diff File

DarkRadiant: vcs d291a24b

21.07.2021 14:14

greebo


Details Diff		 0005662: Introduce new map events to know when the user is done merging Affected Issues
0005662
mod - include/imap.h Diff File
mod - radiantcore/map/Map.cpp Diff File

DarkRadiant: vcs 81c28355

21.07.2021 16:54

greebo


Details Diff		 0005662: Work on completing the merge operation and creating the merge commit. This is not quite working yet. Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/Index.cpp Diff File
mod - plugins/vcs/Index.h Diff File
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs aba24b63

21.07.2021 17:24

greebo


Details Diff		 0005662: Creating merge commits is working now Affected Issues
0005662
mod - libs/gamelib.h Diff File
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - radiantcore/map/ArchivedMapResource.cpp Diff File
mod - radiantcore/map/MapResource.cpp Diff File
mod - radiantcore/map/MapResource.h Diff File
mod - radiantcore/map/VcsMapResource.cpp Diff File
mod - tools/msvc/vcs.vcxproj Diff File

DarkRadiant: vcs dbe535ee

21.07.2021 18:31

greebo


Details Diff		 0005662: UI tweaks Affected Issues
0005662
mod - install/ui/vcsstatusbar.fbp Diff File
mod - install/ui/vcsstatusbar.xrc Diff File
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs eea0c0b0

22.07.2021 17:00

greebo


Details Diff		 0005662: Implement git reset --hard when aborting a merge. Affected Issues
0005662
mod - plugins/vcs/Repository.cpp Diff File
mod - plugins/vcs/Repository.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs b7bcbb85

26.07.2021 05:26

greebo


Details Diff		 0005662: Adjust vcs build settings to correspond to the changes done to the winbuild repository Affected Issues
0005662
mod - plugins/vcs/ui/VcsStatus.cpp Diff File
mod - tools/msvc/DarkRadiant.sln Diff File
mod - tools/msvc/post_build_event_x64.cmd Diff File
mod - tools/msvc/properties/libgit2.props Diff File

DarkRadiant: vcs d8b55ed5

26.07.2021 05:33

greebo


Details Diff		 0005662: Fixup linux build Affected Issues
0005662
mod - radiantcore/CMakeLists.txt Diff File

DarkRadiant: vcs 5bf5d9e1

26.07.2021 05:48

greebo


Details Diff		 0005662: Adjust project dependencies Affected Issues
0005662
mod - tools/msvc/DarkRadiant.sln Diff File

DarkRadiant: vcs b8418572

26.07.2021 12:33

greebo


Details Diff		 0005662: Adjust wording Affected Issues
0005662
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: vcs aa05a800

26.07.2021 13:41

greebo


Details Diff		 0005662: Set up CMake file for vcs plugin, fix compilation in Ubuntu 20 Affected Issues
0005662
mod - CMakeLists.txt Diff File
add - plugins/vcs/CMakeLists.txt Diff File
mod - plugins/vcs/CredentialManager.h Diff File
mod - plugins/vcs/Remote.h Diff File

DarkRadiant: vcs 59cc830f

26.07.2021 13:47

greebo


Details Diff		 0005662: Update README.md Affected Issues
0005662
mod - README.md Diff File

DarkRadiant: master 29f44c98

31.07.2021 06:00

greebo


Details Diff		 0005662: Make GitFetch command update the status bar widget, forward the call Affected Issues
0005662
mod - plugins/vcs/GitModule.cpp Diff File
mod - plugins/vcs/ui/VcsStatus.h Diff File

DarkRadiant: master 23531583

31.07.2021 06:22

greebo


Details Diff		 0005662: With no local commits, and the local map being unaffected by the remote changes the strategy should be a fast-forward. Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File
mod - plugins/vcs/ui/VcsStatus.cpp Diff File

DarkRadiant: master 62711c40

08.08.2021 17:08

greebo


Details Diff		 0005662: Notify the user to reload the map after a fast-forward has been affecting the map file on disk. Affected Issues
0005662
mod - plugins/vcs/Algorithm.h Diff File

Issue History

Date Modified Username Field Change
04.07.2021 11:15 greebo New Issue
04.07.2021 11:15 greebo Status new => confirmed
04.07.2021 17:42 greebo Changeset attached => DarkRadiant vcs 318f5e20
04.07.2021 17:42 greebo Changeset attached => DarkRadiant vcs 61ae4a9a
04.07.2021 17:42 greebo Changeset attached => DarkRadiant vcs b0caa9ba
04.07.2021 17:42 greebo Changeset attached => DarkRadiant vcs 60c47126
04.07.2021 17:42 greebo Changeset attached => DarkRadiant vcs 22375f37
04.07.2021 17:42 greebo Changeset attached => DarkRadiant vcs 48cf0d86
05.07.2021 04:54 greebo Changeset attached => DarkRadiant vcs 5f1704a5
05.07.2021 04:54 greebo Changeset attached => DarkRadiant vcs 5fdbac64
05.07.2021 04:54 greebo Changeset attached => DarkRadiant vcs 5c746b56
05.07.2021 04:54 greebo Changeset attached => DarkRadiant vcs ef045b7e
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs d28f089f
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs 92bc9642
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs 1bc2367f
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs 7980f296
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs c3981246
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs 2b9d7054
10.07.2021 08:07 greebo Changeset attached => DarkRadiant vcs 4035114b
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 84d88d47
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 6d2e9001
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 1ec28b9a
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 5f2aeb43
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs dab0dec3
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 6cbd6cb2
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs de4ed505
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 244b1eba
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 28c77f8d
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs abdb29e8
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs 4121212a
16.07.2021 17:31 greebo Changeset attached => DarkRadiant vcs f51e893a
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs 496cbe95
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs b346c5af
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs 877b1a88
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs ae463f25
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs 8ae868e4
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs 2b2f5a13
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs e21e2f11
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs f7b9da19
17.07.2021 18:55 greebo Changeset attached => DarkRadiant vcs a00a3476
18.07.2021 04:45 greebo Changeset attached => DarkRadiant vcs 190209d7
18.07.2021 04:45 greebo Changeset attached => DarkRadiant vcs 5dacca81
18.07.2021 04:45 greebo Changeset attached => DarkRadiant vcs a7664797
18.07.2021 04:45 greebo Changeset attached => DarkRadiant vcs 5ac648b4
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs 201fdbf1
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs 64bedf46
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs 7dfe9e22
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs 4b9275ef
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs a6222a2c
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs e635e6d6
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs d291a24b
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs 81c28355
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs aba24b63
21.07.2021 18:31 greebo Changeset attached => DarkRadiant vcs dbe535ee
26.07.2021 05:30 greebo Changeset attached => DarkRadiant vcs eea0c0b0
26.07.2021 05:30 greebo Changeset attached => DarkRadiant vcs b7bcbb85
26.07.2021 05:33 greebo Changeset attached => DarkRadiant vcs d8b55ed5
26.07.2021 05:48 greebo Changeset attached => DarkRadiant vcs 5bf5d9e1
26.07.2021 13:48 greebo Changeset attached => DarkRadiant vcs aa05a800
26.07.2021 13:50 greebo Changeset attached => DarkRadiant vcs 59cc830f
26.07.2021 13:50 greebo Changeset attached => DarkRadiant vcs b8418572
31.07.2021 06:00 greebo Changeset attached => DarkRadiant master 29f44c98
31.07.2021 06:22 greebo Changeset attached => DarkRadiant master 23531583
08.08.2021 17:09 greebo Changeset attached => DarkRadiant master 62711c40
08.08.2021 18:02 greebo Assigned To => greebo
08.08.2021 18:02 greebo Status confirmed => assigned
08.08.2021 18:03 greebo Status assigned => resolved
08.08.2021 18:03 greebo Resolution open => fixed
08.08.2021 18:03 greebo Fixed in Version => 2.13.0
08.08.2021 18:03 greebo Target Version => 2.13.0
02.04.2022 05:55 greebo Status resolved => closed