Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Breakdown remote component #27

Merged
merged 5 commits into from
Jun 7, 2020
Merged

Breakdown remote component #27

merged 5 commits into from
Jun 7, 2020

Conversation

arl
Copy link
Owner

@arl arl commented Jun 7, 2020

Currently the remote flags gets replaced in gitmux output by both the name of the remote (e.g origin) and the divergence flags indicating whether the local and the remote branch diverges and how much (e.g ↓·2↑·3).

In order to allow user to skip the remote branch and to keep the divergence flags, or the other way around, we add the remote-branch and the divergence layout elements.

Also, to not break user configurations, we keep the 'remote' layout element as an alias for remote-flags, divergence.

Fixes #23

arl added 5 commits June 7, 2020 13:00
This test ensures that new features do not change gitmux output
when used with a default configuration.
It loads a golden file ('testdata/default.output.golden') and
compares it with the actual output. -update updates the golden
file.
Currently the `remote` flags gets replaced by both the name of the
remote (e.g `origin`) and the divergence flags indicating whether the
local and the remote branch diverges and how much (e.g `↓·2↑·3`).

In order to allow user to skip the remote branch and to keep the
divergence flags, or the other way around, we add the `remote-branch` and
the `divergence` layout elements.

Also, to not break user configurations, we keep the 'remote' layout
element, and make it so that it's equivalent to setting `remote-flags`
and `divergence` consecutively.

Fixes #23
Improve the Customizing section of the README
@arl arl merged commit c0b7b03 into master Jun 7, 2020
@arl arl deleted the breakdown-remote-component branch June 7, 2020 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature: breakdown remote into 2 separate layout components
1 participant