Merge with 2.0.0-m3

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigInIndexResource.java

@@ -0,0 +1,40 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import sonia.scm.config.ConfigurationPermissions;
+import sonia.scm.plugin.Extension;
+import sonia.scm.web.JsonEnricherBase;
+import sonia.scm.web.JsonEnricherContext;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+import static java.util.Collections.singletonMap;
+import static sonia.scm.web.VndMediaType.INDEX;
+
+@Extension
+public class HgConfigInIndexResource extends JsonEnricherBase {
+
+  private final Provider<ScmPathInfoStore> scmPathInfoStore;
+
+  @Inject
+  public HgConfigInIndexResource(Provider<ScmPathInfoStore> scmPathInfoStore, ObjectMapper objectMapper) {
+    super(objectMapper);
+    this.scmPathInfoStore = scmPathInfoStore;
+  }
+
+  @Override
+  public void enrich(JsonEnricherContext context) {
+    if (resultHasMediaType(INDEX, context) && ConfigurationPermissions.list().isPermitted()) {
+      String hgConfigUrl = new LinkBuilder(scmPathInfoStore.get().get(), HgConfigResource.class)
+        .method("get")
+        .parameters()
+        .href();
+
+      JsonNode hgConfigRefNode = createObject(singletonMap("href", value(hgConfigUrl)));
+
+      addPropertyNode(context.getResponseEntity().get("_links"), "hgConfig", hgConfigRefNode);
+    }
+  }
+}

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java

@@ -132,7 +132,11 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
         List<Changeset> changesets = on(repository).rev(start + ":"
                                        + end).execute();
 
-        result = new ChangesetPagingResult(total, changesets);
+        if (request.getBranch() == null) {
+          result = new ChangesetPagingResult(total, changesets);
+        } else {
+          result = new ChangesetPagingResult(total, changesets, request.getBranch());
+        }
       }
       else
       {

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/AbstractChangesetCommand.java

@@ -216,10 +216,7 @@ public abstract class AbstractChangesetCommand extends AbstractCommand
 
     String branch = in.textUpTo('\n');
 
-    if (!BRANCH_DEFAULT.equals(branch))
-    {
-      changeset.getBranches().add(branch);
-    }
+    changeset.getBranches().add(branch);
 
     String p1 = readId(in, changeset, PROPERTY_PARENT1_REVISION);
 

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigInIndexResourceTest.java

@@ -0,0 +1,64 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import com.google.inject.util.Providers;
+import org.junit.Rule;
+import org.junit.Test;
+import sonia.scm.web.JsonEnricherContext;
+import sonia.scm.web.VndMediaType;
+
+import javax.ws.rs.core.MediaType;
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini")
+public class HgConfigInIndexResourceTest {
+
+  @Rule
+  public final ShiroRule shiroRule = new ShiroRule();
+
+  private final ObjectMapper objectMapper = new ObjectMapper();
+  private final ObjectNode root = objectMapper.createObjectNode();
+  private final HgConfigInIndexResource hgConfigInIndexResource;
+
+  public HgConfigInIndexResourceTest() {
+    root.put("_links", objectMapper.createObjectNode());
+    ScmPathInfoStore pathInfoStore = new ScmPathInfoStore();
+    pathInfoStore.set(() -> URI.create("/"));
+    hgConfigInIndexResource = new HgConfigInIndexResource(Providers.of(pathInfoStore), objectMapper);
+  }
+
+  @Test
+  @SubjectAware(username = "admin", password = "secret")
+  public void admin() {
+    JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+    hgConfigInIndexResource.enrich(context);
+
+    assertEquals("/v2/config/hg", root.get("_links").get("hgConfig").get("href").asText());
+  }
+
+  @Test
+  @SubjectAware(username = "readOnly", password = "secret")
+  public void user() {
+    JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+    hgConfigInIndexResource.enrich(context);
+
+    assertFalse(root.get("_links").iterator().hasNext());
+  }
+
+  @Test
+  public void anonymous() {
+    JsonEnricherContext context = new JsonEnricherContext(URI.create("/index"), MediaType.valueOf(VndMediaType.INDEX), root);
+
+    hgConfigInIndexResource.enrich(context);
+
+    assertFalse(root.get("_links").iterator().hasNext());
+  }
+}

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java

@@ -88,6 +88,21 @@ public class HgLogCommandTest extends AbstractHgCommandTestBase
       result.getChangesets().get(2).getId());
   }
 
+  @Test
+  public void testGetDefaultBranchInfo() {
+    LogCommandRequest request = new LogCommandRequest();
+
+    request.setPath("a.txt");
+
+    ChangesetPagingResult result = createComamnd().getChangesets(request);
+
+    assertNotNull(result);
+    assertEquals(1,
+      result.getChangesets().get(0).getBranches().size());
+    assertEquals("default",
+      result.getChangesets().get(0).getBranches().get(0));
+  }
+
   @Test
   public void testGetAllWithLimit() {
     LogCommandRequest request = new LogCommandRequest();

scm-plugins/scm-hg-plugin/src/test/resources/sonia/scm/configuration/shiro.ini

@@ -2,8 +2,10 @@
 readOnly = secret, reader
 writeOnly = secret, writer
 readWrite = secret, readerWriter
+admin = secret, admin
 
 [roles]
 reader = configuration:read:hg
 writer = configuration:write:hg
 readerWriter = configuration:*:hg
+admin = *