[api breakage] alias merge regression.

[Robert Collins]

On Tue, 2006-02-28 at 09:41 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Also, could you explain how to support the 0.8 API please?
> 
> I replaced run_argv with run_alias_argv in push.py, and while that fixes
>  remote push, it breaks the test suite:
> 
>    ERROR  bzrlib.errors.MustUseDecorated:
>   at /home/abentley/.bazaar/plugins/bzrtools/bzrtools.py line 250
>   in push
> Traceback (most recent call last):
>   File "/home/abentley/bzr.ab.integration/bzrlib/commands.py", line 647,
> in run_bzr_catch_errors
>     return run_bzr(argv)
>   File "/home/abentley/bzr.ab.integration/bzrlib/commands.py", line 609,
> in run_bzr
>     ret = run(*run_argv)
>   File "/home/abentley/bzr.ab.integration/bzrlib/commands.py", line 241,
> in run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/home/abentley/.bazaar/plugins/bzrtools/push.py", line 43, in run
>     working_tree=not no_tree)
>   File "/home/abentley/.bazaar/plugins/bzrtools/bzrtools.py", line 250,
> in push
>     raise bzrlib.errors.MustUseDecorated
> MustUseDecorated

Did you replace both uses of argv ?
-    def run_argv(self, argv):
+    def run_argv_aliases(self, argv, aliases_argv):
...
-        self._original_command().run_argv(self, argv)
+        self._original_command().run_argv_aliases(self, argv,
aliases_argv)


Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060301/f7e5d9b0/attachment.pgp