diff --git a/git/update-git.sh b/git/update-git.sh index 6ce7b6d..9b704a8 100755 --- a/git/update-git.sh +++ b/git/update-git.sh @@ -19,7 +19,7 @@ MTN=mtn #SERVER="mtn.i2p-projekt.de:4691" SERVER="localhost:8998" INCLUDE_BRANCHES=0 -PUSH_TO_GITHUB=1 +PUSH_TO_GITHUB=0 BARE_REPO=1 #cd $(dirname "$0") diff --git a/mtn/latest.sh b/mtn/latest.sh index 3607b65..71352e7 100755 --- a/mtn/latest.sh +++ b/mtn/latest.sh @@ -5,7 +5,7 @@ # zzz 06-2012 # public domain # -DB=i2p.mtn +DB=/home/idk/.monotone/databases/default.mtn TMP=/var/tmp/i2platest$$ TMP2=/var/tmp/i2platestx$$ diff --git a/source/git-diffreport.sh b/source/git-diffreport.sh new file mode 100644 index 0000000..bdcfc3e --- /dev/null +++ b/source/git-diffreport.sh @@ -0,0 +1,6 @@ +#! /usr/bin/env sh + +# diffstat the changes from the last release to the current workspace; +# similar to diffreport.sh + +git diff $(git tag --sort=committerdate | tail -1) | diffstat -D . -f 4 diff --git a/source/git-review.sh b/source/git-review.sh new file mode 100644 index 0000000..07f8b69 --- /dev/null +++ b/source/git-review.sh @@ -0,0 +1,10 @@ +#! /usr/bin/env sh +# +# view the diff for the files listed in filelist.txt +# zzz 2008-10 +# +# This does not diff based on the latest release tag, it diffs +# the workspace against the latest checked in code. +# idk 2020-10 +git diff `cat filelist.txt` > out.diff 2>&1 +$EDITOR out.diff diff --git a/source/git-reviewall.sh b/source/git-reviewall.sh new file mode 100644 index 0000000..ddc1096 --- /dev/null +++ b/source/git-reviewall.sh @@ -0,0 +1,10 @@ +#! /usr/bin/env sh +# +# view the diff from the current head for all files changed in the workspace +# zzz 2008-10 +# +# This does not diff based on the latest release tag, it diffs +# the workspace against the latest checked in code. +# idk 2020-10 +git diff > out.diff +$EDITOR out.diff diff --git a/source/git-reviewfromrelease.sh b/source/git-reviewfromrelease.sh new file mode 100644 index 0000000..2996307 --- /dev/null +++ b/source/git-reviewfromrelease.sh @@ -0,0 +1,12 @@ +#! /usr/bin/env sh +# +# view the changes from the last release for all files in the workspace; +# this includes local changes not checked in +# zzz 2008-10 +# +# Re-written for git. +# idk 2020-10 + +REL=$(git diff `git tag --sort=committerdate | tail -1`) +git diff $(git tag --sort=committerdate | tail -1) > $REL.diff +$EDITOR $REL.diff diff --git a/source/git-reviewheadfromrelease.sh b/source/git-reviewheadfromrelease.sh new file mode 100644 index 0000000..4b0a449 --- /dev/null +++ b/source/git-reviewheadfromrelease.sh @@ -0,0 +1,13 @@ +#! /usr/bin/env sh +# +# view the changes from the last release to the current head; +# files not checked in are not included +# Note that this actually diffs the workspace base (w:) not the head (h:) +# zzz 2008-10 +# +# Re-written for git. The git version uses the current head. +# idk 2020-10 + +REL=$(git diff `git tag --sort=committerdate | tail -1`) +git diff $(git tag --sort=committerdate | tail -1) $(git rev-parse --short HEAD) > $REL.diff +$EDITOR $REL.diff diff --git a/source/git-reviewheadfromreleasenopos.sh b/source/git-reviewheadfromreleasenopos.sh new file mode 100644 index 0000000..05ae195 --- /dev/null +++ b/source/git-reviewheadfromreleasenopos.sh @@ -0,0 +1,25 @@ +#! /usr/bin/env sh +# +# view the changes from the last release to the current head; +# files not checked in are not included +# Skip .po files and geoip.txt +# Note that this actually diffs the workspace base (w:) not the head (h:) +# zzz 2010-03 +# +# Re-written for git. The git version uses the current head. +# idk 2020-10 +REL=$(git diff `git tag --sort=committerdate | tail -1`) + +MOREEXCLUDE="installer/resources/geoip.txt" + +echo "Diffing from $REL" +POS=`find -name \*.po` +for i in $MOREEXCLUDE $POS core/java/src/gnu/getopt/*.properties +do + EXCLUDE="$EXCLUDE :(exclude)$i" +done +echo "excluding $EXCLUDE" + + +git diff $(git tag --sort=committerdate | tail -1) $(git rev-parse --short HEAD) $EXCLUDE > $REL.diff +$EDITOR $REL.diff diff --git a/source/git-reviewmissing.sh b/source/git-reviewmissing.sh new file mode 100644 index 0000000..a5f2b21 --- /dev/null +++ b/source/git-reviewmissing.sh @@ -0,0 +1,14 @@ +#! /usr/bin/env sh +# +# view the changes in the current workspace for files NOT listed +# in filelist.txt; this is a good way to make sure you're not +# forgetting something that should be in filelist.txt before you +# check it in +# zzz 2008-10 +# +# Re-written for git. +# idk 2020-10 +git diff `cat filelist.txt` > out.diff +git diff > all.diff +diff all.diff out.diff | cut -c3- > missing.diff +$EDITOR missing.diff diff --git a/source/grepall.sh b/source/grepall.sh index 52ab0f9..b99a375 100755 --- a/source/grepall.sh +++ b/source/grepall.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # # grep the source # maybe grep -R would be better diff --git a/source/review.sh b/source/review.sh index 906fd10..50dd225 100755 --- a/source/review.sh +++ b/source/review.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/sh # # view the diff for the files listed in filelist.txt # zzz 2008-10 diff --git a/source/reviewall.sh b/source/reviewall.sh index 2495c8c..7fbcc6d 100755 --- a/source/reviewall.sh +++ b/source/reviewall.sh @@ -1,3 +1,4 @@ +#! /bin/sh # # view the diff from the current head for all files changed in the workspace # zzz 2008-10 diff --git a/source/reviewfromrelease.sh b/source/reviewfromrelease.sh index d877872..90eda50 100755 --- a/source/reviewfromrelease.sh +++ b/source/reviewfromrelease.sh @@ -1,3 +1,4 @@ +#! /bin/sh # # view the changes from the last release for all files in the workspace; # this includes local changes not checked in diff --git a/source/reviewheadfromrelease.sh b/source/reviewheadfromrelease.sh index 0f99fb4..39f1aaf 100755 --- a/source/reviewheadfromrelease.sh +++ b/source/reviewheadfromrelease.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # # view the changes from the last release to the current head; # files not checked in are not included diff --git a/source/reviewheadfromreleasenopos.sh b/source/reviewheadfromreleasenopos.sh index a5bf8c0..3fe6aec 100755 --- a/source/reviewheadfromreleasenopos.sh +++ b/source/reviewheadfromreleasenopos.sh @@ -1,3 +1,4 @@ +#!/bin/sh # # view the changes from the last release to the current head; # files not checked in are not included diff --git a/source/reviewmissing.sh b/source/reviewmissing.sh index 0179057..0776e70 100755 --- a/source/reviewmissing.sh +++ b/source/reviewmissing.sh @@ -1,3 +1,4 @@ +#! /bin/sh # # view the changes in the current workspace for files NOT listed # in filelist.txt; this is a good way to make sure you're not