Fossil

Check-in [fcb40ac931]
Login

Check-in [fcb40ac931]

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

Overview
Comment:branch ls should also flag private branches with -R.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | branch-ls-private-fix
Files: files | file ages | folders
SHA3-256: fcb40ac9318d405dcecfb5b0a2cd51997de62f7ed65d2327cd48d486455ec934
User & Date: preben 2023-09-28 13:18:10.195
Context
2023-09-28
13:51
The "branch ls" command should flag private branches with -R. ... (check-in: 016f6c5ec5 user: drh tags: trunk)
13:18
branch ls should also flag private branches with -R. ... (Closed-Leaf check-in: fcb40ac931 user: preben tags: branch-ls-private-fix)
2023-09-19
22:03
Correction of simple typos in patch usage text. ... (check-in: 9b10bf4575 user: mgagnon tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/branch.c.
︙︙
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735

      vid = db_lget_int("checkout", 0);
      zCurrent = db_text(0, "SELECT value FROM tagxref"
                            " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
    }
    branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit);
    while( db_step(&q)==SQLITE_ROW ){
      const char *zBr = db_column_text(&q, 0);
      int isPriv = zCurrent!=0 && db_column_int(&q, 1)==1;
      const char *zMergeTo = db_column_text(&q, 2);
      int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0;
      if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){
        continue;
      }
      if( (brFlags & BRL_UNMERGED) && (fossil_strcmp(zCurrent,zMergeTo)==0 
          || isCur) ){








|








721
722
723
724
725
726
727
728
729
730
731
732
733
734
735

      vid = db_lget_int("checkout", 0);
      zCurrent = db_text(0, "SELECT value FROM tagxref"
                            " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
    }
    branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit);
    while( db_step(&q)==SQLITE_ROW ){
      const char *zBr = db_column_text(&q, 0);
      int isPriv = db_column_int(&q, 1)==1;
      const char *zMergeTo = db_column_text(&q, 2);
      int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0;
      if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){
        continue;
      }
      if( (brFlags & BRL_UNMERGED) && (fossil_strcmp(zCurrent,zMergeTo)==0 
          || isCur) ){
︙︙