Fossil

Check-in [9270ae240d]
Login

Check-in [9270ae240d]

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

Overview
Comment:Improvements to error handling and code formatting.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | autoadjust
Files: files | file ages | folders
SHA1: 9270ae240d1730e38f609a5cbc6f3cd6c357824a
User & Date: mistachkin 2014-06-16 20:28:04.539
Context
2014-06-16
21:02
Adjust width auto-detection on Windows for more reasonable line breaks when the final character is a '-'. Seen with comment for check-in [4514910a5f] and a console width of 233. ... (check-in: f4cab56c64 user: mistachkin tags: autoadjust)
20:28
Improvements to error handling and code formatting. ... (check-in: 9270ae240d user: mistachkin tags: autoadjust)
20:01
Merge updates from trunk. ... (check-in: 3c9cca2bd8 user: mistachkin tags: autoadjust)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/comformat.c.
︙︙
40
41
42
43
44
45
46
47
48

49
50
51

52
53
54

55
56

57
58
59
60
61
62
63

  int tlen = lineLength - indent;
  int si, sk, i, k;
  int doIndent = 0;
  char *zBuf;
  char zBuffer[400];
  int lineCnt = 0;
#if defined(_WIN32)
  if ( lineLength<0 ){
    CONSOLE_SCREEN_BUFFER_INFO csbi;

    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
    tlen = csbi.srWindow.Right - csbi.srWindow.Left - indent + 1;
  }

#elif defined(TIOCGWINSZ)
  if ( lineLength<0 ){
    struct winsize w;

    ioctl(0, TIOCGWINSZ, &w);
    tlen = w.ws_col - indent;

  }
#endif
  if( zText==0 ) zText = "(NULL)";
  if( tlen<=0 ){
    tlen = strlen(zText);
  }
  if( tlen >= (sizeof(zBuffer)) ){








|

>
|
|
|
>

|

>
|
|
>








40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67

  int tlen = lineLength - indent;
  int si, sk, i, k;
  int doIndent = 0;
  char *zBuf;
  char zBuffer[400];
  int lineCnt = 0;
#if defined(_WIN32)
  if( lineLength<0 ){
    CONSOLE_SCREEN_BUFFER_INFO csbi;
    memset(&csbi, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFO));
    if( GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi) ){
      tlen = csbi.srWindow.Right - csbi.srWindow.Left - indent + 1;
    }
  }
#elif defined(TIOCGWINSZ)
  if( lineLength<0 ){
    struct winsize w;
    memset(&w, 0, sizeof(struct winsize));
    if( ioctl(0, TIOCGWINSZ, &w)!=-1 ){
      tlen = w.ws_col - indent;
    }
  }
#endif
  if( zText==0 ) zText = "(NULL)";
  if( tlen<=0 ){
    tlen = strlen(zText);
  }
  if( tlen >= (sizeof(zBuffer)) ){
︙︙
Changes to src/stash.c.
︙︙
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537


    if( zWidth ){
      width = atoi(zWidth);
      if( (width!=0) && (width<=46) ){
        fossil_fatal("-W|--width value must be >46 or 0");
      }
    }else{
    width = -1;
    }
    if( !verboseFlag ){
      verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
    }
    verify_all_options();
    db_prepare(&q,
       "SELECT stashid, (SELECT uuid FROM blob WHERE rid=vid),"








|








523
524
525
526
527
528
529
530
531
532
533
534
535
536
537


    if( zWidth ){
      width = atoi(zWidth);
      if( (width!=0) && (width<=46) ){
        fossil_fatal("-W|--width value must be >46 or 0");
      }
    }else{
      width = -1;
    }
    if( !verboseFlag ){
      verboseFlag = find_option("detail","l",0)!=0; /* deprecated */
    }
    verify_all_options();
    db_prepare(&q,
       "SELECT stashid, (SELECT uuid FROM blob WHERE rid=vid),"
︙︙