Revert "Expand submodule subscription support"
This reverts commit 333676bd1b
Too many problems were identified during a secondary review.
Change-Id: I6112e6594827a537ac57ccd283b55674506eef20
This commit is contained in:

committed by
Gerrit Code Review

parent
af17ea96dd
commit
d5714d73d4
@@ -21,7 +21,6 @@ import com.google.gerrit.reviewdb.client.SubmoduleSubscription;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.GerritPersonIdent;
|
||||
import com.google.gerrit.server.config.CanonicalWebUrl;
|
||||
import com.google.gerrit.server.config.SshdListenAddress;
|
||||
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||
import com.google.gerrit.server.util.SubmoduleSectionParser;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
@@ -79,7 +78,6 @@ public class SubmoduleOp {
|
||||
private RevCommit mergeTip;
|
||||
private RevWalk rw;
|
||||
private final Provider<String> urlProvider;
|
||||
private final Provider<String> sshProvider;
|
||||
private ReviewDb schema;
|
||||
private Repository db;
|
||||
private Project destProject;
|
||||
@@ -95,7 +93,6 @@ public class SubmoduleOp {
|
||||
public SubmoduleOp(@Assisted final Branch.NameKey destBranch,
|
||||
@Assisted RevCommit mergeTip, @Assisted RevWalk rw,
|
||||
@CanonicalWebUrl @Nullable final Provider<String> urlProvider,
|
||||
@SshdListenAddress @Nullable final Provider<String> sshProvider,
|
||||
final SchemaFactory<ReviewDb> sf, @Assisted Repository db,
|
||||
@Assisted Project destProject, @Assisted List<Change> submitted,
|
||||
@Assisted final Map<Change.Id, CodeReviewCommit> commits,
|
||||
@@ -105,7 +102,6 @@ public class SubmoduleOp {
|
||||
this.mergeTip = mergeTip;
|
||||
this.rw = rw;
|
||||
this.urlProvider = urlProvider;
|
||||
this.sshProvider = sshProvider;
|
||||
this.schemaFactory = sf;
|
||||
this.db = db;
|
||||
this.destProject = destProject;
|
||||
@@ -141,32 +137,6 @@ public class SubmoduleOp {
|
||||
}
|
||||
|
||||
try {
|
||||
String thisServer = null;
|
||||
String sshHostname = null;
|
||||
String webHostname = new URI(urlProvider.get()).getHost();
|
||||
|
||||
// If SSH is disabled on the command line there will be no
|
||||
// sshProvider to ask. Translate this to the gerrit.config
|
||||
// option "off" inside the [sshd] section.
|
||||
if (sshProvider == null) {
|
||||
sshHostname = "off";
|
||||
} else {
|
||||
// Make sure we only remove the port part and not a substring
|
||||
// of an IPv6 address.
|
||||
sshHostname = sshProvider.get().split(":\\d+$")[0];
|
||||
}
|
||||
// Use the web host name (canonical web url) for the following
|
||||
// conditions:
|
||||
// - If the ssh hostname is the same as the web host
|
||||
// - If we listen on all addresses
|
||||
// - If sshd is turned off
|
||||
if (webHostname.equals(sshHostname) || sshHostname.equals("*") ||
|
||||
sshHostname.equals("off")) {
|
||||
thisServer = webHostname;
|
||||
} else {
|
||||
thisServer = sshHostname;
|
||||
}
|
||||
|
||||
final TreeWalk tw = TreeWalk.forPath(db, GIT_MODULES, mergeTip.getTree());
|
||||
if (tw != null
|
||||
&& (FileMode.REGULAR_FILE.equals(tw.getRawMode(0)) || FileMode.EXECUTABLE_FILE
|
||||
@@ -175,6 +145,8 @@ public class SubmoduleOp {
|
||||
BlobBasedConfig bbc =
|
||||
new BlobBasedConfig(null, db, mergeTip, GIT_MODULES);
|
||||
|
||||
final String thisServer = new URI(urlProvider.get()).getHost();
|
||||
|
||||
final Branch.NameKey target =
|
||||
new Branch.NameKey(new Project.NameKey(destProject.getName()),
|
||||
destBranch.get());
|
||||
|
Reference in New Issue
Block a user