Merge "Remove support for refs/publish/"
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 29c2ca0..85a938a 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -611,7 +611,6 @@
newProgress.end();
replaceProgress.end();
queueSuccessMessages(newChanges);
- refsPublishDeprecationWarning();
logger.atFine().log(
"Command results: %s",
@@ -619,13 +618,6 @@
}
}
- private void refsPublishDeprecationWarning() {
- // TODO(xchangcheng): remove after migrating tools which are using this magic branch.
- if (magicBranch != null && magicBranch.publish) {
- addMessage("Pushing to refs/publish/* is deprecated, use refs/for/* instead.");
- }
- }
-
private void sendErrorMessages() {
if (!errors.isEmpty()) {
logger.atFine().log("Handling error conditions: %s", errors.keySet());
@@ -1362,8 +1354,6 @@
+ "for new changes and '--edit' for existing changes")
boolean draft;
- boolean publish;
-
@Option(name = "--private", usage = "mark new/updated change as private")
boolean isPrivate;
@@ -1501,7 +1491,6 @@
this.deprecatedTopicSeen = false;
this.cmd = cmd;
this.draft = cmd.getRefName().startsWith(MagicBranch.NEW_DRAFT_CHANGE);
- this.publish = cmd.getRefName().startsWith(MagicBranch.NEW_PUBLISH_CHANGE);
this.labelTypes = labelTypes;
this.notesMigration = notesMigration;
GeneralPreferencesInfo prefs = user.state().getGeneralPreferences();
diff --git a/java/com/google/gerrit/server/util/MagicBranch.java b/java/com/google/gerrit/server/util/MagicBranch.java
index a049169..4e41be0 100644
--- a/java/com/google/gerrit/server/util/MagicBranch.java
+++ b/java/com/google/gerrit/server/util/MagicBranch.java
@@ -28,25 +28,19 @@
public static final String NEW_CHANGE = "refs/for/";
// TODO(xchangcheng): remove after 'repo' supports private/wip changes.
public static final String NEW_DRAFT_CHANGE = "refs/drafts/";
- // TODO(xchangcheng): remove after migrating tools which are using this magic branch.
- public static final String NEW_PUBLISH_CHANGE = "refs/publish/";
/** Extracts the destination from a ref name */
public static String getDestBranchName(String refName) {
String magicBranch = NEW_CHANGE;
if (refName.startsWith(NEW_DRAFT_CHANGE)) {
magicBranch = NEW_DRAFT_CHANGE;
- } else if (refName.startsWith(NEW_PUBLISH_CHANGE)) {
- magicBranch = NEW_PUBLISH_CHANGE;
}
return refName.substring(magicBranch.length());
}
/** Checks if the supplied ref name is a magic branch */
public static boolean isMagicBranch(String refName) {
- return refName.startsWith(NEW_DRAFT_CHANGE)
- || refName.startsWith(NEW_PUBLISH_CHANGE)
- || refName.startsWith(NEW_CHANGE);
+ return refName.startsWith(NEW_DRAFT_CHANGE) || refName.startsWith(NEW_CHANGE);
}
/** Returns the ref name prefix for a magic branch, {@code null} if the branch is not magic */
@@ -54,9 +48,6 @@
if (refName.startsWith(NEW_DRAFT_CHANGE)) {
return NEW_DRAFT_CHANGE;
}
- if (refName.startsWith(NEW_PUBLISH_CHANGE)) {
- return NEW_PUBLISH_CHANGE;
- }
if (refName.startsWith(NEW_CHANGE)) {
return NEW_CHANGE;
}
@@ -80,11 +71,6 @@
if (result != Capable.OK) {
return result;
}
- result = checkMagicBranchRef(NEW_PUBLISH_CHANGE, repo, project);
- if (result != Capable.OK) {
- return result;
- }
-
return Capable.OK;
}
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index 2db5b43..5878407 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -2270,16 +2270,6 @@
}
@Test
- public void pushToPublishMagicBranchIsAllowed() throws Exception {
- // Push to "refs/publish/*" will be a synonym of "refs/for/*".
- createChange("refs/publish/master");
- PushOneCommit.Result result = pushTo("refs/publish/master");
- result.assertOkStatus();
- assertThat(result.getMessage())
- .endsWith("Pushing to refs/publish/* is deprecated, use refs/for/* instead.\n");
- }
-
- @Test
public void pushNoteDbRef() throws Exception {
String ref = "refs/changes/34/1234/meta";
RevCommit c = testRepo.commit().message("Junk NoteDb commit").create();
