git-svn-id: https://svn.lrde.epita.fr/perso/roland/trunk@822 be833968-19e8-472b-b5c8-4bceb4e44ec7
---
src/svn-to-git/convert-lrde-techreps-to-git | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/svn-to-git/convert-lrde-techreps-to-git b/src/svn-to-git/convert-lrde-techreps-to-git
index f42913a..5bf9a6b 100755
--- a/src/svn-to-git/convert-lrde-techreps-to-git
+++ b/src/svn-to-git/convert-lrde-techreps-to-git
@@ -15,8 +15,8 @@ git branch -d git-svn
# repo, so that commits and messages are correctly processed.
git config i18n.commitencoding ISO-8859-1
# Get rid of the trunk/ prefix and remove branches/ and tags/
-# directories. As the head commit of rewitten `master' branch is
-# imcompatible with the original checked out working copy, this
+# directories. As the head commit of the rewritten `master' branch is
+# incompatible with the original checked out working copy, this
# command may complain about a failed merge and exit with an erroneous
# status; just ignore it and reset to HEAD (i.e. `master').
git filter-branch \
--
1.7.10.4
* src/svn-to-git/convert-lrde-seminars-to-git: New.
Used to generated the a `csi-seminar' Git repository.
* src/svn-to-git/svn-to-git: Rename variable `path' as `ext_path',
as `path' might be a special variable to the shell (e.g., in Zsh).
By symmetry, rename `url' and `url_hash' as `ext_url' and
`ext_url_hash'.
* src/svn-to-git/authors-lrde.full (aseure): New author.
git-svn-id: https://svn.lrde.epita.fr/perso/roland/trunk@823 be833968-19e8-472b-b5c8-4bceb4e44ec7
---
src/svn-to-git/authors-lrde.full | 1 +
src/svn-to-git/convert-lrde-seminars-to-git | 52 +++++++++++++++++++++++++++
src/svn-to-git/svn-to-git | 12 +++----
3 files changed, 59 insertions(+), 6 deletions(-)
create mode 100755 src/svn-to-git/convert-lrde-seminars-to-git
diff --git a/src/svn-to-git/authors-lrde.full b/src/svn-to-git/authors-lrde.full
index bfc3ce0..7d519d9 100644
--- a/src/svn-to-git/authors-lrde.full
+++ b/src/svn-to-git/authors-lrde.full
@@ -9,6 +9,7 @@ alban = Alban Linard <alban(a)lrde.epita.fr>
angeli_a = Alexis Angelidis <angeli_a(a)lrde.epita.fr>
anisko_r = Robert Anisko <anisko_r(a)lrde.epita.fr>
aroune = Aroune Aroumougame <aroune.aroumougame(a)gmail.com>
+aseure = Anthony Seure <anthony.seure(a)lrde.epita.fr>
astrid = Astrid Wang <astrid(a)lrde.epita.fr>
audin = Maurice Audin <audin(a)lrde.epita.fr>
auroux = Lionel Auroux <auroux_l(a)lse.epita.fr>
diff --git a/src/svn-to-git/convert-lrde-seminars-to-git b/src/svn-to-git/convert-lrde-seminars-to-git
new file mode 100755
index 0000000..9fde65c
--- /dev/null
+++ b/src/svn-to-git/convert-lrde-seminars-to-git
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+# Convert the lrde-seminars repository from Subversion to Git.
+# This repository actually contains the sources of the CSI seminar,
+# hence the renaming to csi-seminar.
+
+./svn-to-git https://svn.lrde.epita.fr/svn/lrde-seminars \
+ csi-seminar authors-lrde.full
+
+# Postprocessing.
+cd csi-seminar
+# Remove branch 'git-svn'.
+git branch -d git-svn
+# Set back i18n.commitencoding to ISO-8859-1 before rewriting the Git
+# repo, so that commits and messages are correctly processed.
+git config i18n.commitencoding ISO-8859-1
+# Get rid of the trunk/ prefix. Also, remove empty commits. As the
+# head commit of the rewritten `master' branch is incompatible with
+# the original checked out working copy, this command may complain
+# about a failed merge and exit with an erroneous status; just ignore
+# it and reset to HEAD (i.e. `master').
+git filter-branch \
+ --prune-empty \
+ --tree-filter '
+ if test -d trunk; then cp -fa trunk/* .; fi
+ rm -rf trunk
+ ' --tag-name-filter cat -- --all || true
+git reset --hard HEAD
+rm -rf .git/refs/original
+# In addition, cancel the commit that initiated the top-level branch/
+# directory, by rewriting the history using git-rebase. For more
+# information on this, see http://stackoverflow.com/a/4558567/1551751
+cat >flatten-branches <<EOF
+#! /bin/sh
+
+mv \$1 \$1.\$\$
+grep -v 'Moved the only existing branch to the global branches directory' \\
+ <\$1.\$\$ >\$1
+rm -f \$1.\$\$
+EOF
+chmod +x flatten-branches
+env GIT_EDITOR="$(pwd)/flatten-branches" git rebase --interactive \
+ $(git rev-list --all | tail -n 1)
+# Reset i18n.commitencoding to default (UTF-8).
+git config --unset i18n.commitencoding
+cd ..
+
+# To install on the Git server, use:
+#
+# cd csi-seminar
+# git remote add origin git@git.lrde.epita.fr:csi-seminar
+# git push --all origin
diff --git a/src/svn-to-git/svn-to-git b/src/svn-to-git/svn-to-git
index a080865..ad45a96 100755
--- a/src/svn-to-git/svn-to-git
+++ b/src/svn-to-git/svn-to-git
@@ -147,13 +147,13 @@ env git_repo="$git_repo" tmp_dir="$tmp_dir" sed="$sed" md5sum="$md5sum" \
-e "s,^/,," \
| "$sed" -e "s|https://svn/svn-lrde/|https://svn.lrde.epita.fr/svn/|" \
-e "s|https://svn\\.lrde\\.epita\\.fr/svn-lrde/|https://svn.lrde.epita.fr/svn/|" \
- | while read path url; do
- echo "$path :: $url" >&2
- url_hash=`echo $url | "$md5sum" | cut -d" " -f 1`
- ext_tmp_dir="$tmp_dir/svn-externals/$url_hash"
+ | while read ext_path ext_url; do
+ echo "$ext_path :: $ext_url" >&2
+ ext_url_hash=`echo $ext_url | "$md5sum" | cut -d" " -f 1`
+ ext_tmp_dir="$tmp_dir/svn-externals/$ext_url_hash"
if test ! -d "$ext_tmp_dir"; then
- mkdir -p "$ext_tmp_dir/$(dirname $path)"
- svn export $url "$ext_tmp_dir/$path"
+ mkdir -p "$ext_tmp_dir/$(dirname $ext_path)"
+ svn export $ext_url "$ext_tmp_dir/$ext_path"
fi
(cd "$ext_tmp_dir" && tar cf - .) | tar xf -
done
--
1.7.10.4
* src/svn-to-git/svn-to-git: Here, encountered during the
tentative conversion of the `lrde-seminars' Subversion repository
to a `csi-seminar' Git repository.
---
src/svn-to-git/svn-to-git | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/svn-to-git/svn-to-git b/src/svn-to-git/svn-to-git
index ad45a96..c052fa2 100755
--- a/src/svn-to-git/svn-to-git
+++ b/src/svn-to-git/svn-to-git
@@ -138,6 +138,13 @@ done
# https://svn/svn-lrde/ -> https://svn.lrde.epita.fr/svn/
# https://svn.lrde.epita.fr/svn-lrde/ -> https://svn.lrde.epita.fr/svn/
#
+
+# FIXME: The cache mechanism is broken: the MD5 sum encodes only the
+# URL (`ext_url') of the svn-external, while the path of the cached
+# exported external contains the path to the external in the host
+# repository (`ext_path'). Fix this, while retaining the capacitity
+# to handle non-directory externals.
+
env git_repo="$git_repo" tmp_dir="$tmp_dir" sed="$sed" md5sum="$md5sum" \
git filter-branch -d "$tmp_dir/git-filter-branch" --tree-filter '
git svn show-externals -r $(git svn find-rev $GIT_COMMIT) \
--
1.7.10.4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch master has been updated
via 1258f94b50c9318a9e470cef13ebc9c3f0ccc29f (commit)
via fffd588319fbada7b46fbb29c6879b01d4e011f7 (commit)
via 872eba9703c0c3afedca60d68602c081be07bdc0 (commit)
via 690a112e773183f7a3b6c432227bb52cae992d51 (commit)
via 79ad450c67938f2a87bbfdb42071300c8b9d937e (commit)
via f70e68bd535dee819e0425c239321eb8e22d266d (commit)
via 000f74f18ffa58473518f3f59d19f0c3f744074e (commit)
via 4fca8e1bc620deba95dfc07a0fcd88450d0d18ee (commit)
via d14b7e25fee0f0bc4dd029288c1480666db0d152 (commit)
via cfdc7efbbf270b607f17bf9877547019ea9511af (commit)
via 4e5722b497253323b44a261bc57f8bde50fd9128 (commit)
via b4bb2ed97338e48ff1fea1cfba556c4dcfd6224b (commit)
via bcae5320a8396662aeaa0ea8f74f02d93381145a (commit)
via 8265cb0fadb52a5b803e248c4433c3b68e5cb01f (commit)
via 8784c8425bd84c03981505c773e0744b93d1fe7e (commit)
via dbdb1674d31d59b5a73785d807d44095632e9e76 (commit)
via 3adb8e00191e862548914eac64cb0ea51c2a82df (commit)
via 9996441b7e41d3735bd848a2160bbef3624a8e0e (commit)
via 831a9966e8dc005b13329fb7adf2bd3ec68b4d53 (commit)
via 947f92bb5f96cf47662d1fc55a8a83c7bbba68e5 (commit)
via 41df12a89751bc45f119ac63f63a7f6646c42d85 (commit)
via b6cd717dbffaa1917d150aab0c6d3562237fdb18 (commit)
via bb6583a17984e62dd6157e5cdf96b836c4dfdeb6 (commit)
via 21e188873fef69fcdb59a50c77682b152e2f30c3 (commit)
via 19c6502612a005cb5a617b053e5dea32fb135955 (commit)
via 6fe25be16548103d79fd27c2447ca959d522c3fc (commit)
via fe41373c18bb415b2e570c57f24a3abde5f0797b (commit)
via a70f31de99b62bfc06443a5621e9d2ce7297d7db (commit)
via 74ca6ba8b70ff3f2eff6ccadcec037af88a53ae9 (commit)
via 962d9ef3d1982e2ec12d1ed655868656060bf193 (commit)
via 87098d21ecbc7fdab688782fb503af15009dfbac (commit)
via b7d771750b64e91cdb393eaafdcda35724edd80c (commit)
via 939f4c1aa00aff38eff95714a279b2f00604ad4d (commit)
via 5ca7053ace0ea287db4623799122a1b34d0ecce9 (commit)
via 103d3fbf74007d182bd60532f4ea24a4e07e7f89 (commit)
via 8f7186b8076a2b0f41a4ba0459e9e929dc8a704b (commit)
via ff005766fccf76a77857a6b156b695c2fc90f8b2 (commit)
via c614cf84adc29aa57ca444d8209e6a896ac8def5 (commit)
via ecd4728c0b854c19e75a1b934ba3cd18a0fe67cd (commit)
from 7d91e26ece039bb93f762787654f404b592a2af1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
1258f94 Highlight issues in svn-to-git.
fffd588 Add a Subversion-to-Git script for `lrde-seminars'.
872eba9 src/svn-to-git/convert-lrde-techreps-to-git: Typos in comment.
690a112 Add a Subversion-to-Git script for `lrde-publis'.
79ad450 Add a Subversion-to-Git script for `l-air-de-rien'.
f70e68b Add a Subversion-to-Git script for `lrde-techrep'.
000f74f Add more authors to src/svn-to-git/authors-lrde.full.
4fca8e1 src/svn-to-git/authors-lrde.full: Revert to Latin-1 encoding.
d14b7e2 Convert to UTF-8.
cfdc7ef Add a Subversion-to-Git script for `mob'.
4e5722b Add a Subversion-to-Git script for `lrde-communication'.
b4bb2ed Dramatically improve and simplify svn-to-git.
bcae532 Partially fix the way svn-to-git propagates svn:externals.
8265cb0 Have svn-to-git handle leading newline chars in svn:externals.
8784c84 Add a Subversion-to-Git script for `lrde-admin-lrde'.
dbdb167 Have svn-to-git abort if a login is not found in the author file.
3adb8e0 Help svn-to-git to find decent versions of sed and md5sum.
9996441 Support externals in subdirectories in svn-to-git.
831a996 Add a Subversion-to-Git script for `compilation-lecture'.
947f92b Add Subversion-to-Git scripts for repositories `akim' and `thl'.
41df12a Add a map of share's (early) SVN revisions to Git (SHA1) digests.
b6cd717 Fix the documentation of convert-share-to-git.
bb6583a src/svn-to-git/authors-lrde.full: s/Nicolas Croiset/Tristan Croiset/.
21e1888 * src/svn-to-git/authors-lrde.full (david): New entry for D. Lesage.
19c6502 Use lrde.epita.fr domain instead of lrde.org in conversion scripts.
6fe25be Improve the documentation of SVN-to-Git conversion scripts.
fe41373 Normalize Git's authors file.
a70f31d * src/svn-to-git/convert-tc-to-git: Make it executable.
74ca6ba Start a conversion script to migrate TC from Subversion to Git.
962d9ef Small correction in convert-olena-to-git.
87098d2 Assign a dummy e-mail address to Git ``author'' prcs2svn.
b7d7717 Fix convert-olena-to-git w.r.t. grafts, branches and tags.
939f4c1 Fix a Git setting in convert-olena-to-git.
5ca7053 Start a conversion script to migrate Olena from Subversion to Git.
103d3fb Import README.branches from `branches/' from the `oln' SVN repository.
8f7186b Update and clean up the list of LRDE authors.
ff00576 * src/svn-to-git/convert-share-to-git: Fix the documentation.
c614cf8 Add an old SVN-to-Git conversion script for share/ (not used).
ecd4728 Add a script to convert SVN share/ to Git.
-----------------------------------------------------------------------
Summary of changes:
src/svn-to-git/README.branches.olena | 77 ++
src/svn-to-git/README.branches.tc | 53 ++
src/svn-to-git/akim | 3 +
src/svn-to-git/authors-lrde.full | 196 +++++
src/svn-to-git/convert-akim-to-git | 14 +
src/svn-to-git/convert-complec-to-git | 29 +
src/svn-to-git/convert-l-air-de-rien-to-git | 74 ++
src/svn-to-git/convert-lrde-admin-lrde-to-git | 16 +
src/svn-to-git/convert-lrde-communication-to-git | 18 +
src/svn-to-git/convert-lrde-publis-to-git | 24 +
src/svn-to-git/convert-lrde-seminars-to-git | 52 ++
src/svn-to-git/convert-lrde-techreps-to-git | 37 +
src/svn-to-git/convert-mob-to-git | 17 +
src/svn-to-git/convert-olena-to-git | 174 ++++
src/svn-to-git/convert-share-to-git | 225 ++++++
src/svn-to-git/convert-share-to-git.old | 73 ++
src/svn-to-git/convert-tc-to-git | 232 ++++++
src/svn-to-git/convert-thl-to-git | 17 +
src/svn-to-git/share-rev-hash-map.txt | 936 ++++++++++++++++++++++
src/svn-to-git/svn-to-git | 186 +++++
src/svn-to-git/unknown-author | 3 +
21 files changed, 2456 insertions(+)
create mode 100644 src/svn-to-git/README.branches.olena
create mode 100644 src/svn-to-git/README.branches.tc
create mode 100755 src/svn-to-git/akim
create mode 100644 src/svn-to-git/authors-lrde.full
create mode 100755 src/svn-to-git/convert-akim-to-git
create mode 100755 src/svn-to-git/convert-complec-to-git
create mode 100755 src/svn-to-git/convert-l-air-de-rien-to-git
create mode 100755 src/svn-to-git/convert-lrde-admin-lrde-to-git
create mode 100755 src/svn-to-git/convert-lrde-communication-to-git
create mode 100755 src/svn-to-git/convert-lrde-publis-to-git
create mode 100755 src/svn-to-git/convert-lrde-seminars-to-git
create mode 100755 src/svn-to-git/convert-lrde-techreps-to-git
create mode 100755 src/svn-to-git/convert-mob-to-git
create mode 100755 src/svn-to-git/convert-olena-to-git
create mode 100755 src/svn-to-git/convert-share-to-git
create mode 100755 src/svn-to-git/convert-share-to-git.old
create mode 100755 src/svn-to-git/convert-tc-to-git
create mode 100755 src/svn-to-git/convert-thl-to-git
create mode 100644 src/svn-to-git/share-rev-hash-map.txt
create mode 100755 src/svn-to-git/svn-to-git
create mode 100755 src/svn-to-git/unknown-author
hooks/post-receive
--
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "HAVM, a Tree intermediate language interpreter".
The branch master has been updated
via b493ecf6ceb8cea38c69c1abcc19171c5da94442 (commit)
from e2a13182489b93904d3afbcfd057992a79154766 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
b493ecf Update the builtins documentation.
-----------------------------------------------------------------------
Summary of changes:
doc/builtins.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
HAVM, a Tree intermediate language interpreter
* doc/builtins.texi: Sync with tc-assignments.
---
doc/builtins.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/builtins.texi b/doc/builtins.texi
index 14e0f1a..2944f49 100644
--- a/doc/builtins.texi
+++ b/doc/builtins.texi
@@ -98,7 +98,7 @@ string equality.
Return a string composed of the characters of @var{string} starting at
the @var{first} character (0 being the origin), and composed of
@var{length} characters (i.e., up to and including the character
-@var{first} + @var{length}).
+@var{first} + @var{length} - 1).
Let @var{size} be the size of the @var{string}, the following assertions
must hold:
--
1.7.10.4
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Nolimips, a MIPS simulator with infinitely many registers".
The branch master has been updated
via eec6f00c23f23341c9ee22e2d4531c842aa9673f (commit)
from df2219384f07ad3b2232c8c15841e52e1512b6f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
eec6f00 Update copyright years in the documentation.
-----------------------------------------------------------------------
Summary of changes:
doc/nolimips.texi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
Nolimips, a MIPS simulator with infinitely many registers
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Nolimips, a MIPS simulator with infinitely many registers".
The branch master has been updated
via df2219384f07ad3b2232c8c15841e52e1512b6f1 (commit)
from acf5a8802738a004c405df71f1a2ed28852a1912 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
df22193 Please makeinfo 5.2.
-----------------------------------------------------------------------
Summary of changes:
doc/macros.texi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
Nolimips, a MIPS simulator with infinitely many registers