opendev/gerrit
Code Issues Proposed changes

Merge "Fix computation of ChangeData#merge"

Browse Source
This commit is contained in:
Gal Paikin
2021-03-18 13:57:55 +00:00
committed by Gerrit Code Review
parent 2425b53eed d3acbc621c
commit 1ea8374493
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -607,7 +607,7 @@ public class ChangeData {
author = c.getAuthorIdent(); author = c.getAuthorIdent();
committer = c.getCommitterIdent(); committer = c.getCommitterIdent();
parentCount = c.getParentCount(); parentCount = c.getParentCount();
merge = parentCount > 0; merge = parentCount > 1;
} catch (IOException e) { } catch (IOException e) {
throw new StorageException( throw new StorageException(
String.format( String.format(

9
javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -2370,21 +2370,24 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
TestRepository<Repo> repo = createProject("repo"); TestRepository<Repo> repo = createProject("repo");
RevCommit commit1 = repo.parseBody(repo.commit().add("file1", "contents1").create()); RevCommit commit1 = repo.parseBody(repo.commit().add("file1", "contents1").create());
RevCommit commit2 = repo.parseBody(repo.commit().add("file1", "contents2").create()); RevCommit commit2 = repo.parseBody(repo.commit().add("file1", "contents2").create());
RevCommit commit3 =
repo.parseBody(repo.commit().parent(commit2).add("file1", "contents3").create());
Change change1 = insert(repo, newChangeForCommit(repo, commit1)); Change change1 = insert(repo, newChangeForCommit(repo, commit1));
Change change2 = insert(repo, newChangeForCommit(repo, commit2)); Change change2 = insert(repo, newChangeForCommit(repo, commit2));
Change change3 = insert(repo, newChangeForCommit(repo, commit3));
RevCommit mergeCommit = RevCommit mergeCommit =
repo.branch("master") repo.branch("master")
.commit() .commit()
.message("Merge commit") .message("Merge commit")
.parent(commit1) .parent(commit1)
.parent(commit2) .parent(commit3)
.insertChangeId() .insertChangeId()
.create(); .create();
Change mergeChange = insert(repo, newChangeForCommit(repo, mergeCommit)); Change mergeChange = insert(repo, newChangeForCommit(repo, mergeCommit));
assertQuery("status:open is:merge", mergeChange); assertQuery("status:open is:merge", mergeChange);
assertQuery("status:open -is:merge", change2, change1); assertQuery("status:open -is:merge", change3, change2, change1);
assertQuery("status:open", mergeChange, change2, change1); assertQuery("status:open", mergeChange, change3, change2, change1);
} }
@Test @Test