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.

Sign up for GitHub

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

Jump to bottom

Refactor and tidy-up the merge/update branch code #22568

Merged
merged 18 commits into from
Mar 7, 2023
Merged

Refactor and tidy-up the merge/update branch code #22568

merged 18 commits into from
Mar 7, 2023

Commits on Jan 22, 2023

  1. Refactor and tidy-up the merge/update branch code 

    The merge and update branch code was previously a little tangled and had
some very long functions. The functions were not very clear in their
reasoning and there were deficiencies in their logging and at least one
bug in the handling of LFS for update by rebase.

This PR substantially refactors this code and splits things out to into
separate functions. It also attempts to tidy up the calls by wrapping
things in "context"s. There are also attempts to improve logging when
there are errors.

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    1217546 View commit details
    Browse the repository at this point in the history

  2. oops 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    6874c95 View commit details
    Browse the repository at this point in the history

  3. trim the output from merge-base 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    8a7b323 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Merge branch 'main' into tidy-up-merge.go

    @zeripath
    zeripath authored Jan 23, 2023
    Configuration menu
    Copy the full SHA
    26079cc View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Merge branch 'main' into tidy-up-merge.go

    @zeripath
    zeripath authored Jan 24, 2023
    Configuration menu
    Copy the full SHA
    1e7facd View commit details
    Browse the repository at this point in the history

  2. create a common simple way of converting a ColorFormat into a simple … 

    …string

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    01f0aeb View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'zeripath/tidy-up-merge.go' into tidy-up… 

    …-merge.go
    @zeripath
    zeripath committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    bd106eb View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2023

  1. adjust pull request colorformat methods 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    71c9b93 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into tidy-up-merge.go

    @zeripath
    zeripath committed Jan 27, 2023
    Configuration menu
    Copy the full SHA
    0301b3b View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Merge branch 'main' into tidy-up-merge.go

    @zeripath
    zeripath authored Jan 28, 2023
    Configuration menu
    Copy the full SHA
    06c42c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Merge branch 'main' into tidy-up-merge.go

    @zeripath
    zeripath committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    2c56552 View commit details
    Browse the repository at this point in the history

  2. few more minor changes 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    c196577 View commit details
    Browse the repository at this point in the history

  3. more minor changes 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    cfdb33d View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. Merge branch 'main' into tidy-up-merge.go

    @techknowlogick
    techknowlogick authored Mar 4, 2023
    Configuration menu
    Copy the full SHA
    8fddc21 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into tidy-up-merge.go

    @techknowlogick
    techknowlogick authored Mar 4, 2023
    Configuration menu
    Copy the full SHA
    365b0a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Merge branch 'main' into tidy-up-merge.go

    @techknowlogick
    techknowlogick authored Mar 6, 2023
    Configuration menu
    Copy the full SHA
    7130d24 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Update services/pull/merge.go 

    Co-authored-by: delvh <dev.lh@web.de>
    @techknowlogick @delvh
    techknowlogick and delvh authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    5196fd2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into tidy-up-merge.go

    @techknowlogick
    techknowlogick authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    ec3c85f View commit details
    Browse the repository at this point in the history