Skip to content

Conversation

@jycor
Copy link
Contributor

@jycor jycor commented Apr 16, 2025

This PR implements dolt_branch_status(<base_branch>, <feature_branch1>, <feature_branch2>, ...).

The function compares base_branch against each of the feature branches and outputs a table that lists how many commits ahead and behind base branch.

Additionally, this PR contains some cleanup/refactoring.

addresses: #9090

@coffeegoddd
Copy link
Contributor

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
cac827c ok 5937457
version total_tests
cac827c 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
49bbdaa ok 5937457
version total_tests
49bbdaa 5937457
correctness_percentage
100.0

@jycor jycor changed the title implement dolt_diverge() implement dolt_branch_status() Apr 18, 2025
@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
aab5d67 ok 5937457
version total_tests
aab5d67 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
e8f2325 ok 5937457
version total_tests
e8f2325 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
9d8848c ok 5937457
version total_tests
9d8848c 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
729f528 ok 5937457
version total_tests
729f528 5937457
correctness_percentage
100.0

Copy link
Contributor

@macneale4 macneale4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. I'm not sure why the test I pushed fails, but it must have something to do with the commit walking.

@coffeegoddd
Copy link
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
e6110aa ok 5937457
version total_tests
e6110aa 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
deda322 ok 5937457
version total_tests
deda322 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
059ce83 ok 5937457
version total_tests
059ce83 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
be07f60 ok 5937457
version total_tests
be07f60 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
d5641d7 ok 5937457
version total_tests
d5641d7 5937457
correctness_percentage
100.0

Copy link
Contributor

@macneale4 macneale4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I think you can simplify.

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
0cc520c ok 5937457
version total_tests
0cc520c 5937457
correctness_percentage
100.0

Copy link
Contributor

@macneale4 macneale4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

                  ~.
           Ya...___|__..aab     .   .
            Y88a  Y88o  Y88a   (     )
             Y88b  Y88b  Y88b   `.oo'
             :888  :888  :888  ( (`-'
    .---.    d88P  d88P  d88P   `.`.
   / .-._)  d8P'"""|"""'-Y8P      `.`.
  ( (`._) .-.  .-. |.-.  .-.  .-.   ) )
   \ `---( O )( O )( O )( O )( O )-' /
    `.    `-'  `-'  `-'  `-'  `-'  .' CJ
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@coffeegoddd
Copy link
Contributor

@jycor DOLT

comparing_percentages
100.000000 to 100.000000
version result total
6999fa4 ok 5937457
version total_tests
6999fa4 5937457
correctness_percentage
100.0

@jycor jycor merged commit 37fee6f into main Jun 2, 2025
21 checks passed
@jycor jycor deleted the james/diverge branch June 2, 2025 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants