[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Quilt-dev] [PATCH 16/39] backup-files: Optimize backup
From: |
Jean Delvare |
Subject: |
[Quilt-dev] [PATCH 16/39] backup-files: Optimize backup |
Date: |
Sat, 19 Mar 2011 10:52:46 +0100 |
User-agent: |
quilt/0.48-17.1 |
Optimize backup:
* Due to the way quilt uses backup-files, the backup file will never
exist, so there is no point checking for this.
* Don't attempt to create directories which already exist.
* Use > instead of touch to create new files, it's faster.
* Stop supporting option -t on backup, it's undocumented and quilt
doesn't use it.
* Drop unneeded quotes around constant.
Signed-off-by: Jean Delvare <address@hidden>
Reviewed-by: Raphael Hertzog <address@hidden>
---
quilt/scripts/backup-files.in | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
--- a/quilt/scripts/backup-files.in
+++ b/quilt/scripts/backup-files.in
@@ -60,19 +60,17 @@ ensure_nolinks() {
backup() {
local file="$1"
local backup="${OPT_PREFIX}${file}"
+ local dir
- if [ -e "$backup" ]; then
- rm "$backup"
- else
- mkdir -p "$(dirname "$backup")"
- fi
+ dir=$(dirname "$backup")
+ [ -d "$dir" ] || mkdir -p "$dir"
if [ ! -e "$file" ]; then
$ECHO "New file $file"
- touch "$backup"
+ : > "$backup"
else
$ECHO "Copying $file"
- if [ -n "$OPT_NOLINKS" -a "$(stat @STAT_HARDLINK@ "$file")" =
"1" ]; then
+ if [ -n "$OPT_NOLINKS" -a "$(stat @STAT_HARDLINK@ "$file")" = 1
]; then
cp -p "$file" "$backup"
else
ln "$file" "$backup" 2> /dev/null || cp -p "$file"
"$backup"
@@ -80,9 +78,6 @@ backup() {
ensure_nolinks "$file"
fi
fi
- if [ -n "$OPT_TOUCH" ]; then
- touch "$backup"
- fi
fi
}
- [Quilt-dev] [PATCH 27/39] backup-files: Remember the list of files, (continued)
- [Quilt-dev] [PATCH 27/39] backup-files: Remember the list of files, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 17/39] backup-files: Drop variable filelist, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 09/39] backup-files: Inline copy_file and link_or_copy_file, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 19/39] backup-files: Use internal implementation of dirname, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 33/39] backup-files: Try mass copy first on copy, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 05/39] Clean up legacy C code, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 11/39] backup-files: Prefix must be a directory, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 30/39] backup-files: Skip first mkdir on restore, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 29/39] backup-files: Try mass link/copy first on restore, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 36/39] backup-files: Drop support for -L on restore, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 16/39] backup-files: Optimize backup,
Jean Delvare <=
- [Quilt-dev] [PATCH 06/39] backup-files: Drop suffix option, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 28/39] backup-files: Separate lists for empty and non-empty files, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 10/39] backup-files: Speed up ensure_nolinks, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 35/39] backup-files: Inline restore_fast, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 20/39] backup-files: Batch mass restore, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 31/39] backup-files: New function for copy, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 37/39] backup-files: Drop support for backup removal, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 08/39] backup-files: Drop variable progname, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 04/39] BSD compatibility: rmdir, Jean Delvare, 2011/03/19
- [Quilt-dev] [PATCH 32/39] backup-files: Separate function copy_many, Jean Delvare, 2011/03/19