Mercurial > hg > easyhg
changeset 237:c9a7e4ec2f78
* Try to do the right thing when completely reverting a merge (forget that the merge took place)
* When trying to clone from remote repo to existing local dir, offer to create a subdir instead
* Tidy up clone-successful notification
* Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files
| author | Chris Cannam |
|---|---|
| date | Mon, 10 Jan 2011 12:44:03 +0000 |
| parents | 960b782f0a64 |
| children | e2f2c6e3c01b |
| files | confirmcommentdialog.cpp easyhg_en.qm hgtabwidget.cpp mainwindow.cpp mainwindow.h |
| diffstat | 5 files changed, 155 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/confirmcommentdialog.cpp Sun Jan 09 10:08:42 2011 +0000 +++ b/confirmcommentdialog.cpp Mon Jan 10 12:44:03 2011 +0000 @@ -37,6 +37,7 @@ QGridLayout *layout = new QGridLayout; setLayout(layout); QLabel *label = new QLabel(introText); + label->setWordWrap(true); layout->addWidget(label, 0, 0); m_textEdit = new QTextEdit;
--- a/hgtabwidget.cpp Sun Jan 09 10:08:42 2011 +0000 +++ b/hgtabwidget.cpp Mon Jan 10 12:44:03 2011 +0000 @@ -99,23 +99,40 @@ bool HgTabWidget::canDiff() const { - if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false; - return m_fileStatusWidget->haveChangesToCommit() || - !m_fileStatusWidget->getAllUnresolvedFiles().empty(); + return canRevert(); } bool HgTabWidget::canCommit() const { - if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false; - return m_fileStatusWidget->haveChangesToCommit() && - m_fileStatusWidget->getAllUnresolvedFiles().empty(); + if (!m_fileStatusWidget->haveChangesToCommit()) return false; + if (!m_fileStatusWidget->getAllUnresolvedFiles().empty()) return false; + + QStringList addable = m_fileStatusWidget->getSelectedAddableFiles(); + if (addable.empty()) return true; + + QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles(); + + // "Removed" files are both committable and addable; don't return + // a false negative if the selection only contains these + if (committable == addable) return true; + return false; } bool HgTabWidget::canRevert() const { - if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false; - return m_fileStatusWidget->haveChangesToCommit() || - !m_fileStatusWidget->getAllUnresolvedFiles().empty(); + // Not the same as canCommit() -- we can revert (and diff) + // unresolved files, but we can't commit them + if (!m_fileStatusWidget->haveChangesToCommit() && + m_fileStatusWidget->getAllUnresolvedFiles().empty()) return false; + + // The rest of this logic is as in canCommit though + + QStringList addable = m_fileStatusWidget->getSelectedAddableFiles(); + if (addable.empty()) return true; + + QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles(); + if (committable == addable) return true; + return false; } bool HgTabWidget::canAdd() const @@ -127,8 +144,9 @@ if (!removable.empty()) return false; QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles(); + // "Removed" files are both committable and addable; don't return - // a false positive if the selection only contains these + // a false negative if the selection only contains these if (committable == addable || committable.empty()) return true; return false; }
--- a/mainwindow.cpp Sun Jan 09 10:08:42 2011 +0000 +++ b/mainwindow.cpp Mon Jan 10 12:44:03 2011 +0000 @@ -31,6 +31,7 @@ #include <QInputDialog> #include <QRegExp> #include <QShortcut> +#include <QUrl> #include "mainwindow.h" #include "multichoicedialog.h" @@ -391,10 +392,6 @@ QStringList files = hgTabs->getSelectedRemovableFiles(); - //!!! todo: confirmation dialog (with file list in it) (or do we - // need that? all it does is move the files to the removed - // list... doesn't it?) - if (!files.empty()) { params << "remove" << "--after" << "--force" << "--" << files; runner->requestAction(HgAction(ACT_REMOVE, workFolderPath, params)); @@ -411,18 +408,28 @@ } QStringList files = hgTabs->getSelectedCommittableFiles(); + QStringList allFiles = hgTabs->getAllCommittableFiles(); QStringList reportFiles = files; - if (reportFiles.empty()) reportFiles = hgTabs->getAllCommittableFiles(); + if (reportFiles.empty()) { + reportFiles = allFiles; + } + QString subsetNote; + if (reportFiles != allFiles) { + subsetNote = tr("<p><b>Note:</b> you are committing only the files you have selected, not all of the files that have been changed!"); + } + QString cf(tr("Commit files")); if (ConfirmCommentDialog::confirmAndGetLongComment (this, cf, - tr("<h3>%1</h3><p>%2").arg(cf) - .arg(tr("You are about to commit the following files:")), - tr("<h3>%1</h3><p>%2").arg(cf) - .arg(tr("You are about to commit %n file(s).", "", reportFiles.size())), + tr("<h3>%1</h3><p>%2%3").arg(cf) + .arg(tr("You are about to commit the following files.")) + .arg(subsetNote), + tr("<h3>%1</h3><p>%2%3").arg(cf) + .arg(tr("You are about to commit %n file(s).", "", reportFiles.size())) + .arg(subsetNote), reportFiles, comment, tr("Commit"))) { @@ -538,16 +545,21 @@ { QSettings settings; settings.beginGroup("Locations"); - QVariant v = settings.value("mergebinary"); - if (v != QVariant()) { - return v.toString(); // even if empty: user may have specified no external tool + if (settings.contains("mergebinary")) { + // use it even if empty: user may have specified no external tool + QVariant v = settings.value("mergebinary"); + DEBUG << "v = " << v << endl; + return v.toString(); } QString merge; QStringList bases; #ifdef Q_OS_MAC bases << "easyhg-merge-osx.sh"; #endif - bases << "meld" << "diffuse" << "kdiff3"; + // I think this is too dangerous, given command line ordering + // differences and suchlike. Need to make sure the hg + // installation is configured OK instead +// bases << "meld" << "diffuse" << "kdiff3"; bool found = false; foreach (QString base, bases) { merge = findInPath(base, m_myDirPath, true); @@ -685,44 +697,70 @@ { QStringList params; QString comment; + bool all = false; QStringList files = hgTabs->getSelectedRevertableFiles(); - if (files.empty()) files = hgTabs->getAllRevertableFiles(); + QStringList allFiles = hgTabs->getAllRevertableFiles(); + if (files.empty() || files == allFiles) { + files = allFiles; + all = true; + } + + QString subsetNote; + if (!all) { + subsetNote = tr("<p><b>Note:</b> you are reverting only the files you have selected, not all of the files that have been changed!"); + } QString rf(tr("Revert files")); - + + // Set up params before asking for confirmation, because there is + // a failure case here that we would need to report on early + + DEBUG << "hgRevert: justMerged = " << justMerged << ", mergeTargetRevision = " << mergeTargetRevision << endl; + + if (justMerged) { + + // This is a little fiddly. The proper way to "revert" the + // whole of an uncommitted merge is with "hg update --clean ." + // But if the user has selected only some files, we're sort of + // promising to revert only those, which means we need to + // specify which parent to revert to. We can only do that if + // we have a record of it, which we do if you just did the + // merge from within easyhg but don't if you've exited and + // restarted, or changed repository, since then. Hmmm. + + if (all) { + params << "update" << "--clean" << "."; + } else { + if (mergeTargetRevision != "") { + params << "revert" << "--rev" + << Changeset::hashOf(mergeTargetRevision) + << "--" << files; + } else { + QMessageBox::information + (this, tr("Unable to revert"), + tr("<qt><b>Sorry, unable to revert these files</b><br><br>EasyMercurial can only revert a subset of files during a merge if it still has a record of which parent was the original merge target; that information is no longer available.<br><br>This is a limitation of EasyMercurial. Consider reverting all files, or using hg revert with a specific revision at the command-line instead.</qt>")); + return; + } + } + } else { + params << "revert" << "--" << files; + } + if (ConfirmCommentDialog::confirmDangerousFilesAction (this, rf, - tr("<h3>%1</h3><p>%2").arg(rf) - .arg(tr("You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed:")), - tr("<h3>%1</h3><p>%2").arg(rf) - .arg(tr("You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.", "", files.size())), + tr("<h3>%1</h3><p>%2%3").arg(rf) + .arg(tr("You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.")) + .arg(subsetNote), + tr("<h3>%1</h3><p>%2%3").arg(rf) + .arg(tr("You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.", "", files.size())) + .arg(subsetNote), files, tr("Revert"))) { lastRevertedFiles = files; - if (files.empty()) { - params << "revert" << "--no-backup"; - } else { - params << "revert" << "--" << files; - } - - //!!! This is problematic. If you've got an uncommitted - //!!! merge, you can't revert it without declaring which - //!!! parent of the merge you want to revert to (reasonably - //!!! enough). We're OK if we just did the merge in easyhg a - //!!! moment ago, because we have a record of which parent was - //!!! the target -- but if you exit and restart, we've lost - //!!! that record and it doesn't appear to be possible to get - //!!! it back from Hg. Even if you just switched from one - //!!! repo to another, the record is lost. What to do? - - if (justMerged && mergeTargetRevision != "") { - params << "--rev" << mergeTargetRevision; - } - runner->requestAction(HgAction(ACT_REVERT, workFolderPath, params)); } } @@ -762,6 +800,10 @@ params << "--" << files; } + if (currentParents.size() == 1) { + mergeTargetRevision = currentParents[0]->id(); + } + runner->requestAction(HgAction(ACT_RETRY_MERGE, workFolderPath, params)); mergeCommitComment = tr("Merge"); @@ -806,6 +848,10 @@ params << "--tool" << merge; } + if (currentParents.size() == 1) { + mergeTargetRevision = currentParents[0]->id(); + } + runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params)); mergeCommitComment = ""; @@ -1126,7 +1172,7 @@ { QMessageBox::critical (this, tr("Path is in existing repository"), - tr("<qt><b>Local path is in an existing repository</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This path is already inside an existing repository.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg))); + tr("<qt><b>Local path is in an existing repository</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This path is already inside an existing repository.<br>Please provide a different folder name for the local repository.</qt>").arg(xmlEncode(arg))); return false; } @@ -1138,12 +1184,43 @@ return false; } -bool MainWindow::complainAboutCloneToExistingFolder(QString arg) +QString MainWindow::complainAboutCloneToExistingFolder(QString arg, QString remote) { + // If the directory "arg" exists but "arg" plus the last path + // component of "remote" does not, then offer the latter as an + // alternative path + + QString offer; + + QDir d(arg); + if (d.exists()) { + if (QRegExp("^\\w+://").indexIn(remote) >= 0) { + QString rpath = QUrl(remote).path(); + if (rpath != "") { + rpath = QDir(rpath).dirName(); + if (rpath != "" && !d.exists(rpath)) { + offer = d.filePath(rpath); + } + } + } + } + + if (offer != "") { + bool result = (QMessageBox::question + (this, tr("Folder exists"), + tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to \"%1\", but this folder already exists and so cannot be cloned to.<br><br>Would you like to create the new folder \"%2\" instead?</qt>") + .arg(xmlEncode(arg)).arg(xmlEncode(offer)), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel) + == QMessageBox::Ok); + if (result) return offer; + else return ""; + } + QMessageBox::critical (this, tr("Folder exists"), - tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to the local path \"%1\".<br>This is the path of an existing folder.<br>Please provide a new folder name for the local repository.</qt>").arg(xmlEncode(arg))); - return false; + tr("<qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to \"%1\", but this file or folder already exists and so cannot be cloned to.<br>Please provide a different folder name for the local repository.</qt>").arg(xmlEncode(arg))); + return ""; } bool MainWindow::askToOpenParentRepo(QString arg, QString parent) @@ -1266,8 +1343,8 @@ } if (status == FolderExists) { - //!!! we can do better than this surely? - return complainAboutCloneToExistingFolder(local); + local = complainAboutCloneToExistingFolder(local, remote); + if (local == "") return false; } workFolderPath = local; @@ -1714,7 +1791,7 @@ MultiChoiceDialog::addRecentArgument("local", workFolderPath); MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath); MultiChoiceDialog::addRecentArgument("remote", workFolderPath, true); - QMessageBox::information(this, "Clone", output); + QMessageBox::information(this, tr("Clone"), tr("<qt><h3>Clone successful</h3><pre>%1</pre>").arg(xmlEncode(output))); enableDisableActions(); shouldHgStat = true; break; @@ -2067,6 +2144,7 @@ DEBUG << "head id = " << h->id() << endl; } } + justMerged = false; } else if (currentParents.size() == 0) { if (currentHeads.size() == 0) { // No heads -> empty repo @@ -2078,6 +2156,7 @@ noWorkingCopy = true; canUpdate = true; } + justMerged = false; } else { haveMerge = true; justMerged = true;
--- a/mainwindow.h Sun Jan 09 10:08:42 2011 +0000 +++ b/mainwindow.h Mon Jan 10 12:44:03 2011 +0000 @@ -138,7 +138,7 @@ bool complainAboutInitFile(QString); bool complainAboutCloneToExisting(QString); bool complainAboutCloneToFile(QString); - bool complainAboutCloneToExistingFolder(QString); //!!! not sure about this one + QString complainAboutCloneToExistingFolder(QString local, QString remote); // returns new location, or empty string for cancel bool askToInitExisting(QString); bool askToInitNew(QString);