mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada: Merge changes regardless whether they are from current instance

Browse Source
This commit is contained in:
ZyX
2015-08-11 01:28:05 +03:00
parent fcb3e96cbd
commit 0a334f9d33
1 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/nvim/shada.c
View File

@@ -394,7 +394,6 @@ typedef struct {
ShadaEntry *additional_marks; ///< All marks with unknown names. ShadaEntry *additional_marks; ///< All marks with unknown names.
size_t additional_marks_size; ///< Size of the additional_marks array. size_t additional_marks_size; ///< Size of the additional_marks array.
Timestamp greatest_timestamp; ///< Greatest timestamp among marks. Timestamp greatest_timestamp; ///< Greatest timestamp among marks.
bool is_local_entry; ///< True if structure comes from the current session.
} FileMarks; } FileMarks;
KHASH_MAP_INIT_STR(file_marks, FileMarks) KHASH_MAP_INIT_STR(file_marks, FileMarks)
@@ -2506,7 +2505,6 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
kh_key(&wms->file_marks, k) = xstrdup(fname); kh_key(&wms->file_marks, k) = xstrdup(fname);
memset(filemarks, 0, sizeof(*filemarks)); memset(filemarks, 0, sizeof(*filemarks));
} }
filemarks->is_local_entry = true;
do { do {
fmark_T fm; fmark_T fm;
char name; char name;
@@ -2701,48 +2699,47 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
COMPARE_WITH_ENTRY(&filemarks->marks[idx], entry); COMPARE_WITH_ENTRY(&filemarks->marks[idx], entry);
} }
} else { } else {
if (filemarks->is_local_entry) { const int cl_len = (int) filemarks->changes_size;
shada_free_shada_entry(&entry); int i;
} else { for (i = cl_len; i > 0; i--) {
const int cl_len = (int) filemarks->changes_size; const ShadaEntry old_entry = filemarks->changes[i - 1].data;
int i; if (old_entry.timestamp <= entry.timestamp) {
for (i = cl_len; i > 0; i--) { if (marks_equal(old_entry.data.filemark.mark,
const ShadaEntry old_entry = filemarks->changes[i - 1].data; entry.data.filemark.mark)) {
if (old_entry.timestamp <= entry.timestamp) { i = -1;
if (marks_equal(old_entry.data.filemark.mark,
entry.data.filemark.mark)) {
i = -1;
}
break;
} }
break;
} }
if (i > 0) { }
if (cl_len == JUMPLISTSIZE) { if (i > 0) {
if (filemarks->changes[0].can_free_entry) { if (cl_len == JUMPLISTSIZE) {
shada_free_shada_entry(&filemarks->changes[0].data); if (filemarks->changes[0].can_free_entry) {
} shada_free_shada_entry(&filemarks->changes[0].data);
memmove(&filemarks->changes[0], &filemarks->changes[1],
sizeof(filemarks->changes[0]) * (size_t) i);
} else if (i == 0) {
if (cl_len == JUMPLISTSIZE) {
i = -1;
} else {
memmove(&filemarks->changes[1], &filemarks->changes[0],
sizeof(filemarks->changes[0]) * (size_t) cl_len);
}
}
}
if (i != -1) {
filemarks->changes[i] = (PossiblyFreedShadaEntry) {
.can_free_entry = true,
.data = entry
};
if (cl_len < JUMPLISTSIZE) {
filemarks->changes_size++;
} }
memmove(&filemarks->changes[0], &filemarks->changes[1],
sizeof(filemarks->changes[0]) * (size_t) i);
} else { } else {
shada_free_shada_entry(&entry); memmove(&filemarks->changes[i + 1], &filemarks->changes[i],
sizeof(filemarks->changes[0]) * (size_t) (cl_len - i));
} }
} else if (i == 0) {
if (cl_len == JUMPLISTSIZE) {
i = -1;
} else if (cl_len > 0) {
memmove(&filemarks->changes[1], &filemarks->changes[0],
sizeof(filemarks->changes[0]) * (size_t) cl_len);
}
}
if (i != -1) {
filemarks->changes[i] = (PossiblyFreedShadaEntry) {
.can_free_entry = true,
.data = entry
};
if (cl_len < JUMPLISTSIZE) {
filemarks->changes_size++;
}
} else {
shada_free_shada_entry(&entry);
} }
} }
break; break;