From ca4e1d1967606cb29bcebda2a51ef17c42de3655 Mon Sep 17 00:00:00 2001 From: esoe Date: Fri, 11 Nov 2022 23:52:05 +0300 Subject: [PATCH] readme, fetch and pull commits/ it works --- README.md | 7 ++++ out/repos | 2 +- .../molokoin/sourceListener/GitListener.java | 33 ++++++++++++++++-- .../sourceListener/git/RepoCrafter.java | 1 + .../molokoin/sourceListener/GitListener.class | Bin 6397 -> 7245 bytes .../sourceListener/git/RepoCrafter.class | Bin 2799 -> 2880 bytes 6 files changed, 39 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 35d1f76..3a60c30 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,13 @@ ## Область применения Приложение предусмотрено для применения в комплексе с остальными компонентами Системы автоматизации развертывания контента на веб-сервере. +предполагаемый контент: +* javadoc +* статические html странички, сгенерированые из markdown, plantuml +в перспективе с использованием maven+git: +* сервлеты, апплеты +* развертывание компонентов работающего сервера, без остановки его работы + ## Варианты использования (use case) * Вариант 1. (library)\ diff --git a/out/repos b/out/repos index 60eda03..0ab4af2 160000 --- a/out/repos +++ b/out/repos @@ -1 +1 @@ -Subproject commit 60eda0382753a60b183fec48f7372c956c7895ff +Subproject commit 0ab4af2faa92b28085e13cf2789ec1652cb7f0a9 diff --git a/src/main/java/ru/molokoin/sourceListener/GitListener.java b/src/main/java/ru/molokoin/sourceListener/GitListener.java index 2ced3a3..95c5ef9 100644 --- a/src/main/java/ru/molokoin/sourceListener/GitListener.java +++ b/src/main/java/ru/molokoin/sourceListener/GitListener.java @@ -4,20 +4,28 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.net.URI; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collection; import java.util.Enumeration; +import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.eclipse.jgit.api.CheckoutCommand; import org.eclipse.jgit.api.FetchCommand; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.LsRemoteCommand; +import org.eclipse.jgit.api.PullCommand; +import org.eclipse.jgit.api.Status; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.TransportException; +import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.FetchResult; import com.fasterxml.jackson.core.exc.StreamReadException; @@ -155,10 +163,29 @@ public class GitListener { } Git git = new Git(ear.getRepo()); - Collection c= git.lsRemote().call(); - for (Ref ref : c) { - System.out.println("ref >>>>>>>>>> " + ref); + //получаем сведения об удаленных комитах + git.fetch().call(); + //System.out.println(">>>>>>>>>>>>>>>>>>>" + git.fetch().getRemote()); + Status status = git.status().call(); + System.out.println("Git Change: " + status.getChanged()); + System.out.println("Git Modified: " + status.getModified()); + System.out.println("Git UncommittedChanges: " + status.getUncommittedChanges()); + System.out.println("Git Untracked: " + status.getUntracked()); + + //выводим список комитов + try { + for (RevCommit c : git.log().all().call()) + System.out.println(c + ": " + c.getShortMessage()); + } catch (IOException e) { + System.out.println("git.log().all().call() >>>>>>> " + e.getMessage()); + e.printStackTrace(); } + //забираем обновления с удаленного репозитария + // CheckoutCommand checkout = git.checkout(); + // checkout.setName("master"); + // checkout.call(); + // PullCommand pullCmd = git.pull(); + // pullCmd.call(); git.close(); } } diff --git a/src/main/java/ru/molokoin/sourceListener/git/RepoCrafter.java b/src/main/java/ru/molokoin/sourceListener/git/RepoCrafter.java index 931ba1e..eab691e 100644 --- a/src/main/java/ru/molokoin/sourceListener/git/RepoCrafter.java +++ b/src/main/java/ru/molokoin/sourceListener/git/RepoCrafter.java @@ -45,6 +45,7 @@ public class RepoCrafter { Git result = Git.cloneRepository() .setURI(gitLink) .setDirectory(localFile) + .setCloneAllBranches(true) //.setProgressMonitor(new SimpleProgressMonitor()) .call(); // Note: the call() returns an opened repository already which needs to be closed to avoid file handle leaks! diff --git a/target/classes/ru/molokoin/sourceListener/GitListener.class b/target/classes/ru/molokoin/sourceListener/GitListener.class index 82b0225c4e986822bf58ab1ee3322d490b175ba8..65d036f78efe7ce5a6123246637c305e87ff5489 100644 GIT binary patch delta 1826 zcmaJ?+fx&F7(FK>Y)BRY1c-PA6buSPKoE&Q6^l2Z3Q}vemo=;*8WK$wwKr3Ho7&rq zvk!LqQrl_Av6lzb#zCi!oxU++XZjcPp>LgW+VQOqNWaYrjKVa@>~4PF`Of$K&iQ_` zGtKuq3a204z6)Rrk1BAOzvZnqi}Spb?KcYxT*q}IGDg&zzbIw>+NoHm&sykBj*n}J z(Xa1|Vwr^oCaR|(|Q?N3G*Y-(n!!WI#KNwpTBDmUkd zWK2A4X1nFt7NR02+MGdq3_YbCi|b)8w^HouBuW?Tlc*;bR=JH`=I2FqnI3Le_{`i53^gxk--kJkkLI#%KhA$=2Fcnf_vFZ3B9cpC{^z-hcA(F=GN z@8Ltdk6#6UU!MNO#Tzr_VY)ts3!j)>fj)j_YGr=&a-h=VsFn@q0}PnA1EI{JhAbUf z<_})S@;me%_OtL7eT`WbXIYWu@+|7+BdhGln#GYCJF;$ZWW61!pN~jA`EAOwZHgVt zpwo2~EtRe*b`$s5+v$8|)* zfRumj4OyI@ghPZ@;S)2j-~s-TdmgrAB_lV;Me1IPXHHmw;jz8u805|XuH(7|ESc;!nfxCi-Oon2~%wZmse{T9XB6CFH zR}n_HG!(?yzi|;C$zuopkaxrL($hVx6ly82|ld>6uP%P0eOzbZ=+6Sf*_#I*d|^pb`7>Afsj&nWd&z?NlnF5)nBM zmWT=wk?>HYf<%Zn2?^q#=$l6mS|1e>>3#U_Ip1&j&iCDOKP>*yTKazCqV*b>*|!L~eh~i659$m>}x)w;8_O z|KSEf61Lt%CPM@on>HLu3?!mQ%ycH&mCt07y=FR}i+BS zC^`xEKiWDoSxA`qf2G1 z7p_X6&!C^P^fgzk!Ns7#5WD+-57PH)71zr*AV4}ZAis(*vxSqX)fBL2f zs}v(b`idub+DlZPK4n`1b#H28jTX0BsQZBbFc(+ z(Sdnbh51;E7X8R$vR&7BFNfpsp%X!@6it`7tQJkTD20V}XvKOg#76zaJMP;m6}Aa; zJ8H2*+;>Xctv~zj7w?AyNmL-E2mPCve)`G3hb#Kv!C|2nP>y~vHL(mw#CiZdIEuYE zh8&Iy;{;C1dkCj+5vTD^_#ZHc?>P4~8;H?91Ut^_$H8u1(4YJstwKR3S4hJ}atm|1 zITStHGw%g0M2GzW8iMv0bP#V?+F^Tw&?~xjc{uYqJwe+Ty<-fFA@Ykeo47gob?z9> zj6%K}47jjBTo;LJo9uvL$zGGyb(G--0=OxC+>$B8df?F3_JR-O`%*V```RIA=HQ$;~FTglAcV=kxr9(HGtNETgQ>)DeC2zIj zh8lx*F>WU9}p?zT+*pi8b Hb*_H^yH-X- delta 221 zcmX>g_Fk0h)W2Q(7#JAL876MzDrTR2j9rbfY4TfkDTNjuhE@iCMh4#W)RLgog8bsl zlKi4dE(R}#b{>WfhR)6E9D+=oUl~{#Sb+M=Cp&Tl8E#{!_1nY{x0}H*QmAn|gQ@N| zhURSyZQB?uwlUajW5@vUHvm;LGjIV(JqGT{C%EK84H-fibQ!`Jj2Vg;Oc=O