changeset 591:c35f03182576

Fix spelling.
author Oleksandr Gavenko <gavenkoa@gmail.com>
date Sat, 21 Nov 2015 23:09:54 +0200
parents 6f110291f25c
children 242d4955e902
files hg/hgsyncee hg/hgsyncew
diffstat 2 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/hg/hgsyncee	Sat Nov 21 22:53:58 2015 +0200
+++ b/hg/hgsyncee	Sat Nov 21 23:09:54 2015 +0200
@@ -12,10 +12,10 @@
 LOG_FILE=$UTIL_NAME.log
 
 Usage() {
-    echo Sync external repo with master set via intermediate repo set.
+    echo Sync external repo-set with master repo-set via intermediate repo-set.
     echo "Usage:"
     echo "$UTIL_NAME [--help]"
-    echo "  --help   print this help"
+    echo "  --help    print this help"
 }
 
 PrintLog() {
@@ -69,7 +69,7 @@
     fi
     # Иначе ищем по стандартному пути.
     if [ x$HOME = x ] ; then
-        MSG="Var HOME not set."
+        MSG="HOME is not set."
         return 1;
     fi
     CFG=$HOME/.hgsyncrc
@@ -80,7 +80,7 @@
     if [ -e $CFG ]; then
         return 0;
     fi
-    MSG="Config file not found, see man page hgsyncrc(1)."
+    MSG="Config file '$CFG' is not found. See hgsyncrc(1)."
     return 1;
 }
 
@@ -91,15 +91,15 @@
     fi
     if [ -d $MASTER_DIR ] ; then :
     else
-        MSG="MASTER_DIR from $CFG point for non existing dir."
+        MSG="MASTER_DIR points to non-existing dir. See hgsyncrc(1) and '$CFG'."
         return 1;
     fi
     if [ x$MERGE_DIR = x ]; then
-        MSG="MERGE_DIR not set in $CFG"
+        MSG="MERGE_DIR is not set in $CFG"
         return 1;
         if [ -d $MERGE_DIR ]; then :
         else
-            MSG="MERGE_DIR from $CFG point for non existing dir."
+            MSG="MERGE_DIR points to non existing dir. See hgsyncrc(1) and '$CFG'."
             return 1;
         fi
     fi
@@ -133,7 +133,7 @@
 
 if Check_HG_exist; then :
 else
-    MSG="It seems hg utility is not in the PATH."
+    MSG="'hg' utility is not in the PATH."
     PrintLog ERROR
     exit 1;
 fi
@@ -177,7 +177,7 @@
         if [ -d $MERGE_DIR/$dir/.hg ]; then
             if CheckRepCompatibility $MERGE_DIR/$dir $MASTER_DIR/$dir; then :
             else
-                MSG="'$MERGE_DIR/$dir' and '$MASTER_DIR/$dir' is not compatable."
+                MSG="'$MERGE_DIR/$dir' and '$MASTER_DIR/$dir' are not compatable."
                 PrintLog ERROR
                 exit 1;
             fi
@@ -187,13 +187,13 @@
         fi
         if CheckRepCompatibility $MERGE_DIR/$dir ./$dir; then :
         else
-            MSG="'$dir' and master is not compatable."
+            MSG="'$dir' and master are not compatable."
             PrintLog ERROR
             exit 1;
         fi
         hg -R $MERGE_DIR/$dir pull ./$dir >>$LOG_FILE 2>&1
     else
-        MSG="'$dir' skiped. It is absent in master repo set."
+        MSG="'$dir' are skiped. It absents in master repo set."
         PrintLog INFO
         continue
     fi
@@ -228,7 +228,7 @@
         # Иначе переносим только "правильные" делты в промежуточный репозиторый
         # для их доступности из промежуточного репозитория на другом рабочем месте.
         *)
-            MSG="You must manually merge '$dir' proj and repeat run $UTIL_NAME."
+            MSG="You must manually merge '$dir' proj and re-run $UTIL_NAME."
             PrintLog WARNING
             MSG="Go to $MERGE_DIR/$dir dir."
             PrintLog WARNING
--- a/hg/hgsyncew	Sat Nov 21 22:53:58 2015 +0200
+++ b/hg/hgsyncew	Sat Nov 21 23:09:54 2015 +0200
@@ -14,7 +14,7 @@
 HTTP_USED=no
 
 Usage() {
-    echo Sync work repo set with master set.
+    echo Sync working repo-set with master repo-set.
     echo "Usage:"
     echo "$UTIL_NAME [--help | --push]"
     echo "  --help    print this help"
@@ -72,7 +72,7 @@
     fi
     # Иначе ищем по стандартному пути.
     if [ x$HOME = x ] ; then
-        MSG="Var HOME not set."
+        MSG="HOME is not set."
         return 1;
     fi
     CFG=$HOME/.hgsyncrc
@@ -83,7 +83,7 @@
     if [ -e $CFG ]; then
         return 0;
     fi
-    MSG="Config file not found, see man page hgsyncrc(1)."
+    MSG="Config file '$CFG' is not found. See hgsyncrc(1)."
     return 1;
 }
 
@@ -98,7 +98,7 @@
         http=${MASTER_DIR#http://}
         http=${http#https://}
         if [ "$http" = $MASTER_DIR ]; then
-            MSG="MASTER_DIR from $CFG point for non existing dir."
+            MSG="MASTER_DIR points to non-existing dir. See hgsyncrc(1) and '$CFG'."
             return 1
         else
             HTTP_USED=yes
@@ -139,7 +139,7 @@
 
 if Check_HG_exist; then :
 else
-    MSG="It seems hg utility is not in the PATH."
+    MSG="'hg' utility is not in the PATH."
     PrintLog ERROR
     exit 1;
 fi
@@ -160,7 +160,7 @@
 MSG="master dir: $MASTER_DIR"
 PrintLog INFO
 
-[ $NEED_PUSH != y ] && echo "INFO: You also may use --push opt."
+[ $NEED_PUSH != y ] && echo "INFO: '--push' option is available."
 
 echo
 
@@ -175,12 +175,12 @@
         if [ -d $MASTER_DIR/$dir/.hg ]; then
             if CheckRepCompatibility ./$dir $MASTER_DIR/$dir; then :
             else
-                MSG="'$dir' and master repo is not compatable."
+                MSG="'$dir' and master repo are not compatable."
                 PrintLog
                 exit 1;
             fi
         else
-            MSG="'$dir' repo skiped. It is absent in master repo set."
+            MSG="'$dir' repo are skiped. It absents in master repo-set."
             PrintLog INFO
             continue
         fi
@@ -195,7 +195,7 @@
         PrintLog ADDED
         CHANGED_FILES_CNT=`hg -R ./$dir st -m -a -r -d | wc -l`
         if [ $CHANGED_FILES_CNT -ge 1 ]; then
-            MSG="Found local changes. Merge needed."
+            MSG="Local changes found. Merge required."
             PrintLog WARNING
         else
             hg -R ./$dir up -r tip >>$LOG_FILE 2>&1
@@ -219,7 +219,7 @@
                 esac
                 ;;
             *)
-                MSG="You must manually merge '$dir' proj and repeat run $UTIL_NAME."
+                MSG="You must manually merge '$dir' proj and re-run $UTIL_NAME."
                 PrintLog WARNING
                 MSG="Go to ./$dir dir."
                 PrintLog WARNING