Fossil

Check-in [119cc37ac5]
Login

Check-in [119cc37ac5]

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

Overview
Comment:Fix find_option() error and badly type --users in argument test.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | filter-branch-ls-by-user
Files: files | file ages | folders
SHA3-256: 119cc37ac5db72b222654a5c6fb634f2f2064fd79ac748a5ac79ac541b1668da
User & Date: preben 2023-09-28 17:58:38.971
Context
2023-09-28
18:39
Use verify_all_options() with fossil branch ls/lsh. ... (Closed-Leaf check-in: 34e0f6817a user: preben tags: filter-branch-ls-by-user)
17:58
Fix find_option() error and badly type --users in argument test. ... (check-in: 119cc37ac5 user: preben tags: filter-branch-ls-by-user)
17:16
Add branch ls --users to list users participating in branches. ... (check-in: 4615e2072a user: preben tags: filter-branch-ls-by-user)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/branch.c.
︙︙
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743

    if( find_option("all","a",0)!=0 ) brFlags = BRL_BOTH;
    if( find_option("closed","c",0)!=0 ) brFlags = BRL_CLOSED_ONLY;
    if( find_option("t",0,0)!=0 ) brFlags |= BRL_ORDERBY_MTIME;
    if( find_option("r",0,0)!=0 ) brFlags |= BRL_REVERSE;
    if( find_option("p",0,0)!=0 ) brFlags |= BRL_PRIVATE;
    if( find_option("merged","m",0)!=0 ) brFlags |= BRL_MERGED;
    if( find_option("unmerged","M",0)!=0 ) brFlags |= BRL_UNMERGED;
    if( find_option("self","0",0)!=0 ){
      if( zUser ){
        fossil_fatal("flags --username and --self are mutually exclusive");
      }
      user_select();
      zUser = login_name();
    }









|








729
730
731
732
733
734
735
736
737
738
739
740
741
742
743

    if( find_option("all","a",0)!=0 ) brFlags = BRL_BOTH;
    if( find_option("closed","c",0)!=0 ) brFlags = BRL_CLOSED_ONLY;
    if( find_option("t",0,0)!=0 ) brFlags |= BRL_ORDERBY_MTIME;
    if( find_option("r",0,0)!=0 ) brFlags |= BRL_REVERSE;
    if( find_option("p",0,0)!=0 ) brFlags |= BRL_PRIVATE;
    if( find_option("merged","m",0)!=0 ) brFlags |= BRL_MERGED;
    if( find_option("unmerged","M",0)!=0 ) brFlags |= BRL_UNMERGED;
    if( find_option("self",0,0)!=0 ){
      if( zUser ){
        fossil_fatal("flags --username and --self are mutually exclusive");
      }
      user_select();
      zUser = login_name();
    }
︙︙
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767

      nLimit = 5;
      if( g.argc>4 || (g.argc==4 && (nLimit = atoi(g.argv[3]))==0) ){
        fossil_fatal("the lsh subcommand allows one optional numeric argument");
      }
      brFlags |= BRL_ORDERBY_MTIME;
    }else{
      if( (g.argc == 4 || g.argc == 5)
       && fossil_strcmp(g.argv[g.argc-1], "--user") == 0 ){
        fossil_fatal("Missing argument for --user");
      }
      if( g.argc >= 4 ) zBrNameGlob = g.argv[3];
    }

    if( g.localOpen ){
      vid = db_lget_int("checkout", 0);
      zCurrent = db_text(0, "SELECT value FROM tagxref"








|
|








752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767

      nLimit = 5;
      if( g.argc>4 || (g.argc==4 && (nLimit = atoi(g.argv[3]))==0) ){
        fossil_fatal("the lsh subcommand allows one optional numeric argument");
      }
      brFlags |= BRL_ORDERBY_MTIME;
    }else{
      if( (g.argc == 4 || g.argc == 5)
       && fossil_strcmp(g.argv[g.argc-1], "--users") == 0 ){
        fossil_fatal("Missing argument for --users");
      }
      if( g.argc >= 4 ) zBrNameGlob = g.argv[3];
    }

    if( g.localOpen ){
      vid = db_lget_int("checkout", 0);
      zCurrent = db_text(0, "SELECT value FROM tagxref"
︙︙