[darcs-devel] [patch1154] Tidy up checkNewAndOldFilenames in the M... (and 17 more)

[Ben Franksen]

Wow, many thanks for your work on these issues!

I hope these patches can be reviewed soon, so I can rebase-pull them into my 
working branch. I always like to avoid conflicts ;-)

BTW, the first wave of my re-factorings of the Arguments/Defaults stuff will 
soon be ready for review, too.

Cheers
Ben

Owen Stephens wrote:
> 
> New submission from Owen Stephens <darcs at owenstephens.co.uk>:
> 
> This patch set makes the move command work "properly", that is, it now
> acts more intuitively.
> 
> 18 patches for repository http://www.darcs.net/screened:
> 
> Wed Apr 23 00:58:35 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Tidy up checkNewAndOldFilenames in the Move command
> 
> Thu Apr 24 22:19:40 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Resolve issue2380: allow darcs mv into known, but deleted in working,
>   file
> 
> Wed Apr 30 03:35:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * renameHelper should not record all changes
>   We were accidentally recording patches that removed files that we wanted
>   to appear as shadow files (recorded as present, but missing in working)
> 
> Wed Apr 30 03:35:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Allow post-hoc moves to known paths
>   The new behaviour is to record patches that first delete the original
>   contents, before adding the move patch
> 
> Sun May 11 12:51:59 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Tidy up of Move - refactor out some common code
> 
> Sun May 11 12:53:22 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * renameHelper now tests all combos of path status and path type
>   (missing/unknown/known/shadow) for status and file/dir for type
> 
> Sun May 11 12:53:23 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Accept issue2382: darcs is confused if a dir is moved inplace of a
>   file
> 
> Sun May 11 12:53:23 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Prevent updateIndex failing if a file is moved to a dir or vice-versa
>   Now, if a file becomes a dir, trying to readFile (to update the index)
>   treats the file as missing.
>   
> 
> Sun May 11 12:53:23 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Allow diff to handle a file changing to a dir or vice-versa
>   It'll return a removal hunk ; rmfile ; adddir for the file dir case
> 
> Sun May 11 16:06:15 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Give user more feedback when doing a move
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Make renameHelper much more efficient
>   Add/record all initial state up front, rather than one file/dir at a
>   time. Avoid extra system calls by using && to join multiple commands
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Fix a rename testcase marked as ok when it shouldn't be
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Implement moveToDir and simpleMove with common function
>   Ensuring that move patches are not applied if the move is post-hoc
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Add addPendingDiffToPending function and comment addToPending
>   The new function allows us to add a patch to pending that is based on
>   the pending state of the repo, not working (as per addToPending).
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Use addPendingDiffToPending to add move patch and deps to pending
>   We used to add an explicit addfile/adddir patch that was a hacky way to
>   get around the implementation of addToPending (the diff to working would
>   notice the rmfile, which would be cancelled-out by the addfile). Now we
>   can just add the move patch and its dependencies (e.g. removing an
>   existing target) by creating a patch that starts at pending
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Always use MyersDiff when removing a file - the diff will be identical
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Tweak renameHelper - add trailing EOL in files and remove unnecessary
>   $
> 
> Sun May 11 16:06:25 BST 2014  Owen Stephens <darcs at owenstephens.co.uk>
>   * Move previously failing issue2382 test
> 
> ----------
> files: patch-preview.txt,
> tidy-up-checknewandoldfilenames-in-the-move-command.dpatch, unnamed
> messages: 17445 nosy: owst
> status: needs-screening
> title: Tidy up checkNewAndOldFilenames in the M... (and 17 more)
> 
> __________________________________
> Darcs bug tracker <bugs at darcs.net>
> <http://bugs.darcs.net/patch1154>
> __________________________________
-- 
"Make it so they have to reboot after every typo." -- Scott Adams