Differential D4981 Diff 18427 vcs/dvcs/ui/branchmanager.cpp

Changeset View

Standalone View

View Options

vcs/dvcs/ui/branchmanager.cpp

Show First 20 Lines • Show All 188 Lines • ▼ Show 20 Line(s)186 } else {
189 close(); 189​ close();
190 } 190​ }
191 } else { 191​ } else {
192 KMessageBox::messageBox(this, KMessageBox::Error, 192​ KMessageBox::messageBox(this, KMessageBox::Error,
193 i18n("You must select a branch to merge into current one from the list.")); 193​ i18n("You must select a branch to merge into current one from the list."));
194 } 194​ }
195} 195​}
196 196​
197​// adapted from VCSStandardDiffUpdater
198​class VCSBranchDiffUpdater : public VCSDiffUpdater {
199​public:
200​ VCSBranchDiffUpdater(const QString& repo, const QString& src, KDevelop::DistributedVersionControlPlugin* vcs);
201​ ~VCSBranchDiffUpdater() override;
202​ KDevelop::VcsDiff update() const override;
203​ KDevelop::IBasicVersionControl* vcs() const override { return m_vcs; }
204​ QUrl url() const override { return QUrl::fromLocalFile(m_repository); }
205​private:
206​ const QString m_repository;
207​ const QString m_src;
208​ KDevelop::DistributedVersionControlPlugin* m_vcs;
209​};
210​
211​VCSBranchDiffUpdater::VCSBranchDiffUpdater(const QString& repo, const QString& src,
212​ KDevelop::DistributedVersionControlPlugin* vcs)
213​ : m_repository(repo)
214​ , m_src(src)
215​ , m_vcs(vcs)
216​{
217​}
218​
219​VCSBranchDiffUpdater::~VCSBranchDiffUpdater() {
220​}
221​
222​VcsDiff VCSBranchDiffUpdater::update() const
223​{
224​ m_vcs->setDiffContextLines(m_contextLines);
225​
226​ VcsRevision srcRev;
227​ srcRev.setRevisionValue(m_src, KDevelop::VcsRevision::GlobalNumber);
228​ // see comment in BranchManager::diffFromBranch()
229​ const auto destRev = VcsRevision::createSpecialRevision(KDevelop::VcsRevision::Working);
230​ QScopedPointer<VcsJob> diffJob(m_vcs->diff(QUrl::fromLocalFile(m_repository), srcRev, destRev));
231​ const bool success = diffJob ? diffJob->exec() : false;
232​ if (!success) {
233​ KMessageBox::error(nullptr, i18n("Could not create a patch for the current version."));
234​ return {};
235​ }
236​
237​ return diffJob->fetchResults().value<VcsDiff>();
238​}
239​
197void BranchManager::diffFromBranch() 240​void BranchManager::diffFromBranch()
198{ 241​{
199 const auto dest = m_model->currentBranch(); 242​ const auto dest = m_model->currentBranch();
200 const auto src = m_ui->branchView->currentIndex().data().toString(); 243​ const auto src = m_ui->branchView->currentIndex().data().toString();
201 if (src == dest) { 244​ if (src == dest) {
202 KMessageBox::messageBox(this, KMessageBox::Information, i18n("Already on branch \"%1\"\n", src)); 245​ KMessageBox::messageBox(this, KMessageBox::Information, i18n("Already on branch \"%1\"\n", src));
203 return; 246​ return;
204 } 247​ }
Show All 24 Lines262{
229 auto diff = vcsjob->fetchResults().value<KDevelop::VcsDiff>(); 272​ auto diff = vcsjob->fetchResults().value<KDevelop::VcsDiff>();
230 if(diff.isEmpty()){ 273​ if(diff.isEmpty()){
231 KMessageBox::information(ICore::self()->uiController()->activeMainWindow(), 274​ KMessageBox::information(ICore::self()->uiController()->activeMainWindow(),
232 i18n("There are no committed differences."), 275​ i18n("There are no committed differences."),
233 i18n("VCS support")); 276​ i18n("VCS support"));
234 return; 277​ return;
235 } 278​ }
236 279​
237 auto patch = new VCSDiffPatchSource(diff); 280​// auto patch = new VCSDiffPatchSource(diff);
281​ auto patch = new VCSDiffPatchSource(new VCSBranchDiffUpdater(m_repository,
282​ m_ui->branchView->currentIndex().data().toString(), m_dvcPlugin));
238 showVcsDiff(patch); 283​ showVcsDiff(patch);
239 close(); 284​ close();
240} 285​}