phases: fix bug where native phase computation wasn't called I forgot to include this change as a previous diff and the native code to compute the phases was never called. The AttributeError was silently caught and the pure implementation was used instead.

merge with stable

record: add default value for operation argument This patch is part of a series of patches to change the recording ui to reflect the operation currently running (commit, shelve, revert ...). This patch adds the default value of the operation argument for record's standard and curses interface to match what is displayed in the interface as of today.

record: precise documentation This patch improves the documentation of the recordfilter function to explain that we need a translated string for the 'operation' argument.

test: use both bundle formats in test-bookmarks-pushpull It is valuable to have both formats tested.

test: explicitly test wire protocol discovery with bundle1 and bundle2 We want to make sure the behavior is similar in both cases.

test: use bundle2 for exchange in test-push-warn Using bundle2 for exchange unlocks the usage of changegroup version 2. This version of the changegroup held more information (delta base) that result in a small increase in content size (20 bytes).

test: use bundle2 for exchange in test-largefile Using bundle2 for exchange unlock the usage of changegroup version 2. This version of the changegroup held more information (delta base) that result in a small increase in content size. It also lead to reordering of output because the exchange scheduling is a bit different.

test: use bundle2 for exchange in test-push-warn Using bundle2 for exchange unlocks the usage of changegroup version 2. This version of the changegroup held more information (delta base) that result in a small increase in content size (20 bytes x 2 changes).

test: use bundle2 for exchange in test-bookmark-pushpull This lets us adapt to changes in obsmarkers exchange output earlier.

test: use bundle2 for exchange in test-obsolete The bundle2 version of obsmarkers exchange is more informative. Switching to bundle2 by default will change the output of this tests. To reduce the noise when switching bundle2 to the default protocol, we migrate this tests early.

revert: remove unused debug code in the test file I left a test environment variable in a previous commit and it is doing nothing useful. This patch removes it.

commands: rename current to active in variables and comments Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.

templatekw: introduce active subkeyword from bookmarks keyword Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.

bookmarks: name label for active bookmark correctly Retain old label as well for backwards compatibility. Today, the terms 'active' and 'current' are interchangeably used throughout the codebase in reference to the active bookmark (the bookmark that will be updated with the next commit). This leads to confusion among developers and users. This patch is part of a series to standardize the usage to 'active' throughout the mercurial codebase and user interface.