← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Robert Collins
  • Date: 2005-10-17 21:20:18 UTC
  • mfrom: (1461)
  • mto: This revision was merged to the branch mainline in revision 1462.
  • Revision ID: robertc@robertcollins.net-20051017212018-5e2a78c67f36a026
merge from integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
288
288
        return -time.timezone
289
289
 
290
290
    
291
 
def format_date(t, offset=0, timezone='original'):
 
291
def format_date(t, offset=0, timezone='original', date_fmt=None, 
 
292
                show_offset=True):
292
293
    ## TODO: Perhaps a global option to use either universal or local time?
293
294
    ## Or perhaps just let people set $TZ?
294
295
    assert isinstance(t, float)
306
307
    else:
307
308
        raise BzrError("unsupported timezone format %r" % timezone,
308
309
                       ['options are "utc", "original", "local"'])
309
 
 
310
 
    return (time.strftime("%a %Y-%m-%d %H:%M:%S", tt)
311
 
            + ' %+03d%02d' % (offset / 3600, (offset / 60) % 60))
 
310
    if date_fmt is None:
 
311
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
 
312
    if show_offset:
 
313
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
 
314
    else:
 
315
        offset_str = ''
 
316
    return (time.strftime(date_fmt, tt) +  offset_str)
312
317
 
313
318
 
314
319
def compact_date(when):