<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12184] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12184">12184</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 21:51:00 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>sync report with revision == 0 on shared address book now returns addressbook.vcf</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoresqlpy">CalendarServer/trunk/txdav/carddav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml (12183 => 12184)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2013-12-21 05:25:27 UTC (rev 12183)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2013-12-21 05:51:00 UTC (rev 12184)
</span><span class="lines">@@ -308,6 +308,7 @@
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$sharedaddressbook:/</value>
</span><ins>+ <value>$sharedaddressbook:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -3950,6 +3951,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3980,6 +3982,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4010,6 +4013,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4267,6 +4271,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4362,6 +4367,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4451,6 +4457,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4544,6 +4551,7 @@
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> <value>$userid2:/1.vcf</value>
</span><span class="cx"> <value>$userid2:/2.vcf</value>
</span><ins>+ <value>$userid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5268,9 +5276,11 @@
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid3:/1.vcf</value>
</span><span class="cx"> <value>$userid3:/2.vcf</value>
</span><ins>+ <value>$userid3:/addressbook.vcf</value>
</ins><span class="cx"> <value>$userid4:/</value>
</span><span class="cx"> <value>$userid4:/1.vcf</value>
</span><span class="cx"> <value>$userid4:/2.vcf</value>
</span><ins>+ <value>$userid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5467,9 +5477,11 @@
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid3:/1.vcf</value>
</span><span class="cx"> <value>$userid3:/2.vcf</value>
</span><ins>+ <value>$userid3:/addressbook.vcf</value>
</ins><span class="cx"> <value>$userid4:/</value>
</span><span class="cx"> <value>$userid4:/1.vcf</value>
</span><span class="cx"> <value>$userid4:/2.vcf</value>
</span><ins>+ <value>$userid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6605,9 +6617,11 @@
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><ins>+ <value>$userid3:/addressbook.vcf</value>
</ins><span class="cx"> <value>$userid4:/</value>
</span><span class="cx"> <value>$userid4:/1.vcf</value>
</span><span class="cx"> <value>$userid4:/2.vcf</value>
</span><ins>+ <value>$userid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py (12183 => 12184)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/sql.py 2013-12-21 05:25:27 UTC (rev 12183)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py 2013-12-21 05:51:00 UTC (rev 12184)
</span><span class="lines">@@ -625,12 +625,8 @@
</span><span class="cx"> # add change for addressbook group
</span><span class="cx"> changed, deleted = yield super(AddressBook, self).sharedChildResourceNamesSinceRevision(revision, depth)
</span><span class="cx">
</span><del>- #===================================================================
- # # Add the following to add the addressbook group in sync report:
- #
- # if changed or deleted and depth != "1":
- # changed.add("%s/%s" % (path, self._groupForSharedAddressBookName(),))
- #===================================================================
</del><ins>+ if revision == 0 and depth != "1":
+ changed.add("%s/%s" % (path, self._groupForSharedAddressBookName(),))
</ins><span class="cx">
</span><span class="cx"> returnValue((changed, deleted))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>