opendev/gerrit
Code Issues Proposed changes

MergeOpRepoManager: Remove abortIfOpen argument

Browse Source 
This was only used once in MergeOp, and hasn't really helped us avoid
any programmer error. We want to encourage wider use of
MergeOpRepoManager within the merge process, and we won't always be
able to assume the repos won't be open by that point.

Change-Id: Ibee928fd50df40d130c888692260ae9a736429dc
(cherry picked from commit 53144d2267)
This commit is contained in:
Dave Borowitz
2016-09-12 15:04:03 -04:00
committed by Zhen Chen
parent 481ba357bd
commit 2e7161c506
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/GitModules.java
View File

@@ -67,7 +67,7 @@ public class GitModules {
logDebug("Loading .gitmodules of {} for project {}", branch, project); logDebug("Loading .gitmodules of {} for project {}", branch, project);
OpenRepo or; OpenRepo or;
try { try {
or = orm.openRepo(project, false); or = orm.openRepo(project);
} catch (NoSuchProjectException e) { } catch (NoSuchProjectException e) {
throw new IOException(e); throw new IOException(e);
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -727,7 +727,7 @@ public class MergeOp implements AutoCloseable {
throws IntegrationException { throws IntegrationException {
for (Project.NameKey project : projects) { for (Project.NameKey project : projects) {
try { try {
orm.openRepo(project, true); orm.openRepo(project);
} catch (NoSuchProjectException noProject) { } catch (NoSuchProjectException noProject) {
logWarn("Project " + noProject.project() + " no longer exists, " logWarn("Project " + noProject.project() + " no longer exists, "
+ "abandoning open changes"); + "abandoning open changes");

7
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java
View File

@@ -187,13 +187,8 @@ public class MergeOpRepoManager implements AutoCloseable {
return or; return or;
} }
public OpenRepo openRepo(Project.NameKey project, boolean abortIfOpen) public OpenRepo openRepo(Project.NameKey project)
throws NoSuchProjectException, IOException { throws NoSuchProjectException, IOException {
if (abortIfOpen) {
checkState(!openRepos.containsKey(project),
"repo already opened: %s", project);
}
if (openRepos.containsKey(project)) { if (openRepos.containsKey(project)) {
return openRepos.get(project); return openRepos.get(project);
} }

12
gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
View File

@@ -251,7 +251,7 @@ public class SubmoduleOp {
} }
OpenRepo or; OpenRepo or;
try { try {
or = orm.openRepo(s.getProject(), false); or = orm.openRepo(s.getProject());
} catch (NoSuchProjectException e) { } catch (NoSuchProjectException e) {
// A project listed a non existent project to be allowed // A project listed a non existent project to be allowed
// to subscribe to it. Allow this for now, i.e. no exception is // to subscribe to it. Allow this for now, i.e. no exception is
@@ -290,7 +290,7 @@ public class SubmoduleOp {
for (Branch.NameKey targetBranch : branches) { for (Branch.NameKey targetBranch : branches) {
Project.NameKey targetProject = targetBranch.getParentKey(); Project.NameKey targetProject = targetBranch.getParentKey();
try { try {
OpenRepo or = orm.openRepo(targetProject, false); OpenRepo or = orm.openRepo(targetProject);
ObjectId id = or.repo.resolve(targetBranch.get()); ObjectId id = or.repo.resolve(targetBranch.get());
if (id == null) { if (id == null) {
logDebug("The branch " + targetBranch + " doesn't exist."); logDebug("The branch " + targetBranch + " doesn't exist.");
@@ -327,7 +327,7 @@ public class SubmoduleOp {
if (dst.containsKey(project)) { if (dst.containsKey(project)) {
superProjects.add(project); superProjects.add(project);
// get a new BatchUpdate for the super project // get a new BatchUpdate for the super project
OpenRepo or = orm.openRepo(project, false); OpenRepo or = orm.openRepo(project);
for (Branch.NameKey branch : dst.get(project)) { for (Branch.NameKey branch : dst.get(project)) {
addOp(or.getUpdate(), branch); addOp(or.getUpdate(), branch);
} }
@@ -348,7 +348,7 @@ public class SubmoduleOp {
throws IOException, SubmoduleException { throws IOException, SubmoduleException {
OpenRepo or; OpenRepo or;
try { try {
or = orm.openRepo(subscriber.getParentKey(), false); or = orm.openRepo(subscriber.getParentKey());
} catch (NoSuchProjectException | IOException e) { } catch (NoSuchProjectException | IOException e) {
throw new SubmoduleException("Cannot access superproject", e); throw new SubmoduleException("Cannot access superproject", e);
} }
@@ -404,7 +404,7 @@ public class SubmoduleOp {
throws IOException, SubmoduleException { throws IOException, SubmoduleException {
OpenRepo or; OpenRepo or;
try { try {
or = orm.openRepo(subscriber.getParentKey(), false); or = orm.openRepo(subscriber.getParentKey());
} catch (NoSuchProjectException | IOException e) { } catch (NoSuchProjectException | IOException e) {
throw new SubmoduleException("Cannot access superproject", e); throw new SubmoduleException("Cannot access superproject", e);
} }
@@ -444,7 +444,7 @@ public class SubmoduleOp {
throws SubmoduleException, IOException { throws SubmoduleException, IOException {
OpenRepo subOr; OpenRepo subOr;
try { try {
subOr = orm.openRepo(s.getSubmodule().getParentKey(), false); subOr = orm.openRepo(s.getSubmodule().getParentKey());
} catch (NoSuchProjectException | IOException e) { } catch (NoSuchProjectException | IOException e) {
throw new SubmoduleException("Cannot access submodule", e); throw new SubmoduleException("Cannot access submodule", e);
} }