View Issue Details

IDProjectCategoryView StatusLast Update
00308882.x IDE BugsSource ControlPublic2019-05-24 12:27
ReporterDanAssigned ToSteven Campbell 
PriorityLowSeverityC - GeneralReproducibility100%
Status ClosedResolutionFixed 
Platform-OSWindows 10OS VersionPro x64
Product Version2.2.2 
Target Version2.2.3Fixed in Version2.2.3 
Summary0030888: Source Control: Need to wrap the paths to merge and diff tool options in quotes, otherwise paths with spaces cause issues
DescriptionBy default, the tool options values for both the merge and diff tools do not include quotes around the input variables. This causes issue if any folder along the way in the repo path has a space in the name, as that is interpreted as an argument delimiter.

Note that the exact strings used for these two options values differ depending on which tools you tell GMS2 to use, so we need to change all of our hardcoded defaults accordingly.

For example, TortoiseGit gives: /base:${scm_base} /theirs:${scm_theirs} /mine:${scm_mine} /merged:${scm_merged}
when the expected would be : /base:"${scm_base}" /theirs:"${scm_theirs}" /mine:"${scm_mine}" /merged:"${scm_merged}"
Steps To Reproduce1. Set the diff/merge tool Preferences to suitable external tools - kdiff3, meld, notepad, tortoisemerge/tortoisegitmerge or diffmerge
2. See the default string GMS2 adds (note that for some of these, GMS2 does not add a default value for the diff tool's options
2. Observe that for none of our default strings do we wrap the macros in " ".
Repro: 100%
TagsNo tags attached.
2.x IDE Found In2.2.2.413
2.x Runtime Found In2.2.2.326
2.x IDE Verified In2.2.3.417
2.x Runtime Verified In2.2.3.332

Activities

Steven Campbell

2019-05-21 10:13

Manager   ~0063953

Fixed in Red IDE/GitHub Pull Request 4637
Git Id: 830f822c5b6d61758599f9ac26c7ea4b7306fc40