Skip to main content

make git_diff_wrapper 

reference site: http://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/


In fact, they need not be directly coded.


Just get git-difftool.


However, the following code would be useful to add what they want.




1) ~/.gitconfig


[diff]
  external = git_diff_wrapper
[pager]
  diff =






2) ~/bin/git_diff_wrapper






#!/bin/sh
# 1: orginal filename
# 2: left temporary filename
# 3:
# 4:
# 5: right temporary filename

DIR_BASENAME=`basename ${PWD}`
G_SZ_FN_LOG_FILE=/tmp/gitdiff_${DIR_BASENAME}_${PPID}.log
G_SZ_FN_TMP_ENV_FILE=/tmp/gitdiff_${DIR_BASENAME}_${PPID}.env
G_SZ_FN_RESUME_FILE="" 

DIFF_WC="" 
STIME=`date +%Y%m%d_%H%M%S`
SZ_TYPE="" 
DEF_ENV_MODE_NONE=0
DEF_ENV_MODE_SKIP=1
DEF_ENV_MODE_PROC=2
DEF_ENV_MODE_EXIT=3
G_SZ_ENV_MODE=${DEF_ENV_MODE_NONE}

if [ -f ${G_SZ_FN_TMP_ENV_FILE} ]; then
  G_SZ_ENV_MODE=`cat ${G_SZ_FN_TMP_ENV_FILE}`
fi

if [ ${G_SZ_ENV_MODE} == ${DEF_ENV_MODE_EXIT} ];then
  kill -9 ${PPID}
  exit
fi

if [ "$2" == "/dev/null" ]; then
  SZ_TYPE="L_NULL" 
elif [ "$5" == "/dev/null" ]; then
  SZ_TYPE="R_NULL" 
else
  if [ "${1}" == "${G_SZ_FN_RESUME_FILE}" ]; then
    G_SZ_ENV_MODE=${DEF_ENV_MODE_PROC}
    echo "${DEF_ENV_MODE_PROC}" > ${G_SZ_FN_TMP_ENV_FILE}
  elif [ "${G_SZ_FN_RESUME_FILE}" == "" ]; then
    G_SZ_ENV_MODE=${DEF_ENV_MODE_PROC}
  else
    if [ ${G_SZ_ENV_MODE} == ${DEF_ENV_MODE_NONE} ]; then
      G_SZ_ENV_MODE=${DEF_ENV_MODE_SKIP}
      echo "${G_SZ_ENV_MODE}" > ${G_SZ_FN_TMP_ENV_FILE}
    fi
  fi
  if [ "${G_SZ_ENV_MODE}" == "${DEF_ENV_MODE_SKIP}" ]; then
    SZ_TYPE="F_SKIP" 
  else
    DIFF_WC=`diff --strip-trailing-cr "$2" "$5" |wc -l`
    if [ ${DIFF_WC} -eq 0 ]; then
      SZ_TYPE="F_SAME" 
    else
      SZ_TYPE="S_DIFF" 
      echo "${STIME} ${SZ_TYPE} ${1} ${2} ${5} wc(${DIFF_WC})" >> ${G_SZ_FN_LOG_FILE}
      vimdiff "$2" "$5" 
      STIME=`date +%Y%m%d_%H%M%S`
      SZ_TYPE="E_DIFF" 
      echo "${STIME} ${SZ_TYPE} ${1} ${2} ${5} wc(${DIFF_WC})" >> ${G_SZ_FN_LOG_FILE}
      SZ_TYPE="" 
    fi
  fi
fi

if [ "${SZ_TYPE}" != "" ]; then
  echo "${STIME} ${SZ_TYPE} ${1} ${2} ${5} wc(${DIFF_WC})" >> ${G_SZ_FN_LOG_FILE}
fi











































Comments











Post a Comment




















Popular posts from this blog



















sanitize on in CMakeLists.txt




























1. CMakeLists.txt set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address") add_compile_options(-fsanitize=address) If a subdir is set with add_subdirectory and a module that does not support sanitize is imported from the path and needs to be removed, add -fno-sanitize=address to add_compile_options in CMakeLists.txt of the subdir to remove it. Basically, if you enable sanitize, sanitize will adjust ulimit's core to 0, so core will not occur. You can do this by putting the following part as an environment variable. (Below is the part you put in systemd's service) 2. service file in systemd [Service] LimitCORE=infinity Environment="ASAN_OPTIONS=handle_segv=0:handle_abort=1:abort_on_error=1:disable_coredump=0"




















Post a Comment









Read more




























[bash-script] get_info.sh print cpu allocation infomation of threads




























1) way1  ps xH -o 'pid tid cmd comm pcpu psr'   2) way2  #!/bin/bash  TMP_FILE=$(mktemp /tmp/abc-script.XXXXXX)  echo ${TMP_FILE}  ps xH -o 'pid tid cmd comm pcpu ' > ${TMP_FILE}   function make_header()  {    echo -n "$1"    echo " psr"  }   function make_values()  {    echo -n "$1"    STATUS_FILE=/proc/${2}/task/${3}/status    if [ -f ${STATUS_FILE} ] ; then      CPU_SET=`cat ${STATUS_FILE}  |grep Cpus_allowed_list |awk ' { print $2 } '`    else      CPU_SET="None"    fi    echo " ${CPU_SET}"  }   let IDX=0  while IFS='' read -r line || [[ -n "$line" ]]; do     LINE_SEP=( $line )     MY_PID=${LINE_SEP[0]}     MY_TID=${LINE_SEP[1]}     if [ ${IDX} -eq 0 ]; then       SZ_HEADER=`make_header "$line"`       echo ${SZ_HEADER}     else       SZ_VALUES=`make_values "$line" ${MY_PID} ${MY_TID}`       echo ${SZ_VALUES}...




















Post a Comment









Read more




























linux file system recovery




























1. broken hdd disk backup   1) remote-server  nc -v -l [port] > hdd_backup.img   2) equipment of broken hdd  dd if=/dev/sda | nc -v [remote-server IP] [port]     ex)   1) remote-server  nc -v -l 2222 > hdd_backup.img   2) equipment of broken hdd  dd if=/dev/sda | nc -v 1.1.1.1 2222   2. use recovery tool   testdisk (http://www.cgsecurity.org/wiki/TestDisk_Download)   3. run fsck from img file   # losetup --offset 32256 /dev/loop2 harddrive.img   # fsck /dev/loop2   and again testdisk   reference:  https://major.io/2010/12/14/mounting-a-raw-partition-file-made-with-dd-or-dd_rescue-in-linux/  https://bbs.archlinux.org/viewtopic.php?id=136766    




















Post a Comment









Read more