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"
9 #hmmm: we need to dump all the outputs in this script into splitter
13 # the maximum depth that the recursive functions will try to go below the starting directory.
16 # use our splitter tool for lengthy output if it's available.
17 if [ ! -z "$(which splitter)" ]; then
18 TO_SPLITTER="| \"$(which splitter)\""
23 # one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory
24 # is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows.
25 # to get past this, TMP gets changed below to a hopefully generic and safe place.
26 if [[ "$TMP" =~ .:.* ]]; then
27 echo "making weirdo temporary directory for PCDOS-style path."
28 export TMP=/tmp/rev_control_$USER
30 if [ ! -d "$TMP" ]; then
33 if [ ! -d "$TMP" ]; then
34 echo "could not create the temporary directory TMP in: $TMP"
35 echo "this script will not work properly without an existing TMP directory."
37 #hmmm: re-address the above code, since it doesn't make a lot of sense to me right now...
42 # checks the directory provided into the revision control system repository it belongs to.
45 local directory="$1"; shift
49 # make a nice echoer since we want to use it inside conditions below.
50 local nicedir="$directory"
51 if [ $nicedir == "." ]; then
54 local blatt="echo checking in '$nicedir'..."
56 local retval=0 # normally successful.
58 do_update "$directory"
60 test_or_die "repository update failed; this should be fixed before check-in."
62 pushd "$directory" &>/dev/null
63 if [ -f ".no-checkin" ]; then
64 echo "skipping check-in due to presence of .no-checkin sentinel file."
65 elif [ -d "CVS" ]; then
66 if test_writeable "CVS"; then
71 elif [ -d ".svn" ]; then
72 if test_writeable ".svn"; then
77 elif [ -d ".git" ]; then
78 if test_writeable ".git"; then
80 # snag all new files. not to everyone's liking.
84 # see if there are any changes in the local repository.
85 if ! git diff-index --quiet HEAD --; then
86 # tell git about all the files and get a check-in comment.
90 # catch if the diff-index failed somehow.
93 local myself="$(my_branch_name)"
94 local parent="$(parent_branch_name)"
96 # upload any changes to the upstream repo so others can see them.
97 if [ "$myself" != "$parent" ]; then
98 git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" $TO_SPLITTER
99 retval+=${PIPESTATUS[0]}
101 # this branch is the same as the parent, so just push.
102 git push 2>&1 | grep -v "X11 forwarding request failed" $TO_SPLITTER
103 retval+=${PIPESTATUS[0]}
108 # nothing there. it's not an error though.
109 echo no repository in $directory
114 restore_terminal_title
119 # shows the local changes in a repository.
122 local directory="$1"; shift
126 pushd "$directory" &>/dev/null
127 local retval=0 # normally successful.
129 # only update if we see a repository living there.
130 if [ -d ".svn" ]; then
133 elif [ -d ".git" ]; then
136 elif [ -d "CVS" ]; then
143 restore_terminal_title
148 # reports any files that are not already known to the upstream repository.
149 function do_report_new
151 local directory="$1"; shift
155 pushd "$directory" &>/dev/null
156 local retval=0 # normally successful.
158 # only update if we see a repository living there.
159 if [ -f ".no-checkin" ]; then
160 echo "skipping reporting due to presence of .no-checkin sentinel file."
161 elif [ -d ".svn" ]; then
162 # this action so far only makes sense and is needed for svn.
163 bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
165 elif [ -d ".git" ]; then
172 restore_terminal_title
177 # checks in all the folders in a specified list.
178 function checkin_list()
180 # make the list of directories unique.
181 local list="$(uniquify $*)"
185 # turn repo list back into an array.
186 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
190 for outer in "${repository_list[@]}"; do
191 # check the repository first, since it might be an absolute path.
192 if [[ $outer =~ /.* ]]; then
193 # yep, this path is absolute. just handle it directly.
194 if [ ! -d "$outer" ]; then continue; fi
196 test_or_die "running check-in on: $outer"
199 for inner in $list; do
200 # add in the directory component to see if we can find the folder.
201 local path="$inner/$outer"
202 if [ ! -d "$path" ]; then continue; fi
204 test_or_die "running check-in on: $path"
210 restore_terminal_title
213 # takes out the first few carriage returns that are in the input.
214 function squash_first_few_crs()
217 while read input_text; do
219 if [ $i -le 5 ]; then
220 echo -n "$input_text "
225 if [ $i -le 3 ]; then
226 # if we're still squashing eols, make sure we don't leave them hanging.
231 # a helpful method that reports the git branch for the current directory's
233 function my_branch_name()
235 echo "$(git branch | grep \* | cut -d ' ' -f2)"
238 # this reports the upstream branch for the current repo.
239 function parent_branch_name()
241 echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
244 # gets the latest versions of the assets from the upstream repository.
247 directory="$1"; shift
251 # make a nice echoer since we want to use it inside conditions below.
252 local nicedir="$directory"
253 if [ $nicedir == "." ]; then
256 local blatt="echo retrieving '$nicedir'..."
258 local retval=0 # plan on success for now.
259 pushd "$directory" &>/dev/null
260 if [ -d "CVS" ]; then
261 if test_writeable "CVS"; then
263 cvs update . | squash_first_few_crs
264 retval=${PIPESTATUS[0]}
266 elif [ -d ".svn" ]; then
267 if test_writeable ".svn"; then
269 svn update . | squash_first_few_crs
270 retval=${PIPESTATUS[0]}
272 elif [ -d ".git" ]; then
273 if test_writeable ".git"; then
277 # from very helpful page:
278 # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
279 git branch -r | grep -v '\->' |
280 while read remote; do
281 git branch --track "${remote#origin/}" "$remote"
282 # ensure we notice a failure when adding tracking.
285 retval+=${PIPESTATUS[0]}$?
287 git fetch --all 2>&1 | grep -v "X11 forwarding request failed" $TO_SPLITTER
288 retval+=${PIPESTATUS[0]}
290 git pull --all 2>&1 | grep -v "X11 forwarding request failed" $TO_SPLITTER
291 retval+=${PIPESTATUS[0]}
294 # this is not an error necessarily; we'll just pretend they planned this.
295 echo no repository in $directory
299 restore_terminal_title
304 # gets all the updates for a list of folders under revision control.
305 function checkout_list()
307 local list="$(uniquify $*)"
311 # turn repo list back into an array.
312 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
316 for outer in "${repository_list[@]}"; do
317 # check the repository first, since it might be an absolute path.
318 if [[ $outer =~ /.* ]]; then
319 # yep, this path is absolute. just handle it directly.
320 if [ ! -d "$outer" ]; then continue; fi
322 test_or_die "running update on: $path"
325 for inner in $list; do
326 # add in the directory component to see if we can find the folder.
327 local path="$inner/$outer"
328 if [ ! -d "$path" ]; then continue; fi
330 test_or_die "running update on: $path"
336 restore_terminal_title
339 # provides a list of absolute paths of revision control directories
340 # that are located under the directory passed as the first parameter.
341 function generate_rev_ctrl_filelist()
343 local dir="$1"; shift
344 pushd "$dir" &>/dev/null
345 local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
346 local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
348 local additional_filter
349 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
350 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
351 # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
354 # see if they've warned us not to try checking in within vendor hierarchies.
355 if [ ! -z "NO_CHECKIN_VENDOR" ]; then
356 sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
359 local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
360 sort <"$tempfile" >"$sortfile"
365 # iterates across a list of directories contained in a file (first parameter).
366 # on each directory name, it performs the action (second parameter) provided.
367 function perform_revctrl_action_on_file()
369 local tempfile="$1"; shift
370 local action="$1"; shift
374 while read -u 3 dirname; do
375 if [ -z "$dirname" ]; then continue; fi
376 pushd "$dirname" &>/dev/null
379 test_or_die "performing action $action on: $(pwd)"
384 restore_terminal_title