Commits

Will Kiefer  committed a8bac5e

- fixed up file extension handling to be more robust.

  • Participants
  • Parent commits ad8db26

Comments (0)

Files changed (1)

  • +12 -12
    hg
 		# Diff the old file with the new file
 		ksdiff "$OLD_DIR/$file" --label "$file$LABEL1_SUFFIX" --snapshot "$NEW_DIR/$file" --label "$file$LABEL2_SUFFIX" --snapshot $LABEL2
 	else # File does not exist
-		tempname=`basename $file`
-        TMPFILE=`mktemp -t ${tempname}`
-		EXT=${file##*.}
-		TMPFILEEXT="$TMPFILE.$EXT"
-		mv $TMPFILE $TMPFILEEXT
-		ksdiff "$OLD_DIR/$file" --label "$file (remove)" "$TMPFILEEXT" --label "$file"
+		FILENAME=$(basename $file)
+		TEMPFILE=`mktemp -t ${FILENAME}`
+		TEMPBASE=$(dirname $TEMPFILE)
+		TEMPFILE_RENAMED="$TEMPBASE/$FILENAME"
+		mv $TEMPFILE $TEMPFILE_RENAMED
+		ksdiff "$OLD_DIR/$file" --label "$file (remove)" "$TEMPFILE_RENAMED" --label "$file"
 	fi
 done
 
 # We still have to describe the files that were added in B
 (cd "$NEW_DIR" && find . -print0) | while read -d $'\0' file; do
 	if [ -f "$NEW_DIR/$file" ] && [ ! -e "$OLD_DIR/$file" ]; then
-		tempname=`basename $file`
-        TMPFILE=`mktemp -t ${tempname}`
-		EXT=${file##*.}
-		TMPFILEEXT="$TMPFILE.$EXT" 
-		mv $TMPFILE $TMPFILEEXT
-		ksdiff "$TMPFILEEXT" --label "$file (add)" "$NEW_DIR/$file" --label "$file$LABEL2_SUFFIX"
+		FILENAME=$(basename $file)
+		TEMPFILE=`mktemp -t ${FILENAME}`
+		TEMPBASE=$(dirname $TEMPFILE)
+		TEMPFILE_RENAMED="$TEMPBASE/$FILENAME"
+		mv $TEMPFILE $TEMPFILE_RENAMED
+		ksdiff "$TEMPFILE_RENAMED" --label "$file (add)" "$NEW_DIR/$file" --label "$file$LABEL2_SUFFIX"
 	fi
 done