Fossil

Changes On Branch cmdline-timeline-enhancement
Login

Changes On Branch cmdline-timeline-enhancement

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

Changes In Branch cmdline-timeline-enhancement Excluding Merge-Ins

This is equivalent to a diff from e7518b44 to 22a74690

2014-10-22
20:00
Now use a switch to specify the file/directory to the timeline command. ... (check-in: f24d85ae user: mistachkin tags: trunk)
2014-10-21
22:12
Avoid invoking fossil_error() in manifest_crosslink() while processing a push, even though such errors are suppose to be ignored. ... (Closed-Leaf check-in: 1d857968 user: drh tags: experimental)
03:19
Restore use of short string identifiers in titles on the check-in info page. ... (check-in: c1d20c33 user: mistachkin tags: trunk)
03:12
Merge updates from trunk. ... (Closed-Leaf check-in: 22a74690 user: mistachkin tags: cmdline-timeline-enhancement)
03:05
Fix compiler warning and clarify use of local variables. ... (check-in: e7518b44 user: mistachkin tags: trunk)
03:00
Merge updates from trunk. ... (Closed-Leaf check-in: d1983dd2 user: mistachkin tags: warningFix)
02:52
Add the codecheck1 program to the build tools. This program validates the format strings on printf-style internal interfaces, verifying that the correct number of arguments follow and that SQL is protected from injection attacks. ... (check-in: 49b0ff15 user: drh tags: trunk)
2014-10-20
21:37
Now use a switch to specify the file/directory to the timeline command.

- Use -p|--path PATH since "-f" is already used as a deprecated options.

- Restore command line arguments parsing of the timeline command as before the cmdline-timeline-enhancement branch so the previous behavior and argument priority stay compatible as before.

(We were not able to specify a checkin prefix or tagname without specifying the ?WHEN? argument anymore.)
... (check-in: 1e870e1e user: mgagnon tags: cmdline-timeline-enhancement)

Changes to src/timeline.c.

1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726


1727
1728
1729
1730
1731
1732
1733
      && fossil_isdigit(z[0])
      && fossil_isdigit(z[5]);
}

/*
** COMMAND: timeline
**
** Usage: %fossil timeline ?WHEN? ?BASELINE|DATETIME? ?OPTIONS?
**
** Print a summary of activity going backwards in date and time
** specified or from the current date and time if no arguments
** are given.  The WHEN argument can be any unique abbreviation
** of one of these keywords:
**
**     before
**     after
**     descendants | children
**     ancestors | parents
**
** The BASELINE can be any unique prefix of 4 characters or more.
** The DATETIME should be in the ISO8601 format.  For
** examples: "2007-08-18 07:21:21".  You can also say "current"
** for the current version or "now" for the current time.
**
** Options:
**   -n|--limit N         Output the first N entries (default 20 lines).
**                        N=0 means no limit.


**   --offset P           skip P changes
**   -t|--type TYPE       Output items from the given types only, such as:
**                            ci = file commits only
**                            e  = events only
**                            t  = tickets only
**                            w  = wiki commits only
**   -v|--verbose         Output the list of files changed by each commit







|



















>
>







1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
      && fossil_isdigit(z[0])
      && fossil_isdigit(z[5]);
}

/*
** COMMAND: timeline
**
** Usage: %fossil timeline ?WHEN? ?CHECKIN|DATETIME? ?OPTIONS?
**
** Print a summary of activity going backwards in date and time
** specified or from the current date and time if no arguments
** are given.  The WHEN argument can be any unique abbreviation
** of one of these keywords:
**
**     before
**     after
**     descendants | children
**     ancestors | parents
**
** The BASELINE can be any unique prefix of 4 characters or more.
** The DATETIME should be in the ISO8601 format.  For
** examples: "2007-08-18 07:21:21".  You can also say "current"
** for the current version or "now" for the current time.
**
** Options:
**   -n|--limit N         Output the first N entries (default 20 lines).
**                        N=0 means no limit.
**   -p|--path PATH       Output items affecting PATH only. 
**                        PATH can be a file or a sub directory.
**   --offset P           skip P changes
**   -t|--type TYPE       Output items from the given types only, such as:
**                            ci = file commits only
**                            e  = events only
**                            t  = tickets only
**                            w  = wiki commits only
**   -v|--verbose         Output the list of files changed by each commit
1761
1762
1763
1764
1765
1766
1767


1768
1769
1770
1771
1772
1773
1774
  if( !verboseFlag){
    verboseFlag = find_option("showfiles","f", 0)!=0; /* deprecated */
  }
  db_find_and_open_repository(0, 0);
  zLimit = find_option("limit","n",1);
  zWidth = find_option("width","W",1);
  zType = find_option("type","t",1);


  if( !zLimit ){
    zLimit = find_option("count",0,1);
  }
  if( zLimit ){
    n = atoi(zLimit);
  }else{
    n = -20;







>
>







1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
  if( !verboseFlag){
    verboseFlag = find_option("showfiles","f", 0)!=0; /* deprecated */
  }
  db_find_and_open_repository(0, 0);
  zLimit = find_option("limit","n",1);
  zWidth = find_option("width","W",1);
  zType = find_option("type","t",1);
  zFilePattern = find_option("path","p",1);

  if( !zLimit ){
    zLimit = find_option("count",0,1);
  }
  if( zLimit ){
    n = atoi(zLimit);
  }else{
    n = -20;
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807



1808
1809
1810
1811
1812

1813
1814
1815
1816
1817
1818

1819
1820
1821
1822
1823
1824
1825
  }
  zOffset = find_option("offset",0,1);
  iOffset = zOffset ? atoi(zOffset) : 0;

  /* We should be done with options.. */
  verify_all_options();

  zOrigin = "now";
  zFilePattern = 0;
  for(i=2; i<g.argc; i++){
    char *zArg = g.argv[i];
    k = strlen(zArg);
    if( mode==0 ){
      if( strncmp(zArg,"before",k)==0 ){
        mode = 1;
      }else if( strncmp(zArg,"after",k)==0 && k>1 ){
        mode = 2;
      }else if( strncmp(zArg,"descendants",k)==0 ){
        mode = 3;
      }else if( strncmp(zArg,"children",k)==0 ){
        mode = 3;
      }else if( strncmp(zArg,"ancestors",k)==0 && k>1 ){
        mode = 4;
      }else if( strncmp(zArg,"parents",k)==0 ){
        mode = 4;



      }
      if( mode ){
        if( i<g.argc-1 ) zOrigin = g.argv[++i];
        continue;
      }

    }
    if( zFilePattern==0 ){
      zFilePattern = zArg;
    }else{
      usage("?WHEN? ?CHECKIN|DATETIME? ?FILE? ?OPTIONS?");
    }

  }
  k = strlen(zOrigin);
  blob_zero(&uuid);
  blob_append(&uuid, zOrigin, -1);
  if( fossil_strcmp(zOrigin, "now")==0 ){
    if( mode==3 || mode==4 ){
      fossil_fatal("cannot compute descendants or ancestors of a date");







<
<
<
|
|
<
|
|
|
|
|
|
|
|
|
|
|
|
>
>
>
|
|
|
<
|
>

|
|
|
<
<
>







1787
1788
1789
1790
1791
1792
1793



1794
1795

1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813

1814
1815
1816
1817
1818
1819


1820
1821
1822
1823
1824
1825
1826
1827
  }
  zOffset = find_option("offset",0,1);
  iOffset = zOffset ? atoi(zOffset) : 0;

  /* We should be done with options.. */
  verify_all_options();




  if( g.argc>=4 ){
    k = strlen(g.argv[2]);

    if( strncmp(g.argv[2],"before",k)==0 ){
      mode = 1;
    }else if( strncmp(g.argv[2],"after",k)==0 && k>1 ){
      mode = 2;
    }else if( strncmp(g.argv[2],"descendants",k)==0 ){
      mode = 3;
    }else if( strncmp(g.argv[2],"children",k)==0 ){
      mode = 3;
    }else if( strncmp(g.argv[2],"ancestors",k)==0 && k>1 ){
      mode = 4;
    }else if( strncmp(g.argv[2],"parents",k)==0 ){
      mode = 4;
    }else if(!zType && !zLimit){
      usage("?WHEN? ?CHECKIN|DATETIME? ?-n|--limit #? ?-t|--type TYPE? "
            "?-W|--width WIDTH? ?-p|--path PATH");
    }
    if( '-' != *g.argv[3] ){
      zOrigin = g.argv[3];

    }else{
      zOrigin = "now";
    }
  }else if( g.argc==3 ){
    zOrigin = g.argv[2];
  }else{


    zOrigin = "now";
  }
  k = strlen(zOrigin);
  blob_zero(&uuid);
  blob_append(&uuid, zOrigin, -1);
  if( fossil_strcmp(zOrigin, "now")==0 ){
    if( mode==3 || mode==4 ){
      fossil_fatal("cannot compute descendants or ancestors of a date");