This is a fix to a ProbablyEasy bug.

Attachments

• resolve-issue1737_-darcs-mv-does-not-warn-when-moving-old-to-new-if-_-2-args.dpatch

This is a fix to a ProbablyEasy bug.


1 patch for repository http://darcs.net/screened:

Mon Feb 21 13:32:22 IST 2011  bsrkaditya@gmail.com
  * resolve issue1737: darcs mv does not warn when moving old to new if > 2
args


-- 
BSRK Aditya

Attachments

• resolve-issue1737_-darcs-mv-does-not-warn-when-moving-old-to-new-if-_-2-args.dpatch
• unnamed

Since this patch intersects with my recent changes to Darcs.Commands.* 
and is trivial, I'll review it.

A note on the patch name: as pointed out in 
http://wiki.darcs.net/Development/GettingStarted#sending-your-patches, 
it's a good practice to keep your patch names down to 72 characters or 
less.

         Nothing -> fail "Invalid destination directory."
         Just to' -> do
           xs <- nub . sort <$> fixSubPaths opts froms
-          case xs of
-            [] -> fail "Nothing to move."
-            froms' -> moveFilesToDir opts froms' to'
+          if to' `elem` xs
+            then fail "Cannot rename a file or directory onto itself!"
+            else case xs of
+              [] -> fail "Nothing to move."
+              froms' -> moveFilesToDir opts froms' to'
 
 moveFile :: [DarcsFlag] -> SubPath -> SubPath -> IO ()
 moveFile opts old new = withRepoLock opts $ RepoJob $ \repository -> do

A check that the moved files do not include the target directory itself, 
good. The error message is consistent with that of 2 aruments case (i.e. 
darcs move x x).

This patch applies cleanly to both HEAD and screened, and doesn't break 
any tests.

One thing that is usually has to be done is writing tests.  But in this 
case, the tests are already written (see tests/failing-issue1737-
move_args.sh in darcs repository).  They are skipped because of the 
"failing-" prefix in the filename.  Could you send a followup patch 
removing that prefix?

Overall, thanks for the patch!  I'm marking it as "accepted", it will 
appear in the repositories when someone from the Core Team will push it.

1 patch for repository http://darcs.net/screened:

Tue Feb 22 10:30:31 IST 2011  bsrkaditya@gmail.com
  * [patch558] Removed failing prefix from test

Attachments

• _patch558_-removed-failing-prefix-from-test.dpatch
• unnamed
• unnamed

Hi BSRK Aditya,

I'm willing to push this patch but because of the poor naming of the
followup patch you sent, I'm going to ask you to just amend the first
patch so that it includes the renaming of the test script.

In case I'm not clear: you should unrecord your patch "[patch558]
Removed failing prefix from test", then amend "resolve issue1737
[...]" to include the renaming, and send this new version as a
followup by using "darcs send --subject="[patch558]".

thanks!

guillaume

darcs mv does not warn when moving old to new
is same and the number of arguments are > 2.
(issue1737)

The patch rectifies this error.

The test for this bug is already written
and is tests/failing-issue1737-move_args.sh

The patch renames this to tests/issue1737-move_args.sh

1 patch for repository http://darcs.net/screened:

Wed Feb 23 00:39:56 IST 2011  bsrkaditya@gmail.com
  * resolve issue1737: darcs mv does not warn when moving old to new if > 2 args

Attachments

• resolve-issue1737_-darcs-mv-does-not-warn-when-moving-old-to-new-if-_-2-args.dpatch
• unnamed
• unnamed

OK, it's in, thanks!