VCS: Minor optimization in relative file resolving

Change-Id: Idc7349ef7066cdc3888d0b0cfabf6b4390b8659a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Orgad Shaneh
2022-10-13 22:43:30 +03:00
committed by Orgad Shaneh
parent 424fd7c557
commit e757122843

View File

@@ -372,7 +372,7 @@ FilePath VcsBasePluginState::currentFileDirectory() const
QString VcsBasePluginState::relativeCurrentFile() const QString VcsBasePluginState::relativeCurrentFile() const
{ {
QTC_ASSERT(hasFile(), return {}); QTC_ASSERT(hasFile(), return {});
return data->m_state.currentFile.relativePath(data->m_state.currentFileTopLevel).toString(); return data->m_state.currentFile.relativeChildPath(data->m_state.currentFileTopLevel).toString();
} }
QString VcsBasePluginState::currentPatchFile() const QString VcsBasePluginState::currentPatchFile() const
@@ -403,9 +403,7 @@ FilePath VcsBasePluginState::currentProjectTopLevel() const
QString VcsBasePluginState::relativeCurrentProject() const QString VcsBasePluginState::relativeCurrentProject() const
{ {
QTC_ASSERT(hasProject(), return QString()); QTC_ASSERT(hasProject(), return QString());
if (data->m_state.currentProjectTopLevel == data->m_state.currentProjectPath) return data->m_state.currentProjectPath.relativeChildPath(data->m_state.currentProjectTopLevel).toString();
return {};
return data->m_state.currentProjectPath.relativePath(data->m_state.currentProjectTopLevel).toString();
} }
bool VcsBasePluginState::hasTopLevel() const bool VcsBasePluginState::hasTopLevel() const