[MERGE] enhanced mv command

[Marius Kruger]

hi,

I see I've also missed 0.14, but thats ok.
I just have some questions before I post a new bundle.


@@ -830,14 +822,14 @@
>     def merge_modified(self):
>         try:
>             hashfile = self._control_files.get('merge-hashes')
> - -        except NoSuchFile:
> +        except errors.NoSuchFile:
>
> I have to say that it's kinda frustrating plowing through all these
> unrelated changes in order to review this new mv thing.
>
I'm sorry about that, I was told that the "errors." syntax should
be used from now on and I'm one for fixing stuff immediately if
they should be fixed. But I see your point.
Do you want me to split it up so that we have a separate bundle
to fixup all errors in bzrlib/workingtree.py ?


@@ -147,3 +152,151 @@
>         self.run_bzr('mv', 'c/b', 'b')
>         tree = workingtree.WorkingTree.open('.')
>         self.assertEqual('b-id', tree.path2id('b'))
> +
> +    def test_mv_already_moved_file(self):
> +        """a is in repository, b does not exist. User does
> +        mv a b; bzr mv a b"""
>
> ^^^ Docstrings should have a one-line summary, then an empty line, then
> a longer description.
>
I can't make up my mind how these doc strings should look
(I'm going around in circles changing it),
It is quite difficult to describe these tests in one line without
almost exactly copying the method name.
Please tel me which one you would prefer (or give a better suggestion).

    def test_mv_already_moved_file(self):
        """Test bzr mv existing_file to new_file.

        a is in the working tree, b does not exist.
        User does mv a b; bzr mv a b

        """

    def test_mv_already_moved_file(self):
        """Test bzr mv [existing file] [new file].

        a is in the working tree, b does not exist.
        User does mv a b; bzr mv a b

        """

    def test_mv_already_moved_file_into_unversioned_subdir(self):
        """Test bzr mv [already moved file] into [unversioned subdirectory].

        a is in the working tree, sub1/ is not.
        User does mv a sub1/a; bzr mv a sub1/a

        """



regards
marius

-- 



I code therefore I am.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20070109/4de973b9/attachment-0001.htm