[bzr-git/MERGE] Fix bzr-git for use with current bzr.dev.

Robert Collins robertc at robertcollins.net
Fri Oct 12 02:47:56 BST 2007


On Thu, 2007-10-11 at 12:58 +0200, Jelmer Vernooij wrote:
> === modified file '__init__.py'
> --- __init__.py 2007-10-04 19:52:03 +0000
> +++ __init__.py 2007-10-11 10:57:33 +0000
> @@ -24,7 +24,7 @@
>  import stgit
>  import stgit.git as git
>  
> -from bzrlib import config, iterablefile, graph, osutils, urlutils
> +from bzrlib import config, iterablefile, deprecated_graph, osutils,
> urlutils
>  from bzrlib.decorators import *
>  import bzrlib.branch
>  import bzrlib.bzrdir
> @@ -156,6 +156,11 @@
>  bzrlib.bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
>  
>  
> +class GitBranchFormat(bzrlib.branch.BranchFormat):
> +    def get_branch_description(self):
> +        return 'Git Branch'
> +
> +

PEP-8 - this should be
--
class GitBranchFormat(bzrlib.branch.BranchFormat):

    def get_branch_description(self):
        return 'Git Branch'


--

I'd really prefer a docstring on class and method though.


Other than that, +1

-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: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071012/8ec72224/attachment.pgp 


More information about the bazaar mailing list