This is our first official Bitbucket Data Center compatible version! We're running a combined Server / Data-Center release, and so this version is also good on Bitbucket Server instances.

----

Full changelog:

• All deprecated features finally removed.
• Commit Graph: please install our free Commit Graph add-on instead.
• Foxtrot Blocking: please install our free Control Freak add-on instead.

Bug fix:

• Issue #66 - cherry-pick should redirect to /commits if commit-graph not present.
• Fixed regression in v2019.07.03 with approvals preserving logic when git version < 2.1.0.

Performance Improvement:

• Issue #73 - load testing - reduce locking contention in GET against /plugins/servlet/bb_rb/.

We also changed the way we call Bitbucket APIs to address feedback from the DC certification process, including complete removal of jgit.jar from PR-Booster.

This is our first official Bitbucket Data Center compatible version! We're running a combined Server / Data-Center release, and so this version is also good on Bitbucket Server instances.

----

Full changelog:

• All deprecated features finally removed.
• Commit Graph: please install our free Commit Graph add-on instead.
• Foxtrot Blocking: please install our free Control Freak add-on instead.

Bug fix:

• Issue #66 - cherry-pick should redirect to /commits if commit-graph not present.
• Fixed regression in v2019.07.03 with approvals preserving logic when git version < 2.1.0.

Performance Improvement:

• Issue #73 - load testing - reduce locking contention in GET against /plugins/servlet/bb_rb/.

We also changed the way we call Bitbucket APIs to address feedback from the DC certification process, including complete removal of jgit.jar from PR-Booster.

This is our first official Bitbucket Data Center compatible version! We're running a combined Server / Data-Center release, and so this version is also good on Bitbucket Server instances.

----

Full changelog:

• All deprecated features finally removed.
• Commit Graph: please install our free Commit Graph add-on instead.
• Foxtrot Blocking: please install our free Control Freak add-on instead.

Bug fix:

• Issue #66 - cherry-pick should redirect to /commits if commit-graph not present.
• Fixed regression in v2019.07.03-bb5 with approvals preserving logic when git version < 2.1.0.

Performance Improvement:

• Issue #73 - load testing - reduce locking contention in GET against /plugins/servlet/bb_rb/.

We also changed the way we call Bitbucket APIs to address feedback from the DC certification process, including complete removal of jgit.jar from PR-Booster.

Note: this version (v2019.07.17-bb5) is from our backport branch, where we maintain backwards compatibility with Bitbucket 4.10.0 to Bitbucket 5.x.

This is our first official Bitbucket Data Center compatible version! We're running a combined Server / Data-Center release, and so this version is also good on Bitbucket Server instances.

----

Full changelog:

• All deprecated features finally removed.
• Commit Graph: please install our free Commit Graph add-on instead.
• Foxtrot Blocking: please install our free Control Freak add-on instead.

Bug fix:

• Issue #66 - cherry-pick should redirect to /commits if commit-graph not present.
• Fixed regression in v2019.07.03-bb5 with approvals preserving logic when git version < 2.1.0.

Performance Improvement:

• Issue #73 - load testing - reduce locking contention in GET against /plugins/servlet/bb_rb/.

We also changed the way we call Bitbucket APIs to address feedback from the DC certification process, including complete removal of jgit.jar from PR-Booster.

Note: this version (v2019.07.17-bb5) is from our backport branch, where we maintain backwards compatibility with Bitbucket 4.10.0 to Bitbucket 5.x.

Bug fix:

• Issue #66 - cherry-pick should redirect to /commits if commit-graph not present.

Performance Improvement:

• Issue #73 - load testing - reduce locking contention in GET against /plugins/servlet/bb_rb/.

We also changed the way we call some Bitbucket internal APIs to address feedback we have received during the DC certification process, including the complete removal of jgit.jar from PR-Booster.

(Note: v2019.07.02 also had the same changes, but that version left a debug flag enabled in the build. Recutting a new v2019.07.03 release here with that debug flag removed.)

All deprecated features finally removed:

• Commit Graph: please install our free Commit Graph add-on instead.
• Foxtrot Blocking: please install our free Control Freak add-on instead.

Bug fix:

• Issue #66 - cherry-pick should redirect to /commits if commit-graph not present.

Performance Improvement:

• Issue #73 - load testing - reduce locking contention in GET against /plugins/servlet/bb_rb/.

We also changed the way we call some Bitbucket internal APIs to address feedback we have received during the DC certification process, including the complete removal of jgit.jar from PR-Booster.

Note: this version (v2019.07.03-bb5) is from our backport branch, where we maintain backwards compatibility with Bitbucket 4.10.0 to Bitbucket 5.x.

The rebase / squash / amend functionality stopped working in Bitbucket 6.4.0 and newer. Fixed!

• Bitbucket 6.x compatibility in place!
• All deprecated features finally removed:
  • Commit Graph: please install our free Commit Graph add-on instead.
  • Foxtrot Blocking: please install our free Control Freak add-on instead.

The approval-reset and retain-needs-work logic would fail if any of the current approvers (or disapprovers) no longer had read access to the repository.

The approval-reset logic now checks each user's current permission and completely drops their review if they no longer have read access to the repo.

Three fixes in this release, and one troubleshooting enhancement:

• Issue #55 - approvals were not being properly dropped if commits hit the source branch while the pull-request was declined. Approvals would stay in place after the pull-request was reopened.
• "Needs Work" reviews were getting dropped when they shouldn't be in some cases.
• Also, with this release we've back-ported the "needs work" retention and auto-unapprove functionality to work with Bitbucket 4.x.

The troubleshooting enhancement:

• All PR-Booster config pages (including at the repo and project levels) now include a button for refreshing the temporary Bit-Booster clones. This can be helpful in the rare situation where the clone gets corrupted.

Bit-Booster renamed to PR-Booster.

Also introduced two new features:

• Automatic approvals resetting. Drops approvals when PR's receive new commits.
• Automatic "needs work" retention. Preserves "needs work" reviews when PR's receive new commits. Out of the box Bitbucket drops "needs-work" reviews for all pushes, including clean sync merges or even trivial commit-message adjustments via "git commit --amend"!

These features were inspired by the free Auto Unapprove for Bitbucket Server app. We introduced per-project and global settings; ability to switch between an "all pushes" strategy versus a "significant pushes" strategy, and the ability to retain "needs-work" reviews.

Push significance is calculated using the "git patch-id" command.

This release feature major improvements to Bit-Booster's configuration screens:

• The five buttons can now be individually enabled or disabled globally, per-project, or per-repo (rebase, squash, amend, cherry-pick, revert).
• Config screens streamlined and simplified.

Over the last year we've slowly re-implemented the graphing and hooks functionality from this original Bit-Booster add-on into a pair of free standalone add-ons:

• Commit Graph for Bitbucket Server (free)
• Control Freak for Bitbucket Server (free)

To make this add-on smaller, easier to maintain, and more focused exclusively on Rebase, Amend, Squash, etc, we're encouraging our users to install those free add-ons. As of version 2018.07.16:

• The hooks still work ("Require Fast-Forwards" and "Prevent Foxtrot Merges"), but the "Manage Hooks" and "Manage Merge Checks" pages in Bitbucket now say:"DEPRECATED - Use "Control Freak for Bitbucket Server" instead. It's free."
• The commit graph also puts a warning at the top now:"Notice: Bit-Booster graph logic is moving to the free Commit Graph add-on. (Install Commit Graph to make this notice go away. Only Bitbucket admins are shown this notice.)"
• For both of these features (hooks and graph) all config is preserved after transition to the free add-ons.

Version 2018.07.01-bb5 contains two important bug fixes:

• Fixed problem where the integrated commit graph looked weird if the latest version of Mohami's "Charts & Graphs for Bitbucket" was also installed. (A highly likely scenario since that add-on has an install count of 8000).
• Fixed the spurious stacktraces that were happening in the logs. Newer versions of Bitbucket no longer contain the "AoJiraIndex" class, and Bit-Booster was bringing its own copy, contributing to some classpath problems under the hood.

Sadly (for us, the maintainers) that 2nd bugfix requires we run two branches of Bit-Booster from now on: a Bitbucket 4.x branch as well as a Bitbucket 5.x branch. Life on one branch was good while it lasted...

Version 2018.07.01-bb4 contains two important bug fixes:

• Fixed problem where the integrated commit graph looked weird if the latest version of Mohami's "Charts & Graphs for Bitbucket" was also installed. (A highly likely scenario since that add-on has an install count of 8000).
• Fixed the spurious stacktraces that were happening in the logs. Newer versions of Bitbucket no longer contain the "AoJiraIndex" class, and Bit-Booster was bringing its own copy, contributing to some classpath problems under the hood.

Sadly (for us, the maintainers) that 2nd bugfix requires we run two branches of Bit-Booster from now on: a Bitbucket 4.x branch as well as a Bitbucket 5.x branch. Life on one branch was good while it lasted...

Version 2018.06.05 is creating a massive amount of logs because of a spurious RuntimeException that's being thrown/caught and logged on every push. Seems to be related to JIRA branch monitoring. Does not appear to affect functionality at all, but fills up logs.

Current theory: compiling against the Bitbucket 4.x libraries may be contributing to this problem. Recompiling against Bitbucket 5.x libraries to see if that helps.

Version 2018.06.05 includes two small bugfixes:

• The build status propagation feature would stay enabled for all builds-in-flight even after an admin disabled the feature. (It would successfully disable itself for new builds, just not builds-in-flight)
• Fixed issue #41 concerning commit message truncation on the commit graph.

Also the wording on a few admin links and labels was improved.

A single regression was fixed in version 2018.04.10:

• Squash/Amend would error out on Bitbucket 4.x.

No change to functionality. Just the logo changed to better indicate what this plugin does.

• Bug fixed in the Bit-Booster Hook / Merge Check: since version 2018.01.31 the Bit-Booster Hook, when enabled, blocks all tag or branch deletions attempted via "git push" with the following error message:

remote: Repository hook com.bit-booster.bb:bit-booster-hook failedremote: Commit '0000000000000000000000000000000000000000' does not exist in repository

One bug fix:

• Build-status on all-branches-graph was not showing up with newer versions of Bitbucket Server.

Recent Bitbucket versions renamed the build-status API to 'bitbucket-plugin-build/internal/feature/build/common/build-status-common', so we now have some logic to probe for that.

Yes, yes, we know, we shouldn't call into "internal" APIs, but we're not interested in writing our own build-status integration from scratch, and we can get the native feature with only 3 nested try/catch blocks! :-D

One bug fixed, and one enhancement implemented:

• The bug: Rebase, cherry-pick, and revert functionality was completely broken if LFS (large file storage) was enabled for the repo, and the repo included some LFS backed files. Fixed. (Background: LFS requires origin to point to a https:// or ssh:// remote, but Bit-Booster's temporary clone for rebase uses a file:// remote. Solution: disable LFS pointer resolutions in our temporary clone.)
• The enhancement: Foxtrot merges created from Bitbucket's automatic merge feature are now permitted. This is a special (and subtle!) case where the importance of letting the merge through outweighs the annoyance introduced by the foxtrot merge. We plan to blog about this situation at some future date in 2018, since it's probably interesting to deep-git nerds. At the very least it was interesting to us.

• As before, please note: squash is no longer a rebasing squash. It's an in-place squash. Please see previous release notes from version 2017.12.18 for more details.
• Previous version (2017.12.18) completely broke the Squash / Amend functionality for Bitbucket 4.x installs. Fixed!

Also a couple rare race conditions fixed around Rebase / Squash / Amend features and forked repos:

• Rebase / Squash / Amend feature could stop working (buttons greyed out) if "sync changes" was not checked during new fork dialog. Fixed!
• Rebase / Squash / Amend feature could stop working (buttons greyed out) with forks if "Delete Bit-Booster Temporary Clones" button was clicked (from admin screen), and new forks subsequently created. Fixed!

• Squash is now an in-place squash rather than a rebase squash. This makes it behave closer to "rebase --interactive HEAD~N" that people are more used to. Except the Bit-Booster squash does not silently drop merges! :-D
• All Branches Graph is now free forever (no longer complains about invalid or expired license). Background: I noticed Mohamicorp recently acquired the free "Commit Graph" add-on, and so in case they transition it to a paid add-on (like they did with Webhook to Jenkins), I want to give Bitbucket users an escape route. But do not think I am being altruistic: it's all a marketing play. ;-)
• Amend and Squash are now based on the "git commit-tree" command under the hood. This makes them much faster.

Background reading on "squash": I originally based the logic on "git merge --squash", but I've slowly transitioned to a "git rebase --interactive" model over the last 6 months: the pre-filled commit messages became more terse, their order reversed, and now I've dropped the rebase.

Two enhancements and thankfully no bug fixes this time:

• The "All Branches Graph" now includes build status (if available) in the far right column of the table for each commit on the graph. It uses the usual success/failure/in-progress icons and the same build status on-click dialog that native Bitbucket uses. Very useful for getting a quick view of how all your recent branches are doing with respect to their builds!
• The commit message for the Squash functionality is now pre-filled with the commit messages in reverse order. Based on user feedback, this is closer to what people expect, since it's identical to how squashing with "git rebase --interactive HEAD~5" orders the commit messages.(Background info: originally we copied the behaviour of "git merge --squash", which squashes the commit messages using reverse-chronology, but we now agree with our users that the forward-chronology approach used by "git rebase --interactive" is more natural and intuitive).

Fixed this error (only happens with empty repositories):

Repository hook com.bit-booster.bb:bit-booster-hook failed remote: refs/heads/master is set as the default branch, but this branch does not exist

Before this version, the squash logic could result in an empty commit. We've removed that ability, and instead the pull-request gets automatically declined now if the end-result of a rebase or a squash would be an empty commit.

We've also updated the error messages around this scenario. Here's an example:

-----Rebasing...Success! (see note:)

Rebase succeeded, but caused the pull-request to be declined. The diff was empty. No work was lost, but the rebase caused branch "TKT-123" to be subsumed into branch "master".Reload page to see the now declined pull-request."-----

Background note: the reason a branch can be subsumed into its upstream through a rebase or squash is explained in the git rebase manual (e.g., "git help rebase"). Here's the pertinent sentence:

> Note that any commits in HEAD which introduce the same textual changes as a commit in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped).

Version 2017.09.27 introduces Build-Status Propagation, a powerful productivity booster.

• Build status propagation is strongly recommended for repositories where the "Minimum Successful Builds" merge check is enabled. This setting prevents rebases (or amends) from slowing down your team, since team members no longer need to wait for builds to complete every time they rewrite history.
• The logic uses "git patch-id" to determine if a pull-request update represents a material change to the patch. If "git patch-id" determines the change is immaterial (e.g., the patch-id is identical), then Build-Status Propagation is activated.
• This prevents rebase fights

Bit-Booster - Rebase Squash Amend, with Build-Status Propagation enabled (it's enabled by default) greatly improves this situation:

1. Your CI build is on the slow side (e.g., slower than 1 minute)

2. Your merge policy enforces a rebase workflow.

3. Your merge policy also requires a minimum number of successful builds on the feature branch.

This release contains 2 fixes:

• Bit-Booster per-repository settings now follow the repository if it's moved to a different project. (Previously moves would cause repo-specific Bit-Booster settings to get reset to defaults).
• Eliminated spurious error messages about bad merge-bases when condensed all-branches-graph results span git orphans.

• All-Branches-Graph has a filter-by-author control now!
• Cherry-Pick / Revert branch drop-down increased to 50 branches. (Previously limited to 30 branches).

Minor Tweaks:

• "Bit-Booster - Settings" link added to Bitbucket global config screen.
• Bug on global settings screen for the "require-fast-forwards" setting fixed. (Current value was not rendering properly).
• Spurious error message removed from All-Branches-Graph when selected branches did not match any branches in repo.

• Foxtrot merge protection extended to all branches (note: we also changed the default behaviour. Whereas before the default behaviour only protected the default branch -- typically master -- now the default is to protect all branches).
• Foxtrot hook no longer blocks branch deletions or branch rewrites. It only blocks foxtrot merges now.
• Ability to configure protected branches for Foxtrot hook, as well as for Require Fast-Forwards Hook. Configure either globally, or per-project, or per-repo. Based on Bitbucket's "Branching Model."

Version 2017.08.01 contains two features, and two bugfixes.

Features:

• Squash author selection now includes all previous authors from any previous commit associated with the pull-request (including deleted commits from previous Rebases and Squashes).
• Amend dialog now let's you adjust the commit author. Useful when you accidentally choose the wrong author during a Squash!

Bug Fixes:

• Permanent fix for issue #30 (rebase stops working if BITBUCKET_HOME changes).
• Author select on squash broke in previous version (2017.07.24, from last week). Author dropdown was empty and resulted in squashed commit's author being set to current user.

Two changes:

1. The "blind revert blocker" has been removed. This functionality, introduced a year ago, would look for the word "revert" in commit messages and block pushes if a corresponding commit-id was not also present in the same commit message. It's annoyed many of my users, causing all sorts of awkward workarounds. It's time has come. Good bye, blind revert blocker. I liked you, but I think most other people did not.

2. The suggested commit-message in the squash dialogue is now similar to what "git rebase -i" would suggest. And lines that start with "#" are ignored.

New Features:

• All-Branches-Graph now offers a general-purpose search box built on "git log --all --grep=x". Git graph condensing operations no longer confined to only Jira tickets!
• Stacktraces when drawing commit-graphs are now captured and displayed to end-user (to help triage failing commit-graphs). Don't worry, these should never happen. But if they do, I won't have to ask for catalina logs!

Bugfixes:

• No longer using -Xignore-space-at-eol for rebase / cherry-pick / etc since it can corrupt files that are missing newlines at the end.
• A couple rendering problems with All-Branches-Graph fixed (occasional NPE, and some commits missing sometimes).
• Breadcrumb links on All-Branches-Graph fixed for setups when Bitbucket is not the root URL.
• Rebase / Squash / Amend etc broken on Windows Server installs of Bitbucket (regression in 2017.06.05. Sorry!)
• Jira integration fixed for alpha-numeric project keys (e.g., A23-456).

Version 2017.06.05 includes two major improvements to the Jira filter on the "All Branches Graph":

• Branch names are part of the matching logic now (not just commit messages).
• The three most recent tags after a match are now always included in the result. This helps users understand the context around a match.

Some additional minor improvements to Bit-Booster also included in this release: breadcrumb on "All Branches Graph"; 18th stab-in-dark fix for our longest standing bug; more improvements to error/debug logging.

2017.05.08 release notes:

• Rebase / Squash / Cherry-Pick functionality automatically disabled now if there is not enough space on disk.
• Fixed bug from 2017.05.05; Non-admins could not use Rebase/Amend/Squash functionality.

2017.05.05 release notes:

• Bitbucket 5 compatibility!
• New feature: Bit-Booster Require Fast-Forwards Hook: "Pull-requests into "important branches" must be rebased or squashed before they merge."
• Feature enhancement: Rebase / Squash / Amend functionality preemptively probes branch permissions to Improve user experience when history rewriting is not possible.
• Bug fix: allow squashes that result in an empty commit.
• Bug fix: better error message when cherry-pick or revert results in an empty commit.
• Bug fix: Rebase / Squash / Amend / Cherry-Pick / Revert was broken for windows based Bitbucket installations. Git reset --hard was blowing up with "Entry 'X' not uptodate. Cannot merge."

• Stale temporary "bbClones" (untouched after 4 weeks) are automatically deleted. Added some code to make sure this logic is correct.
• Fixed problem where Jira ids stopped being clickable on the all-branches-graph. It's a boring story why. Email me if you really want to know... (sylvie@bit-booster.com).

• Fixed race condition in version "2016.03.15".
• Global settings now allows admins to disable all-branches-graph.
• squash/rebase/cherry-pick etc done with -Xignore-space-at-eol to help avoid EOL conflicts
• bbClones now configured with core.ignoreStat=true to speed things up
• bbClones set with info/attributes of "* -text" to disable all EOL conversions.
• Low heap warning showed on Bit-Booster Settings in repo and project areas (if applicable, e.g., heap less than 1500M).

• Project and Repository settings now have a "Bit-Booster Settings" menu option. You can use this to enable or disable Rebase/Squash/Amend and Revert/Cherry-Pick per project or per repo. Before the only choice was a global all-or-nothing. This gives Bitbucket admins much finer granularity for controlling the rebase & cherry-pick features.
• The rebase & cherry-pick features would sometimes complain that they could not write ORIG_HEAD in the bbClones temporary clone. Fixed.

• Cherry-pick button now puts "(cherry picked from commit X)" in the commit message.
• Bugfix: prevent bit-booster temporary clone (under bbClones/) from filling up with invalid refs after the upstream clone garbage collects.

• Allow strategy-option (-X) for cherry-pick / revert buttons.
• Rebase/Squash now does "git clean -xfd" in the temporary clone after the "git reset --hard" instead of before.

Author value for squash / cherry-pick / amend now uses "Display Name <user@email.com>" when the user is in Bitbucket's user database. Fixes Bug #23.

• New feature: cherry-pick button.
• New feature: revert button.
• Significant performance improvement for the all-branches graph.

Bit-Booster now puts three buttons on the pull-request screen (can be disabled via add-on settings):

• Rebase ("git rebase origin/TARGET")
• Squash ("git merge --squash origin/SOURCE")
• Amend ("git commit --amend")

All three of these rewrite history via "git push --force" if successful. They respect all push hooks and branch permissions.

The "Squash" button also lets you choose the author for the squashed commit if the commits you are squashing happen to have different authors.

Small fixes to the "Squash" logic in this version since the previous version:

• Pre-filled squashed commit left as is if you are squashing a single-commit branch (e.g., no longer prepends sentence "squashed commit of the following" if it's just one commit in the first place).
• The commit's author can no longer be changed if all commits to be squashed have the same author.

- New "Rebase" button appears on pull-request screen.

- Solves BSERV-2874

- New config screen let's you control commit dates on the main "commits" page. You can use this screen to control the source of the time & date values (CommitDate vs. AuthorDate), and to control whether to enable or disable relative time values (e.g., "42 minutes ago").

- The config screen also let's you disable the Bit-Booster commit graph in favor of the Awesome Graphs version instead, if that's what you prefer.

- Bugfix: commit message with raw tab characters breaks graph.

- Further enhancements to the Jira integration. Introduced a control for quickly switching between repositories that contain commits related to the provided Jira ticket on the All Branches Graph. Demo here: vm.bit-booster.com/bitbucket.

This is the minimum version you must install if you want the "Bit-Booster Git Graph for Jira" add-on to work. Licensing note: "Bit-Booster Git Graph for Jira" does *not* depend on this add-on being properly licensed. It only depends on this add-on being installed.

(Bit-Booster Git for Jira is currently in Marketplace's approval queue. The pre-approval version is hosted here, if you're curious: http://bit-booster.com/misc.html).

Introduces the Jira Git Integration Graph. Type in a Jira ticket on the "All Branches Graph" to see it in action, or click here for a live demo: Git Integration Graph Live Demo

- Foxtrot prevention uses "default" branch now (instead of being hard-coded to use "master") (change introduced in 2016.7.17)

- The "All Others" filter in the "All Branches Graph" was omitting branches that had been already merged into "master".

- Foxtrot prevention uses "default" branch now (instead of being hard-coded to use "master").

- "All Branches Graph" would not display on Windows installs if the git repo had over 750 branches & tags. Fixed.

- "All Branches Graph" performance (especially infinite scroll) improved significantly.

- Branch & Tag names over 30 characters long are truncated now on "All Branches Graph". The full branch & tag name is available as a tooltip (hover mouse for 0.5 seconds).

- Commit messages that reference Jira ticket numbers are now made clickable, both on the commits page, and on the "All Branches Graph".

- License check is less intrusive.

- License check no longer complains on every push. If the license is invalid, then only blocked reverts and foxtrot merges include a mention of the license being expired (and the commits are still blocked).

- repos with no tags no longer show a spurious error message on "all branches graph"

- blind revert blocker ported to stash3

- some wording fixups in the ui

- Repositories with no tags using Git 1.8.x or earlier no logger report a spurious error on "All Branches Graph". (The "git show-ref" invocation I use under the hood resturns the correct result, but also sets exit-code to -1 when git version <= 1.8.x and there are no tags).

- The "Revert Checker" introduced: this forces "git revert" commit messages to include the reverted commit-id in their log message. Otherwise we cannot cross out the reverted commit on the commits page and the all-branches graph (there is no way to identify it).

- Note: "revert checker" integrated with the foxtrot blocker, so it's still just one hook to enable.

- Minor renamings of some UI elements to improve clarity of the add-on (e.g., "first-parent-hook" renamed "bit-booster hook", "all branches" renamed to "all branches graph").