1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
|
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "vcsmanager.h"
#include "iversioncontrol.h"
#include "icore.h"
#include "documentmanager.h"
#include "idocument.h"
#include <coreplugin/dialogs/addtovcsdialog.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/infobar.h>
#include <utils/optional.h>
#include <utils/qtcassert.h>
#include <vcsbase/vcsbaseconstants.h>
#include <QDir>
#include <QString>
#include <QList>
#include <QMap>
#include <QFileInfo>
#include <QMessageBox>
using namespace Utils;
namespace Core {
#if defined(WITH_TESTS)
const char TEST_PREFIX[] = "/8E3A9BA0-0B97-40DF-AEC1-2BDF9FC9EDBE/";
#endif
// ---- VCSManagerPrivate:
// Maintains a cache of top-level directory->version control.
class VcsManagerPrivate
{
public:
class VcsInfo {
public:
VcsInfo() = default;
VcsInfo(IVersionControl *vc, const QString &tl) :
versionControl(vc), topLevel(tl)
{ }
bool operator == (const VcsInfo &other) const
{
return versionControl == other.versionControl && topLevel == other.topLevel;
}
IVersionControl *versionControl = nullptr;
QString topLevel;
};
Utils::optional<VcsInfo> findInCache(const QString &dir) const
{
QTC_ASSERT(QDir(dir).isAbsolute(), return Utils::nullopt);
QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return Utils::nullopt);
QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return Utils::nullopt);
const auto it = m_cachedMatches.constFind(dir);
return it == m_cachedMatches.constEnd() ? Utils::nullopt : Utils::make_optional(it.value());
}
void clearCache()
{
m_cachedMatches.clear();
}
void resetCache(const QString &dir)
{
QTC_ASSERT(QDir(dir).isAbsolute(), return);
QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return);
QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return);
const QString dirSlash = dir + QLatin1Char('/');
const QList<QString> keys = m_cachedMatches.keys();
for (const QString &key : keys) {
if (key == dir || key.startsWith(dirSlash))
m_cachedMatches.remove(key);
}
}
void cache(IVersionControl *vc, const QString &topLevel, const QString &dir)
{
QTC_ASSERT(QDir(dir).isAbsolute(), return);
QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return);
QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return);
QTC_ASSERT(dir.startsWith(topLevel + QLatin1Char('/'))
|| topLevel == dir || topLevel.isEmpty(), return);
QTC_ASSERT((topLevel.isEmpty() && !vc) || (!topLevel.isEmpty() && vc), return);
QString tmpDir = dir;
const QChar slash = QLatin1Char('/');
while (tmpDir.count() >= topLevel.count() && !tmpDir.isEmpty()) {
m_cachedMatches.insert(tmpDir, VcsInfo(vc, topLevel));
// if no vc was found, this might mean we're inside a repo internal directory (.git)
// Cache only input directory, not parents
if (!vc)
break;
const int slashPos = tmpDir.lastIndexOf(slash);
if (slashPos >= 0)
tmpDir.truncate(slashPos);
else
tmpDir.clear();
}
}
QList<IVersionControl *> m_versionControlList;
QMap<QString, VcsInfo> m_cachedMatches;
IVersionControl *m_unconfiguredVcs = nullptr;
FilePaths m_cachedAdditionalToolsPaths;
bool m_cachedAdditionalToolsPathsDirty = true;
};
static VcsManagerPrivate *d = nullptr;
static VcsManager *m_instance = nullptr;
VcsManager::VcsManager(QObject *parent) :
QObject(parent)
{
m_instance = this;
d = new VcsManagerPrivate;
}
// ---- VCSManager:
VcsManager::~VcsManager()
{
m_instance = nullptr;
delete d;
}
void VcsManager::addVersionControl(IVersionControl *vc)
{
QTC_ASSERT(!d->m_versionControlList.contains(vc), return);
d->m_versionControlList.append(vc);
}
VcsManager *VcsManager::instance()
{
return m_instance;
}
void VcsManager::extensionsInitialized()
{
// Change signal connections
const QList<IVersionControl *> vcs = versionControls();
for (IVersionControl *vc : vcs) {
connect(vc, &IVersionControl::filesChanged, DocumentManager::instance(),
[](const QStringList &fileNames) {
DocumentManager::notifyFilesChangedInternally(
FileUtils::toFilePathList(fileNames));
});
connect(vc, &IVersionControl::repositoryChanged,
m_instance, &VcsManager::repositoryChanged);
connect(vc, &IVersionControl::configurationChanged, m_instance, [vc] {
m_instance->handleConfigurationChanges(vc);
});
}
}
const QList<IVersionControl *> VcsManager::versionControls()
{
return d->m_versionControlList;
}
IVersionControl *VcsManager::versionControl(Id id)
{
return Utils::findOrDefault(versionControls(), Utils::equal(&Core::IVersionControl::id, id));
}
static QString absoluteWithNoTrailingSlash(const QString &directory)
{
QString res = QDir(directory).absolutePath();
if (res.endsWith(QLatin1Char('/')))
res.chop(1);
return res;
}
void VcsManager::resetVersionControlForDirectory(const FilePath &inputDirectory)
{
if (inputDirectory.isEmpty())
return;
const QString directory = absoluteWithNoTrailingSlash(inputDirectory.toString());
d->resetCache(directory);
emit m_instance->repositoryChanged(FilePath::fromString(directory));
}
IVersionControl* VcsManager::findVersionControlForDirectory(const FilePath &inputDirectory,
QString *topLevelDirectory)
{
using StringVersionControlPair = QPair<QString, IVersionControl *>;
using StringVersionControlPairs = QList<StringVersionControlPair>;
if (inputDirectory.isEmpty()) {
if (topLevelDirectory)
topLevelDirectory->clear();
return nullptr;
}
// Make sure we an absolute path:
QString directory = absoluteWithNoTrailingSlash(inputDirectory.toString());
#ifdef WITH_TESTS
if (directory[0].isLetter() && directory.indexOf(QLatin1Char(':') + QLatin1String(TEST_PREFIX)) == 1)
directory = directory.mid(2);
#endif
auto cachedData = d->findInCache(directory);
if (cachedData) {
if (topLevelDirectory)
*topLevelDirectory = cachedData->topLevel;
return cachedData->versionControl;
}
// Nothing: ask the IVersionControls directly.
StringVersionControlPairs allThatCanManage;
const QList<IVersionControl *> versionControlList = versionControls();
for (IVersionControl *versionControl : versionControlList) {
FilePath topLevel;
if (versionControl->managesDirectory(FilePath::fromString(directory), &topLevel))
allThatCanManage.push_back(StringVersionControlPair(topLevel.toString(), versionControl));
}
// To properly find a nested repository (say, git checkout inside SVN),
// we need to select the version control with the longest toplevel pathname.
Utils::sort(allThatCanManage, [](const StringVersionControlPair &l,
const StringVersionControlPair &r) {
return l.first.size() > r.first.size();
});
if (allThatCanManage.isEmpty()) {
d->cache(nullptr, QString(), directory); // register that nothing was found!
// report result;
if (topLevelDirectory)
topLevelDirectory->clear();
return nullptr;
}
// Register Vcs(s) with the cache
QString tmpDir = absoluteWithNoTrailingSlash(directory);
#if defined WITH_TESTS
// Force caching of test directories (even though they do not exist):
if (directory.startsWith(QLatin1String(TEST_PREFIX)))
tmpDir = directory;
#endif
// directory might refer to a historical directory which doesn't exist.
// In this case, don't cache it.
if (!tmpDir.isEmpty()) {
const QChar slash = QLatin1Char('/');
const StringVersionControlPairs::const_iterator cend = allThatCanManage.constEnd();
for (StringVersionControlPairs::const_iterator i = allThatCanManage.constBegin(); i != cend; ++i) {
// If topLevel was already cached for another VC, skip this one
if (tmpDir.count() < i->first.count())
continue;
d->cache(i->second, i->first, tmpDir);
tmpDir = i->first;
const int slashPos = tmpDir.lastIndexOf(slash);
if (slashPos >= 0)
tmpDir.truncate(slashPos);
}
}
// return result
if (topLevelDirectory)
*topLevelDirectory = allThatCanManage.first().first;
IVersionControl *versionControl = allThatCanManage.first().second;
const bool isVcsConfigured = versionControl->isConfigured();
if (!isVcsConfigured || d->m_unconfiguredVcs) {
Id vcsWarning("VcsNotConfiguredWarning");
IDocument *curDocument = EditorManager::currentDocument();
if (isVcsConfigured) {
if (curDocument && d->m_unconfiguredVcs == versionControl) {
curDocument->infoBar()->removeInfo(vcsWarning);
d->m_unconfiguredVcs = nullptr;
}
return versionControl;
} else {
Utils::InfoBar *infoBar = curDocument ? curDocument->infoBar() : nullptr;
if (infoBar && infoBar->canInfoBeAdded(vcsWarning)) {
Utils::InfoBarEntry info(vcsWarning,
tr("%1 repository was detected but %1 is not configured.")
.arg(versionControl->displayName()),
Utils::InfoBarEntry::GlobalSuppression::Enabled);
d->m_unconfiguredVcs = versionControl;
info.addCustomButton(ICore::msgShowOptionsDialog(), []() {
QTC_ASSERT(d->m_unconfiguredVcs, return);
ICore::showOptionsDialog(d->m_unconfiguredVcs->id());
});
infoBar->addInfo(info);
}
return nullptr;
}
}
return versionControl;
}
FilePath VcsManager::findTopLevelForDirectory(const FilePath &directory)
{
QString result;
findVersionControlForDirectory(directory, &result);
return FilePath::fromString(result);
}
QStringList VcsManager::repositories(const IVersionControl *vc)
{
QStringList result;
for (auto it = d->m_cachedMatches.constBegin(); it != d->m_cachedMatches.constEnd(); ++it) {
if (it.value().versionControl == vc)
result.append(it.value().topLevel);
}
return result;
}
bool VcsManager::promptToDelete(IVersionControl *versionControl, const QString &fileName)
{
return promptToDelete(versionControl, {Utils::FilePath::fromString(fileName)}).isEmpty();
}
FilePaths VcsManager::promptToDelete(const FilePaths &filePaths)
{
// Categorize files by their parent directory, so we won't call
// findVersionControlForDirectory() more often than necessary.
QMap<FilePath, FilePaths> filesByParentDir;
for (const FilePath &fp : filePaths)
filesByParentDir[fp.absolutePath()].append(fp);
// Categorize by version control system.
QHash<IVersionControl *, FilePaths> filesByVersionControl;
for (auto it = filesByParentDir.cbegin(); it != filesByParentDir.cend(); ++it) {
IVersionControl * const vc = findVersionControlForDirectory(it.key());
if (vc)
filesByVersionControl[vc] << it.value();
}
// Remove the files.
FilePaths failedFiles;
for (auto it = filesByVersionControl.cbegin(); it != filesByVersionControl.cend(); ++it)
failedFiles << promptToDelete(it.key(), it.value());
return failedFiles;
}
FilePaths VcsManager::promptToDelete(IVersionControl *vc, const FilePaths &filePaths)
{
QTC_ASSERT(vc, return {});
if (!vc->supportsOperation(IVersionControl::DeleteOperation))
return {};
const QString fileListForUi = "<ul><li>" + transform(filePaths, [](const FilePath &fp) {
return fp.toUserOutput();
}).join("</li><li>") + "</li></ul>";
const QString title = tr("Version Control");
const QString msg = tr("Remove the following files from the version control system (%2)?"
"%1Note: This might remove the local file.").arg(fileListForUi, vc->displayName());
const QMessageBox::StandardButton button =
QMessageBox::question(ICore::dialogParent(), title, msg, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if (button != QMessageBox::Yes)
return {};
FilePaths failedFiles;
for (const FilePath &fp : filePaths) {
if (!vc->vcsDelete(fp))
failedFiles << fp;
}
return failedFiles;
}
QString VcsManager::msgAddToVcsTitle()
{
return tr("Add to Version Control");
}
QString VcsManager::msgPromptToAddToVcs(const QStringList &files, const IVersionControl *vc)
{
return files.size() == 1
? tr("Add the file\n%1\nto version control (%2)?")
.arg(files.front(), vc->displayName())
: tr("Add the files\n%1\nto version control (%2)?")
.arg(files.join(QString(QLatin1Char('\n'))), vc->displayName());
}
QString VcsManager::msgAddToVcsFailedTitle()
{
return tr("Adding to Version Control Failed");
}
QString VcsManager::msgToAddToVcsFailed(const QStringList &files, const IVersionControl *vc)
{
return files.size() == 1
? tr("Could not add the file\n%1\nto version control (%2)\n")
.arg(files.front(), vc->displayName())
: tr("Could not add the following files to version control (%1)\n%2")
.arg(vc->displayName(), files.join(QString(QLatin1Char('\n'))));
}
FilePaths VcsManager::additionalToolsPath()
{
if (d->m_cachedAdditionalToolsPathsDirty) {
d->m_cachedAdditionalToolsPaths.clear();
for (IVersionControl *vc : versionControls())
d->m_cachedAdditionalToolsPaths.append(vc->additionalToolsPath());
d->m_cachedAdditionalToolsPathsDirty = false;
}
return d->m_cachedAdditionalToolsPaths;
}
void VcsManager::promptToAdd(const FilePath &directory, const FilePaths &filePaths)
{
IVersionControl *vc = findVersionControlForDirectory(directory);
if (!vc || !vc->supportsOperation(IVersionControl::AddOperation))
return;
const FilePaths unmanagedFiles = vc->unmanagedFiles(filePaths);
if (unmanagedFiles.isEmpty())
return;
Internal::AddToVcsDialog dlg(ICore::dialogParent(), VcsManager::msgAddToVcsTitle(),
unmanagedFiles, vc->displayName());
if (dlg.exec() == QDialog::Accepted) {
QStringList notAddedToVc;
for (const FilePath &file : unmanagedFiles) {
if (!vc->vcsAdd(directory.resolvePath(file)))
notAddedToVc << file.toUserOutput();
}
if (!notAddedToVc.isEmpty()) {
QMessageBox::warning(ICore::dialogParent(),
VcsManager::msgAddToVcsFailedTitle(),
VcsManager::msgToAddToVcsFailed(notAddedToVc, vc));
}
}
}
void VcsManager::emitRepositoryChanged(const FilePath &repository)
{
emit m_instance->repositoryChanged(repository);
}
void VcsManager::clearVersionControlCache()
{
const QStringList repoList = d->m_cachedMatches.keys();
d->clearCache();
for (const QString &repo : repoList)
emit m_instance->repositoryChanged(FilePath::fromString(repo));
}
void VcsManager::handleConfigurationChanges(IVersionControl *vc)
{
d->m_cachedAdditionalToolsPathsDirty = true;
emit configurationChanged(vc);
}
} // namespace Core
#if defined(WITH_TESTS)
#include <QtTest>
#include "coreplugin.h"
#include <extensionsystem/pluginmanager.h>
namespace Core {
namespace Internal {
const char ID_VCS_A[] = "A";
const char ID_VCS_B[] = "B";
using FileHash = QHash<FilePath, FilePath>;
static FileHash makeHash(const QStringList &list)
{
FileHash result;
for (const QString &i : list) {
QStringList parts = i.split(QLatin1Char(':'));
QTC_ASSERT(parts.count() == 2, continue);
result.insert(FilePath::fromString(QString::fromLatin1(TEST_PREFIX) + parts.at(0)),
FilePath::fromString(QString::fromLatin1(TEST_PREFIX) + parts.at(1)));
}
return result;
}
static QString makeString(const QString &s)
{
if (s.isEmpty())
return QString();
return QString::fromLatin1(TEST_PREFIX) + s;
}
void CorePlugin::testVcsManager_data()
{
// avoid conflicts with real files and directories:
QTest::addColumn<QStringList>("dirsVcsA"); // <directory>:<toplevel>
QTest::addColumn<QStringList>("dirsVcsB"); // <directory>:<toplevel>
// <directory>:<toplevel>:<vcsid>:<- from cache, * from VCS>
QTest::addColumn<QStringList>("results");
QTest::newRow("A and B next to each other")
<< QStringList({"a:a", "a/1:a", "a/2:a", "a/2/5:a", "a/2/5/6:a"})
<< QStringList({"b:b", "b/3:b", "b/4:b"})
<< QStringList({":::-", // empty directory to look up
"c:::*", // Neither in A nor B
"a:a:A:*", // in A
"b:b:B:*", // in B
"b/3:b:B:*", // in B
"b/4:b:B:*", // in B
"a/1:a:A:*", // in A
"a/2:a:A:*", // in A
":::-", // empty directory to look up
"a/2/5/6:a:A:*", // in A
"a/2/5:a:A:-", // in A (cached from before!)
// repeat: These need to come from the cache now:
"c:::-", // Neither in A nor B
"a:a:A:-", // in A
"b:b:B:-", // in B
"b/3:b:B:-", // in B
"b/4:b:B:-", // in B
"a/1:a:A:-", // in A
"a/2:a:A:-", // in A
"a/2/5/6:a:A:-", // in A
"a/2/5:a:A:-" // in A
});
QTest::newRow("B in A")
<< QStringList({"a:a", "a/1:a", "a/2:a", "a/2/5:a", "a/2/5/6:a"})
<< QStringList({"a/1/b:a/1/b", "a/1/b/3:a/1/b", "a/1/b/4:a/1/b", "a/1/b/3/5:a/1/b",
"a/1/b/3/5/6:a/1/b"})
<< QStringList({"a:a:A:*", // in A
"c:::*", // Neither in A nor B
"a/3:::*", // Neither in A nor B
"a/1/b/x:::*", // Neither in A nor B
"a/1/b:a/1/b:B:*", // in B
"a/1:a:A:*", // in A
"a/1/b/../../2:a:A:*" // in A
});
QTest::newRow("A and B") // first one wins...
<< QStringList({"a:a", "a/1:a", "a/2:a"})
<< QStringList({"a:a", "a/1:a", "a/2:a"})
<< QStringList({"a/2:a:A:*"});
}
void CorePlugin::testVcsManager()
{
// setup:
QList<IVersionControl *> orig = Core::d->m_versionControlList;
TestVersionControl *vcsA(new TestVersionControl(ID_VCS_A, QLatin1String("A")));
TestVersionControl *vcsB(new TestVersionControl(ID_VCS_B, QLatin1String("B")));
Core::d->m_versionControlList = {vcsA, vcsB};
// test:
QFETCH(QStringList, dirsVcsA);
QFETCH(QStringList, dirsVcsB);
QFETCH(QStringList, results);
vcsA->setManagedDirectories(makeHash(dirsVcsA));
vcsB->setManagedDirectories(makeHash(dirsVcsB));
QString realTopLevel = QLatin1String("ABC"); // Make sure this gets cleared if needed.
// From VCSes:
int expectedCount = 0;
for (const QString &result : qAsConst(results)) {
// qDebug() << "Expecting:" << result;
QStringList split = result.split(QLatin1Char(':'));
QCOMPARE(split.count(), 4);
QVERIFY(split.at(3) == QLatin1String("*") || split.at(3) == QLatin1String("-"));
const QString directory = split.at(0);
const QString topLevel = split.at(1);
const QString vcsId = split.at(2);
bool fromCache = split.at(3) == QLatin1String("-");
if (!fromCache && !directory.isEmpty())
++expectedCount;
IVersionControl *vcs;
vcs = VcsManager::findVersionControlForDirectory(
FilePath::fromString(makeString(directory)), &realTopLevel);
QCOMPARE(realTopLevel, makeString(topLevel));
if (vcs)
QCOMPARE(vcs->id().toString(), vcsId);
else
QCOMPARE(QString(), vcsId);
QCOMPARE(vcsA->dirCount(), expectedCount);
QCOMPARE(vcsA->fileCount(), 0);
QCOMPARE(vcsB->dirCount(), expectedCount);
QCOMPARE(vcsB->fileCount(), 0);
}
// teardown:
qDeleteAll(Core::d->m_versionControlList);
Core::d->m_versionControlList = orig;
}
} // namespace Internal
} // namespace Core
#endif
|