From 767fb175edeb96ece4a2360796a82e85b0fa354e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 18 Jun 2010 23:24:56 +0200 Subject: [PATCH] Fix line endings Some sources had dos line endings. Also configure all projects to use unix line endings and UTF-8 text encoding. Change-Id: I8fc9a1dbb219ffa91d1b3011b3b11b7e48e74ca7 Signed-off-by: Matthias Sohn --- .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + org.eclipse.jgit.iplog/README | 108 +++++++++--------- .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 6 +- .../.settings/org.eclipse.core.runtime.prefs | 6 +- .../.settings/org.eclipse.core.runtime.prefs | 6 +- 10 files changed, 81 insertions(+), 63 deletions(-) create mode 100644 org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs create mode 100644 org.eclipse.jgit.http.test/.settings/org.eclipse.core.runtime.prefs create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.runtime.prefs create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.runtime.prefs diff --git a/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..ceaec8217 --- /dev/null +++ b/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Fri Jun 18 23:33:29 CEST 2010 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.eclipse.jgit.http.test/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.http.test/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 000000000..1111b451e --- /dev/null +++ b/org.eclipse.jgit.http.test/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Fri Jun 18 23:33:29 CEST 2010 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.jgit.iplog/README b/org.eclipse.jgit.iplog/README index 8ea323346..4015c7da9 100644 --- a/org.eclipse.jgit.iplog/README +++ b/org.eclipse.jgit.iplog/README @@ -1,54 +1,54 @@ -# ----------------------------------------------------------- -# This document describes how to generate the Eclipse ip log -# for the eclipse project technology.jgit using a local clone -# of the git repository -# git://egit.eclipse.org/jgit.git -# starting point is a manually written file -# .eclipse_iplog -# located in the repository's work dir root path -# which is describing the project, see first section of this -# file in the jgit root directory: -# $JGIT_BASE/.eclipse_iplog -# ----------------------------------------------------------- -# Prepare: -# jgit work tree base dir -export JGIT_BASE="c:/data/ide/helios/jgit" - -# repository work dir root path -export WORK_DIR="c:/data/ide/helios/jgit" - -# cd to repository work dir root path (for jgit this is identical to $JGIT_BASE) -cd $WORK_DIR - -# ----------------------------------------------------------- -# Update the CQ list: -# - this command updates file .eclipse_iplog -java -jar $JGIT_BASE/org.eclipse.jgit.pgm/target/jgit-cli.jar eclipse-ipzilla - -# - if there are any updates 'git commit' them -git add .eclipse_iplog -git commit - -# - type in ipzilla user and password - -# ----------------------------------------------------------- -# Get the committer data from gerrit: -# - start gerrit gsql via ssh -# options: -# -p : ssh port gerrit is listening on -ssh -p 29418 username@egit.eclipse.org gerrit gsql --format PRETTY - -# - type in ssh passphrase for your ssh key -# - run the SQL query (cut and paste content to interactive gerrit shell) -# org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/gsql_query.txt -# - copy the query result into the file (no headers, no blank lines): -# $WORK_DIR/.git/gerrit_committers - -# ----------------------------------------------------------- -# Generate the iplog: -# options: -# -- version : the project version the iplog is to be generated for -# - o : the output file -java -jar $JGIT_BASE/org.eclipse.jgit.pgm/target/jgit-cli.jar eclipse-iplog --version=0.8.0 -o jgit-0.8.0.xml - - +# ----------------------------------------------------------- +# This document describes how to generate the Eclipse ip log +# for the eclipse project technology.jgit using a local clone +# of the git repository +# git://egit.eclipse.org/jgit.git +# starting point is a manually written file +# .eclipse_iplog +# located in the repository's work dir root path +# which is describing the project, see first section of this +# file in the jgit root directory: +# $JGIT_BASE/.eclipse_iplog +# ----------------------------------------------------------- +# Prepare: +# jgit work tree base dir +export JGIT_BASE="c:/data/ide/helios/jgit" + +# repository work dir root path +export WORK_DIR="c:/data/ide/helios/jgit" + +# cd to repository work dir root path (for jgit this is identical to $JGIT_BASE) +cd $WORK_DIR + +# ----------------------------------------------------------- +# Update the CQ list: +# - this command updates file .eclipse_iplog +java -jar $JGIT_BASE/org.eclipse.jgit.pgm/target/jgit-cli.jar eclipse-ipzilla + +# - if there are any updates 'git commit' them +git add .eclipse_iplog +git commit + +# - type in ipzilla user and password + +# ----------------------------------------------------------- +# Get the committer data from gerrit: +# - start gerrit gsql via ssh +# options: +# -p : ssh port gerrit is listening on +ssh -p 29418 username@egit.eclipse.org gerrit gsql --format PRETTY + +# - type in ssh passphrase for your ssh key +# - run the SQL query (cut and paste content to interactive gerrit shell) +# org.eclipse.jgit.iplog/src/org/eclipse/jgit/iplog/gsql_query.txt +# - copy the query result into the file (no headers, no blank lines): +# $WORK_DIR/.git/gerrit_committers + +# ----------------------------------------------------------- +# Generate the iplog: +# options: +# -- version : the project version the iplog is to be generated for +# - o : the output file +java -jar $JGIT_BASE/org.eclipse.jgit.pgm/target/jgit-cli.jar eclipse-iplog --version=0.8.0 -o jgit-0.8.0.xml + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..6f96ce809 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Fri Jun 18 23:33:45 CEST 2010 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 000000000..1a32dba17 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Fri Jun 18 23:33:45 CEST 2010 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..f6d7cf334 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Fri Jun 18 23:33:08 CEST 2010 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 000000000..039a33ca0 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Fri Jun 18 23:33:08 CEST 2010 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs index fc5b578c1..4f21775ea 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs @@ -1,3 +1,3 @@ -#Mon Mar 24 18:55:44 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n +#Mon Mar 24 18:55:44 EDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.jgit.test/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.test/.settings/org.eclipse.core.runtime.prefs index 72987c252..9f733eeea 100644 --- a/org.eclipse.jgit.test/.settings/org.eclipse.core.runtime.prefs +++ b/org.eclipse.jgit.test/.settings/org.eclipse.core.runtime.prefs @@ -1,3 +1,3 @@ -#Mon Mar 24 18:55:56 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n +#Mon Mar 24 18:55:56 EDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.jgit/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit/.settings/org.eclipse.core.runtime.prefs index cce05685b..006e07ede 100644 --- a/org.eclipse.jgit/.settings/org.eclipse.core.runtime.prefs +++ b/org.eclipse.jgit/.settings/org.eclipse.core.runtime.prefs @@ -1,3 +1,3 @@ -#Mon Mar 24 18:55:50 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n +#Mon Mar 24 18:55:50 EDT 2008 +eclipse.preferences.version=1 +line.separator=\n