[Astlinux-commits] SF.net SVN: astlinux:[7209] branches/1.0/package/fossil

[<abe...@us...>]

Revision: 7209
          http://sourceforge.net/p/astlinux/code/7209
Author:   abelbeck
Date:     2015-08-20 22:21:15 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add another helper script fossil-diff and rework fossil-revert

Modified Paths:
--------------
    branches/1.0/package/fossil/fossil.mk
    branches/1.0/package/fossil/scripts/fossil-revert

Added Paths:
-----------
    branches/1.0/package/fossil/scripts/fossil-diff

Modified: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk	2015-08-20 19:13:16 UTC (rev 7208)
+++ branches/1.0/package/fossil/fossil.mk	2015-08-20 22:21:15 UTC (rev 7209)
@@ -33,6 +33,7 @@
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-close $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-update $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-revert $(TARGET_DIR)/usr/bin/
+	$(INSTALL) -m 0755 -D package/fossil/scripts/fossil-diff $(TARGET_DIR)/usr/bin/
 	$(INSTALL) -m 0755 -D package/fossil/fossil.init $(TARGET_DIR)/etc/init.d/fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	ln -sf ../../init.d/fossil $(TARGET_DIR)/etc/runlevels/default/K15fossil
@@ -44,6 +45,7 @@
 	rm -f $(TARGET_DIR)/usr/bin/fossil-close
 	rm -f $(TARGET_DIR)/usr/bin/fossil-update
 	rm -f $(TARGET_DIR)/usr/bin/fossil-revert
+	rm -f $(TARGET_DIR)/usr/bin/fossil-diff
 	rm -f $(TARGET_DIR)/etc/init.d/fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S75fossil
 	rm -f $(TARGET_DIR)/etc/runlevels/default/K15fossil

Added: branches/1.0/package/fossil/scripts/fossil-diff
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-diff	                        (rev 0)
+++ branches/1.0/package/fossil/scripts/fossil-diff	2015-08-20 22:21:15 UTC (rev 7209)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+REPO="/mnt/kd/fossil/astlinux.fossil"
+
+LOCKFILE="/var/lock/fossil-update.lock"
+
+if [ ! -f $REPO ]; then
+  echo "Fossil repository not found: $REPO" >&2
+  exit 1
+fi
+
+if ! cd /mnt/kd; then
+  exit 1
+fi
+
+if [ -f "$LOCKFILE" ]; then
+  echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+  exit 9
+fi
+
+fossil open $REPO --keep >/dev/null
+
+fossil diff
+rtn=$?
+
+fossil close --force
+
+exit $rtn


Property changes on: branches/1.0/package/fossil/scripts/fossil-diff
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/fossil/scripts/fossil-revert
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-revert	2015-08-20 19:13:16 UTC (rev 7208)
+++ branches/1.0/package/fossil/scripts/fossil-revert	2015-08-20 22:21:15 UTC (rev 7209)
@@ -4,12 +4,14 @@
 
 LOCKFILE="/var/lock/fossil-update.lock"
 
-revision="$1"
+file="$1"
 
-file="$2"
+revision="$2"
 
-if [ -z "$revision" -o -z "$file" ]; then
-  echo "Usage: fossil-revert hex_revision_num file_name"
+if [ -z "$file" ]; then
+  echo "Usage: fossil-revert [/mnt/kd/]file_name [hex_revision_num]"
+  echo ""
+  echo "Note:  If no hex_revision_num is specified, the latest is used."
   exit 1
 fi
 
@@ -34,14 +36,10 @@
 
 fossil open $REPO --keep >/dev/null
 
-fossil revert -r "$revision" "$file"
+fossil revert${revision:+ -r $revision} "$file" | grep -v 'fossil undo'
 rtn=$?
 
-if [ $rtn -eq 0 ]; then
-  fossil changes
-  fossil commit --no-warnings -m "Revert file: $file"
-  rtn=$?
-fi
+fossil changes
 
 fossil close --force
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.