Changeset 1584 in tailor

Timestamp:

05/30/08 10:26:45 (5 years ago)

Author:

<walter.franzini@…>

Hash name:

20080530082645-bb3d1-e730328812d7929b56c431ece3c8d053fa4c0b72

Message:

aegis backend simulate the (missing) aemv -keep command
The aegis -move command does not provide the -keep option to preserve
the content of the newly created file, so the target backend simulate
that behavior.

Files:

• test-scripts/test-darcs2aegis-simple.sh (modified) (4 diffs)
• vcpx/repository/aegis/target.py (modified) (2 diffs)

test-scripts/test-darcs2aegis-simple.sh

@@ -129 +129 @@
 if test $? -ne 0; then no_result; fi
 
+cat > $work/darcs-repo/bar.txt <<EOF
+This will be baz.txt
+EOF
+if test $? -ne 0; then no_result; fi
+
 darcs mv bar.txt baz.txt --repodir=$work/darcs-repo > log 2>&1
 if test $? -ne 0; then cat log; no_result; fi
@@ -139 +144 @@
 # Initialize the aegis repository
 #
-
 unset AEGIS_PROJECT
 unset AEGIS_CHANGE
@@ -261 +265 @@
 
 diff -u $work/ok $work/history
+if test $? -ne 0; then fail; fi
+
+activity="check the aegis baseline vs. darcs repository"
+diff $work/darcs-repo/baz.txt $workproj/baseline/baz.txt
+if test $? -ne 0; then fail; fi
+
+diff $work/darcs-repo/dir/foo.txt $workproj/baseline/dir/foo.txt
 if test $? -ne 0; then fail; fi
 
@@ -604 +615 @@
 if test $? -ne 0; then fail; fi
 
-activity="check baz.txt baseline copy"
-cat > $work/ok <<EOF
-A simple text file
-wit some more text.
-more text again!
-ancora piu\` test
-EOF
-if test $? -ne 0; then no_result; fi
-
-diff ok $workproj/baseline/baz.txt
+diff $work/darcs-repo/baz.txt $workproj/baseline/baz.txt
 if test $? -ne 0; then fail; fi
 

vcpx/repository/aegis/target.py

@@ -315 +315 @@
 
     def __move_file(self, old_name, new_name):
+        #
+        # The aegis command to rename files does not have the -keep
+        # option to preserve the content of the file, do it manually.
+        #
+        fp = open(os.path.join(self.repository.basedir, new_name), 'rb')
+        content = fp.read()
+        fp.close()
         cmd = self.repository.command("-move",
                                       "-not-logging",
@@ -326 +333 @@
                 "%s returned status %d, saying: %s" %
                 (str(move_file), move_file.exit_status, output.read()))
+
+        #
+        # Restore the previously saved content of the renamed file.
+        #
+        fp = open(os.path.join(self.repository.basedir, new_name), 'wb')
+        fp.write(content)
+        fp.close()
 
     def __remove_file(self, file_name):