diff options
author | dt <[email protected]> | 2010-05-11 14:13:38 +0200 |
---|---|---|
committer | dt <[email protected]> | 2010-05-12 14:14:44 +0200 |
commit | 9bc9fe73e160f9ef87979a3cf5f1276b5f1ae0cf (patch) | |
tree | 1384611d81dcba7bfc2b25f02409322603e6931e /src/plugins/git/gitclient.cpp | |
parent | e65e011706915a90e98ee67046a150ade84757e6 (diff) |
File renaming
Reviewed-By: con
Reviewed-By: Friedemann Kleint
We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.
Note: Only the qt4projectmanager knows how to rename files.
Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.
Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r-- | src/plugins/git/gitclient.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 242e42db45a..8984813632c 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -525,6 +525,27 @@ bool GitClient::synchronousDelete(const QString &workingDirectory, return rc; } +bool GitClient::synchronousMove(const QString &workingDirectory, + const QString &from, + const QString &to) +{ + if (Git::Constants::debug) + qDebug() << Q_FUNC_INFO << workingDirectory << from << to; + QByteArray outputText; + QByteArray errorText; + QStringList arguments; + arguments << QLatin1String("mv"); + arguments << (from); + arguments << (to); + const bool rc = synchronousGit(workingDirectory, arguments, &outputText, &errorText); + if (!rc) { + const QString errorMessage = tr("Unable to move from %1 to %2: %3"). + arg(from, to, commandOutputFromLocal8Bit(errorText)); + outputWindow()->appendError(errorMessage); + } + return rc; +} + bool GitClient::synchronousReset(const QString &workingDirectory, const QStringList &files, QString *errorMessage) |