Changes On Branch localtime_fixes
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch localtime_fixes Excluding Merge-Ins

This is equivalent to a diff from 0cf5416002 to 1765c18d94

2011-09-06
13:23
Close A and LI tags when displaying new and deleted files in timeline. check-in: 8d703ff956 user: dmitry tags: trunk
07:33
Two fixes about localtime: • The ci_edit page tells the user that it asks UTC time • The object_description gives links to localtime (if it's set in the config). Otherwise the links were not pointing at the concerning checkin. Leaf check-in: 1765c18d94 user: viriketo tags: localtime_fixes
2011-09-04
20:43
Updating from trunk to get the latest code. check-in: 73b6ff4966 user: viriketo tags: annotate_noleak
01:28
Update the built-in SQLite to the latest 3.7.8-alpha version that contains the improved merge-sort logic. check-in: 0cf5416002 user: drh tags: trunk
2011-09-02
16:19
Do a better job of merging branches that contain lots of file renames. check-in: 0b93b0f958 user: drh tags: trunk

Changes to src/info.c.

   778    778     int cnt = 0;
   779    779     int nWiki = 0;
   780    780     char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
   781    781   
   782    782     char *prevName = 0;
   783    783   
   784    784     db_prepare(&q,
   785         -    "SELECT filename.name, datetime(event.mtime),"
          785  +    "SELECT filename.name, datetime(event.mtime, 'localtime'),"
   786    786       "       coalesce(event.ecomment,event.comment),"
   787    787       "       coalesce(event.euser,event.user),"
   788    788       "       b.uuid, mlink.mperm,"
   789    789       "       coalesce((SELECT value FROM tagxref"
   790    790                       "  WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
   791    791       "  FROM mlink, filename, event, blob a, blob b"
   792    792       " WHERE filename.fnid=mlink.fnid"
................................................................................
   848    848         blob_append(pDownloadName, zName, -1);
   849    849       }
   850    850     }
   851    851     @ </ul></ul>
   852    852     free(prevName);
   853    853     db_finalize(&q);
   854    854     db_prepare(&q, 
   855         -    "SELECT substr(tagname, 6, 10000), datetime(event.mtime),"
          855  +    "SELECT substr(tagname, 6, 10000), datetime(event.mtime, 'localtime'),"
   856    856       "       coalesce(event.euser, event.user)"
   857    857       "  FROM tagxref, tag, event"
   858    858       " WHERE tagxref.rid=%d"
   859    859       "   AND tag.tagid=tagxref.tagid" 
   860    860       "   AND tag.tagname LIKE 'wiki-%%'"
   861    861       "   AND event.objid=tagxref.rid",
   862    862       rid
................................................................................
   924    924           blob_appendf(pDownloadName, "%.10s.txt", zUuid);
   925    925         }
   926    926         cnt++;
   927    927       }
   928    928       db_finalize(&q);
   929    929     }
   930    930     db_prepare(&q, 
   931         -    "SELECT target, filename, datetime(mtime), user, src"
          931  +    "SELECT target, filename, datetime(mtime,'localtime'), user, src"
   932    932       "  FROM attachment"
   933    933       " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)"
   934    934       " ORDER BY mtime DESC /*sort*/",
   935    935       rid
   936    936     );
   937    937     while( db_step(&q)==SQLITE_ROW ){
   938    938       const char *zTarget = db_column_text(&q, 0);
................................................................................
  1796   1796     @ </td></tr>
  1797   1797   
  1798   1798     @ <tr><td align="right" valign="top"><b>Comment:</b></td>
  1799   1799     @ <td valign="top">
  1800   1800     @ <textarea name="c" rows="10" cols="80">%h(zNewComment)</textarea>
  1801   1801     @ </td></tr>
  1802   1802   
  1803         -  @ <tr><td align="right" valign="top"><b>Check-in Time:</b></td>
         1803  +  @ <tr><td align="right" valign="top"><b>Check-in UTC Time:</b></td>
  1804   1804     @ <td valign="top">
  1805   1805     @   <input type="text" name="dt" size="20" value="%h(zNewDate)" />
  1806   1806     @ </td></tr>
  1807   1807   
  1808   1808     @ <tr><td align="right" valign="top"><b>Background Color:</b></td>
  1809   1809     @ <td valign="top">
  1810   1810     render_color_chooser(fNewPropagateColor, zNewColor, "pclr", "clr", "clrcust");