MercurialOperationsService, with first method MergeAnalysis
This new service will take care of all mutations, in analogy with Gitaly's `OperationsService`. The first method is actually an exception, since it does not perform any mutation, but it will make sense to have it beside `Merge` and `FastForwardMerge`. Normally, we should not add it in stable branches, but the default branch is currently tied to upstream protocol updates, hence to the release schedule of the Rails app, which is not released frequently due to jumps for upstream catch-up. It will be acceptable if clients use this only if certain feature flags that are `false` by default are activated. The `MergeAnalysis` method should provide everything needed by the Rails app for all merge operations (fast-forward or not). The conflicts detection is the second use case of working directories (after `CommitLanguages`), and the first introducing local modifications.
parent
f4b5893b
No related branches found
No related tags found
Showing
- conftest.py 7 additions, 0 deletionsconftest.py
- generate-stubs 1 addition, 1 deletiongenerate-stubs
- hgitaly/changelog.py 23 additions, 0 deletionshgitaly/changelog.py
- hgitaly/server/mono.py 6 additions, 0 deletionshgitaly/server/mono.py
- hgitaly/service/mercurial_operations.py 124 additions, 0 deletionshgitaly/service/mercurial_operations.py
- hgitaly/service/tests/test_mercurial_operations.py 169 additions, 0 deletionshgitaly/service/tests/test_mercurial_operations.py
- hgitaly/stub/mercurial_operations_pb2.py 232 additions, 0 deletionshgitaly/stub/mercurial_operations_pb2.py
- hgitaly/stub/mercurial_operations_pb2_grpc.py 69 additions, 0 deletionshgitaly/stub/mercurial_operations_pb2_grpc.py
- protos/mercurial-operations.proto 48 additions, 0 deletionsprotos/mercurial-operations.proto
- ruby/lib/hgitaly.rb 2 additions, 0 deletionsruby/lib/hgitaly.rb
- ruby/lib/hgitaly/mercurial-operations_pb.rb 35 additions, 0 deletionsruby/lib/hgitaly/mercurial-operations_pb.rb
- ruby/lib/hgitaly/mercurial-operations_services_pb.rb 25 additions, 0 deletionsruby/lib/hgitaly/mercurial-operations_services_pb.rb
- ruby/lib/hgitaly/version.rb 1 addition, 1 deletionruby/lib/hgitaly/version.rb
Loading
Please register or sign in to comment