Peter Suter avatar Peter Suter committed 78e8c8c

Update to trunk: Fix module import conflicts.
Remove obsolete patch for fixing message ids. (Fixed in trunk)

Comments (0)

Files changed (3)

customtimefields.patch

 # HG changeset patch
-# Parent d501680c657df79afc64f2244b2e20dc1981a058
+# Parent 798a158cc10b8061e3124dd51f85a927de792398
 Support custom time fields:
 Convert between DB time strings and datetime objects in the model.
 Parse ticket time input to datetime objects.
 Render time fields in notification emails.
 Support parsing relative time values in the future (e.g. ''tomorrow'', ''next month'' or ''in 3 hours'').
 
-diff -r d501680c657d trac/ticket/api.py
---- a/trac/ticket/api.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/api.py	Sat Feb 11 07:52:06 2012 +0100
+diff -r 798a158cc10b trac/ticket/api.py
+--- a/trac/ticket/api.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/api.py	Thu Mar 01 23:32:22 2012 +0100
 @@ -351,9 +351,9 @@
          fields.append({'name': 'cc', 'type': 'text', 'label': N_('Cc')})
  
              fields.append(field)
  
          fields.sort(lambda x, y: cmp((x['order'], x['name']),
-diff -r d501680c657d trac/ticket/model.py
---- a/trac/ticket/model.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/model.py	Sat Feb 11 07:52:06 2012 +0100
+diff -r 798a158cc10b trac/ticket/model.py
+--- a/trac/ticket/model.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/model.py	Thu Mar 01 23:32:22 2012 +0100
 @@ -28,7 +28,8 @@
  from trac.ticket.api import TicketSystem
  from trac.util import embedded_numbers, partition
  
      def delete(self, db=None):
          """Delete the ticket.
-diff -r d501680c657d trac/ticket/notification.py
---- a/trac/ticket/notification.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/notification.py	Sat Feb 11 07:52:06 2012 +0100
+diff -r 798a158cc10b trac/ticket/notification.py
+--- a/trac/ticket/notification.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/notification.py	Thu Mar 01 23:32:22 2012 +0100
 @@ -26,7 +26,8 @@
  from trac.config import *
  from trac.notification import NotifyEmail
      def get_recipients(self, tktid):
          notify_reporter = self.config.getbool('notification',
                                                'always_notify_reporter')
-diff -r d501680c657d trac/ticket/query.py
---- a/trac/ticket/query.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/query.py	Sat Feb 11 07:52:06 2012 +0100
+diff -r 798a158cc10b trac/ticket/query.py
+--- a/trac/ticket/query.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/query.py	Thu Mar 01 23:32:22 2012 +0100
 @@ -34,8 +34,9 @@
  from trac.ticket.api import TicketSystem
  from trac.ticket.model import Milestone, group_milestones
                      elif field and field['type'] == 'checkbox':
                          try:
                              val = bool(int(val))
-@@ -1136,8 +1137,8 @@
+@@ -1135,8 +1136,8 @@
                          value = Chrome(self.env).format_emails(
                                      context.child(ticket), value)
                      elif col in query.time_fields:
                      values.append(unicode(value).encode('utf-8'))
                  writer.writerow(values)
          return (content.getvalue(), '%s;charset=utf-8' % mimetype)
-diff -r d501680c657d trac/ticket/templates/query_results.html
---- a/trac/ticket/templates/query_results.html	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/templates/query_results.html	Sat Feb 11 07:52:06 2012 +0100
+diff -r 798a158cc10b trac/ticket/templates/query_results.html
+--- a/trac/ticket/templates/query_results.html	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/templates/query_results.html	Thu Mar 01 23:32:22 2012 +0100
 @@ -75,7 +75,7 @@
                          class="${classes(closed=result.status == 'closed')}">#$result.id</a></td>
                      <td py:otherwise="" class="$name" py:choose="">
                        <py:when test="name == 'reporter'">${authorinfo(value)}</py:when>
                        <py:when test="name == 'cc'">${format_emails(ticket_context, value)}</py:when>
                        <py:when test="name == 'owner' and value">${authorinfo(value)}</py:when>
-diff -r d501680c657d trac/ticket/templates/ticket.html
---- a/trac/ticket/templates/ticket.html	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/templates/ticket.html	Sat Feb 11 07:52:06 2012 +0100
-@@ -266,6 +266,8 @@
+diff -r 798a158cc10b trac/ticket/templates/ticket.html
+--- a/trac/ticket/templates/ticket.html	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/templates/ticket.html	Thu Mar 01 23:32:22 2012 +0100
+@@ -277,6 +277,8 @@
                                   checked="${value == option or None}" />
                            ${option}
                          </label>
                          <py:otherwise><!--! Text input fields -->
                            <py:choose>
                              <span py:when="field.cc_entry"><!--! Special case for Cc: field -->
-diff -r d501680c657d trac/ticket/web_ui.py
---- a/trac/ticket/web_ui.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/ticket/web_ui.py	Sat Feb 11 07:52:06 2012 +0100
+diff -r 798a158cc10b trac/ticket/web_ui.py
+--- a/trac/ticket/web_ui.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/ticket/web_ui.py	Thu Mar 01 23:32:22 2012 +0100
 @@ -37,8 +37,9 @@
  from trac.ticket.notification import TicketNotifyEmail
  from trac.timeline.api import ITimelineEventProvider
  from trac.util.text import exception_to_unicode, obfuscate_email_address, \
                             shorten_line, to_unicode
  from trac.util.presentation import separated
-@@ -702,6 +703,18 @@
+@@ -710,6 +711,18 @@
          for each in Ticket.protected_fields:
              fields.pop(each, None)
              fields.pop('checkbox_' + each, None)    # See Ticket.populate()
          ticket.populate(fields)
          # special case for updating the Cc: field
          if 'cc_update' in req.args:
-@@ -1056,8 +1069,8 @@
+@@ -1064,8 +1077,8 @@
              if name in ('cc', 'reporter'):
                  value = Chrome(self.env).format_emails(context, value, ' ')
              elif name in ticket.time_fields:
              cols.append(value.encode('utf-8'))
          writer.writerow(cols)
          return (content.getvalue(), '%s;charset=utf-8' % mimetype)
-@@ -1196,6 +1209,22 @@
+@@ -1204,6 +1217,22 @@
              # Shouldn't happen in "normal" circumstances, hence not a warning
              raise InvalidTicket(_("Invalid comment threading identifier"))
  
          # Custom validation rules
          for manipulator in self.ticket_manipulators:
              for field, message in manipulator.validate_ticket(req, ticket):
-@@ -1362,7 +1391,7 @@
+@@ -1370,7 +1399,7 @@
              type_ = field['type']
   
              # enable a link to custom query for all choice fields
                  field['rendered'] = self._query_link(req, name, ticket[name])
  
              # per field settings
-@@ -1437,6 +1466,17 @@
+@@ -1445,6 +1474,17 @@
                      field['rendered'] = \
                          format_to_html(self.env, context, ticket[name],
                                  escape_newlines=self.must_preserve_newlines)
              
              # ensure sane defaults
              field.setdefault('optional', False)
-@@ -1602,6 +1642,10 @@
+@@ -1610,6 +1650,10 @@
                                                    resource_new)
              if rendered:
                  changes['rendered'] = rendered
  
      def _render_property_diff(self, req, ticket, field, old, new, 
                                resource_new=None):
-diff -r d501680c657d trac/util/datefmt.py
---- a/trac/util/datefmt.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/util/datefmt.py	Sat Feb 11 07:52:06 2012 +0100
-@@ -298,6 +298,23 @@
+diff -r 798a158cc10b trac/util/datefmt.py
+--- a/trac/util/datefmt.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/util/datefmt.py	Thu Mar 01 23:32:22 2012 +0100
+@@ -391,6 +391,23 @@
          weekdays[t.weekday()], t.day, months[t.month - 1], t.year,
          t.hour, t.minute, t.second)
  
  
  # -- parsing
  
-@@ -358,7 +375,8 @@
+@@ -451,7 +468,8 @@
          dt = _parse_relative_time(text, tzinfo)
      if dt is None:
          hint = {'datetime': get_datetime_format_hint,
                 }.get(hint, lambda(l): hint)(locale)
          raise TracError(_('"%(date)s" is an invalid date, or the date format '
                            'is not known. Try "%(hint)s" instead.', 
-@@ -515,10 +533,12 @@
+@@ -608,10 +626,12 @@
      t = tzinfo.localize(datetime(*(values[k] for k in 'yMdhms')))
      return tzinfo.normalize(t)
  
  _time_intervals = dict(
      second=lambda v: timedelta(seconds=v),
      minute=lambda v: timedelta(minutes=v),
-@@ -533,7 +553,7 @@
+@@ -626,7 +646,7 @@
      m=lambda v: timedelta(days=30 * v),
      y=lambda v: timedelta(days=365 * v),
  )
                              r'(second|minute|hour|day|week|month|year)$')
  _time_starts = dict(
      second=lambda now: now.replace(microsecond=0),
-@@ -557,8 +577,15 @@
+@@ -650,8 +670,15 @@
      if text == 'yesterday':
          return now.replace(microsecond=0, second=0, minute=0, hour=0) \
                 - timedelta(days=1)
          value, interval = match.groups()
          return now - _time_intervals[interval](float(value))
      match = _TIME_START_RE.match(text)
-@@ -573,6 +600,14 @@
+@@ -666,6 +693,14 @@
                      dt = dt.replace(year=dt.year - 1, month=12)
              else:
                  dt -= _time_intervals[start](1)
          return dt
  
  # -- formatting/parsing helper functions
-diff -r d501680c657d trac/web/chrome.py
---- a/trac/web/chrome.py	Sat Feb 11 07:49:16 2012 +0100
-+++ b/trac/web/chrome.py	Sat Feb 11 07:52:06 2012 +0100
-@@ -54,9 +54,9 @@
+diff -r 798a158cc10b trac/web/chrome.py
+--- a/trac/web/chrome.py	Thu Mar 01 23:30:39 2012 +0100
++++ b/trac/web/chrome.py	Thu Mar 01 23:32:22 2012 +0100
+@@ -54,8 +54,9 @@
  from trac.util.text import pretty_size, obfuscate_email_address, \
                             shorten_line, unicode_quote_plus, to_unicode, \
                             javascript_quote, exception_to_unicode
 -from trac.util.datefmt import pretty_timedelta, format_datetime, format_date, \
 -                              format_time, from_utimestamp, http_date, utc, \
--                              user_time
-+from trac.util.datefmt import pretty_timedelta, pretty_format_time, \
++from trac.util.datefmt import pretty_timedelta, pretty_format_time, \
 +                              format_datetime, format_date, format_time, \
-+                              from_utimestamp, http_date, utc, user_time
- from trac.util.translation import _, get_available_locales
- from trac.web.api import IRequestHandler, ITemplateStreamFilter, HTTPNotFound
- from trac.web.href import Href
-@@ -919,6 +919,7 @@
++                              from_utimestamp, http_date, utc, \
+                               get_date_format_jquery_ui, is_24_hours, \
+                               get_time_format_jquery_ui, user_time, \
+                               get_month_names_jquery_ui, \
+@@ -919,6 +920,7 @@
              'fromtimestamp': partial(datetime.datetime.fromtimestamp,
                                       tz=req and req.tz),
              'from_utimestamp': from_utimestamp,

fx-msgids.patch

-# HG changeset patch
-# Parent 9182daf0d7da44977b96cbb5039016790c902d38
-Fix various msgids.
-
-diff --git a/trac/ticket/templates/ticket.html b/trac/ticket/templates/ticket.html
---- a/trac/ticket/templates/ticket.html
-+++ b/trac/ticket/templates/ticket.html
-@@ -165,7 +165,8 @@
-             <a id="edit" onfocus="$('#comment').get(0).focus()">Add a comment</a>
-           </h2>
-           <div id="trac-edit-warning" class="warning system-message"
--               style="${'display: none' if start_time == ticket['changetime'] else None}">
-+               style="${'display: none' if start_time == ticket['changetime'] else None}"
-+               i18n:msg="">
-             This ticket has been modified since you started editing. You should review the
-             <em class="trac-new">other modifications</em> which have been appended above,
-             and any <em class="trac-conflict">conflicts</em> shown in the preview below.
-diff --git a/trac/versioncontrol/templates/changeset.html b/trac/versioncontrol/templates/changeset.html
---- a/trac/versioncontrol/templates/changeset.html
-+++ b/trac/versioncontrol/templates/changeset.html
-@@ -137,7 +137,7 @@
-           <dd class="time" py:choose="datetime.now(utc) - changeset.date &lt; timedelta(0, 3600)">
-              ${format_datetime(changeset.date)}
-              <py:when test="True">(less than one hour ago)</py:when>
--             <py:otherwise>(${dateinfo(changeset.date)} ago)</py:otherwise>
-+             <py:otherwise><span i18n:msg="elapsedtime">(${dateinfo(changeset.date)} ago)</span></py:otherwise>
-           </dd>
-           <dt class="property author">Author:</dt>
-           <dd class="author">${authorinfo(changeset.author)}</dd>
 MinorStyleCleanup.patch
-fx-msgids.patch
 TicketFieldList.patch
 customtimefields.patch
 ct-tests.patch
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.