Skip to content

Commit 6d6d9d2

Browse files
committed
ST6RI-178 Added error message for empty branch loading
1 parent 28d964d commit 6d6d9d2

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,11 @@ private String load(RemoteBranch branch) {
538538
System.out.println();
539539
System.out.println("Selected branch " + branch.getName() + " (" + branch.getRemoteId().toString() + ")");
540540

541+
Revision headRevision = branch.getHeadRevision();
542+
if (!headRevision.isRemote()) {
543+
return "ERROR:Branch has no head commit\n";
544+
}
545+
541546
if (!tracker.isLibraryTracked()) {
542547
System.out.println("Caching library UUIDs...");
543548
tracker.trackLibraryUUIDs(getLibraryResources());
@@ -549,9 +554,6 @@ private String load(RemoteBranch branch) {
549554
tracker.trackLocalUUIDs(inputResources);
550555

551556
System.out.println("Downloading model...");
552-
553-
RemoteProject remoteProject = branch.getRemoteProject();
554-
Revision headRevision = branch.getHeadRevision();
555557
APIModel model = headRevision.fetchRemote();
556558

557559
EMFModelRefresher modelRefresher = new EMFModelRefresher(model, tracker);
@@ -565,6 +567,7 @@ private String load(RemoteBranch branch) {
565567
addResourceToIndex(resource);
566568
});
567569

570+
RemoteProject remoteProject = branch.getRemoteProject();
568571
return "Loaded Project " + remoteProject.getProjectName() + " (" + remoteProject.getRemoteId().toString() + ")\n";
569572
}
570573

0 commit comments

Comments
 (0)