Skip to content

Commit

Permalink
enable selective pull (#217)
Browse files Browse the repository at this point in the history
Selective Pull was disabled as backend call ran into error while PULL, as it involves sub-package creation which requires a transport request to be passed on and since transport request is not available at the time of calculating modified objects.
The issue was fixed and selective pull is now enabled.
  • Loading branch information
shubhamWaghmare-sap authored Sep 27, 2021
1 parent 58285e8 commit 6a5e23b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ AbapGitWizard_task_pulling_repository=Pulling from repository...
AbapGitWizard_title=Link abapGit Repository
AbapGitWizardPull_title=Pull from abapGit Repository
AbapGitWizardPullSelectedObjects_OverwriteObjectsMessage=The following objects have been modified (or deleted) locally. Select the objects which should be overwritten (or recreated).
AbapGitWizardPullSelectedObjects_PackageWarningObjectsMessage=The following objects have been created in other packages. Select the objects which should be overwritten. CAUTION: Selected objects will be overwritten in other packages.
AbapGitWizardPullSelectedObjects_PackageWarningObjectsMessage=Caution: The following objects have been created in other packages. Select the objects which should be overwritten.
AbapGitWizardPageApack_checkbox_pull_all_dependencies=Pull all dependent repositories
AbapGitWizardPageApack_description=Verify all dependencies and specify local packages for them
AbapGitWizardPageApack_label_dependencies=Dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,12 @@ public boolean isFolderLogicSupportedWhileLink(IRepositories repositories) {
//TODO: Remove after 2105 back end release supporting selective pull reaches all customers
@Override
public boolean isSelectivePullSupported(IRepository repository) {
/*
* Disable the selective pull temporarily because of the incident https://support.wdf.sap.corp/sap/support/message/2170159859.
* Selective pull backend call runs into error while PULL as it somehow involves package creation which requires a transport request to be passed on.
*/

// for (IAtomLink link : repository.getLinks()) {
// if (link.getRel().equalsIgnoreCase(IRepositoryService.RELATION_MODIFIED_OBJECTS)) {
// return true;
// }
// }
for (IAtomLink link : repository.getLinks()) {
if (link.getRel().equalsIgnoreCase(IRepositoryService.RELATION_MODIFIED_OBJECTS)) {
return true;
}
}
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public String getText(Object element) {

});

createTreeViewerColumn("Type", 50).setLabelProvider(new ColumnLabelProvider() { //$NON-NLS-1$
createTreeViewerColumn("Type", 20).setLabelProvider(new ColumnLabelProvider() { //$NON-NLS-1$
@Override
public String getText(Object element) {
if (element instanceof IAbapGitObject) {
Expand All @@ -145,6 +145,7 @@ private TreeViewerColumn createTreeViewerColumn(String title, int bound) {
viewerColumn.getColumn().setText(title);
this.treeColumnLayout.setColumnData(viewerColumn.getColumn(), new ColumnWeightData(20, bound, true));
return viewerColumn;

}

@Override
Expand Down

0 comments on commit 6a5e23b

Please sign in to comment.