summaryrefslogtreecommitdiff
blob: 1e1c0a4c44d3c0d21fbb08a1309f78b00d67fa15 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
#!/bin/bash
# review - Move a certain revision from sunrise/ to reviewed/
# Released into the public domain

source /etc/init.d/functions.sh

BLUE=$BRACKET
BOLD=$'\e[0;01m'
DARKGREEN=$'\e[32m'
GREEN=$GOOD
LIGHTBLUE=$HILITE
RED=$BAD
YELLOW=$WARN
opt_norepoman=0
opt_noupdate=0
opt_quiet=0
opt_verbose=0

svn_up() {
	if [[ "$opt_noupdate" == "0" ]] ; then
		svn update $*

		local conflict_files=$(svn status | sed -rn 's/^C.+ ([^ ]+)$/\1/p')
		if [[ -n "$conflict_files" ]] ; then
			echo "!!! Error: Some local files have changes that conflict with the latest"
			echo "!!! revisions in the repository. Please contact the previous committer(s) to"
			echo "!!! resolve the conflicts manually before running sunrise-commit again:"
			for filename in $conflict_files ; do
				echo "!!!"
				echo "!!!        file: ${filename}"
				echo "!!!   committer: $(svn info ${filename} | sed -rn 's/Last Changed Author\: (.*)$/\1/p')"
			done
			exit 1
		fi
	fi
	return 0
}

repoman_check() {
	if [[ "$opt_norepoman" == "0" ]] ; then
		ebegin "Running repoman"
		export PORTDIR_OVERLAY="$(pwd)"
		repoman
		eend $?
		return $?
	fi
}

usage() {
cat << EOF
${BOLD}Usage:${NORMAL} ${LIGHTBLUE}$0${NORMAL} [ ${GREEN}options${NORMAL} ] ${BLUE}revision${NORMAL}

${GREEN}options${NORMAL}:
  ${BOLD}--help, -h${NORMAL}       Show help
  ${BOLD}--norepoman, -p${NORMAL}  Skip repoman check
  ${BOLD}--noupdate, -d${NORMAL}   Don't update from repository before committing
  ${BOLD}--quiet, -q${NORMAL}      Don't ask for confirmation
  ${BOLD}--verbose, -v${NORMAL}    Show detailed information during commit
EOF
	exit ${1:-0}
}

while [[ $# > 0 ]] ; do
	case "$1" in
		--help|-h)
			usage ;;

		--norepoman|-p)
			opt_norepoman=1
			shift ;;

		--noupdate|-d)
			opt_noupdate=1
			shift ;;

		--quiet|-q)
			opt_quiet=1
			shift ;;

		--verbose|-v)
			opt_verbose=1
			shift ;;

		-*)
   			echo "!!! Error: Unknown option ${1}. See: sunrise-commit -h"
   			exit 1 ;;

		*)
			break ;;
	esac
done

if [[ -z "$*" ]] ; then
	ebegin "Updating working copy to latest version from repository"
	update=$(svn_up)
	if [[ "$opt_verbose" == "1" ]] ; then
		echo $update
	fi
	update=$(echo $update | tail -n 1)
	update=${update/At revision }
	sunrise_revision=${update/.}
	[ "$sunrise_revision" -lt "10" ] && exit 1
	eend
#elif [[ "$*" =~ "^[0-9]*$" ]]; then 
#	echo "!!! Error: The revision must be an integer value $*"
#	exit 1
else
	sunrise_revision=$*

	ebegin "Updating working copy to latest version from repository"
	svn_up -r $sunrise_revision || exit $?
	eend
fi

if ! [ -e sunrise ] || ! [ -e reviewed ]; then
	eerror "You need to have sunrise and reviewed subdirs"
	exit
fi

reviewed_revision=$(svn log reviewed 2>/dev/null | grep "Reviewed up to revision " -m 1 | sed "s:Reviewed up to revision ::")

if [ $reviewed_revision -gt $sunrise_revision ]; then
	eerror "a newer revision is already reviewed"
	exit
fi
(
cd sunrise

repoman_check || exit $?

ebegin "Running portdupe"
scripts/portdupe
eend $?

cd ..
if [[ "$opt_quiet" == "0" ]] ; then
	which diffstat >/dev/null 2>&1 && diff -Nur reviewed sunrise --exclude=.svn | diffstat
	diff -Nur reviewed sunrise --exclude=Manifest --exclude=.svn --exclude=metadata.xml --exclude=digest-*
fi
) | if [[ "$opt_quiet" == "0" ]] ; then less; else cat; fi

if [[ "$opt_quiet" == "0" ]] ; then
	echo
	echo -n "${BOLD}Commit changes?${NORMAL} [${GREEN}Yes${NORMAL}/${RED}No${NORMAL}] "
	read choice
	echo

	case "$choice" in
		y*|Y*|"")
			;;

		*)
			echo "Quitting."
			echo
			exit ;;
	esac
fi

ebegin "Merging in changes..."
if [[ "$opt_verbose" == "1" ]] ; then
	svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed
else
	svn merge sunrise@$reviewed_revision sunrise@$sunrise_revision reviewed -q
fi
eend ${?}

ebegin "Committing working copy to repository"
svn commit reviewed -m "Reviewed up to revision $sunrise_revision"
eend $?