forked from mirrors/jj
ea82340654
I realized only recently that we can try to parse conflict markers in files and leave them as conflicted if they haven't changed. If they have changed and some conflict markers have been removed, we can even update the conflict with that partial resolution. This change teaches the working copy to write conflicts to the working copy. It used to expect that the caller had already updated the tree by materializing conflicts. With this change, we also start parsing the conflict markers and leave the conflicts unresolved in the working copy if the conflict markers remain. There are some cases that we don't handle yet. For example, we don't even try to set the executable bit correctly when we write conflicts. OTOH, we didn't do that even before this change. We still never actually write conflicts to the working copy (outside of tests) because we currently materialize conflicts in `MutRepo::check_out()`. I'll change that next.
40 lines
988 B
Protocol Buffer
40 lines
988 B
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";
|
|
|
|
enum FileType {
|
|
Normal = 0;
|
|
Symlink = 1;
|
|
Executable = 2;
|
|
Conflict = 3;
|
|
}
|
|
|
|
message FileState {
|
|
uint64 mtime_millis_since_epoch = 1;
|
|
uint64 size = 2;
|
|
FileType file_type = 3;
|
|
// Set only if file_type is Conflict
|
|
bytes conflict_id = 4;
|
|
}
|
|
|
|
message TreeState {
|
|
bytes tree_id = 1;
|
|
map<string, FileState> file_states = 2;
|
|
}
|
|
|
|
message Checkout {
|
|
bytes commit_id = 1;
|
|
}
|