Home
last modified time | relevance | path

Searched refs:conflict_name (Results 1 – 25 of 33) sorted by relevance

12

/dports/devel/libgit2/libgit2-1.3.0/tests/index/
H A Dnames.c66 const git_index_name_entry *conflict_name; in test_index_names__add() local
77 cl_assert(strcmp(conflict_name->ours, "ours") == 0); in test_index_names__add()
78 cl_assert(strcmp(conflict_name->theirs, "theirs") == 0); in test_index_names__add()
82 cl_assert(strcmp(conflict_name->ours, "ours2") == 0); in test_index_names__add()
83 cl_assert(conflict_name->theirs == NULL); in test_index_names__add()
87 cl_assert(conflict_name->ours == NULL); in test_index_names__add()
95 const git_index_name_entry *conflict_name; in test_index_names__roundtrip() local
110 cl_assert(strcmp(conflict_name->ours, "ours") == 0); in test_index_names__roundtrip()
115 cl_assert(strcmp(conflict_name->ours, "ours2") == 0); in test_index_names__roundtrip()
116 cl_assert(conflict_name->theirs == NULL); in test_index_names__roundtrip()
[all …]
/dports/net-mgmt/seafile-server/seafile-server-8.0.7-server/common/
H A Dmerge-new.c52 return conflict_name; in merge_conflict_filename()
79 return conflict_name; in merge_conflict_dirname()
109 char *conflict_name; in merge_entries() local
139 if (!conflict_name) in merge_entries()
146 remote->name = conflict_name; in merge_entries()
167 if (!conflict_name) in merge_entries()
210 if (!conflict_name) in merge_entries()
266 if (!conflict_name) in merge_entries()
270 remote->name = conflict_name; in merge_entries()
305 if (!conflict_name) in merge_entries()
[all …]
/dports/security/pkcs11-tools/pkcs11-tools-2.5.0/include/oasis-pkcs11/working/identifier_db/
H A Dprocess_proposal.pl113 $conflict_name{$type} = $conflict_name{$type}." ".$name;
128 $conflict_name{$type}=$conflict_name{$type}." ".$name;
166 if (keys %conflict_name eq () ) {
170 for $type (keys %conflict_name) {
171 for (split(" ",$conflict_name{$type}) ) {
/dports/x11-fm/nautilus/nautilus-41.1/src/
H A Dnautilus-file-conflict-dialog.c40 gchar *conflict_name; member
141 gchar *conflict_name) in nautilus_file_conflict_dialog_set_conflict_name() argument
143 fcd->conflict_name = g_strdup (conflict_name); in nautilus_file_conflict_dialog_set_conflict_name()
184 g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), dialog->conflict_name) != 0) in entry_text_changed_cb()
235 start_pos = get_character_position_after_basename (dialog->conflict_name); in on_expanded_notify()
264 gtk_entry_set_text (GTK_ENTRY (dialog->entry), dialog->conflict_name); in reset_button_clicked_cb()
266 eel_filename_get_rename_region (dialog->conflict_name, &start_pos, &end_pos); in reset_button_clicked_cb()
379 g_free (dialog->conflict_name); in do_finalize()
/dports/devel/spark/spark-2.1.1/sql/hive/src/test/resources/ql/src/test/queries/clientpositive/
H A Ddatabase.q175 CREATE TABLE conflict_name AS
179 CREATE TABLE db1.conflict_name AS
184 SELECT value FROM db1.conflict_name
186 SELECT value FROM conflict_name
191 SELECT value FROM db1.conflict_name
193 SELECT value FROM db2.conflict_name
/dports/x11-fm/nemo/nemo-4.8.3/libnemo-private/
H A Dnemo-file-conflict-dialog.c46 gchar *conflict_name; member
322 details->conflict_name = edit_name; in file_list_ready_cb()
387 g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), details->conflict_name) != 0) { in entry_text_changed_cb()
417 details->conflict_name) == 0) { in expander_activated_cb()
420 eel_filename_get_rename_region (details->conflict_name, in expander_activated_cb()
445 details->conflict_name) != 0) { in checkbox_toggled_cb()
464 details->conflict_name); in reset_button_clicked_cb()
466 eel_filename_get_rename_region (details->conflict_name, in reset_button_clicked_cb()
587 g_free (details->conflict_name); in do_finalize()
/dports/x11-fm/caja/caja-1.26.0/libcaja-private/
H A Dcaja-file-conflict-dialog.c47 gchar *conflict_name; member
340 details->conflict_name = edit_name; in file_list_ready_cb()
426 g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), details->conflict_name) != 0) in entry_text_changed_cb()
460 details->conflict_name) == 0) in expander_activated_cb()
464 eel_filename_get_rename_region (details->conflict_name, in expander_activated_cb()
489 details->conflict_name) != 0) in checkbox_toggled_cb()
511 details->conflict_name); in reset_button_clicked_cb()
513 eel_filename_get_rename_region (details->conflict_name, in reset_button_clicked_cb()
687 g_free (details->conflict_name); in do_finalize()
/dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/
H A Dindex.c2040 git_index_name_entry *conflict_name; in git_index_name_add() local
2045 GITERR_CHECK_ALLOC(conflict_name); in git_index_name_add()
2282 GITERR_CHECK_ALLOC(conflict_name); in read_conflict_names()
2295 git__free(conflict_name->ours); in read_conflict_names()
2296 git__free(conflict_name->theirs); in read_conflict_names()
2297 git__free(conflict_name); in read_conflict_names()
2780 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2785 if (conflict_name->ours == NULL) in create_name_extension_data()
2788 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2793 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/cargo-c/cargo-c-0.9.6+cargo-0.58/cargo-crates/libgit2-sys-0.12.26+1.3.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/
H A Dindex.c2126 git_index_name_entry *conflict_name; in git_index_name_add() local
2149 git_index_name_entry *conflict_name; in git_index_name_clear() local
2392 git__free(conflict_name->ancestor); in read_conflict_names()
2393 git__free(conflict_name->ours); in read_conflict_names()
2394 git__free(conflict_name->theirs); in read_conflict_names()
2395 git__free(conflict_name); in read_conflict_names()
2878 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2883 if (conflict_name->ours == NULL) in create_name_extension_data()
2886 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2891 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/R-cran-git2r/git2r/src/libgit2/src/
H A Dindex.c2109 git_index_name_entry *conflict_name; in git_index_name_add() local
2132 git_index_name_entry *conflict_name; in git_index_name_clear() local
2371 git__free(conflict_name->ancestor); in read_conflict_names()
2372 git__free(conflict_name->ours); in read_conflict_names()
2373 git__free(conflict_name->theirs); in read_conflict_names()
2374 git__free(conflict_name); in read_conflict_names()
2859 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2864 if (conflict_name->ours == NULL) in create_name_extension_data()
2867 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2872 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/
H A Dindex.c2126 git_index_name_entry *conflict_name; in git_index_name_add() local
2149 git_index_name_entry *conflict_name; in git_index_name_clear() local
2392 git__free(conflict_name->ancestor); in read_conflict_names()
2393 git__free(conflict_name->ours); in read_conflict_names()
2394 git__free(conflict_name->theirs); in read_conflict_names()
2395 git__free(conflict_name); in read_conflict_names()
2876 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2881 if (conflict_name->ours == NULL) in create_name_extension_data()
2884 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2889 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2913 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2918 if (conflict_name->ours == NULL) in create_name_extension_data()
2921 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2926 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/
H A Dindex.c2116 git_index_name_entry *conflict_name; in git_index_name_add() local
2139 git_index_name_entry *conflict_name; in git_index_name_clear() local
2378 git__free(conflict_name->ancestor); in read_conflict_names()
2379 git__free(conflict_name->ours); in read_conflict_names()
2380 git__free(conflict_name->theirs); in read_conflict_names()
2381 git__free(conflict_name); in read_conflict_names()
2868 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2873 if (conflict_name->ours == NULL) in create_name_extension_data()
2876 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2881 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.19+1.1.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2913 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2918 if (conflict_name->ours == NULL) in create_name_extension_data()
2921 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2926 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/
H A Dindex.c2126 git_index_name_entry *conflict_name; in git_index_name_add() local
2149 git_index_name_entry *conflict_name; in git_index_name_clear() local
2392 git__free(conflict_name->ancestor); in read_conflict_names()
2393 git__free(conflict_name->ours); in read_conflict_names()
2394 git__free(conflict_name->theirs); in read_conflict_names()
2395 git__free(conflict_name); in read_conflict_names()
2878 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2883 if (conflict_name->ours == NULL) in create_name_extension_data()
2886 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2891 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2914 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2919 if (conflict_name->ours == NULL) in create_name_extension_data()
2922 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2927 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]
/dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/
H A Dindex.c2155 git_index_name_entry *conflict_name; in git_index_name_add() local
2178 git_index_name_entry *conflict_name; in git_index_name_clear() local
2426 git__free(conflict_name->ancestor); in read_conflict_names()
2427 git__free(conflict_name->ours); in read_conflict_names()
2428 git__free(conflict_name->theirs); in read_conflict_names()
2429 git__free(conflict_name); in read_conflict_names()
2913 error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); in create_name_extension_data()
2918 if (conflict_name->ours == NULL) in create_name_extension_data()
2921 error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); in create_name_extension_data()
2926 if (conflict_name->theirs == NULL) in create_name_extension_data()
[all …]

12