Search in sources :

Example 21 with RepositoryMapping

use of org.eclipse.egit.core.project.RepositoryMapping in project egit by eclipse.

the class DefaultGitSynchronizer method compare.

@Override
public void compare(IResource[] resources, @NonNull Repository repository, String leftRev, String rightRev, boolean includeLocal, IWorkbenchPage page) throws IOException {
    if (canCompareDirectly(resources)) {
        if (includeLocal) {
            CompareUtils.compareWorkspaceWithRef(repository, resources[0], rightRev, page);
        } else {
            final IResource file = resources[0];
            Assert.isNotNull(file);
            final RepositoryMapping mapping = RepositoryMapping.getMapping(file);
            if (mapping == null) {
                Activator.error(NLS.bind(UIText.GitHistoryPage_errorLookingUpPath, file.getLocation(), repository), null);
                return;
            }
            final String gitPath = mapping.getRepoRelativePath(file);
            CompareUtils.compareBetween(repository, gitPath, leftRev, rightRev, page);
        }
    } else {
        synchronize(resources, repository, leftRev, rightRev, includeLocal);
    }
}
Also used : RepositoryMapping(org.eclipse.egit.core.project.RepositoryMapping) IResource(org.eclipse.core.resources.IResource)

Example 22 with RepositoryMapping

use of org.eclipse.egit.core.project.RepositoryMapping in project egit by eclipse.

the class ExistingOrNewPage method createControl.

@Override
public void createControl(Composite parent) {
    final RepositoryUtil util = Activator.getDefault().getRepositoryUtil();
    Composite main = new Composite(parent, SWT.NONE);
    // use zero spacing to save some real estate here
    GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(main);
    final Button internalModeButton = new Button(main, SWT.CHECK);
    internalModeButton.setText(UIText.ExistingOrNewPage_InternalModeCheckbox);
    internalModeButton.setToolTipText(UIText.ExistingOrNewPage_CreationInWorkspaceWarningTooltip);
    internalModeButton.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            internalMode = internalModeButton.getSelection();
            updateControls();
        }
    });
    externalComposite = new Composite(main, SWT.NONE);
    GridDataFactory.fillDefaults().grab(true, true).applyTo(externalComposite);
    externalComposite.setLayout(new GridLayout(3, false));
    new Label(externalComposite, SWT.NONE).setText(UIText.ExistingOrNewPage_ExistingRepositoryLabel);
    final Combo existingRepoCombo = new Combo(externalComposite, SWT.READ_ONLY);
    GridDataFactory.fillDefaults().grab(true, false).applyTo(existingRepoCombo);
    final ComboViewer v = new ComboViewer(existingRepoCombo);
    v.setContentProvider(new RepoComboContentProvider());
    v.setLabelProvider(new RepoComboLabelProvider());
    v.setInput(new Object());
    // the default ViewerSorter seems to do the right thing
    // i.e. sort as String
    v.setComparator(new ViewerComparator());
    existingRepoCombo.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            selectedRepository = null;
            IStructuredSelection sel = (IStructuredSelection) v.getSelection();
            setRepository((Repository) sel.getFirstElement());
            updateControls();
        }
    });
    Button createRepoWizard = new Button(externalComposite, SWT.PUSH);
    createRepoWizard.setText(UIText.ExistingOrNewPage_CreateRepositoryButton);
    createRepoWizard.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            NewRepositoryWizard wiz = new NewRepositoryWizard(true);
            if (new WizardDialog(getShell(), wiz).open() == Window.OK) {
                v.refresh();
                selectedRepository = wiz.getCreatedRepository();
                v.setSelection(new StructuredSelection(selectedRepository));
                updateControls();
            }
        }
    });
    new Label(externalComposite, SWT.NONE).setText(UIText.ExistingOrNewPage_WorkingDirectoryLabel);
    workDir = new Text(externalComposite, SWT.BORDER | SWT.READ_ONLY);
    GridDataFactory.fillDefaults().grab(true, false).applyTo(workDir);
    GridDataFactory.fillDefaults().applyTo(workDir);
    // leave the space between the "Create" and "Browse" buttons empty (i.e.
    // do not fill to the right border
    new Label(externalComposite, SWT.NONE);
    new Label(externalComposite, SWT.NONE).setText(UIText.ExistingOrNewPage_RelativePathLabel);
    relPath = new Text(externalComposite, SWT.BORDER);
    relPath.addModifyListener(new ModifyListener() {

        @Override
        public void modifyText(ModifyEvent e) {
            updateControls();
        }
    });
    GridDataFactory.fillDefaults().grab(true, false).applyTo(relPath);
    browseRepository = new Button(externalComposite, SWT.PUSH);
    browseRepository.setEnabled(false);
    browseRepository.setText(UIText.ExistingOrNewPage_BrowseRepositoryButton);
    browseRepository.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            DirectoryDialog dlg = new DirectoryDialog(getShell());
            dlg.setMessage(UIText.ExistingOrNewPage_title);
            dlg.setFilterPath(selectedRepository.getWorkTree().getPath());
            String directory = dlg.open();
            if (directory != null) {
                setRelativePath(directory);
                updateControls();
            }
        }
    });
    Table projectMoveTable = new Table(externalComposite, SWT.MULTI | SWT.FULL_SELECTION | SWT.CHECK | SWT.BORDER);
    projectMoveViewer = new CheckboxTableViewer(projectMoveTable);
    GridDataFactory.fillDefaults().span(3, 1).grab(true, true).applyTo(projectMoveTable);
    TableColumn tc;
    tc = new TableColumn(projectMoveTable, SWT.NONE);
    tc.setText(UIText.ExistingOrNewPage_ProjectNameColumnHeader);
    tc.setWidth(100);
    tc = new TableColumn(projectMoveTable, SWT.NONE);
    tc.setText(UIText.ExistingOrNewPage_CurrentLocationColumnHeader);
    tc.setWidth(250);
    tc = new TableColumn(projectMoveTable, SWT.NONE);
    tc.setText(UIText.ExistingOrNewPage_NewLocationTargetHeader);
    tc.setWidth(350);
    projectMoveTable.setHeaderVisible(true);
    projectMoveViewer.setContentProvider(ArrayContentProvider.getInstance());
    projectMoveViewer.setLabelProvider(moveProjectsLabelProvider);
    projectMoveViewer.setInput(myWizard.projects);
    projectMoveViewer.addCheckStateListener(new ICheckStateListener() {

        @Override
        public void checkStateChanged(CheckStateChangedEvent event) {
            updateControls();
        }
    });
    TableItem[] children = projectMoveViewer.getTable().getItems();
    for (int i = 0; i < children.length; i++) {
        TableItem item = children[i];
        IProject data = (IProject) item.getData();
        RepositoryFinder repositoryFinder = new RepositoryFinder(data);
        repositoryFinder.setFindInChildren(false);
        try {
            Collection<RepositoryMapping> find = repositoryFinder.find(new NullProgressMonitor());
            if (find.size() != 1)
                item.setChecked(true);
        } catch (CoreException e1) {
            item.setText(2, e1.getMessage());
        }
    }
    parentRepoComposite = new Composite(main, SWT.NONE);
    parentRepoComposite.setLayout(new GridLayout(3, false));
    GridDataFactory.fillDefaults().grab(true, true).applyTo(parentRepoComposite);
    tree = new Tree(parentRepoComposite, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION | SWT.CHECK);
    viewer = new CheckboxTreeViewer(tree);
    tree.setHeaderVisible(true);
    tree.setLayout(new GridLayout());
    tree.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).span(3, 1).create());
    viewer.addCheckStateListener(new ICheckStateListener() {

        @Override
        public void checkStateChanged(CheckStateChangedEvent event) {
            if (event.getChecked()) {
                ProjectAndRepo checkable = (ProjectAndRepo) event.getElement();
                for (TreeItem ti : tree.getItems()) {
                    if (ti.getItemCount() > 0 || ((ProjectAndRepo) ti.getData()).getRepo().equals(// $NON-NLS-1$
                    ""))
                        ti.setChecked(false);
                    for (TreeItem subTi : ti.getItems()) {
                        IProject project = ((ProjectAndRepo) subTi.getData()).getProject();
                        if (checkable.getProject() != null && !subTi.getData().equals(checkable) && checkable.getProject().equals(project))
                            subTi.setChecked(false);
                    }
                }
            }
        }
    });
    TreeColumn c1 = new TreeColumn(tree, SWT.NONE);
    c1.setText(UIText.ExistingOrNewPage_HeaderProject);
    c1.setWidth(100);
    TreeColumn c2 = new TreeColumn(tree, SWT.NONE);
    c2.setText(UIText.ExistingOrNewPage_HeaderLocation);
    c2.setWidth(400);
    TreeColumn c3 = new TreeColumn(tree, SWT.NONE);
    c3.setText(UIText.ExistingOrNewPage_HeaderRepository);
    c3.setWidth(200);
    boolean allProjectsInExistingRepos = true;
    for (IProject project : myWizard.projects) {
        RepositoryFinder repositoryFinder = new RepositoryFinder(project);
        repositoryFinder.setFindInChildren(false);
        try {
            Collection<RepositoryMapping> mappings;
            mappings = repositoryFinder.find(new NullProgressMonitor());
            Iterator<RepositoryMapping> mi = mappings.iterator();
            RepositoryMapping m = mi.hasNext() ? mi.next() : null;
            if (m == null) {
                // no mapping found, enable repository creation
                TreeItem treeItem = new TreeItem(tree, SWT.NONE);
                updateProjectTreeItem(treeItem, project);
                treeItem.setText(1, project.getLocation().toOSString());
                // $NON-NLS-1$
                treeItem.setText(2, "");
                // $NON-NLS-1$
                treeItem.setData(new ProjectAndRepo(project, ""));
                allProjectsInExistingRepos = false;
            } else if (!mi.hasNext()) {
                // exactly one mapping found
                IPath path = m.getGitDirAbsolutePath();
                if (path != null) {
                    TreeItem treeItem = new TreeItem(tree, SWT.NONE);
                    updateProjectTreeItem(treeItem, project);
                    treeItem.setText(1, project.getLocation().toOSString());
                    fillTreeItemWithGitDirectory(m, treeItem, path, false);
                    treeItem.setData(new ProjectAndRepo(project, path.toOSString()));
                    treeItem.setChecked(true);
                }
            } else {
                IPath path = m.getGitDirAbsolutePath();
                if (path != null) {
                    TreeItem treeItem = new TreeItem(tree, SWT.NONE);
                    updateProjectTreeItem(treeItem, project);
                    treeItem.setText(1, project.getLocation().toOSString());
                    // $NON-NLS-1$
                    treeItem.setData(new ProjectAndRepo(project, ""));
                    TreeItem treeItem2 = new TreeItem(treeItem, SWT.NONE);
                    updateProjectTreeItem(treeItem2, project);
                    fillTreeItemWithGitDirectory(m, treeItem2, path, true);
                    treeItem2.setData(new ProjectAndRepo(project, path.toOSString()));
                    while (mi.hasNext()) {
                        // fill in additional mappings
                        m = mi.next();
                        path = m.getGitDirAbsolutePath();
                        if (path != null) {
                            treeItem2 = new TreeItem(treeItem, SWT.NONE);
                            updateProjectTreeItem(treeItem2, project);
                            fillTreeItemWithGitDirectory(m, treeItem2, path, true);
                            treeItem2.setData(new ProjectAndRepo(m.getContainer().getProject(), path.toOSString()));
                        }
                    }
                    treeItem.setExpanded(true);
                }
                allProjectsInExistingRepos = false;
            }
        } catch (CoreException e) {
            TreeItem treeItem2 = new TreeItem(tree, SWT.BOLD | SWT.ITALIC);
            treeItem2.setText(e.getMessage());
        }
    }
    createRepo = new Button(parentRepoComposite, SWT.PUSH);
    createRepo.setLayoutData(GridDataFactory.fillDefaults().create());
    createRepo.setText(UIText.ExistingOrNewPage_CreateButton);
    createRepo.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            File gitDir = new File(repositoryToCreate.getText(), Constants.DOT_GIT);
            try {
                Repository repository = FileRepositoryBuilder.create(gitDir);
                repository.create();
                for (IProject project : getProjects(false).keySet()) {
                    // 
                    if (// $NON-NLS-1$
                    !gitDir.toString().contains(".."))
                        project.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
                }
                util.addConfiguredRepository(gitDir);
            } catch (IOException e1) {
                String msg = NLS.bind(UIText.ExistingOrNewPage_ErrorFailedToCreateRepository, gitDir.toString());
                org.eclipse.egit.ui.Activator.handleError(msg, e1, true);
            } catch (CoreException e2) {
                String msg = NLS.bind(UIText.ExistingOrNewPage_ErrorFailedToRefreshRepository, gitDir);
                org.eclipse.egit.ui.Activator.handleError(msg, e2, true);
            }
            for (TreeItem ti : tree.getSelection()) {
                IPath projectPath = new Path(ti.getText(1));
                IPath gitPath = new Path(gitDir.toString());
                IPath relative = gitPath.makeRelativeTo(projectPath);
                ti.setText(2, relative.toOSString());
                ((ProjectAndRepo) ti.getData()).repo = gitDir.toString();
                ti.setChecked(true);
            }
            updateControls();
        }
    });
    repositoryToCreate = new Text(parentRepoComposite, SWT.SINGLE | SWT.BORDER);
    repositoryToCreate.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(1, 1).create());
    repositoryToCreate.addListener(SWT.Modify, new Listener() {

        @Override
        public void handleEvent(Event e) {
            if (repositoryToCreate.getText().equals("")) {
                // $NON-NLS-1$
                createRepo.setEnabled(false);
                return;
            }
            IPath fromOSString = Path.fromOSString(repositoryToCreate.getText());
            createRepo.setEnabled(minumumPath.matchingFirstSegments(fromOSString) == fromOSString.segmentCount());
        }
    });
    dotGitSegment = new Label(parentRepoComposite, SWT.NONE);
    dotGitSegment.setEnabled(false);
    dotGitSegment.setText(File.separatorChar + Constants.DOT_GIT);
    dotGitSegment.setLayoutData(GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).create());
    tree.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            tree.select((TreeItem) e.item);
            updateControls();
        }
    });
    Dialog.applyDialogFont(main);
    setControl(main);
    if (allProjectsInExistingRepos) {
        internalMode = true;
        internalModeButton.setSelection(true);
        updateControls();
    }
}
Also used : CheckboxTableViewer(org.eclipse.jface.viewers.CheckboxTableViewer) TreeItem(org.eclipse.swt.widgets.TreeItem) ICheckStateListener(org.eclipse.jface.viewers.ICheckStateListener) RepositoryFinder(org.eclipse.egit.core.project.RepositoryFinder) TableItem(org.eclipse.swt.widgets.TableItem) Label(org.eclipse.swt.widgets.Label) IStructuredSelection(org.eclipse.jface.viewers.IStructuredSelection) StructuredSelection(org.eclipse.jface.viewers.StructuredSelection) Combo(org.eclipse.swt.widgets.Combo) IStructuredSelection(org.eclipse.jface.viewers.IStructuredSelection) ModifyEvent(org.eclipse.swt.events.ModifyEvent) Button(org.eclipse.swt.widgets.Button) SelectionEvent(org.eclipse.swt.events.SelectionEvent) RevTree(org.eclipse.jgit.revwalk.RevTree) Tree(org.eclipse.swt.widgets.Tree) IPath(org.eclipse.core.runtime.IPath) TableColumn(org.eclipse.swt.widgets.TableColumn) CheckboxTreeViewer(org.eclipse.jface.viewers.CheckboxTreeViewer) CoreException(org.eclipse.core.runtime.CoreException) ComboViewer(org.eclipse.jface.viewers.ComboViewer) File(java.io.File) NullProgressMonitor(org.eclipse.core.runtime.NullProgressMonitor) ICheckStateListener(org.eclipse.jface.viewers.ICheckStateListener) Listener(org.eclipse.swt.widgets.Listener) ModifyListener(org.eclipse.swt.events.ModifyListener) ModifyListener(org.eclipse.swt.events.ModifyListener) GridLayout(org.eclipse.swt.layout.GridLayout) TreeColumn(org.eclipse.swt.widgets.TreeColumn) RepositoryMapping(org.eclipse.egit.core.project.RepositoryMapping) NewRepositoryWizard(org.eclipse.egit.ui.internal.repository.NewRepositoryWizard) DirectoryDialog(org.eclipse.swt.widgets.DirectoryDialog) IPath(org.eclipse.core.runtime.IPath) Path(org.eclipse.core.runtime.Path) Table(org.eclipse.swt.widgets.Table) Composite(org.eclipse.swt.widgets.Composite) ViewerComparator(org.eclipse.jface.viewers.ViewerComparator) SelectionAdapter(org.eclipse.swt.events.SelectionAdapter) Text(org.eclipse.swt.widgets.Text) UIText(org.eclipse.egit.ui.internal.UIText) IOException(java.io.IOException) IProject(org.eclipse.core.resources.IProject) RepositoryUtil(org.eclipse.egit.core.RepositoryUtil) Repository(org.eclipse.jgit.lib.Repository) ModifyEvent(org.eclipse.swt.events.ModifyEvent) CheckStateChangedEvent(org.eclipse.jface.viewers.CheckStateChangedEvent) Event(org.eclipse.swt.widgets.Event) SelectionEvent(org.eclipse.swt.events.SelectionEvent) CheckStateChangedEvent(org.eclipse.jface.viewers.CheckStateChangedEvent) WizardDialog(org.eclipse.jface.wizard.WizardDialog)

Example 23 with RepositoryMapping

use of org.eclipse.egit.core.project.RepositoryMapping in project egit by eclipse.

the class GitModelSynchronizeParticipant method getRepositoryForPath.

private Repository getRepositoryForPath(String containerPath) {
    IPath path = Path.fromPortableString(containerPath);
    IContainer mappedContainer = ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(path);
    if (mappedContainer == null) {
        return null;
    }
    GitProjectData projectData = GitProjectData.get(mappedContainer.getProject());
    if (projectData == null) {
        return null;
    }
    RepositoryMapping mapping = projectData.getRepositoryMapping(mappedContainer);
    if (mapping != null)
        return mapping.getRepository();
    return null;
}
Also used : IPath(org.eclipse.core.runtime.IPath) RepositoryMapping(org.eclipse.egit.core.project.RepositoryMapping) IContainer(org.eclipse.core.resources.IContainer) GitProjectData(org.eclipse.egit.core.project.GitProjectData)

Example 24 with RepositoryMapping

use of org.eclipse.egit.core.project.RepositoryMapping in project egit by eclipse.

the class GitOpenInCompareAction method getHeadFileElement.

private ITypedElement getHeadFileElement(GitModelBlob blob) {
    RepositoryMapping mapping = RepositoryMapping.getMapping(blob.getLocation());
    if (mapping == null) {
        return null;
    }
    Repository repo = mapping.getRepository();
    String gitPath = mapping.getRepoRelativePath(blob.getLocation());
    return CompareUtils.getHeadTypedElement(repo, gitPath);
}
Also used : GitModelRepository(org.eclipse.egit.ui.internal.synchronize.model.GitModelRepository) Repository(org.eclipse.jgit.lib.Repository) RepositoryMapping(org.eclipse.egit.core.project.RepositoryMapping)

Example 25 with RepositoryMapping

use of org.eclipse.egit.core.project.RepositoryMapping in project egit by eclipse.

the class GitTemplateVariableResolver method resolveVariable.

/**
 * Resolves the git_config variable for a project
 *
 * @param variable
 *            the current template variable.
 * @param project
 *            the current project.
 */
protected static void resolveVariable(TemplateVariable variable, IProject project) {
    final List<String> params = variable.getVariableType().getParams();
    if (params.isEmpty()) {
        // $NON-NLS-1$
        variable.setValue("");
        return;
    }
    final String gitKey = params.get(0);
    if (gitKey == null || gitKey.length() == 0) {
        // $NON-NLS-1$
        variable.setValue("");
        return;
    }
    // Get git's config
    RepositoryMapping mapping = RepositoryMapping.getMapping(project);
    Repository repository = null;
    if (mapping != null) {
        repository = mapping.getRepository();
    }
    if (repository == null) {
        // $NON-NLS-1$
        variable.setValue("");
        return;
    }
    StoredConfig config = repository.getConfig();
    // Get the value of the key
    // $NON-NLS-1$
    final String[] splits = gitKey.split("\\.");
    String section = null;
    String subSection = null;
    String name = null;
    if (splits.length == 3) {
        section = splits[0];
        subSection = splits[1];
        name = splits[2];
    } else if (splits.length == 2) {
        section = splits[0];
        name = splits[1];
    } else {
        // $NON-NLS-1$
        variable.setValue("");
        return;
    }
    String gitValue = config.getString(section, subSection, name);
    if (gitValue != null) {
        variable.setValue(gitValue);
    }
}
Also used : StoredConfig(org.eclipse.jgit.lib.StoredConfig) Repository(org.eclipse.jgit.lib.Repository) RepositoryMapping(org.eclipse.egit.core.project.RepositoryMapping)

Aggregations

RepositoryMapping (org.eclipse.egit.core.project.RepositoryMapping)87 Repository (org.eclipse.jgit.lib.Repository)40 IResource (org.eclipse.core.resources.IResource)31 IProject (org.eclipse.core.resources.IProject)23 IPath (org.eclipse.core.runtime.IPath)20 IOException (java.io.IOException)18 File (java.io.File)17 CoreException (org.eclipse.core.runtime.CoreException)15 IFile (org.eclipse.core.resources.IFile)12 Path (org.eclipse.core.runtime.Path)12 RevCommit (org.eclipse.jgit.revwalk.RevCommit)11 IStructuredSelection (org.eclipse.jface.viewers.IStructuredSelection)10 GitProjectData (org.eclipse.egit.core.project.GitProjectData)9 ArrayList (java.util.ArrayList)8 Test (org.junit.Test)8 HashSet (java.util.HashSet)6 IStatus (org.eclipse.core.runtime.IStatus)6 Status (org.eclipse.core.runtime.Status)6 RevWalk (org.eclipse.jgit.revwalk.RevWalk)6 HashMap (java.util.HashMap)5