[Calypso] [PATCH 1/1] Support description tags.

[Guido Günther]

On Sun, Nov 08, 2015 at 01:53:43PM +0000, Jelmer Vernooij wrote:
> Conflicts:
> 	calypso/xmlutils.py
> ---
>  calypso/xmlutils.py | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/calypso/xmlutils.py b/calypso/xmlutils.py
> index d873edf..2f75485 100644
> --- a/calypso/xmlutils.py
> +++ b/calypso/xmlutils.py
> @@ -214,6 +214,10 @@ def propfind(path, xml_request, collection, depth, context):
>                  tag = ET.Element(_tag("D", "href"))
>                  tag.text = paths.base_prefix() + config.get("server", "user_principal") % context
>                  element.append(tag)
> +            elif tag == _tag("A", "addressbook-description") and is_collection:
> +                element.text = collection.read_file(".git/description")
> +            elif tag == _tag("C", "calendar-description") and is_collection:
> +                element.text = collection.read_file(".git/description")
>              prop.append(element)

This one looks good to me too but I'd remove the "Conflicts:" before
pushing since I don't think it serves an purpose or does it?
Cheers,
 -- Guido