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
80 # snag all new files. not to everyone's liking.
82 test_or_die "git add all new files"
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.
88 test_or_die "git commit"
90 # catch if the diff-index failed somehow.
91 test_or_die "git diff-index"
93 # we continue on to the push, even if there were no changes this time, because
94 # there could already be committed changes that haven't been pushed yet.
96 local myself="$(my_branch_name)"
97 local parent="$(parent_branch_name)"
99 # upload any changes to the upstream repo so others can see them.
100 if [ "$myself" != "$parent" ]; then
101 git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
102 test_or_die "git push to origin: $myself"
104 # this branch is the same as the parent, so just push.
105 git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
106 test_or_die "normal git push"
111 # nothing there. it's not an error though.
112 echo no repository in $directory
116 restore_terminal_title
121 # shows the local changes in a repository.
124 local directory="$1"; shift
128 pushd "$directory" &>/dev/null
130 # only update if we see a repository living there.
131 if [ -d ".svn" ]; then
133 test_or_die "subversion diff"
134 elif [ -d ".git" ]; then
136 test_or_die "git diff"
137 elif [ -d "CVS" ]; then
139 test_or_die "cvs diff"
144 restore_terminal_title
149 # reports any files that are not already known to the upstream repository.
150 function do_report_new
152 local directory="$1"; shift
156 pushd "$directory" &>/dev/null
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
164 test_or_die "svn diff"
165 elif [ -d ".git" ]; then
167 test_or_die "git status -u"
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 (absolute) on path: $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 (relative) on path: $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 pushd "$directory" &>/dev/null
259 if [ -d "CVS" ]; then
260 if test_writeable "CVS"; then
262 cvs update . | $TO_SPLITTER
263 test_or_die "cvs update"
265 elif [ -d ".svn" ]; then
266 if test_writeable ".svn"; then
268 svn update . | $TO_SPLITTER
269 test_or_die "svn update"
271 elif [ -d ".git" ]; then
272 if test_writeable ".git"; then
275 #let's start over clean here...
278 test_or_die "git fetch origin"
281 test_or_die "git remote update"
283 # from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
284 UPSTREAM="${1:-'@{u}'}"
285 LOCAL=$(git rev-parse @)
286 REMOTE=$(git rev-parse "$UPSTREAM")
287 BASE=$(git merge-base @ "$UPSTREAM")
288 var UPSTREAM LOCAL REMOTE BASE
290 if [ $LOCAL = $REMOTE ]; then
292 elif [ $LOCAL = $BASE ]; then
294 elif [ $REMOTE = $BASE ]; then
300 echo The rest of pull is not done yet.
303 # reslog=$(git log HEAD..origin/master --oneline)
304 # if [[ "${reslog}" != "" ]] ; then
305 # git merge origin/master
309 # # from very helpful page:
310 # # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
311 # for remote in $( git branch -r | grep -v -- '->' ); do
312 # git branch --track ${remote#origin/} $remote 2>/dev/null
313 ##hmmm: ignoring errors from these, since they are continual.
314 ##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.
317 ##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.
318 # git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
319 # test_or_die "git fetch"
321 # git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
322 # test_or_die "git pull"
325 # this is not an error necessarily; we'll just pretend they planned this.
326 echo no repository in $directory
330 restore_terminal_title
335 # gets all the updates for a list of folders under revision control.
336 function checkout_list()
338 local list="$(uniquify $*)"
342 # turn repo list back into an array.
343 eval "repository_list=( ${REPOSITORY_LIST[*]} )"
347 for outer in "${repository_list[@]}"; do
348 # check the repository first, since it might be an absolute path.
349 if [[ $outer =~ /.* ]]; then
350 # yep, this path is absolute. just handle it directly.
351 if [ ! -d "$outer" ]; then continue; fi
353 test_or_die "running update on: $path"
356 for inner in $list; do
357 # add in the directory component to see if we can find the folder.
358 local path="$inner/$outer"
359 if [ ! -d "$path" ]; then continue; fi
361 test_or_die "running update on: $path"
367 restore_terminal_title
370 # provides a list of absolute paths of revision control directories
371 # that are located under the directory passed as the first parameter.
372 function generate_rev_ctrl_filelist()
374 local dir="$1"; shift
375 pushd "$dir" &>/dev/null
376 local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
377 local tempfile=$(mktemp /tmp/zz_checkins.XXXXXX)
379 local additional_filter
380 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
381 find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
382 # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
385 # see if they've warned us not to try checking in within vendor hierarchies.
386 if [ ! -z "NO_CHECKIN_VENDOR" ]; then
387 sed -i -e '/.*\/vendor\/.*/d' "$tempfile"
390 local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
391 sort <"$tempfile" >"$sortfile"
396 # iterates across a list of directories contained in a file (first parameter).
397 # on each directory name, it performs the action (second parameter) provided.
398 function perform_revctrl_action_on_file()
400 local tempfile="$1"; shift
401 local action="$1"; shift
405 while read -u 3 dirname; do
406 if [ -z "$dirname" ]; then continue; fi
407 pushd "$dirname" &>/dev/null
410 test_or_die "performing action $action on: $(pwd)"
415 restore_terminal_title