private String getBranchChangesetPath(GeoGIG geogig) { final String branch = getHead(geogig).getTarget(); String path = "osm/" + branch; return path; }
private Ref resolveHeadTarget() { final Optional<Ref> currHead = refParse(Ref.HEAD); checkState(currHead.isPresent(), "Repository has no HEAD, can't push."); checkState(currHead.get() instanceof SymRef, "Can't push from detached HEAD"); final Optional<Ref> headTarget = refParse(((SymRef) currHead.get()).getTarget()); checkState(headTarget.isPresent()); return headTarget.get(); }
private Ref resolveHeadTarget() { final Optional<Ref> currHead = refParse(Ref.HEAD); checkState(currHead.isPresent(), "Repository has no HEAD, can't push."); checkState(currHead.get() instanceof SymRef, "Can't push from detached HEAD"); final Optional<Ref> headTarget = refParse(((SymRef) currHead.get()).getTarget()); checkState(headTarget.isPresent()); return headTarget.get(); }
private Ref resolveHeadTarget() { final Optional<Ref> currHead = refParse(Ref.HEAD); checkState(currHead.isPresent(), "Repository has no HEAD, can't push."); checkState(currHead.get() instanceof SymRef, "Can't push from detached HEAD"); final Optional<Ref> headTarget = refParse(((SymRef) currHead.get()).getTarget()); checkState(headTarget.isPresent()); return headTarget.get(); }
private Ref resolveHeadTarget() { final Optional<Ref> currHead = refParse(Ref.HEAD); checkState(currHead.isPresent(), "Repository has no HEAD, can't push."); checkState(currHead.get() instanceof SymRef, "Can't push from detached HEAD"); final Optional<Ref> headTarget = refParse(((SymRef) currHead.get()).getTarget()); checkState(headTarget.isPresent()); return headTarget.get(); }
private String refDisplayString(Ref ref) { String branchName = ref.getName(); if (branchName.startsWith(Ref.HEADS_PREFIX)) { branchName = ref.localName(); } else if (branchName.startsWith(Ref.REMOTES_PREFIX)) { branchName = branchName.substring(Ref.REMOTES_PREFIX.length()); } if (ref instanceof SymRef) { branchName += " -> " + Ref.localName(((SymRef) ref).getTarget()); } return branchName; } }
private String refDisplayString(Ref ref) { String branchName = ref.getName(); if (branchName.startsWith(Ref.HEADS_PREFIX)) { branchName = ref.localName(); } else if (branchName.startsWith(Ref.REMOTES_PREFIX)) { branchName = branchName.substring(Ref.REMOTES_PREFIX.length()); } if (ref instanceof SymRef) { branchName += " -> " + Ref.localName(((SymRef) ref).getTarget()); } return branchName; } }
private String refDisplayString(Ref ref) { String branchName = ref.getName(); if (branchName.startsWith(Ref.HEADS_PREFIX)) { branchName = ref.localName(); } else if (branchName.startsWith(Ref.REMOTES_PREFIX)) { branchName = branchName.substring(Ref.REMOTES_PREFIX.length()); } if (ref instanceof SymRef) { branchName += " -> " + Ref.localName(((SymRef) ref).getTarget()); } return branchName; } }
@Test public void testResolveSymbolicRef() { when(mockRefDb.getRef(eq("HEAD"))).thenThrow(new IllegalArgumentException()); when(mockRefDb.getSymRef(eq("HEAD"))).thenReturn("refs/heads/branch1"); Optional<Ref> ref = command.setName("HEAD").call(); assertTrue(ref.isPresent()); assertTrue(ref.get() instanceof SymRef); assertEquals("HEAD", ref.get().getName()); assertEquals("refs/heads/branch1", ((SymRef) ref.get()).getTarget()); } }
@Test public void testResolveSymbolicRef() { when(mockRefDb.getRef(eq("HEAD"))).thenThrow(new IllegalArgumentException()); when(mockRefDb.getSymRef(eq("HEAD"))).thenReturn("refs/heads/branch1"); Optional<Ref> ref = command.setName("HEAD").call(); assertTrue(ref.isPresent()); assertTrue(ref.get() instanceof SymRef); assertEquals("HEAD", ref.get().getName()); assertEquals("refs/heads/branch1", ((SymRef) ref.get()).getTarget()); } }
/** * Writes the response for the {@link RefParse} command to the stream. * * @param ref the ref returned from the command * @throws StreamWriterException */ public void writeRefParseResponse(Ref ref) throws StreamWriterException { out.writeStartElement("Ref"); writeElement("name", ref.getName()); writeElement("objectId", ref.getObjectId().toString()); if (ref instanceof SymRef) { writeElement("target", ((SymRef) ref).getTarget()); } out.writeEndElement(); }
public TestData checkout(String branch) { getContext().command(CheckoutOp.class).setSource(branch).call(); Ref head = getContext().command(RefParse.class).setName(Ref.HEAD).call().get(); if (head instanceof SymRef) { String target = ((SymRef) head).getTarget(); head = getContext().command(RefParse.class).setName(target).call().get(); } String headBranch = head.localName(); checkState(branch.equals(headBranch), "expected %s, got %s", branch, headBranch); return this; }
public TestData checkout(String branch) { getContext().command(CheckoutOp.class).setSource(branch).call(); Ref head = getContext().command(RefParse.class).setName(Ref.HEAD).call().get(); if (head instanceof SymRef) { String target = ((SymRef) head).getTarget(); head = getContext().command(RefParse.class).setName(target).call().get(); } String headBranch = head.localName(); checkState(branch.equals(headBranch), "expected %s, got %s", branch, headBranch); return this; }
@Test public void testSymRef() { Ref testRef = new Ref(Ref.REFS_PREFIX + "commit1", ObjectId.valueOf("abc123000000000000001234567890abcdef0000")); SymRef symRef = new SymRef("TestRef", testRef); assertEquals(testRef.getName(), symRef.getTarget()); String symRefString = symRef.toString(); assertEquals("TestRef -> " + "[" + testRef.getName() + " -> " + testRef.getObjectId().toString() + "]", symRefString); } }
@Test public void testCheckoutBranchWithForceOptionAndChangesInTheIndex() throws Exception { insertAndAdd(points1); RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); Ref branch1 = geogig.command(BranchCreateOp.class).setName("branch1").call(); insertAndAdd(points2); CheckoutResult result = geogig.command(CheckoutOp.class).setSource("branch1").setForce(true) .call(); assertEquals(c1.getTreeId(), result.getNewTree()); assertTrue(geogig.command(RefParse.class).setName(Ref.HEAD).call().get() instanceof SymRef); assertEquals(branch1.getName(), ((SymRef) geogig.command(RefParse.class).setName(Ref.HEAD).call().get()) .getTarget()); }
@Test public void testCheckoutBranchWithForceOptionAndChangesInTheIndex() throws Exception { insertAndAdd(points1); RevCommit c1 = geogig.command(CommitOp.class).setMessage("commit for " + idP1).call(); Ref branch1 = geogig.command(BranchCreateOp.class).setName("branch1").call(); insertAndAdd(points2); CheckoutResult result = geogig.command(CheckoutOp.class).setSource("branch1").setForce(true) .call(); assertEquals(c1.getTreeId(), result.getNewTree()); assertTrue(geogig.command(RefParse.class).setName(Ref.HEAD).call().get() instanceof SymRef); assertEquals(branch1.getName(), ((SymRef) geogig.command(RefParse.class).setName(Ref.HEAD).call().get()) .getTarget()); }
@Test public void testDeleteRefTurnedIntoASymbolicRef() throws Exception { insertAndAdd(points1); RevCommit commit = geogig.command(CommitOp.class).call(); Ref branch = geogig.command(BranchCreateOp.class).setName("branch1").call(); assertTrue(branch.getObjectId().equals(commit.getId())); geogig.command(UpdateSymRef.class).setName("refs/heads/branch1") .setOldValue(commit.getId().toString()).setNewValue(Ref.MASTER) .setReason("this is a test").call(); Optional<Ref> branchId = geogig.command(RefParse.class).setName("refs/heads/branch1") .call(); assertTrue(((SymRef) branchId.get()).getTarget().equals(Ref.MASTER)); geogig.command(UpdateSymRef.class).setName("refs/heads/branch1").setDelete(true).call(); }
@Test public void testDeleteRefTurnedIntoASymbolicRef() throws Exception { insertAndAdd(points1); RevCommit commit = geogig.command(CommitOp.class).call(); Ref branch = geogig.command(BranchCreateOp.class).setName("branch1").call(); assertTrue(branch.getObjectId().equals(commit.getId())); geogig.command(UpdateSymRef.class).setName("refs/heads/branch1") .setOldValue(commit.getId().toString()).setNewValue(Ref.MASTER) .setReason("this is a test").call(); Optional<Ref> branchId = geogig.command(RefParse.class).setName("refs/heads/branch1") .call(); assertTrue(((SymRef) branchId.get()).getTarget().equals(Ref.MASTER)); geogig.command(UpdateSymRef.class).setName("refs/heads/branch1").setDelete(true).call(); }
private RevTree createHeadTree(NodeRef... treeRefs) { RevTree root = createFromRefs(objectDb, treeRefs); objectDb.put(root); CommitBuilder cb = new CommitBuilder(geogig.getPlatform()); ObjectId treeId = root.getId(); RevCommit commit = cb.setTreeId(treeId).setCommitter("Gabriel Roldan") .setAuthor("Gabriel Roldan").build(); objectDb.put(commit); SymRef head = (SymRef) geogig.command(RefParse.class).setName(Ref.HEAD).call().get(); final String currentBranch = head.getTarget(); geogig.command(UpdateRef.class).setName(currentBranch).setNewValue(commit.getId()).call(); verifyRepositoryTree(NodeRef.ROOT, treeId); verifyTreeStructure(treeId, treeRefs); return root; }
private RevTree createHeadTree(NodeRef... treeRefs) { RevTree root = createFromRefs(objectDb, treeRefs); objectDb.put(root); RevCommitBuilder cb = RevCommit.builder().platform(geogig.getPlatform()); ObjectId treeId = root.getId(); RevCommit commit = cb.treeId(treeId).committer("Gabriel Roldan").author("Gabriel Roldan") .build(); objectDb.put(commit); SymRef head = (SymRef) geogig.command(RefParse.class).setName(Ref.HEAD).call().get(); final String currentBranch = head.getTarget(); geogig.command(UpdateRef.class).setName(currentBranch).setNewValue(commit.getId()).call(); verifyRepositoryTree(NodeRef.ROOT, treeId); verifyTreeStructure(treeId, treeRefs); return root; }