github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

When a repo has migrated to v2, print message about updating remote

Browse source
This commit is contained in:
Shane Kilkelly 2018-12-03 11:49:06 +00:00
parent c553094a60
commit 326d0a0722
2 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java
View file

@ -15,11 +15,30 @@ public class MissingRepositoryException extends SnapshotAPIException {
"If this problem persists, please contact us." "If this problem persists, please contact us."
); );
public static final List<String> EXPORTED_TO_V2 = Arrays.asList( static List<String> buildExportedToV2Message(String remoteUrl) {
"This Overleaf project has been moved to Overleaf v2, and git access is temporarily unsupported.", if (remoteUrl == null) {
return Arrays.asList(
"This Overleaf project has been moved to Overleaf v2, and cannot be used with git at this time.",
"", "",
"See https://www.overleaf.com/help/342 for more information." "If this error persists, please contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
); );
} else {
return Arrays.asList(
"This Overleaf project has been moved to Overleaf v2, You should change your remote to:",
"",
" " + remoteUrl,
"",
"Assuming you are using the default \"origin\" remote, the following commands",
"will change the remote for you:",
"",
" git remote set-url origin " + remoteUrl,
"",
"If this does not work, contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
);
}
}
private List<String> descriptionLines; private List<String> descriptionLines;

10
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java
View file

@ -79,9 +79,17 @@ public abstract class Request<T extends Result> {
try { try {
JsonObject json = Instance.gson.fromJson(httpCause.getContent(), JsonObject.class); JsonObject json = Instance.gson.fromJson(httpCause.getContent(), JsonObject.class);
String message = json.get("message").getAsString(); String message = json.get("message").getAsString();
String newRemote;
if (json.has("new_remote")) {
newRemote = json.get("new_remote").getAsString();
} else {
newRemote = null;
}
if ("Exported to v2".equals(message)) { if ("Exported to v2".equals(message)) {
throw new MissingRepositoryException(MissingRepositoryException.EXPORTED_TO_V2); throw new MissingRepositoryException(
MissingRepositoryException.buildExportedToV2Message(newRemote)
);
} }
} catch (IllegalStateException } catch (IllegalStateException
| ClassCastException | ClassCastException