git: save repo root

When requesting to show a diff - also pass the repo root. Also save the
repo root in the file state. This means that even saved diff will work.

Author: diegoiast

src/plugins/git/GitPlugin.cpp

@@ -198,11 +198,13 @@ void GitPlugin::diffFileHandler() {
         return;
     }
     auto position = manager->getMdiServer()->getClientIndex(client);
+    repoRoot = detectRepoRoot(repoRoot);
     CommandArgs args = {
         {GlobalArguments::FileName, QString("%1.diff").arg(client->mdiClientName)},
         {GlobalArguments::Content, diff},
         {GlobalArguments::ReadOnly, true},
         {GlobalArguments::Position, position},
+        {GlobalArguments::SourceDirectory, repoRoot},
     };
     manager->handleCommandAsync(GlobalCommands::DisplayText, args);
 }
@@ -283,6 +285,7 @@ void GitPlugin::diffBranchHandler() {
         {GlobalArguments::Content, diff},
         {GlobalArguments::ReadOnly, true},
         {GlobalArguments::FoldTopLevel, true},
+        {GlobalArguments::SourceDirectory, repoRoot},
     };
     manager->handleCommandAsync(GlobalCommands::DisplayText, args);
 }
@@ -384,6 +387,7 @@ void GitPlugin::on_gitCommitClicked(const QModelIndex &mi) {
                         {GlobalArguments::FileName, displayName},
                         {GlobalArguments::Content, diff},
                         {GlobalArguments::ReadOnly, true},
+                        {GlobalArguments::SourceDirectory, getConfig().getGitLastDir()},
                     };
                     manager->handleCommandAsync(GlobalCommands::DisplayText, args);
                 });
@@ -417,6 +421,7 @@ void GitPlugin::on_gitCommitDoubleClicked(const QModelIndex &mi) {
         {GlobalArguments::Content, *fullCommit.raw},
         {GlobalArguments::ReadOnly, true},
         {GlobalArguments::FoldTopLevel, true},
+        {GlobalArguments::SourceDirectory, getConfig().getGitLastDir()},
     };
     manager->handleCommandAsync(GlobalCommands::DisplayText, args);
 }

src/plugins/texteditor/texteditor_plg.cpp

@@ -315,6 +315,7 @@ QFuture<CommandArgs> TextEditorPlugin::handleCommandAsync(const QString &command
     auto content = args[GlobalArguments::Content].toString();
     auto isReadOnly = args[GlobalArguments::ReadOnly].toBool();
     auto shouldFold = args[GlobalArguments::FoldTopLevel].toBool();
+    auto sourceDir = args[GlobalArguments::SourceDirectory].toString();
     auto ok = false;
     auto clientPosition = args[GlobalArguments::Position].toInt(&ok);
     if (!ok) {
@@ -334,7 +335,7 @@ QFuture<CommandArgs> TextEditorPlugin::handleCommandAsync(const QString &command
     editor->setHistoryModel(historyModel);
     editor->setPlainText(content);
     editor->setReadOnly(isReadOnly);
-    editor->updateInternalMappings();
+    editor->updateInternalMappings(sourceDir);
     applySettings(editor);
     mdiServer->addClient(editor, clientPosition);
     if (shouldFold) {

src/widgets/qmdieditor.cpp

@@ -505,6 +505,7 @@ qmdiClientState qmdiEditor::getState() const {
     state[StateConstants::ROW] = row;
     state[StateConstants::ZOOM] = zoom;
     state[StateConstants::READ_ONLY] = textEditor->isReadOnly();
+    state[StateConstants::BASE_DIR] = diffMetadata.baseDir;
 
     if (!uid.isEmpty()) {
         state[StateConstants::UUID] = uid;
@@ -562,6 +563,7 @@ void qmdiEditor::setState(const qmdiClientState &state) {
     if (state.contains(StateConstants::READ_ONLY)) {
         textEditor->setReadOnly(state[StateConstants::READ_ONLY].toBool());
     }
+    diffMetadata.baseDir = state[StateConstants::BASE_DIR].toString();
 }
 
 void qmdiEditor::on_client_unmerged(qmdiHost *host) {
@@ -934,9 +936,19 @@ bool qmdiEditor::eventFilter(QObject *watched, QEvent *event) {
             if (block.isValid()) {
                 auto blockNumber = block.blockNumber();
                 auto text = block.text();
-                if (patchMappings.contains(blockNumber)) {
-                    auto l = patchMappings[blockNumber];
-                    qDebug() << "Should open " << l.file << "line: " << l.newLine;
+                if (diffMetadata.mappings.contains(blockNumber)) {
+                    auto l = diffMetadata.mappings[blockNumber];
+                    auto pluginManager = dynamic_cast<PluginManager *>(mdiServer->mdiHost);
+                    if (pluginManager) {
+                        // Lines start on the editor from 0
+                        if (l.newLine >= 0) {
+                            pluginManager->openFile(l.file, l.newLine - 1);
+                        } else {
+                            pluginManager->openFile(l.file, l.oldLine - 1);
+                        }
+                    } else {
+                        qDebug() << "qmdiEditor::eventFilter - cannot open file from diff/patch";
+                    }
                 }
             }
         }
@@ -1397,7 +1409,7 @@ void qmdiEditor::loadContent(bool useBackup) {
 
     updateClientName();
     setState(savedState);
-    updateInternalMappings();
+    updateInternalMappings(savedState[StateConstants::BASE_DIR].toString());
 }
 
 void qmdiEditor::chooseHighliter(const QString &newText) {
@@ -1427,8 +1439,10 @@ void qmdiEditor::findText(const QString &text) {
     textEditor->setTextCursor(c);
 }
 
-void qmdiEditor::updateInternalMappings() {
-    patchMappings.clear();
+void qmdiEditor::updateInternalMappings(const QString& baseDir) {
+    diffMetadata.mappings.clear();
+    diffMetadata.baseDir = baseDir;
+
     if (!mdiClientName.endsWith(".diff",Qt::CaseInsensitive) && mdiClientName.endsWith(".patch", Qt::CaseInsensitive)) {
         return;
     }
@@ -1511,18 +1525,17 @@ void qmdiEditor::updateInternalMappings() {
 
         auto i = line.lineNumber();
         if (text.startsWith(' ')) {
-            patchMappings[i] = {current_file,old_line,new_line};
+            diffMetadata.mappings[i] = {baseDir + "/" + current_file,old_line,new_line};
             old_line += 1;
             new_line += 1;
         } else if (text.startsWith('-')) {
-            patchMappings[i] = {current_file,old_line,-1};
+            diffMetadata.mappings[i] = {baseDir + "/" + current_file,old_line,-1};
             old_line += 1;
         } else if (text.startsWith('+')) {
-            patchMappings[i] = {current_file,-1,new_line};
+            diffMetadata.mappings[i] = {baseDir + "/" + current_file,-1,new_line};
             new_line += 1;
         }
     }
-
 }
 
 /**

src/widgets/qmdieditor.h

@@ -121,7 +121,7 @@ class qmdiEditor : public QWidget, public qmdiClient {
     void chooseHighliter(const QString &newText);
     void chooseIndenter(const QAction *action);
     void findText(const QString &text);
-    void updateInternalMappings();
+    void updateInternalMappings(const QString &baseDir);
 
   private slots:
     void updateFileDetails();
@@ -235,6 +235,7 @@ class qmdiEditor : public QWidget, public qmdiClient {
         static constexpr const char *SEL_POSITION = "sel-position";
         static constexpr const char *UUID = "uuid";
         static constexpr const char *READ_ONLY = "read-only";
+        static constexpr const char *BASE_DIR = "basedir";
     };
 
     QString fileName;
@@ -277,14 +278,17 @@ class qmdiEditor : public QWidget, public qmdiClient {
     // and the file and offset inside it.
     QMap<int, diffLineNumber> patchMappings;
 
-    struct diffLineNumber {
-        QString file;
-        int oldLine = -1;
-        int newLine = -1;
-    };
-    // When loading a path/diff file - this maps between lines
-    // and the file and offset inside it.
-    QMap<int, diffLineNumber> patchMappings;
+    struct {
+        struct diffLineNumber {
+            QString file;
+            int oldLine = -1;
+            int newLine = -1;
+        };
+        // When loading a path/diff file - this maps between lines
+        // and the file and offset inside it.
+        QMap<int, diffLineNumber> mappings;
+        QString baseDir;
+    } diffMetadata;
 
     QTimer *autoSaveTimer = nullptr;
     QString uid;