forked from mirrors/jj
0aa738a518
This adds support for having conflicting git refs in the view, but we never create conflicts yet. The `git_refs()` revset includes all "add" sides of any conflicts. Similarly `origin/main` (for example) resolves to all "adds" if it's conflicted (meaning that `jj co origin/main` and many other commands will error out if `origin/main` is conflicted). The `git_refs` template renders the reference for all "adds" and adds a "?" as suffix for conflicted refs. The reason I'm adding this now is not because it's high priority on its own (it's likely extremely uncommon to run two concurrent `jj git refresh` and *also* update refs in the underlying git repo at the same time) but because it's a building block for the branch support I've planned (issue #21).
66 lines
1.7 KiB
Protocol Buffer
66 lines
1.7 KiB
Protocol Buffer
// Copyright 2020 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
syntax = "proto3";
|
|
|
|
message RefConflict {
|
|
repeated bytes removes = 1;
|
|
repeated bytes adds = 2;
|
|
}
|
|
|
|
message RefTarget {
|
|
oneof value {
|
|
bytes commit_id = 1;
|
|
RefConflict conflict = 2;
|
|
}
|
|
}
|
|
|
|
message GitRef {
|
|
string name = 1;
|
|
// This field is just for historical reasons (before we had the RefTarget
|
|
// type). New GitRefs have (only) the target field.
|
|
// TODO: Delete support for the old format.
|
|
bytes commit_id = 2;
|
|
RefTarget target = 3;
|
|
}
|
|
|
|
message View {
|
|
repeated bytes head_ids = 1;
|
|
repeated bytes public_head_ids = 4;
|
|
bytes checkout = 2;
|
|
// Only a subset of the refs. For example, does not include refs/notes/.
|
|
repeated GitRef git_refs = 3;
|
|
}
|
|
|
|
message Operation {
|
|
bytes view_id = 1;
|
|
repeated bytes parents = 2;
|
|
OperationMetadata metadata = 3;
|
|
}
|
|
|
|
// TODO: Share with store.proto? Do we even need the timezone here?
|
|
message Timestamp {
|
|
uint64 millis_since_epoch = 1;
|
|
int32 tz_offset = 2;
|
|
}
|
|
|
|
message OperationMetadata {
|
|
Timestamp start_time = 1;
|
|
Timestamp end_time = 2;
|
|
string description = 3;
|
|
string hostname = 4;
|
|
string username = 5;
|
|
map<string, string> tags = 6;
|
|
}
|