These are chat archives for fiji/fiji

10th
Nov 2017
Stephan Preibisch
@StephanPreibisch
Nov 10 2017 10:17
yes
Stephan Preibisch
@StephanPreibisch
Nov 10 2017 10:30
Varun Kapoor
@kapoorlab
Nov 10 2017 18:50
@ctrueden When you did the Travis CI for MTrack, author name and licence information appeared on all the java files, now I tried to clone the repo through a firewall using the Proxy but I do not see those lines of code anymore, this must be due to proxy interfering with eclipse settings somehow, I was able to put the proxy information in a settings.xml file and made maven projects read it but I think eclipse itself is not reading the proxy setting, have you encountered such issues when you are behind a firewall? Cheers,
Curtis Rueden
@ctrueden
Nov 10 2017 19:27
@kapoorlab Actually, the license stuff came in from PR PreibischLab/MTrack#1.
Specifically, from PreibischLab/MTrack@8cf3f2c.
Maven and proxies and Eclipse all have nothing to do with Git and its commits.
There is no chance that your settings.xml, for example, could prevent you from getting changes to the source, Git commit histories, etc.
The following files still do not have license headers on the latest master:
src/main/java/initialization/LocalPrefs.java
src/main/java/mt/MyCellRenderer.java
src/main/java/mt/ScrollablePicture.java
src/main/java/mt/WordWrapCellRenderer.java
src/main/java/mt/listeners/LengthdistroListener.java
src/main/java/mt/listeners/WriteLengthListener.java
I figured this out by running mvn license:update-file-header from the latest master, and seeing what changed.
You can check if you have the latest code by doing git checkout master && git fetch && git status and seeing if you are up to date. If it says you are behind, you can safely use git pull to fast forward to the latest, as long as you have no uncommitted changes.
I urge you to learn the git command line tool if you do not already know it, because it helps a lot with understanding how git actually works.
Stephan Saalfeld
@axtimwalde
Nov 10 2017 20:39
@StephanPreibisch I had another look at your repository and I cannot see why you wouldn't do that with the mpicbg package as is. Your function package covers 1D functions which would be sets of 1D point matches (x -> y)---no?
Varun Kapoor
@kapoorlab
Nov 10 2017 20:40
@ctrueden Hi, thanks I will try this when I am next in front of the office comp where all these problems came in today, I simply cloned the git repo and also did a git pull later but it said that master was up to date and I still did not see the licence and author info on java files not on the list above, the pom file was the same as on git repo and that is what surprised me. git pull just kept saying that everything was up to date! On my laptop, which is not under the firewall everything is normal!
Jan Eglinger
@imagejan
Nov 10 2017 20:44
@kapoorlab did you maybe pull from a fork instead of the origin?
Varun Kapoor
@kapoorlab
Nov 10 2017 20:51
@imagejan I did it from the origin (there is only master branch), and then cloned imglib2 and eclipse showed errors 'coz it could not get the repos which were there on the pom due to proxy issues so when I resolved that and looked in the file where new author information is included on git, it was showing me the old stuff I had put before the new author and licence info was put it. git pull said i was up to date so i have no clue why this is.
Niko Ehrenfeuchter
@ehrenfeu
Nov 10 2017 21:00
@kapoorlab note that "origin" doesn't clearly indicate which repository (fork) you were pulling from - that's just the standard name git assigns to the default remote. If you clone from a fork, the remote will still be called "origin". On the command line you can verify the repository using git remote - v
Jan Eglinger
@imagejan
Nov 10 2017 21:00
@kapoorlab I just noticed that master on https://github.com/ctrueden/MTrack is 31 commits behind master from https://github.com/PreibischLab/MTrack, so I thought you might've pulled from the wrong source...
@ehrenfeu :+1:
Varun Kapoor
@kapoorlab
Nov 10 2017 21:03
I pulled it from PreibischLab repo, has to be a proxy related matter right, everything works fine with normal internet!
Stephan Preibisch
@StephanPreibisch
Nov 10 2017 22:29
@ac
@alessandrofelder
Ok, this does not work on an iPhone
@axtimwalde we discussed it already and you agreed 😊 let’s talk about it next week