equal
deleted
inserted
replaced
231 echo "$ROOT/$1" |
231 echo "$ROOT/$1" |
232 } |
232 } |
233 |
233 |
234 ## hg |
234 ## hg |
235 function hg { |
235 function hg { |
236 local repo=$1; shift |
236 local repo=$REPO; shift |
237 |
237 |
238 cmd $HG -R $ROOT/$repo "$@" |
238 cmd $HG -R $ROOT/$repo "$@" |
239 } |
239 } |
240 |
240 |
241 function hg_modified { |
241 function hg_modified { |
242 local repo=$1 |
242 hg id | grep -q '+' |
243 |
|
244 hg $repo id | grep -q '+' |
|
245 } |
243 } |
246 |
244 |
247 function hg_user { |
245 function hg_user { |
248 if [ ${SUDO_USER:-} ]; then |
246 if [ ${SUDO_USER:-} ]; then |
249 echo '-u' "$SUDO_USER" |
247 echo '-u' "$SUDO_USER" |
256 echo '-u' "$USER" |
254 echo '-u' "$USER" |
257 fi |
255 fi |
258 } |
256 } |
259 |
257 |
260 function hg_diff { |
258 function hg_diff { |
261 local repo=$1 |
259 hg diff |
262 |
|
263 hg $repo diff |
|
264 } |
260 } |
265 |
261 |
266 function hg_commit { |
262 function hg_commit { |
267 local repo=$1 |
|
268 local msg=$2 |
263 local msg=$2 |
269 local user_opt=$(hg_user) |
264 local user_opt=$(hg_user) |
270 |
265 |
271 log_debug "commit: $user_opt: $msg" |
266 log_debug "commit: $user_opt: $msg" |
272 hg $repo commit $user_opt -m "$msg" |
267 hg commit $user_opt -m "$msg" |
273 } |
268 } |
274 |
269 |
275 |
270 |
276 ## functions |
271 ## functions |
277 function check_update { |
272 function check_update { |
554 indent " rndc: " $RNDC reload |
549 indent " rndc: " $RNDC reload |
555 } |
550 } |
556 |
551 |
557 # commit data changes |
552 # commit data changes |
558 function commit_data { |
553 function commit_data { |
559 local repo=$1 |
554 local repo=$REPO |
560 |
555 |
561 if hg_modified $repo; then |
556 if hg_modified; then |
562 log_info "Commit changes in $repo:" |
557 log_info "Commit changes in $repo:" |
563 |
558 |
564 indent " " hg_diff $repo |
559 indent " " hg_diff |
565 |
560 |
566 hg_commit $repo "$COMMIT_MSG" |
561 hg_commit "$COMMIT_MSG" |
567 else |
562 else |
568 log_info "Commit changes in $repo: no changes" |
563 log_info "Commit changes in $repo: no changes" |
569 fi |
564 fi |
570 } |
565 } |
571 |
566 |
690 if [ $COMMIT_SKIP ] && [ ! $COMMIT_FORCE ]; then |
685 if [ $COMMIT_SKIP ] && [ ! $COMMIT_FORCE ]; then |
691 log "Commit data: skipped" |
686 log "Commit data: skipped" |
692 |
687 |
693 else |
688 else |
694 log "Commit data..." |
689 log "Commit data..." |
695 commit_data $REPO |
690 commit_data |
696 fi |
691 fi |
697 } |
692 } |
698 |
693 |
699 main "$@" |
694 main "$@" |