Fossil

Check-in [798a48ee]
Login

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

Overview
Comment:Merged mjanssen's timeline updates
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:798a48ee468a15085a89f636977ea49379dde8b7
User & Date: jnc 2007-09-24 23:58:55
Context
2007-09-25
00:17
When checking for win32 absolute paths, I added a check to make sure we don't overstep the bounds of a string check-in: af3a7518 user: jnc tags: trunk
2007-09-24
23:58
Merged mjanssen's timeline updates check-in: 798a48ee user: jnc tags: trunk
23:56
Merged dhr's todo and ideas update check-in: b8cc22eb user: jnc tags: trunk
23:19
Accidently changed time format in timeline_query_for_tty output in checkin [aad573b31c] reverted so that timeline shows local timestamps again. check-in: d54731da user: mjanssen tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/timeline.c.

441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
** a timeline query for display on a TTY.
*/
const char *timeline_query_for_tty(void){
  static const char zBaseSql[] = 
    @ SELECT
    @   blob.rid,
    @   uuid,
    @   datetime(event.mtime,'utc'),
    @   coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
    @   (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
    @   (SELECT count(*) FROM plink WHERE cid=blob.rid)
    @ FROM event, blob
    @ WHERE blob.rid=event.objid
  ;
  return zBaseSql;







|







441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
** a timeline query for display on a TTY.
*/
const char *timeline_query_for_tty(void){
  static const char zBaseSql[] = 
    @ SELECT
    @   blob.rid,
    @   uuid,
    @   datetime(event.mtime,'localtime'),
    @   coalesce(ecomment,comment) || ' (by ' || coalesce(euser,user) || ')',
    @   (SELECT count(*) FROM plink WHERE pid=blob.rid AND isprim),
    @   (SELECT count(*) FROM plink WHERE cid=blob.rid)
    @ FROM event, blob
    @ WHERE blob.rid=event.objid
  ;
  return zBaseSql;

Changes to tools/fossil_chat.tcl.

217
218
219
220
221
222
223

224
225
226
227

228
229
230
231
232
233
234
    }
    .who.list config -text [string trim $ulist]
  } elseif {$cmd=="message"||$cmd=="private_message"} {
    set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
    set from [lindex $line 1]
    .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
    .msg.t see end

    bell
    wm deiconify .
    update
    raise .

  } elseif {$cmd=="noop"} {
    # do nothing
  } elseif {$cmd=="meta"} {
    set now [clock seconds]
    set time [clock format $now -format {%H:%M} -gmt 1]
    .msg.t insert end "\[$time\] [lindex $line 1]\n" meta
    .msg.t see end







>




>







217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
    }
    .who.list config -text [string trim $ulist]
  } elseif {$cmd=="message"||$cmd=="private_message"} {
    set time [clock format [clock seconds] -format {%H:%M} -gmt 1]
    set from [lindex $line 1]
    .msg.t insert end "\[$time $from\] " meta [lindex $line 2]\n norm
    .msg.t see end
    set current_focus [focus]
    bell
    wm deiconify .
    update
    raise .
    focus $current_focus
  } elseif {$cmd=="noop"} {
    # do nothing
  } elseif {$cmd=="meta"} {
    set now [clock seconds]
    set time [clock format $now -format {%H:%M} -gmt 1]
    .msg.t insert end "\[$time\] [lindex $line 1]\n" meta
    .msg.t see end