opendev
/
gerrit
Code Issues Proposed changes

Use ~ instead of - as delimiter for local comments 

Projects can contain dashes as part of their name which confuses the
local comments storage. By using tilde instead, we can work around this
issue because it is part of the invalid strings collection that prevents
creation of new projects containing any of those strings.

Once deployed, we start neglecting local comments that use the old
delimiter. Since comments are synced to the server immediately if the
user is online, there should be almost no cases where comments are lost.
In addition, a comment would still be in the browser's local storage and
retrievable from there manually.

Change-Id: Ibb18635e359a3b338b04e6a0e95637f699d2ebef
This commit is contained in:
Patrick Hiesel 2017-08-29 08:50:53 +02:00
parent b84c35c9cf
commit 1bd33e3132
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LocalComments.java
View File

@ -128,7 +128,7 @@ public class LocalComments {
}
private String getReplyCommentName() {
return "savedReplyComment-" + PageLinks.toChangeId(project, changeId);
return "savedReplyComment~" + PageLinks.toChangeId(project, changeId);
}
public static void saveInlineComments() {
@ -194,9 +194,9 @@ public class LocalComments {
}
private static boolean isInlineComment(String key) {
return key.startsWith("patchCommentEdit-")
|| key.startsWith("patchReply-")
|| key.startsWith("patchComment-");
return key.startsWith("patchCommentEdit~")
|| key.startsWith("patchReply~")
|| key.startsWith("patchComment~");
}
private static InlineComment getInlineComment(String key) {
@ -206,9 +206,9 @@ public class LocalComments {
CommentRange range;
StorageBackend storage = new StorageBackend();
String[] elements = key.split("-");
String[] elements = key.split("~");
int offset = 1;
if (key.startsWith("patchReply-") || key.startsWith("patchCommentEdit-")) {
if (key.startsWith("patchReply~") || key.startsWith("patchCommentEdit~")) {
offset = 2;
}
ProjectChangeId id = ProjectChangeId.create(elements[offset + 0]);
@ -232,9 +232,9 @@ public class LocalComments {
}
CommentInfo info = CommentInfo.create(path, side, line, range, false);
info.message(storage.getItem(key));
if (key.startsWith("patchReply-")) {
if (key.startsWith("patchReply~")) {
info.inReplyTo(elements[1]);
} else if (key.startsWith("patchCommentEdit-")) {
} else if (key.startsWith("patchCommentEdit~")) {
info.id(elements[1]);
}
InlineComment inlineComment = new InlineComment(id.getProject(), psId, info);
@ -245,22 +245,22 @@ public class LocalComments {
if (psId == null) {
return null;
}
String result = "patchComment-";
String result = "patchComment~";
if (comment.id() != null) {
result = "patchCommentEdit-" + comment.id() + "-";
result = "patchCommentEdit~" + comment.id() + "~";
} else if (comment.inReplyTo() != null) {
result = "patchReply-" + comment.inReplyTo() + "-";
result = "patchReply~" + comment.inReplyTo() + "~";
}
result += PageLinks.toChangeId(project, changeId);
result += "-" + psId.getId() + "-" + btoa(comment.path()) + "-" + comment.side() + "-";
result += "~" + psId.getId() + "~" + btoa(comment.path()) + "~" + comment.side() + "~";
if (comment.hasRange()) {
result +=
"R"
+ comment.range().startLine()
+ ","
+ comment.range().startCharacter()
+ "-"
+ "~"
+ comment.range().endLine()
+ ","
+ comment.range().endCharacter();