3 # these are helper functions for doing localized revision control.
4 # this script should be sourced into other scripts that use it.
6 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
7 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
11 # the maximum depth that the recursive functions will try to go below the starting directory.
14 # one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory
15 # is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows.
16 # to get past this, TMP gets changed below to a hopefully generic and safe place.
17 if [[ "$TMP" =~ .:.* ]]; then
18 echo "making weirdo temporary directory for PCDOS-style path."
19 export TMP=/tmp/rev_control_$USER
21 if [ ! -d "$TMP" ]; then
24 if [ ! -d "$TMP" ]; then
25 echo "could not create the temporary directory TMP in: $TMP"
26 echo "this script will not work properly without an existing TMP directory."
28 #hmmm: re-address the above code, since it doesn't make a lot of sense to me right now...
33 # checks the directory provided into the revision control system repository it belongs to.
36 local directory="$1"; shift
40 # make a nice echoer since we want to use it inside conditions below.
41 local nicedir="$directory"
42 if [ $nicedir == "." ]; then
45 local blatt="echo checking in '$nicedir'..."
47 local retval=0 # normally successful.
49 do_update "$directory"
51 test_or_die "repository update failed; this should be fixed before check-in."
53 pushd "$directory" &>/dev/null
54 if [ -f ".no-checkin" ]; then
55 echo "skipping check-in due to presence of .no-checkin sentinel file."
56 elif [ -d "CVS" ]; then
57 if test_writeable "CVS"; then
62 elif [ -d ".svn" ]; then
63 if test_writeable ".svn"; then
68 elif [ -d ".git" ]; then
69 if test_writeable ".git"; then
71 # snag all new files. not to everyone's liking.
75 # see if there are any changes in the local repository.
76 if ! git diff-index --quiet HEAD --; then
77 # tell git about all the files and get a check-in comment.
81 # catch if the diff-index failed somehow.
84 # upload any changes to the upstream repo so others can see them.
86 #| grep -v "X11 forwarding request failed"
87 #have to do pipestatus if want to keep the above.
91 # nothing there. it's not an error though.
92 echo no repository in $directory
97 restore_terminal_title
102 # shows the local changes in a repository.
105 local directory="$1"; shift
109 pushd "$directory" &>/dev/null
110 local retval=0 # normally successful.
112 # only update if we see a repository living there.
113 if [ -d ".svn" ]; then
116 elif [ -d ".git" ]; then
119 elif [ -d "CVS" ]; then
126 restore_terminal_title
131 # reports any files that are not already known to the upstream repository.
132 function do_report_new
134 local directory="$1"; shift
138 pushd "$directory" &>/dev/null
139 local retval=0 # normally successful.
141 # only update if we see a repository living there.
142 if [ -f ".no-checkin" ]; then
143 echo "skipping reporting due to presence of .no-checkin sentinel file."
144 elif [ -d ".svn" ]; then
145 # this action so far only makes sense and is needed for svn.
146 bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
148 elif [ -d ".git" ]; then
155 restore_terminal_title
160 # checks in all the folders in a specified list.
161 function checkin_list()
163 # make the list of directories unique.
164 local list="$(uniquify $*)"
168 # turn repo list back into an array.
169 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
173 for outer in "${repository_list[@]}"; do
174 # check the repository first, since it might be an absolute path.
175 if [[ $outer =~ /.* ]]; then
176 # yep, this path is absolute. just handle it directly.
177 if [ ! -d "$outer" ]; then continue; fi
179 test_or_die "running check-in on: $outer"
182 for inner in $list; do
183 # add in the directory component to see if we can find the folder.
184 local path="$inner/$outer"
185 if [ ! -d "$path" ]; then continue; fi
187 test_or_die "running check-in on: $path"
193 restore_terminal_title
196 # takes out the first few carriage returns that are in the input.
197 function squash_first_few_crs()
200 while read input_text; do
202 if [ $i -le 5 ]; then
203 echo -n "$input_text "
208 if [ $i -le 3 ]; then
209 # if we're still squashing eols, make sure we don't leave them hanging.
214 # gets the latest versions of the assets from the upstream repository.
217 directory="$1"; shift
221 # make a nice echoer since we want to use it inside conditions below.
222 local nicedir="$directory"
223 if [ $nicedir == "." ]; then
226 local blatt="echo retrieving '$nicedir'..."
228 local retval=0 # plan on success for now.
229 pushd "$directory" &>/dev/null
230 if [ -d "CVS" ]; then
231 if test_writeable "CVS"; then
233 cvs update . | squash_first_few_crs
234 retval=${PIPESTATUS[0]}
236 elif [ -d ".svn" ]; then
237 if test_writeable ".svn"; then
239 svn update . | squash_first_few_crs
240 retval=${PIPESTATUS[0]}
242 elif [ -d ".git" ]; then
243 if test_writeable ".git"; then
245 git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
246 retval=${PIPESTATUS[0]}
249 # this is not an error necessarily; we'll just pretend they planned this.
250 echo no repository in $directory
254 restore_terminal_title
259 # gets all the updates for a list of folders under revision control.
260 function checkout_list()
262 local list="$(uniquify $*)"
266 # turn repo list back into an array.
267 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
271 for outer in "${repository_list[@]}"; do
272 # check the repository first, since it might be an absolute path.
273 if [[ $outer =~ /.* ]]; then
274 # yep, this path is absolute. just handle it directly.
275 if [ ! -d "$outer" ]; then continue; fi
277 test_or_die "running update on: $path"
280 for inner in $list; do
281 # add in the directory component to see if we can find the folder.
282 local path="$inner/$outer"
283 if [ ! -d "$path" ]; then continue; fi
285 test_or_die "running update on: $path"
291 restore_terminal_title
294 # provides a list of absolute paths of revision control directories
295 # that are located under the directory passed as the first parameter.
296 function generate_rev_ctrl_filelist()
298 local dir="$1"; shift
299 pushd "$dir" &>/dev/null
300 local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
301 local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
303 local additional_filter
304 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
305 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
306 # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
309 # see if they've warned us not to try checking in within vendor hierarchies.
310 if [ ! -z "NO_CHECKIN_VENDOR" ]; then
311 sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
314 local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
315 sort <"$tempfile" >"$sortfile"
320 # iterates across a list of directories contained in a file (first parameter).
321 # on each directory name, it performs the action (second parameter) provided.
322 function perform_revctrl_action_on_file()
324 local tempfile="$1"; shift
325 local action="$1"; shift
329 while read -u 3 dirname; do
330 if [ -z "$dirname" ]; then continue; fi
331 pushd "$dirname" &>/dev/null
334 test_or_die "performing action $action on: $(pwd)"
339 restore_terminal_title