copy/move directory updates #39

rmboggs · 2012-03-16T03:07:09Z

My attempt on addressing the issue of copying/moving directories. Please review before merging into master.

…Empty static method to FilterChain. Added test to Move task to check issue that was reported regarding moving directories.

…if the Includes list is empty when the tasks are called.

…. Comments and additional tests needed.

… cleaned up the formatting and removed some commented codes.

… the FileOperationMap class. Updated the Log outputs in the copy and move tasks to take directory operations into account. Added more comments.

…ed documentation reference.

…nsideration. Also added comments.

rmboggs · 2012-03-16T03:10:02Z

This is trying to fix the problem reported in issue #11.

…cted FileCopyMap property back in CopyTask (as obsolete property). Reworked Copy/Move tasks to move entire directoriesif CopyFileSet Includes list is empty. Added method to convert FileOperationMap to Hashtable (for FileCopyMap property). Added private static method to FileUtils static class to check if FilterChain is null or empty.

rmboggs · 2012-03-21T03:28:49Z

FYI - These changes were tested using mono-2.0, mono-4.0, net-2.0, net-3.5, and net-4.0 on WinXP and Mac OS X 10.6.

drieseng · 2012-03-25T07:56:41Z

src/NAnt.Core/Tasks/CopyTask.cs

        ///   destination file.
        ///   </para>
        ///   <para>
        ///   On Windows, the <see cref="Hashtable" /> is case-insensitive.
        ///   </para>
        /// </remarks>
-        protected Hashtable FileCopyMap {
-            get { return _fileCopyMap; }
+        [ObsoleteAttribute("Use OperationMap instead of FileCopyMap.")]


I'd make it clear that this is essentially a read-only hashtable now.
Any changes you make to the hashtable will not be taken into account.
I'd clarify this in the docs and the ObsoleteAttribute, and check if you can actually return a read-only hashtable (that will throw exception when you attend to modify it); does such a thing exist in .NET ?

…eSet class (as protected internal property). Added IsNullOrEmpty static method to FilterChain class as an internal method. Reworked MoveDirectory static method in FileUtils class for clarity. Removed copytask test that was no longer relevent. Added more move task tests. Documented copy/move task to include details about directories operations.

…ring build. Matches recent change to Makefile.

…n checking files, not directories. Fixed new MoveTask test to take recent DirectoryScanner.IsEverythingIncluded fix into account. Added additional MoveTask test and added DirectoryScanner test.

drieseng · 2012-04-01T08:43:01Z

src/NAnt.Core/Util/FileUtils.cs

+                    {
+                        string stagePath = GetTempDirectoryName();
+
+                        Directory.Move(sourceDirectory, stagePath);


perhaps add a try / catch or try / finally in which you ensure that - if the stagePath (still) exists, it is removed.
this avoids "leaking" stage paths.

…additional comments.

…string.

…the status of directory operations.

… but different casing (ie: C:\nant to C:\NAnt) on windows system. Added test for this change and additional comments for clarity.

drieseng · 2012-04-08T05:30:35Z

src/NAnt.Core/Tasks/CopyTask.cs

-                    Log(Level.Info, "Copying {0} file{1} to '{2}'.", fileCount, (fileCount != 1) ? "s" : "", ToFile);
-                } else {
-                    Log(Level.Info, "Copying {0} file{1} to '{2}'.", fileCount, (fileCount != 1) ? "s" : "", ToDirectory);
+            if (OperationMap.Count > 0)


Personally, I'd have the following to start the method:

if (OperationMap.Count == 0)
return;

That way you don't have to indent the complete logic in that method.

drieseng · 2012-04-08T05:33:57Z

src/NAnt.Core/Tasks/MoveTask.cs

-                foreach (DictionaryEntry fileEntry in FileCopyMap) {
-                    string destinationPath = (string) fileEntry.Key;
-                    string sourcePath = ((FileDateInfo) fileEntry.Value).Path;
+            if (OperationMap.Count > 0)


Personally, I'd have the following to start the method:

if (OperationMap.Count == 0)
return;

That way you don't have to indent the complete logic in that method.

…rectoryName methods to internal for the time being as suggested by Gert Driesen.

…er efficiency.

…ck moving files in subdirectories.

…ectory.

rmboggs · 2012-04-09T19:00:25Z

Rec'd ok from Gert via email this merge. Will merge sometime today. :)

copy/move directory updates

…opy files into bin/Debug or bin/Release nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly nant/nant#39). Which makes nant time-consumingly copy these files when the aren't actually used. Tested removal of <copy> on both nant 0.91 and nant 0.92 Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.

…opy files into bin/Debug or bin/Release nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly nant/nant#39). Which makes nant time-consumingly copy these files when the aren't actually used. Tested removal of <copy> on both nant 0.91 and nant 0.92 This change has been used without issue for OpenSimulator since Nov 14 2012 commit 90c6d2e

…opy files into bin/Debug or bin/Release nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly nant/nant#39). Which makes nant time-consumingly copy these files when the aren't actually used. Tested removal of <copy> on both nant 0.91 and nant 0.92 Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.

Fix for issue nant#38

rmboggs added 10 commits February 27, 2012 20:11

Added copy/move directory static methods to FileUtils. Added IsNullOr…

6c1ae93

…Empty static method to FilterChain. Added test to Move task to check issue that was reported regarding moving directories.

Merge remote-tracking branch 'upstream/master' into filemovementupdates

1f3dd67

Set the copy/move tasks to add **/* to the CopyFileSet Includes list …

7420539

…if the Includes list is empty when the tasks are called.

Merge branch 'master' into filemovementupdates

468cdd8

Updated copy and move tasks to take directory operations into account…

90bd409

…. Comments and additional tests needed.

Added comments to the recent changes to the copy and move tasks. Also…

97d69cc

… cleaned up the formatting and removed some commented codes.

Added methods to count the number of file and directory operations in…

d670a92

… the FileOperationMap class. Updated the Log outputs in the copy and move tasks to take directory operations into account. Added more comments.

Fixed the OperationType property of the FileOperation class. Also fix…

7699619

…ed documentation reference.

Update DirectoryIsEmpty methods to take directory inforamtion into co…

3d7ad86

…nsideration. Also added comments.

Fix line endings in CopyTask.

48992d7

rmboggs added 4 commits March 18, 2012 15:15

Cleanup using statements in Copy/Move Task classes.

84171e3

Add additional tests for the Copy and Move tasks.

731f4a8

Add more tests for the Move and Copy tasks.

6ab7fb4

drieseng reviewed Mar 25, 2012
View reviewed changes

rmboggs added 3 commits March 26, 2012 22:39

Update Makefile.nmake file to pass debug flag to nant bootstrapper du…

a1c28dd

…ring build. Matches recent change to Makefile.

Fixed DirectoryScanner.IsEverythingIncluded so it is only updated whe…

437e63b

…n checking files, not directories. Fixed new MoveTask test to take recent DirectoryScanner.IsEverythingIncluded fix into account. Added additional MoveTask test and added DirectoryScanner test.

drieseng reviewed Apr 1, 2012
View reviewed changes

rmboggs added 4 commits April 1, 2012 18:02

Updated FileUtils.MoveDirectory method for better error handling and …

e5798d5

…additional comments.

Make sure that the fullname of the parent path is passed to the root …

2ab7bac

…string.

Added additional methods to FileOperation class to better understand …

1af0ff9

…the status of directory operations.

Update move task to allow for renaming directories with the same name…

b6994bc

… but different casing (ie: C:\nant to C:\NAnt) on windows system. Added test for this change and additional comments for clarity.

drieseng reviewed Apr 8, 2012
View reviewed changes

rmboggs added 4 commits April 8, 2012 00:42

Changed FileUtils methods CopyDirectory, MoveDirectory, and GetTempDi…

764ef99

…rectoryName methods to internal for the time being as suggested by Gert Driesen.

Updated the DoFileOperations methods for the Copy/Move tasks for bett…

436e5d7

…er efficiency.

Added comment in DirectoryScanner for clarity. Added move test to che…

b2a11cb

…ck moving files in subdirectories.

Adjusted one of the move tests to check the existance of the base dir…

006c7a0

…ectory.

rmboggs added a commit that referenced this pull request Apr 9, 2012

Merge pull request #39 from rmboggs/filemovementupdates

2406278

copy/move directory updates

rmboggs merged commit 2406278 into nant:master Apr 9, 2012

rmboggs mentioned this pull request Apr 9, 2012

Rename Directory #11

Closed

nathanscottdaniels pushed a commit to nathanscottdaniels/pnant that referenced this pull request Oct 18, 2016

Merge pull request nant#39 from nikhilgg/patch-1

7407329

Fix for issue nant#38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

copy/move directory updates #39

copy/move directory updates #39

rmboggs commented Mar 16, 2012

rmboggs commented Mar 16, 2012

rmboggs commented Mar 21, 2012

drieseng Mar 25, 2012

drieseng Apr 1, 2012

drieseng Apr 8, 2012

drieseng Apr 8, 2012

rmboggs commented Apr 9, 2012

copy/move directory updates #39

copy/move directory updates #39

Conversation

rmboggs commented Mar 16, 2012

rmboggs commented Mar 16, 2012

rmboggs commented Mar 21, 2012

drieseng Mar 25, 2012

Choose a reason for hiding this comment

drieseng Apr 1, 2012

Choose a reason for hiding this comment

drieseng Apr 8, 2012

Choose a reason for hiding this comment

drieseng Apr 8, 2012

Choose a reason for hiding this comment

rmboggs commented Apr 9, 2012