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.
85 git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
86 retval+=${PIPESTATUS[0]}
89 # nothing there. it's not an error though.
90 echo no repository in $directory
95 restore_terminal_title
100 # shows the local changes in a repository.
103 local directory="$1"; shift
107 pushd "$directory" &>/dev/null
108 local retval=0 # normally successful.
110 # only update if we see a repository living there.
111 if [ -d ".svn" ]; then
114 elif [ -d ".git" ]; then
117 elif [ -d "CVS" ]; then
124 restore_terminal_title
129 # reports any files that are not already known to the upstream repository.
130 function do_report_new
132 local directory="$1"; shift
136 pushd "$directory" &>/dev/null
137 local retval=0 # normally successful.
139 # only update if we see a repository living there.
140 if [ -f ".no-checkin" ]; then
141 echo "skipping reporting due to presence of .no-checkin sentinel file."
142 elif [ -d ".svn" ]; then
143 # this action so far only makes sense and is needed for svn.
144 bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
146 elif [ -d ".git" ]; then
153 restore_terminal_title
158 # checks in all the folders in a specified list.
159 function checkin_list()
161 # make the list of directories unique.
162 local list="$(uniquify $*)"
166 # turn repo list back into an array.
167 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
171 for outer in "${repository_list[@]}"; do
172 # check the repository first, since it might be an absolute path.
173 if [[ $outer =~ /.* ]]; then
174 # yep, this path is absolute. just handle it directly.
175 if [ ! -d "$outer" ]; then continue; fi
177 test_or_die "running check-in on: $outer"
180 for inner in $list; do
181 # add in the directory component to see if we can find the folder.
182 local path="$inner/$outer"
183 if [ ! -d "$path" ]; then continue; fi
185 test_or_die "running check-in on: $path"
191 restore_terminal_title
194 # takes out the first few carriage returns that are in the input.
195 function squash_first_few_crs()
198 while read input_text; do
200 if [ $i -le 5 ]; then
201 echo -n "$input_text "
206 if [ $i -le 3 ]; then
207 # if we're still squashing eols, make sure we don't leave them hanging.
212 # a helpful method that reports the git branch for the current directory's
214 function git_branch_name()
216 echo "$(git branch | grep \* | cut -d ' ' -f2-)"
219 # gets the latest versions of the assets from the upstream repository.
222 directory="$1"; shift
226 # make a nice echoer since we want to use it inside conditions below.
227 local nicedir="$directory"
228 if [ $nicedir == "." ]; then
231 local blatt="echo retrieving '$nicedir'..."
233 local retval=0 # plan on success for now.
234 pushd "$directory" &>/dev/null
235 if [ -d "CVS" ]; then
236 if test_writeable "CVS"; then
238 cvs update . | squash_first_few_crs
239 retval=${PIPESTATUS[0]}
241 elif [ -d ".svn" ]; then
242 if test_writeable ".svn"; then
244 svn update . | squash_first_few_crs
245 retval=${PIPESTATUS[0]}
247 elif [ -d ".git" ]; then
248 if test_writeable ".git"; then
252 if [ "$(git_branch_name)" != "master" ]; then
253 git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
254 retval+=${PIPESTATUS[0]}
257 git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
258 retval+=${PIPESTATUS[0]}
261 # this is not an error necessarily; we'll just pretend they planned this.
262 echo no repository in $directory
266 restore_terminal_title
271 # gets all the updates for a list of folders under revision control.
272 function checkout_list()
274 local list="$(uniquify $*)"
278 # turn repo list back into an array.
279 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
283 for outer in "${repository_list[@]}"; do
284 # check the repository first, since it might be an absolute path.
285 if [[ $outer =~ /.* ]]; then
286 # yep, this path is absolute. just handle it directly.
287 if [ ! -d "$outer" ]; then continue; fi
289 test_or_die "running update on: $path"
292 for inner in $list; do
293 # add in the directory component to see if we can find the folder.
294 local path="$inner/$outer"
295 if [ ! -d "$path" ]; then continue; fi
297 test_or_die "running update on: $path"
303 restore_terminal_title
306 # provides a list of absolute paths of revision control directories
307 # that are located under the directory passed as the first parameter.
308 function generate_rev_ctrl_filelist()
310 local dir="$1"; shift
311 pushd "$dir" &>/dev/null
312 local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
313 local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
315 local additional_filter
316 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
317 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
318 # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
321 # see if they've warned us not to try checking in within vendor hierarchies.
322 if [ ! -z "NO_CHECKIN_VENDOR" ]; then
323 sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
326 local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
327 sort <"$tempfile" >"$sortfile"
332 # iterates across a list of directories contained in a file (first parameter).
333 # on each directory name, it performs the action (second parameter) provided.
334 function perform_revctrl_action_on_file()
336 local tempfile="$1"; shift
337 local action="$1"; shift
341 while read -u 3 dirname; do
342 if [ -z "$dirname" ]; then continue; fi
343 pushd "$dirname" &>/dev/null
346 test_or_die "performing action $action on: $(pwd)"
351 restore_terminal_title