opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.7'

Browse Source 
* stable-2.7:
  Use user's full name even when email is not configured
  Only handle last value change event for attached change screens
  Update the 2.6 release notes
  Fixed: Draft patch sets are visible in diff screens

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java

Change-Id: I26fd898a92577444a33b2cb7459487562d78a0b8
This commit is contained in:
Shawn Pearce
2013-06-13 21:50:51 -07:00
parent c6240c172d 734671c5d0
commit 62f7ce6583
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReleaseNotes/ReleaseNotes-2.6.txt
View File

@@ -1192,7 +1192,7 @@ but was coming up black on initial page load due to a style setup
ordering issue between the SearchPanel and the HintTextBox.
* link:https://code.google.com/p/gerrit/issues/detail?id=1661[Issue 1661]:
Update links to Change-Id and Signed-off-by docu on project info
Update links to Change-Id and Signed-off-by documentation on project info
screen
* Use href="javascript;" for All {Side-by-Side,Unified} links
@@ -1232,6 +1232,9 @@ Correctly handle paths with URL-escaped characters
URL-unescape the path portion of a change history token to correctly
handle paths with URL-escapable characters, i.e. '+', ' ', etc.
* link:https://code.google.com/p/gerrit/issues/detail?id=1915[Issue 1915]:
Don't show non-visible drafts in the diff screens.
REST API
~~~~~~~~

9
gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
View File

@@ -98,10 +98,11 @@ public class FromAddressGeneratorProvider implements
@Override
public Address from(final Account.Id fromId) {
if (fromId != null) {
final Account a = accountCache.get(fromId).getAccount();
if (a.getPreferredEmail() != null) {
return new Address(a.getFullName(), a.getPreferredEmail());
}
Account a = accountCache.get(fromId).getAccount();
String userEmail = a.getPreferredEmail();
return new Address(
a.getFullName(),
userEmail != null ? userEmail : srvAddr.getEmail());
}
return srvAddr;
}

8
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java
View File

@@ -126,6 +126,11 @@ public class PatchScriptFactory implements Callable<PatchScript> {
aId = psa != null ? toObjectId(db, psa) : null;
bId = toObjectId(db, psb);
if ((psa != null && !control.isPatchVisible(db.patchSets().get(psa), db)) ||
(psb != null && !control.isPatchVisible(db.patchSets().get(psb), db))) {
throw new NoSuchChangeException(changeId);
}
final Repository git;
try {
git = repoManager.openRepository(projectKey);
@@ -220,6 +225,9 @@ public class PatchScriptFactory implements Callable<PatchScript> {
// proper rename detection between the patch sets.
//
for (final PatchSet ps : db.patchSets().byChange(changeId)) {
if (!control.isPatchVisible(ps, db)) {
continue;
}
String name = fileName;
if (psa != null) {
switch (changeType) {

5
gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
View File

@@ -102,12 +102,13 @@ public class FromAddressGeneratorProviderTest extends TestCase {
public void testUSER_NoPreferredEmailUser() {
setFrom("USER");
final Account.Id user = user("A U. Thor", null);
final String name = "A U. Thor";
final Account.Id user = user(name, null);
replay(accountCache);
final Address r = create().from(user);
assertNotNull(r);
assertEquals(ident.getName(), r.name);
assertEquals(name, r.name);
assertEquals(ident.getEmailAddress(), r.email);
verify(accountCache);
}