Unnamed: 0 int64 0 305k | body stringlengths 7 52.9k | name stringlengths 1 185 |
|---|---|---|
67,700 | void (JTable table, Object value, boolean selected) { myPanel.removeAll(); myPanel.setBackground(null); myRenderer.clear(); myRenderer.setBackground(null); // 7-8, a hack if (value instanceof SvnChangeList changeList) { myRenderer.renderChangeList(table, changeList); final Color bg = selected ? UIUtil.getTableSelection... | customizeCellRenderer |
67,701 | Component ( JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column ) { customizeCellRenderer(table, value, isSelected); return myPanel; } | getTableCellRendererComponent |
67,702 | SvnChangeList (SvnChangeList changeList) { return changeList; } | valueOf |
67,703 | void () { ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator(); if (indicator != null) { indicator.setIndeterminate(true); indicator.setText(message("action.Subversion.integrate.changes.progress.integrating.text")); } } | indicatorOnStart |
67,704 | void (@NotNull final ProgressIndicator indicator) { myHandler.setProgressIndicator(ProgressManager.getInstance().getProgressIndicator()); myResolveWorker = new ResolveWorker(myInfo.isUnderProjectRoot(), myProject); if (myProject != null) { StoreReloadManager.Companion.getInstance(myProject).blockReloadingProjectOnExter... | run |
67,705 | VcsException (boolean isWarning, @Nls @Nullable String @NotNull ... messages) { Collection<String> notEmptyMessages = ContainerUtil.mapNotNull(messages, message -> StringUtil.nullize(message, true)); return new VcsException(notEmptyMessages).setIsWarning(isWarning); } | createException |
67,706 | void () { myHandler.startUpdate(); try { myMerger.mergeNext(); } catch (VcsException e) { myExceptions.add(createException(false, e.getMessage(), myMerger.getInfo(), myMerger.getSkipped())); } finally { myHandler.finishUpdate(); } } | doMerge |
67,707 | void () { onTaskFinished(true); } | onCancel |
67,708 | void () { onTaskFinished(false); } | onSuccess |
67,709 | void (boolean wasCancelled) { TransactionGuard.submitTransaction(getProject(), () -> { try { afterExecution(wasCancelled); } finally { if (myProject != null) { StoreReloadManager.Companion.getInstance(myProject).unblockReloadingProjectOnExternalChanges(); } } }); } | onTaskFinished |
67,710 | void () { myAccumulatedFiles.accumulateFiles(myRecentlyUpdatedFiles, UpdatedFilesReverseSide.DuplicateLevel.DUPLICATE_ERRORS); } | accumulate |
67,711 | void (final boolean wasCanceled) { if (! myRecentlyUpdatedFiles.isEmpty()) { myResolveWorker.execute(myRecentlyUpdatedFiles); } final boolean haveConflicts = ResolveWorker.haveUnresolvedConflicts(myRecentlyUpdatedFiles); accumulate(); if ((!myMerger.hasNext()) || haveConflicts || (!myExceptions.isEmpty()) || myAccumula... | afterExecution |
67,712 | void (final boolean wasCanceled) { if (! wasCanceled) { if (! ApplicationManager.getApplication().isUnitTestMode() && (! myDryRun) && (myExceptions.isEmpty()) && (! myAccumulatedFiles.containErrors()) && ((! myAccumulatedFiles.isEmpty()) || (myMergeTarget != null))) { if (myInfo.isUnderProjectRoot()) { showLocalCommit(... | finishActions |
67,713 | void () { // todo unite into one window?? if (!myAccumulatedFiles.isEmpty()) { showUpdateTree(); } if (! myExceptions.isEmpty()) { AbstractVcsHelper.getInstance(myProject).showErrors(myExceptions, VcsBundle.message("message.title.vcs.update.errors", myExceptions.size())); } } | prepareAndShowResults |
67,714 | void () { RestoreUpdateTree restoreUpdateTree = RestoreUpdateTree.getInstance(getProject()); // action info is actually NOT used restoreUpdateTree.registerUpdateInformation(myAccumulatedFiles.getUpdatedFiles(), INTEGRATE); UpdateInfoTree tree = myProjectLevelVcsManager.showUpdateProjectInfo(myAccumulatedFiles.getUpdate... | showUpdateTree |
67,715 | void () { ApplicationManager.getApplication().invokeLater(() -> ProgressManager.getInstance().run(this)); } | stepToNextChangeList |
67,716 | void () { final File mergeInfoHolder = myMerger.getMergeInfoHolder(); if (mergeInfoHolder != null) { final Status svnStatus = SvnUtil.getStatus(myVcs, mergeInfoHolder); if (svnStatus != null && svnStatus.isProperty(StatusType.STATUS_MODIFIED)) { myMergeTarget = VcsUtil.getFilePath(mergeInfoHolder); } } } | initMergeTarget |
67,717 | void () { final Collection<FilePath> files = gatherChangedPaths(); // for changes to be detected, we need switch to background change list manager update thread and back to dispatch thread // so callback is used; ok to be called after VCS update markup closed: no remote operations VcsDirtyScopeManager.getInstance(getPr... | showLocalCommit |
67,718 | Collection<FilePath> () { final Collection<FilePath> result = new ArrayList<>(); UpdateFilesHelper.iterateFileGroupFiles(myAccumulatedFiles.getUpdatedFiles(), (filePath, groupId) -> result.add(VcsUtil.getFilePath(new File(filePath)))); ContainerUtil.addIfNotNull(result, myMergeTarget); return result; } | gatherChangedPaths |
67,719 | void () { final AlienDirtyScope dirtyScope = new AlienDirtyScope(myVcs); if (myMergeTarget != null) { dirtyScope.addDir(myMergeTarget); } else { UpdateFilesHelper.iterateFileGroupFiles(myAccumulatedFiles.getUpdatedFiles(), (filePath, groupId) -> dirtyScope.addFile(VcsUtil.getFilePath(new File(filePath)))); } showAlienC... | showAlienCommit |
67,720 | void (@NotNull final AlienDirtyScope dirtyScope) { new Task.Backgroundable(myVcs.getProject(), message("action.Subversion.integrate.changes.collecting.changes.to.commit.task.title")) { private final GatheringChangelistBuilder changesBuilder = new GatheringChangelistBuilder(myVcs, myAccumulatedFiles); private final Ref<... | showAlienCommit |
67,721 | void (@NotNull ProgressIndicator indicator) { indicator.setIndeterminate(true); if (!myVcs.getProject().isDisposed()) { try { new SvnChangeProvider(myVcs).getChanges(dirtyScope, changesBuilder, indicator, new FakeGate()); } catch (VcsException e) { caughtError.set(message("action.Subversion.integrate.changes.error.unab... | run |
67,722 | void () { if (!caughtError.isNull()) { VcsBalloonProblemNotifier.showOverVersionControlView(myVcs.getProject(), caughtError.get(), MessageType.ERROR); } else if (!changesBuilder.getChanges().isEmpty()) { AlienCommitWorkflow workflow = new AlienCommitWorkflow(myVcs, myMerger.getComment(), changesBuilder.getChanges(), my... | onSuccess |
67,723 | List<LocalChangeList> () { throw new UnsupportedOperationException(); } | getListsCopy |
67,724 | LocalChangeList (String name) { throw new UnsupportedOperationException(); } | findChangeList |
67,725 | LocalChangeList (@NotNull String name, String comment) { throw new UnsupportedOperationException(); } | addChangeList |
67,726 | LocalChangeList (@NotNull String name, String comment) { throw new UnsupportedOperationException(); } | findOrCreateList |
67,727 | void (@NotNull String name, String comment) { throw new UnsupportedOperationException(); } | editComment |
67,728 | void (@NotNull String oldName, @NotNull String newName) { throw new UnsupportedOperationException(); } | editName |
67,729 | void (@NotNull Collection<String> names) { throw new UnsupportedOperationException(); } | setListsToDisappear |
67,730 | FileStatus (@NotNull VirtualFile file) { throw new UnsupportedOperationException(); } | getStatus |
67,731 | FileStatus (@NotNull FilePath filePath) { throw new UnsupportedOperationException(); } | getStatus |
67,732 | void (@NotNull String list) { throw new UnsupportedOperationException(); } | setDefaultChangeList |
67,733 | ActionListener (@NotNull QuickMergeContentsVariants variant) { return e -> { myVariant = variant; close(); }; } | setCodeAndClose |
67,734 | void () { myWrapper.close(DialogWrapper.OK_EXIT_CODE); } | close |
67,735 | void (DialogWrapper wrapper) { myWrapper = wrapper; } | setWrapper |
67,736 | QuickMergeContentsVariants () { return myVariant; } | getVariant |
67,737 | JPanel () { return myMainPanel; } | getMainPanel |
67,738 | MergeContext () { return myMergeContext; } | getMergeContext |
67,739 | QuickMergeInteraction () { return myInteraction; } | getInteraction |
67,740 | void () { if (!myExceptions.isEmpty()) { myInteraction.showErrors(myMergeContext.getMergeTitle(), myExceptions); } } | showErrors |
67,741 | void () { super.waitForTasksToFinish(); mySemaphore.waitFor(); } | waitForTasksToFinish |
67,742 | void () { super.end(); mySemaphore.up(); } | end |
67,743 | boolean () { return myMergeContext.getWcInfo().getFormat().isOrGreater(ONE_DOT_EIGHT); } | is18 |
67,744 | void () { FileDocumentManager.getInstance().saveAllDocuments(); mySemaphore.down(); runInEdt(() -> { if (areInSameHierarchy(myMergeContext.getSourceUrl(), myMergeContext.getWcInfo().getUrl())) { LOG.info("Error: Cannot merge from self"); end(message("notification.content.can.not.merge.from.self"), true); } else if (!ha... | execute |
67,745 | void () { switch (myInteraction.selectMergeVariant()) { case all: mergeAll(true); break; case showLatest: runInBackground( message("progress.title.loading.recent.branch.revisions", myMergeContext.getBranchName()), new MergeCalculatorTask(this, null, task -> runInEdt(() -> selectRevisionsToMerge(task, false)) ) ); break... | selectMergeVariant |
67,746 | void (@NotNull MergeCalculatorTask task, boolean allStatusesCalculated) { SelectMergeItemsResult result = myInteraction.selectMergeItems(task.getChangeLists(), task.getMergeChecker(), allStatusesCalculated, task.areAllListsLoaded()); switch (result.getResultCode()) { case all -> mergeAll(true); case select, showLatest ... | selectRevisionsToMerge |
67,747 | void (boolean supportsMergeInfo) { // merge info is not supported - branch copy point is used to make first sync merge successful (without unnecessary tree conflicts) // merge info is supported and svn client < 1.8 - branch copy point is used to determine if sync or reintegrate merge should be performed // merge info i... | mergeAll |
67,748 | void (@Nullable WrapperInvertor copyPoint, boolean supportsMergeInfo) { boolean reintegrate = copyPoint != null && copyPoint.isInvertedSense(); if (!reintegrate || myInteraction.shouldReintegrate(copyPoint.inverted().getTarget())) { MergerFactory mergerFactory = createMergeAllFactory(reintegrate, copyPoint, supportsMer... | checkReintegrateIsAllowedAndMergeAll |
67,749 | void (@NotNull List<SvnChangeList> changeLists) { if (!changeLists.isEmpty()) { ChangeListsMergerFactory mergerFactory = new ChangeListsMergerFactory(changeLists, false, false, true); merge(myMergeContext.getMergeTitle(), mergerFactory, changeLists); } } | merge |
67,750 | void (@ProgressTitle @NotNull String title, @NotNull MergerFactory mergerFactory, @Nullable List<SvnChangeList> changeLists) { runInEdt(new LocalChangesPromptTask(this, changeLists, () -> runInEdt(new MergeTask(this, () -> newIntegrateTask(title, mergerFactory).queue())))); } | merge |
67,751 | Task (@ProgressTitle @NotNull String title, @NotNull MergerFactory mergerFactory) { return new SvnIntegrateChangesTask(myMergeContext.getVcs(), new WorkingCopyInfo(myMergeContext.getWcInfo().getPath(), true), mergerFactory, myMergeContext.getSourceUrl(), title, false, myMergeContext.getBranchName()) { @Override public ... | newIntegrateTask |
67,752 | void () { super.onFinished(); mySemaphore.up(); } | onFinished |
67,753 | boolean () { File currentRoot = myMergeContext.getWcInfo().getRootInfo().getIoFile(); return myMergeContext.getVcs().getAllWcInfos().stream() .filter(info -> NestedCopyType.switched.equals(info.getType())) .anyMatch(info -> FileUtil.isAncestor(currentRoot, info.getRootInfo().getIoFile(), true)); } | hasSwitchedRoots |
67,754 | boolean () { return myMergeContext.getWcInfo().getFormat().supportsMergeInfo() && checkRepositoryVersion15(myMergeContext.getVcs(), myMergeContext.getSourceUrl()); } | supportsMergeInfo |
67,755 | MergerFactory (boolean reintegrate, @Nullable WrapperInvertor copyPoint, boolean supportsMergeInfo) { long revision = copyPoint != null ? reintegrate ? copyPoint.getWrapped().getTargetRevision() : copyPoint.getWrapped().getSourceRevision() : -1; return (vcs, target, handler, currentBranchUrl, branchName) -> new BranchM... | createMergeAllFactory |
67,756 | boolean (@NotNull Url url1, @NotNull Url url2) { return isAncestor(url1, url2) || isAncestor(url2, url1); } | areInSameHierarchy |
67,757 | QuickMergeContentsVariants () { QuickMergeWayOptionsPanel panel = new QuickMergeWayOptionsPanel(); DialogBuilder builder = new DialogBuilder(myProject); builder.title(message("dialog.title.select.merge.variant")).centerPanel(panel.getMainPanel()).removeAllActions(); panel.setWrapper(builder.getDialogWrapper()); builder... | selectMergeVariant |
67,758 | boolean () { return prompt(message("dialog.message.merge.with.switched.paths.in.working.copy")); } | shouldContinueSwitchedRootFound |
67,759 | boolean (@NotNull Url targetUrl) { return prompt(wrapInHtml( message("dialog.message.merge.confirm.reintegrate", myMergeContext.getSourceUrl().toDecodedString(), targetUrl.toDecodedString()))); } | shouldReintegrate |
67,760 | SelectMergeItemsResult (@NotNull List<SvnChangeList> lists, @NotNull MergeChecker mergeChecker, boolean allStatusesCalculated, boolean allListsLoaded) { ToBeMergedDialog dialog = new ToBeMergedDialog(myMergeContext, lists, mergeChecker, allStatusesCalculated, allListsLoaded); dialog.show(); QuickMergeContentsVariants r... | selectMergeItems |
67,761 | LocalChangesAction (boolean mergeAll) { LocalChangesAction[] possibleResults; String message; if (!mergeAll) { possibleResults = new LocalChangesAction[]{shelve, inspect, continueMerge, cancel}; message = message("dialog.message.merge.intersects.with.local.changes.prompt"); } else { possibleResults = new LocalChangesAc... | selectLocalChangesAction |
67,762 | void (@NotNull List<FilePath> paths) { IntersectingLocalChangesPanel.showInVersionControlToolWindow( myProject, message("tab.title.merge.local.changes.intersection", myMergeContext.getMergeTitle()), paths ); } | showIntersectedLocalPaths |
67,763 | void (@TabTitle @NotNull String message, @NotNull List<VcsException> exceptions) { AbstractVcsHelper.getInstance(myProject).showErrors(exceptions, message); } | showErrors |
67,764 | void (@NotificationContent @NotNull String message, boolean isError) { VcsBalloonProblemNotifier.showOverChangesView(myProject, message, isError ? MessageType.ERROR : MessageType.WARNING); } | showErrors |
67,765 | boolean (@DialogMessage @NotNull String question) { return showOkCancelDialog(myProject, question, myMergeContext.getMergeTitle(), getQuestionIcon()) == OK; } | prompt |
67,766 | QuickMergeContentsVariants (int exitCode) { return switch (exitCode) { case MERGE_ALL_CODE -> QuickMergeContentsVariants.all; case OK_EXIT_CODE -> QuickMergeContentsVariants.select; default -> QuickMergeContentsVariants.cancel; }; } | toMergeVariant |
67,767 | IMerger (final SvnVcs vcs, final File target, final UpdateEventHandler handler, final Url currentBranchUrl, String branchName) { return new PointMerger(vcs, myChangeList, target, handler, currentBranchUrl, myChanges, branchName); } | createMerger |
67,768 | boolean (final ProgressEvent event) { if ((event.getAction() == EventAction.UPDATE_UPDATE) && (event.getContentsStatus() == StatusType.UNCHANGED) && (event.getPropertiesStatus() == StatusType.UNKNOWN)) { myText2 = SvnBundle.message("progres.text2.updated", event.getFile().getName()); return true; } else if (event.getAc... | handleInDescendants |
67,769 | boolean () { return isInBounds(getNextChunkStart()); } | hasNext |
67,770 | void () { if (myProgressIndicator != null) { myProgressIndicator.setText2(message("progress.details.merging.changelist.range", myMergeChunk)); } } | setMergeIndicator |
67,771 | int () { return myMergeChunk == null ? 0 : myMergeChunk.nextChunkStart(); } | getNextChunkStart |
67,772 | MergeChunk () { int start = getNextChunkStart(); int size = 0; if (isInBounds(start)) { size = myGroupSequentialChangeLists ? getGroupSize(start) : 1; } return size > 0 ? new MergeChunk(start, size) : null; } | getNextChunk |
67,773 | int (int start) { assert isInBounds(start); int size = 1; while (isInBounds(start + size) && areSequential(listAt(start + size - 1), listAt(start + size))) { size++; } return size; } | getGroupSize |
67,774 | void () { if (myCommitMessage.length() == 0) { myCommitMessage.append(message("label.merged.from.branch", myBranchName)); } for (CommittedChangeList list : myMergeChunk.changeLists()) { myCommitMessage.append('\n'); myCommitMessage.append(message("merge.chunk.changelist.description", list.getComment().trim(), list.getN... | appendComment |
67,775 | String () { if (myMergeChunk == null) return null; return message("label.changelists.merging.faced.problems", join(myMergeChunk.changeLists(), it -> getChangeListDescription(it), "\n")); } | getInfo |
67,776 | String () { List<? extends CommittedChangeList> changeLists = myMergeChunk != null ? myMergeChunk.chunkAndAfterLists() : ContainerUtil.emptyList(); if (changeLists.isEmpty()) return null; return message("label.skipped.changelists", join(changeLists, it -> getChangeListDescription(it), ",")); } | getSkipped |
67,777 | String () { return myCommitMessage.toString(); } | getComment |
67,778 | File () { return myTarget; } | getMergeInfoHolder |
67,779 | void () { // TODO: Previous logic (previously used GroupMerger) that was applied when grouping was enabled contained its own Topic with no // TODO: subscribers - so currently message is sent only when grouping is disabled. // TODO: Check if corresponding event is also necessary when grouping is enabled and update subsc... | afterProcessing |
67,780 | CommittedChangeList (int index) { return myChangeLists.get(index); } | listAt |
67,781 | boolean (int index) { return index >= 0 && index < myChangeLists.size(); } | isInBounds |
67,782 | boolean (@NotNull CommittedChangeList list1, @NotNull CommittedChangeList list2) { return list1.getNumber() + 1 == list2.getNumber(); } | areSequential |
67,783 | int () { return myStart; } | start |
67,784 | int () { return myStart + mySize - 1; } | end |
67,785 | int () { return mySize; } | size |
67,786 | int () { return end() + 1; } | nextChunkStart |
67,787 | long () { return myChangeLists.get(start()).getNumber(); } | lowestNumber |
67,788 | long () { return myChangeLists.get(end()).getNumber(); } | highestNumber |
67,789 | List<CommittedChangeList> () { return myChangeLists.subList(start(), nextChunkStart()); } | changeLists |
67,790 | List<CommittedChangeList> () { return myChangeLists.subList(0, nextChunkStart()); } | chunkAndBeforeLists |
67,791 | List<CommittedChangeList> () { return ContainerUtil.subList(myChangeLists, start()); } | chunkAndAfterLists |
67,792 | RevisionRange () { Revision startRevision = Revision.of(lowestNumber() - 1); Revision endRevision = Revision.of(highestNumber()); return myInvertRange ? new RevisionRange(endRevision, startRevision) : new RevisionRange(startRevision, endRevision); } | revisionRange |
67,793 | String () { return highestNumber() == lowestNumber() ? String.valueOf(lowestNumber()) : lowestNumber() + "-" + highestNumber(); } | toString |
67,794 | File (@NotNull String repositoryRelativePath) { try { Url url = append(myMergeContext.getWcInfo().getRepoUrl(), repositoryRelativePath); return isAncestor(myMergeContext.getSourceUrl(), url) ? new File(myMergeContext.getWcInfo().getPath(), getRelativeUrl(myMergeContext.getSourceUrl(), url)) : null; } catch (SvnBindExce... | getLocalPath |
67,795 | void () { List<LocalChangeList> localChangeLists = ChangeListManager.getInstance(myMergeContext.getProject()).getChangeLists(); Intersection intersection = myChangeListsToMerge != null ? getChangesIntersection(localChangeLists, myChangeListsToMerge) : getAllChangesIntersection(localChangeLists); processIntersection(int... | run |
67,796 | void (@Nullable Intersection intersection) { boolean mergeAll = myChangeListsToMerge == null; LocalChangesAction nextAction = !isEmpty(intersection) ? myInteraction.selectLocalChangesAction(mergeAll) : continueMerge; switch (nextAction) { case continueMerge -> myCallback.run(); case shelve -> myMergeProcess.runInBackgr... | processIntersection |
67,797 | Intersection (@NotNull List<LocalChangeList> localChangeLists, @NotNull List<SvnChangeList> changeListsToMerge) { Set<FilePath> pathsToMerge = collectPaths(changeListsToMerge); return !changeListsToMerge.isEmpty() ? getChangesIntersection(localChangeLists, change -> hasPathToMerge(change, pathsToMerge)) : null; } | getChangesIntersection |
67,798 | Set<FilePath> (@NotNull List<SvnChangeList> lists) { return lists.stream() .flatMap(list -> list.getAffectedPaths().stream()) .map(this::getLocalPath) .filter(Objects::nonNull) .map(localPath -> VcsUtil.getFilePath(localPath, false)) .collect(toSet()); } | collectPaths |
67,799 | Intersection (@NotNull List<LocalChangeList> localChangeLists) { return getChangesIntersection(localChangeLists, alwaysTrue()); } | getAllChangesIntersection |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.