Fossil

Check-in [0625a42c68]
Login

Check-in [0625a42c68]

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

Overview
Comment:Backout remaining of [8e01c2257d] and fix corresponding change log entry, as it apparently is not accepted upstream. See: [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg13883.html]. Sorry Joerg.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0625a42c686bce501a0e03eacdc971398b8d67d6
User & Date: jan.nijtmans 2013-11-12 08:32:49
Context
2013-11-12
08:58
Add option --offset to "fossil timeline" ... (check-in: 32a9b55e17 user: jan.nijtmans tags: trunk)
08:32
Backout remaining of [8e01c2257d] and fix corresponding change log entry, as it apparently is not accepted upstream. See: [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg13883.html]. Sorry Joerg. ... (check-in: 0625a42c68 user: jan.nijtmans tags: trunk)
03:43
Merge change to fossil ui which first looks for default user if set before falling back to the Setup user. ... (check-in: 1460b7476f user: andybradford tags: trunk)
2013-11-11
19:32
Output "+++ end of timeline reached +++" when appropriate at the end of timeline output in stead of marker indicating that a limit is reached. After ML request. If n=0 no marker will be output. ... (check-in: 8e01c2257d user: jan.nijtmans tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/timeline.c.

︙︙
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541

  int nAbsLimit = (nLimit >= 0) ? nLimit : -nLimit;
  int nLine = 0;
  int nEntry = 0;
  char zPrevDate[20];
  const char *zCurrentUuid = 0;
  int fchngQueryInit = 0;     /* True if fchngQuery is initialized */
  Stmt fchngQuery;            /* Query for file changes on check-ins */
  int rc;

  zPrevDate[0] = 0;
  if( g.localOpen ){
    int rid = db_lget_int("checkout", 0);
    zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
  }

  while( (rc=db_step(q))==SQLITE_ROW ){
    int rid = db_column_int(q, 0);
    const char *zId = db_column_text(q, 1);
    const char *zDate = db_column_text(q, 2);
    const char *zCom = db_column_text(q, 3);
    int nChild = db_column_int(q, 4);
    int nParent = db_column_int(q, 5);
    char *zFree = 0;








<







|








1519
1520
1521
1522
1523
1524
1525

1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540

  int nAbsLimit = (nLimit >= 0) ? nLimit : -nLimit;
  int nLine = 0;
  int nEntry = 0;
  char zPrevDate[20];
  const char *zCurrentUuid = 0;
  int fchngQueryInit = 0;     /* True if fchngQuery is initialized */
  Stmt fchngQuery;            /* Query for file changes on check-ins */


  zPrevDate[0] = 0;
  if( g.localOpen ){
    int rid = db_lget_int("checkout", 0);
    zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
  }

  while( db_step(q)==SQLITE_ROW ){
    int rid = db_column_int(q, 0);
    const char *zId = db_column_text(q, 1);
    const char *zDate = db_column_text(q, 2);
    const char *zCom = db_column_text(q, 3);
    int nChild = db_column_int(q, 4);
    int nParent = db_column_int(q, 5);
    char *zFree = 0;
︙︙
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627

        }
        nLine++; /* record another line */
      }
      db_reset(&fchngQuery);
    }
    nEntry++; /* record another complete entry */
  }
  if( rc==SQLITE_DONE ){
    fossil_print("+++ end of timeline +++\n");
  }
  if( fchngQueryInit ) db_finalize(&fchngQuery);
}

/*
** Return a pointer to a static string that forms the basis for
** a timeline query for display on a TTY.
*/








<
<
<








1610
1611
1612
1613
1614
1615
1616



1617
1618
1619
1620
1621
1622
1623

        }
        nLine++; /* record another line */
      }
      db_reset(&fchngQuery);
    }
    nEntry++; /* record another complete entry */
  }



  if( fchngQueryInit ) db_finalize(&fchngQuery);
}

/*
** Return a pointer to a static string that forms the basis for
** a timeline query for display on a TTY.
*/
︙︙

Changes to www/changes.wiki.

︙︙
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

  *  Ten-fold performance improvement in large "fossil blame" or 
     "fossil annotate" commands.
  *  Add option -W|--width to the "[/help?cmd=timeline | fossil timeline]"
     and  "[/help?cmd=finfo | fossil finfo]" commands.
  *  Option -n|--limit of "[/help?cmd=timeline | fossil timeline]" now
     specifies the number of entries, just like all other commands which
     have the -n|--limit option. The various timeline-related functions
     now output "+++ end of timeline reached +++" whenever appropriate.
     Use "-n 0" if no limit is desired, the end of timeline marker will
     not be printed then.
  *  Fix handling of password embedded in Fossil URL.
  *  New --once option to [/help?cmd=clone | fossil clone] command which does
     not store the URL or password when cloning.
  *  Modify [/help?cmd=ui | fossil ui] to respect "default user" in open repository.

<h2>Changes For Version 1.27 (2013-09-11)</h2>
  *  Enhance the [/help?cmd=changes | fossil changes],








|
|
<








21
22
23
24
25
26
27
28
29

30
31
32
33
34
35
36

  *  Ten-fold performance improvement in large "fossil blame" or 
     "fossil annotate" commands.
  *  Add option -W|--width to the "[/help?cmd=timeline | fossil timeline]"
     and  "[/help?cmd=finfo | fossil finfo]" commands.
  *  Option -n|--limit of "[/help?cmd=timeline | fossil timeline]" now
     specifies the number of entries, just like all other commands which
     have the -n|--limit option. The various timeline-related functions
     now output "--- ?? limit (??) reached ---" at the end whenever
     appropriate. Use "-n 0" if no limit is desired.

  *  Fix handling of password embedded in Fossil URL.
  *  New --once option to [/help?cmd=clone | fossil clone] command which does
     not store the URL or password when cloning.
  *  Modify [/help?cmd=ui | fossil ui] to respect "default user" in open repository.

<h2>Changes For Version 1.27 (2013-09-11)</h2>
  *  Enhance the [/help?cmd=changes | fossil changes],
︙︙