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 #push the changes to where? locally?
85 git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
86 retval+=${PIPESTATUS[0]}
88 # upload any changes to the upstream repo so others can see them.
89 if [ "$(my_branch_name)" != "master" ]; then
90 git push origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
91 retval+=${PIPESTATUS[0]}
96 # nothing there. it's not an error though.
97 echo no repository in $directory
102 restore_terminal_title
107 # shows the local changes in a repository.
110 local directory="$1"; shift
114 pushd "$directory" &>/dev/null
115 local retval=0 # normally successful.
117 # only update if we see a repository living there.
118 if [ -d ".svn" ]; then
121 elif [ -d ".git" ]; then
124 elif [ -d "CVS" ]; then
131 restore_terminal_title
136 # reports any files that are not already known to the upstream repository.
137 function do_report_new
139 local directory="$1"; shift
143 pushd "$directory" &>/dev/null
144 local retval=0 # normally successful.
146 # only update if we see a repository living there.
147 if [ -f ".no-checkin" ]; then
148 echo "skipping reporting due to presence of .no-checkin sentinel file."
149 elif [ -d ".svn" ]; then
150 # this action so far only makes sense and is needed for svn.
151 bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
153 elif [ -d ".git" ]; then
160 restore_terminal_title
165 # checks in all the folders in a specified list.
166 function checkin_list()
168 # make the list of directories unique.
169 local list="$(uniquify $*)"
173 # turn repo list back into an array.
174 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
178 for outer in "${repository_list[@]}"; do
179 # check the repository first, since it might be an absolute path.
180 if [[ $outer =~ /.* ]]; then
181 # yep, this path is absolute. just handle it directly.
182 if [ ! -d "$outer" ]; then continue; fi
184 test_or_die "running check-in on: $outer"
187 for inner in $list; do
188 # add in the directory component to see if we can find the folder.
189 local path="$inner/$outer"
190 if [ ! -d "$path" ]; then continue; fi
192 test_or_die "running check-in on: $path"
198 restore_terminal_title
201 # takes out the first few carriage returns that are in the input.
202 function squash_first_few_crs()
205 while read input_text; do
207 if [ $i -le 5 ]; then
208 echo -n "$input_text "
213 if [ $i -le 3 ]; then
214 # if we're still squashing eols, make sure we don't leave them hanging.
219 # a helpful method that reports the git branch for the current directory's
221 function my_branch_name()
223 echo "$(git branch | grep \* | cut -d ' ' -f2)"
226 # this reports the upstream branch for the current repo.
227 function parent_branch_name()
229 echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
232 # gets the latest versions of the assets from the upstream repository.
235 directory="$1"; shift
239 # make a nice echoer since we want to use it inside conditions below.
240 local nicedir="$directory"
241 if [ $nicedir == "." ]; then
244 local blatt="echo retrieving '$nicedir'..."
246 local retval=0 # plan on success for now.
247 pushd "$directory" &>/dev/null
248 if [ -d "CVS" ]; then
249 if test_writeable "CVS"; then
251 cvs update . | squash_first_few_crs
252 retval=${PIPESTATUS[0]}
254 elif [ -d ".svn" ]; then
255 if test_writeable ".svn"; then
257 svn update . | squash_first_few_crs
258 retval=${PIPESTATUS[0]}
260 elif [ -d ".git" ]; then
261 if test_writeable ".git"; then
265 git pull origin "$(parent_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
266 retval+=${PIPESTATUS[0]}
268 git pull origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
269 retval+=${PIPESTATUS[0]}
272 # this is not an error necessarily; we'll just pretend they planned this.
273 echo no repository in $directory
277 restore_terminal_title
282 # gets all the updates for a list of folders under revision control.
283 function checkout_list()
285 local list="$(uniquify $*)"
289 # turn repo list back into an array.
290 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
294 for outer in "${repository_list[@]}"; do
295 # check the repository first, since it might be an absolute path.
296 if [[ $outer =~ /.* ]]; then
297 # yep, this path is absolute. just handle it directly.
298 if [ ! -d "$outer" ]; then continue; fi
300 test_or_die "running update on: $path"
303 for inner in $list; do
304 # add in the directory component to see if we can find the folder.
305 local path="$inner/$outer"
306 if [ ! -d "$path" ]; then continue; fi
308 test_or_die "running update on: $path"
314 restore_terminal_title
317 # provides a list of absolute paths of revision control directories
318 # that are located under the directory passed as the first parameter.
319 function generate_rev_ctrl_filelist()
321 local dir="$1"; shift
322 pushd "$dir" &>/dev/null
323 local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
324 local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
326 local additional_filter
327 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
328 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
329 # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
332 # see if they've warned us not to try checking in within vendor hierarchies.
333 if [ ! -z "NO_CHECKIN_VENDOR" ]; then
334 sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
337 local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
338 sort <"$tempfile" >"$sortfile"
343 # iterates across a list of directories contained in a file (first parameter).
344 # on each directory name, it performs the action (second parameter) provided.
345 function perform_revctrl_action_on_file()
347 local tempfile="$1"; shift
348 local action="$1"; shift
352 while read -u 3 dirname; do
353 if [ -z "$dirname" ]; then continue; fi
354 pushd "$dirname" &>/dev/null
357 test_or_die "performing action $action on: $(pwd)"
362 restore_terminal_title