3 # these are helper functions for doing localized revision control.
4 # this script should be sourced into other scripts that use it.
6 # Author: Chris Koeritz
7 # Author: Kevin Wentworth
9 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
10 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
12 #hmmm: we need to dump all the outputs in this script into splitter
16 # the maximum depth that the recursive functions will try to go below the starting directory.
19 # use our splitter tool for lengthy output if it's available.
20 if [ ! -z "$(which splitter)" ]; then
21 TO_SPLITTER="$(which splitter)"
28 # one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory
29 # is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows.
30 # to get past this, TMP gets changed below to a hopefully generic and safe place.
31 if [[ "$TMP" =~ .:.* ]]; then
32 echo "making weirdo temporary directory for PCDOS-style path."
33 export TMP=/tmp/rev_control_$USER
35 if [ ! -d "$TMP" ]; then
38 if [ ! -d "$TMP" ]; then
39 echo "could not create the temporary directory TMP in: $TMP"
40 echo "this script will not work properly without an existing TMP directory."
45 # checks the directory provided into the revision control system repository it belongs to.
48 local directory="$1"; shift
52 # make a nice echoer since we want to use it inside conditions below.
53 local nicedir="$directory"
54 if [ $nicedir == "." ]; then
57 local blatt="echo checking in '$nicedir'..."
59 do_update "$directory"
60 test_or_die "repository update--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
69 test_or_die "cvs checkin"
71 elif [ -d ".svn" ]; then
72 if test_writeable ".svn"; then
75 test_or_die "svn checkin"
77 elif [ -d ".git" ]; then
78 if test_writeable ".git"; then
81 # classic implementation, but only works with one master branch.
82 # fixes will be forthcoming from development branch.
84 # snag all new files. not to everyone's liking.
86 test_or_die "git add all new files"
88 # see if there are any changes in the local repository.
89 if ! git diff-index --quiet HEAD --; then
90 # tell git about all the files and get a check-in comment.
92 test_or_die "git commit"
95 # # upload the files to the server so others can see them.
96 # git push 2>&1 | grep -v "X11 forwarding request failed"
97 # if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
98 # test_or_die "git push"
100 # catch if the diff-index failed somehow.
101 test_or_die "git diff-index"
103 # we continue on to the push, even if there were no changes this time, because
104 # there could already be committed changes that haven't been pushed yet.
106 local myself="$(my_branch_name)"
107 local parent="$(parent_branch_name)"
109 # upload any changes to the upstream repo so others can see them.
110 if [ "$myself" != "$parent" ]; then
111 git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
112 test_or_die "git push to origin: $myself"
114 # this branch is the same as the parent, so just push.
115 git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
116 test_or_die "normal git push"
121 # nothing there. it's not an error though.
122 echo no repository in $directory
126 restore_terminal_title
131 # shows the local changes in a repository.
134 local directory="$1"; shift
138 pushd "$directory" &>/dev/null
140 # only update if we see a repository living there.
141 if [ -d ".svn" ]; then
143 test_or_die "subversion diff"
144 elif [ -d ".git" ]; then
146 test_or_die "git diff"
147 elif [ -d "CVS" ]; then
149 test_or_die "cvs diff"
154 restore_terminal_title
159 # reports any files that are not already known to the upstream repository.
160 function do_report_new
162 local directory="$1"; shift
166 pushd "$directory" &>/dev/null
168 # only update if we see a repository living there.
169 if [ -f ".no-checkin" ]; then
170 echo "skipping reporting due to presence of .no-checkin sentinel file."
171 elif [ -d ".svn" ]; then
172 # this action so far only makes sense and is needed for svn.
173 bash $FEISTY_MEOW_SCRIPTS/rev_control/svnapply.sh \? echo
174 test_or_die "svn diff"
175 elif [ -d ".git" ]; then
177 test_or_die "git status -u"
182 restore_terminal_title
187 # checks in all the folders in a specified list.
188 function checkin_list()
190 # make the list of directories unique.
191 local list="$(uniquify $*)"
195 # turn repo list back into an array.
196 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
200 for outer in "${repository_list[@]}"; do
201 # check the repository first, since it might be an absolute path.
202 if [[ $outer =~ /.* ]]; then
203 # yep, this path is absolute. just handle it directly.
204 if [ ! -d "$outer" ]; then continue; fi
206 test_or_die "running check-in (absolute) on path: $outer"
209 for inner in $list; do
210 # add in the directory component to see if we can find the folder.
211 local path="$inner/$outer"
212 if [ ! -d "$path" ]; then continue; fi
214 test_or_die "running check-in (relative) on path: $path"
220 restore_terminal_title
223 # takes out the first few carriage returns that are in the input.
224 function squash_first_few_crs()
227 while read input_text; do
229 if [ $i -le 5 ]; then
230 echo -n "$input_text "
235 if [ $i -le 3 ]; then
236 # if we're still squashing eols, make sure we don't leave them hanging.
241 # a helpful method that reports the git branch for the current directory's
243 function my_branch_name()
245 echo "$(git branch | grep \* | cut -d ' ' -f2)"
248 # this reports the upstream branch for the current repo.
249 function parent_branch_name()
251 echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
254 # this exits with 0 for success (normal bash behavior) when up to date. if the branch is not up to date,
255 # then these values are returned:
257 # reference: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
258 function check_branch_state()
260 local branch="$1"; shift
262 local to_return=120 # unknown issue.
264 LOCAL=$(git rev-parse @)
265 REMOTE=$(git rev-parse "$branch")
266 BASE=$(git merge-base @ "$branch")
267 var branch LOCAL REMOTE BASE
269 if [ "$LOCAL" == "$REMOTE" ]; then
272 elif [ "$LOCAL" == "$BASE" ]; then
275 elif [ "$REMOTE" == "$BASE" ]; then
286 # the git update process just gets more and more complex when you bring in
287 # branches, so we've moved this here to avoid having a ton of code in the
289 function careful_git_update()
291 # first update all our remote branches to their current state from the repos.
293 test_or_die "git remote update"
295 #is parent branch the right thing to tell it?
296 #or we want mybranch for real, don't we?
297 # check_branch_state $(parent_branch_name)
298 state=$(check_branch_state $(my_branch_name) )
299 test_or_continue "branch state check"
300 #need to instead do something here if fails.
302 # now pull down any changes in our own origin in the repo, to stay in synch
303 # with any changes from others.
304 git pull --no-ff --all
305 test_or_die "git fetch origin"
308 echo The rest of pull is not being done yet.
313 # below has older shards of partial knowledge.
315 # reslog=$(git log HEAD..origin/master --oneline)
316 # if [[ "${reslog}" != "" ]] ; then
317 # git merge origin/master
319 # # from very helpful page:
320 # # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
321 # for remote in $( git branch -r | grep -v -- '->' ); do
322 # git branch --track ${remote#origin/} $remote 2>/dev/null
323 ##hmmm: ignoring errors from these, since they are continual.
324 ##hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell. it's probably simple.
327 ##hmmm: well, one time it failed without the fetch. i hope that's because the fetch is actually needed and not because the whole approach is fubar.
328 # git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
329 # test_or_die "git fetch"
331 # git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
332 # test_or_die "git pull"
336 # gets the latest versions of the assets from the upstream repository.
339 directory="$1"; shift
343 # make a nice echoer since we want to use it inside conditions below.
344 local nicedir="$directory"
345 if [ $nicedir == "." ]; then
348 local blatt="echo retrieving '$nicedir'..."
350 pushd "$directory" &>/dev/null
351 if [ -d "CVS" ]; then
352 if test_writeable "CVS"; then
354 cvs update . | $TO_SPLITTER
355 test_or_die "cvs update"
357 elif [ -d ".svn" ]; then
358 if test_writeable ".svn"; then
360 svn update . | $TO_SPLITTER
361 test_or_die "svn update"
363 elif [ -d ".git" ]; then
364 if test_writeable ".git"; then
367 # classic implementation, but only works with one master branch.
368 # fixes will be forthcoming from development branch.
370 # git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
371 # if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
372 # test_or_die "git pull"
379 # this is not an error necessarily; we'll just pretend they planned this.
380 echo no repository in $directory
384 restore_terminal_title
389 # gets all the updates for a list of folders under revision control.
390 function checkout_list()
392 local list="$(uniquify $*)"
396 # turn repo list back into an array.
397 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
401 for outer in "${repository_list[@]}"; do
402 # check the repository first, since it might be an absolute path.
403 if [[ $outer =~ /.* ]]; then
404 # yep, this path is absolute. just handle it directly.
405 if [ ! -d "$outer" ]; then continue; fi
407 test_or_die "running update on: $path"
410 for inner in $list; do
411 # add in the directory component to see if we can find the folder.
412 local path="$inner/$outer"
413 if [ ! -d "$path" ]; then continue; fi
415 test_or_die "running update on: $path"
421 restore_terminal_title
424 # provides a list of absolute paths of revision control directories
425 # that are located under the directory passed as the first parameter.
426 function generate_rev_ctrl_filelist()
428 local dir="$1"; shift
429 pushd "$dir" &>/dev/null
430 local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
431 local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
433 local additional_filter
434 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
435 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
436 # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
439 # see if they've warned us not to try checking in within vendor hierarchies.
440 if [ ! -z "NO_CHECKIN_VENDOR" ]; then
441 sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
444 local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
445 sort <"$tempfile" >"$sortfile"
450 # iterates across a list of directories contained in a file (first parameter).
451 # on each directory name, it performs the action (second parameter) provided.
452 function perform_revctrl_action_on_file()
454 local tempfile="$1"; shift
455 local action="$1"; shift
459 while read -u 3 dirname; do
460 if [ -z "$dirname" ]; then continue; fi
461 pushd "$dirname" &>/dev/null
464 test_or_die "performing action $action on: $(pwd)"
469 restore_terminal_title