{{ message }}
Repository navigation
Expand file tree
/
Copy pathrepository.c
More file actions
2587 lines (2150 loc) · 72.7 KB
/
Copy pathrepository.c
File metadata and controls
2587 lines (2150 loc) · 72.7 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
/*
* Copyright 2010-2026 The pygit2 contributors
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2,
* as published by the Free Software Foundation.
*
* In addition to the permissions in the GNU General Public License,
* the authors give you unlimited permission to link the compiled
* version of this file into combinations with other programs,
* and to distribute those combinations without any restriction
* coming from the use of this file. (The General Public License
* restrictions do apply in other respects; for example, they cover
* modification of the file, and distribution when not linked into
* a combined executable.)
*
* This file is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include <git2/status.h>
#include "error.h"
#include "types.h"
#include "reference.h"
#include "revspec.h"
#include "utils.h"
#include "odb.h"
#include "object.h"
#include "oid.h"
#include "note.h"
#include "refdb.h"
#include "repository.h"
#include "diff.h"
#include "branch.h"
#include "signature.h"
#include "worktree.h"
#include <git2/odb_backend.h>
#include <git2/sys/repository.h>
// TODO: remove this function when Python 3.13 becomes the minimum supported version
#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 13
static inline PyObject *
PyList_GetItemRef(PyObject *op, Py_ssize_t index)
{
PyObject *item = PyList_GetItem(op, index);
Py_XINCREF(item);
return item;
}
#endif
extern PyObject *GitError;
extern PyTypeObject IndexType;
extern PyTypeObject WalkerType;
extern PyTypeObject SignatureType;
extern PyTypeObject ObjectType;
extern PyTypeObject OidType;
extern PyTypeObject CommitType;
extern PyTypeObject TreeType;
extern PyTypeObject TreeBuilderType;
extern PyTypeObject ConfigType;
extern PyTypeObject DiffType;
extern PyTypeObject ReferenceType;
extern PyTypeObject RevSpecType;
extern PyTypeObject NoteType;
extern PyTypeObject NoteIterType;
extern PyTypeObject StashType;
extern PyTypeObject RefsIteratorType;
extern PyObject *FileStatusEnum;
extern PyObject *MergeAnalysisEnum;
extern PyObject *MergePreferenceEnum;
/* forward-declaration for Repository._from_c() */
PyTypeObject RepositoryType;
PyObject *
wrap_repository(git_repository *c_repo)
{
Repository *py_repo = PyObject_GC_New(Repository, &RepositoryType);
if (py_repo) {
py_repo->repo = c_repo;
py_repo->config = NULL;
py_repo->index = NULL;
py_repo->owned = 1;
}
return (PyObject *)py_repo;
}
int
Repository_init(Repository *self, PyObject *args, PyObject *kwds)
{
PyObject *backend = NULL;
if (kwds && PyDict_Size(kwds) > 0) {
PyErr_SetString(PyExc_TypeError,
"Repository takes no keyword arguments");
return -1;
}
if (!PyArg_ParseTuple(args, "|O", &backend)) {
return -1;
}
if (backend == NULL) {
/* Create repository without odb/refdb */
int err = git_repository_new(&self->repo);
if (err != 0) {
Error_set(err);
return -1;
}
self->owned = 1;
self->config = NULL;
self->index = NULL;
return 0;
}
self->repo = PyCapsule_GetPointer(backend, "backend");
if (self->repo == NULL) {
PyErr_SetString(PyExc_TypeError,
"Repository unable to unpack backend.");
return -1;
}
self->owned = 1;
self->config = NULL;
self->index = NULL;
return 0;
}
PyDoc_STRVAR(Repository__from_c__doc__, "Init a Repository from a pointer. For internal use only.");
PyObject *
Repository__from_c(Repository *py_repo, PyObject *args)
{
PyObject *py_pointer, *py_free;
char *buffer;
Py_ssize_t len;
int err;
py_repo->repo = NULL;
py_repo->config = NULL;
py_repo->index = NULL;
if (!PyArg_ParseTuple(args, "OO!", &py_pointer, &PyBool_Type, &py_free))
return NULL;
err = PyBytes_AsStringAndSize(py_pointer, &buffer, &len);
if (err < 0)
return NULL;
if (len != sizeof(git_repository *)) {
PyErr_SetString(PyExc_TypeError, "invalid pointer length");
return NULL;
}
py_repo->repo = *((git_repository **) buffer);
py_repo->owned = py_free == Py_True;
Py_RETURN_NONE;
}
PyDoc_STRVAR(Repository__disown__doc__, "Mark the object as not-owned by us. For internal use only.");
PyObject *
Repository__disown(Repository *py_repo)
{
py_repo->owned = 0;
Py_RETURN_NONE;
}
void
Repository_dealloc(Repository *self)
{
PyObject_GC_UnTrack(self);
Py_CLEAR(self->index);
Py_CLEAR(self->config);
if (self->owned)
git_repository_free(self->repo);
Py_TYPE(self)->tp_free(self);
}
int
Repository_traverse(Repository *self, visitproc visit, void *arg)
{
Py_VISIT(self->index);
return 0;
}
int
Repository_clear(Repository *self)
{
Py_CLEAR(self->index);
return 0;
}
PyDoc_STRVAR(Repository_head__doc__,
"Current head reference of the repository.");
PyObject *
Repository_head__get__(Repository *self)
{
git_reference *head;
int err;
err = git_repository_head(&head, self->repo);
if (err < 0) {
if (err == GIT_ENOTFOUND)
PyErr_SetString(GitError, "head reference does not exist");
else
Error_set(err);
return NULL;
}
return wrap_reference(head, self);
}
PyDoc_STRVAR(Repository_head_is_detached__doc__,
"A repository's HEAD is detached when it points directly to a commit\n"
"instead of a branch.");
PyObject *
Repository_head_is_detached__get__(Repository *self)
{
if (git_repository_head_detached(self->repo) > 0)
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyDoc_STRVAR(Repository_head_is_unborn__doc__,
"An unborn branch is one named from HEAD but which doesn't exist in the\n"
"refs namespace, because it doesn't have any commit to point to.");
PyObject *
Repository_head_is_unborn__get__(Repository *self)
{
if (git_repository_head_unborn(self->repo) > 0)
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyDoc_STRVAR(Repository_is_empty__doc__,
"Check if a repository is empty.");
PyObject *
Repository_is_empty__get__(Repository *self)
{
if (git_repository_is_empty(self->repo) > 0)
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyDoc_STRVAR(Repository_is_bare__doc__,
"Check if a repository is a bare repository.");
PyObject *
Repository_is_bare__get__(Repository *self)
{
if (git_repository_is_bare(self->repo) > 0)
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyDoc_STRVAR(Repository_is_shallow__doc__,
"Check if a repository is a shallow repository.");
PyObject *
Repository_is_shallow__get__(Repository *self)
{
if (git_repository_is_shallow(self->repo) > 0)
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyDoc_STRVAR(Repository_git_object_lookup_prefix__doc__,
"git_object_lookup_prefix(oid: Oid) -> Object\n"
"\n"
"Returns the Git object with the given oid.");
PyObject *
Repository_git_object_lookup_prefix(Repository *self, PyObject *key)
{
int err;
size_t len;
git_oid oid;
git_object *obj;
len = py_oid_to_git_oid(key, &oid);
if (len == 0)
return NULL;
err = git_object_lookup_prefix(&obj, self->repo, &oid, len, GIT_OBJECT_ANY);
if (err == 0)
return wrap_object(obj, self, NULL);
if (err == GIT_ENOTFOUND)
Py_RETURN_NONE;
return Error_set_oid(err, &oid, len);
}
PyDoc_STRVAR(Repository_lookup_branch__doc__,
"lookup_branch(branch_name: str, branch_type: BranchType = BranchType.LOCAL) -> Branch\n"
"\n"
"Returns the Git reference for the given branch name (local or remote).\n"
"If branch_type is BranchType.REMOTE, you must include the remote name\n"
"in the branch name (eg 'origin/master').");
PyObject *
Repository_lookup_branch(Repository *self, PyObject *args)
{
git_reference *c_reference;
const char *c_name;
Py_ssize_t c_name_len;
git_branch_t branch_type = GIT_BRANCH_LOCAL;
int err;
if (!PyArg_ParseTuple(args, "s#|I", &c_name, &c_name_len, &branch_type))
return NULL;
err = git_branch_lookup(&c_reference, self->repo, c_name, branch_type);
if (err == 0)
return wrap_branch(c_reference, self);
if (err == GIT_ENOTFOUND)
Py_RETURN_NONE;
return Error_set(err);
}
PyDoc_STRVAR(Repository_path_is_ignored__doc__,
"path_is_ignored(path: str) -> bool\n"
"\n"
"Check if a path is ignored in the repository.");
PyObject *
Repository_path_is_ignored(Repository *self, PyObject *args)
{
int ignored;
char *path;
if (!PyArg_ParseTuple(args, "s", &path))
return NULL;
git_ignore_path_is_ignored(&ignored, self->repo, path);
if (ignored == 1)
Py_RETURN_TRUE;
Py_RETURN_FALSE;
}
PyDoc_STRVAR(Repository_revparse_single__doc__,
"revparse_single(revision: str) -> Object\n"
"\n"
"Find an object, as specified by a revision string. See\n"
"`man gitrevisions`, or the documentation for `git rev-parse` for\n"
"information on the syntax accepted.");
PyObject *
Repository_revparse_single(Repository *self, PyObject *py_spec)
{
/* Get the C revision spec */
const char *c_spec = pgit_borrow(py_spec);
if (c_spec == NULL)
return NULL;
/* Lookup */
git_object *c_obj;
int err = git_revparse_single(&c_obj, self->repo, c_spec);
if (err)
return Error_set_str(err, c_spec);
return wrap_object(c_obj, self, NULL);
}
PyDoc_STRVAR(Repository_revparse_ext__doc__,
"revparse_ext(revision: str) -> tuple[Object, Reference]\n"
"\n"
"Find a single object and intermediate reference, as specified by a revision\n"
"string. See `man gitrevisions`, or the documentation for `git rev-parse`\n"
"for information on the syntax accepted.\n"
"\n"
"In some cases (@{<-n>} or <branchname>@{upstream}), the expression may\n"
"point to an intermediate reference, which is returned in the second element\n"
"of the result tuple.");
PyObject *
Repository_revparse_ext(Repository *self, PyObject *py_spec)
{
/* Get the C revision spec */
const char *c_spec = pgit_borrow(py_spec);
if (c_spec == NULL)
return NULL;
/* Lookup */
git_object *c_obj = NULL;
git_reference *c_ref = NULL;
int err = git_revparse_ext(&c_obj, &c_ref, self->repo, c_spec);
if (err)
return Error_set_str(err, c_spec);
PyObject *py_obj = wrap_object(c_obj, self, NULL);
PyObject *py_ref = NULL;
if (c_ref != NULL) {
py_ref = wrap_reference(c_ref, self);
} else {
py_ref = Py_None;
Py_INCREF(Py_None);
}
return Py_BuildValue("NN", py_obj, py_ref);
}
PyDoc_STRVAR(Repository_revparse__doc__,
"revparse(revspec: str) -> RevSpec\n"
"\n"
"Parse a revision string for from, to, and intent. See `man gitrevisions`,\n"
"or the documentation for `git rev-parse` for information on the syntax\n"
"accepted.");
PyObject *
Repository_revparse(Repository *self, PyObject *py_spec)
{
/* Get the C revision spec */
const char *c_spec = pgit_borrow(py_spec);
if (c_spec == NULL)
return NULL;
/* Lookup */
git_revspec revspec;
int err = git_revparse(&revspec, self->repo, c_spec);
if (err) {
return Error_set_str(err, c_spec);
}
return wrap_revspec(&revspec, self);
}
PyDoc_STRVAR(Repository_path__doc__,
"The normalized path to the git repository.");
PyObject *
Repository_path__get__(Repository *self, void *closure)
{
const char *c_path;
if (self->repo == NULL)
Py_RETURN_NONE;
c_path = git_repository_path(self->repo);
if (c_path == NULL)
Py_RETURN_NONE;
return PyUnicode_DecodeFSDefault(c_path);
}
PyDoc_STRVAR(Repository_workdir__doc__,
"The normalized path to the working directory of the repository. If the\n"
"repository is bare, None will be returned.");
PyObject *
Repository_workdir__get__(Repository *self, void *closure)
{
const char *c_path;
c_path = git_repository_workdir(self->repo);
if (c_path == NULL)
Py_RETURN_NONE;
return PyUnicode_DecodeFSDefault(c_path);
}
int
Repository_workdir__set__(Repository *self, PyObject *py_workdir)
{
const char *workdir = pgit_borrow(py_workdir);
if (workdir == NULL)
return -1;
int err = git_repository_set_workdir(self->repo, workdir, 0 /* update_gitlink */);
if (err) {
Error_set_str(err, workdir);
return -1;
}
return 0;
}
PyDoc_STRVAR(Repository_descendant_of__doc__,
"descendant_of(oid1: Oid, oid2: Oid) -> bool\n"
"\n"
"Determine if the first commit is a descendant of the second commit.\n"
"Note that a commit is not considered a descendant of itself.");
PyObject *
Repository_descendant_of(Repository *self, PyObject *args)
{
PyObject *value1;
PyObject *value2;
git_oid oid1;
git_oid oid2;
int err;
if (!PyArg_ParseTuple(args, "OO", &value1, &value2))
return NULL;
err = py_oid_to_git_oid_expand(self->repo, value1, &oid1);
if (err < 0)
return NULL;
err = py_oid_to_git_oid_expand(self->repo, value2, &oid2);
if (err < 0)
return NULL;
// err < 0 => error, see source code of `git_graph_descendant_of`
err = git_graph_descendant_of(self->repo, &oid1, &oid2);
if (err < 0)
return Error_set(err);
return PyBool_FromLong(err);
}
PyDoc_STRVAR(Repository_merge_base__doc__,
"merge_base(oid1: Oid, oid2: Oid) -> Oid\n"
"\n"
"Find as good common ancestors as possible for a merge.\n"
"Returns None if there is no merge base between the commits");
PyObject *
Repository_merge_base(Repository *self, PyObject *args)
{
PyObject *value1;
PyObject *value2;
git_oid oid;
git_oid oid1;
git_oid oid2;
int err;
if (!PyArg_ParseTuple(args, "OO", &value1, &value2))
return NULL;
err = py_oid_to_git_oid_expand(self->repo, value1, &oid1);
if (err < 0)
return NULL;
err = py_oid_to_git_oid_expand(self->repo, value2, &oid2);
if (err < 0)
return NULL;
err = git_merge_base(&oid, self->repo, &oid1, &oid2);
if (err == GIT_ENOTFOUND)
Py_RETURN_NONE;
if (err < 0)
return Error_set(err);
return git_oid_to_python(&oid);
}
typedef int (*git_merge_base_xxx_t)(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[]);
static PyObject *
merge_base_xxx(Repository *self, PyObject *args, git_merge_base_xxx_t git_merge_base_xxx)
{
PyObject *py_result = NULL;
PyObject *py_commit_oid;
PyObject *py_commit_oids;
git_oid oid;
int commit_oid_count;
git_oid *commit_oids = NULL;
int i = 0;
int err;
if (!PyArg_ParseTuple(args, "O!", &PyList_Type, &py_commit_oids))
return NULL;
commit_oid_count = (int)PyList_Size(py_commit_oids);
commit_oids = malloc(commit_oid_count * sizeof(git_oid));
if (commit_oids == NULL) {
PyErr_SetNone(PyExc_MemoryError);
goto out;
}
for (; i < commit_oid_count; i++) {
py_commit_oid = PyList_GetItemRef(py_commit_oids, i);
if (py_commit_oid == NULL)
goto out;
err = py_oid_to_git_oid_expand(self->repo, py_commit_oid, &commit_oids[i]);
Py_DECREF(py_commit_oid);
if (err < 0)
goto out;
}
err = (*git_merge_base_xxx)(&oid, self->repo, commit_oid_count, (const git_oid*)commit_oids);
if (err == GIT_ENOTFOUND) {
Py_INCREF(Py_None);
py_result = Py_None;
goto out;
}
if (err < 0) {
py_result = Error_set(err);
goto out;
}
py_result = git_oid_to_python(&oid);
out:
free(commit_oids);
return py_result;
}
PyDoc_STRVAR(Repository_merge_base_many__doc__,
"merge_base_many(oids: list[Oid]) -> Oid\n"
"\n"
"Find as good common ancestors as possible for an n-way merge.\n"
"Returns None if there is no merge base between the commits");
PyObject *
Repository_merge_base_many(Repository *self, PyObject *args)
{
return merge_base_xxx(self, args, &git_merge_base_many);
}
PyDoc_STRVAR(Repository_merge_base_octopus__doc__,
"merge_base_octopus(oids: list[Oid]) -> Oid\n"
"\n"
"Find as good common ancestors as possible for an n-way octopus merge.\n"
"Returns None if there is no merge base between the commits");
PyObject *
Repository_merge_base_octopus(Repository *self, PyObject *args)
{
return merge_base_xxx(self, args, &git_merge_base_octopus);
}
PyDoc_STRVAR(Repository_merge_analysis__doc__,
"merge_analysis(their_head: Oid, our_ref: str = \"HEAD\") -> tuple[MergeAnalysis, MergePreference]\n"
"\n"
"Analyzes the given branch and determines the opportunities for\n"
"merging it into a reference (defaults to HEAD).\n"
"\n"
"Parameters:\n"
"\n"
"our_ref\n"
" The reference name (String) to perform the analysis from\n"
"\n"
"their_head\n"
" Head (commit Oid) to merge into\n"
"\n"
"The first returned value is a mixture of the MergeAnalysis.NONE, NORMAL,\n"
"UP_TO_DATE, FASTFORWARD and UNBORN flags.\n"
"The second value is the user's preference from 'merge.ff'");
PyObject *
Repository_merge_analysis(Repository *self, PyObject *args)
{
char *our_ref_name = "HEAD";
PyObject *py_their_head;
PyObject *py_result = NULL;
git_oid head_id;
git_reference *our_ref;
git_annotated_commit *commit;
git_merge_analysis_t analysis;
git_merge_preference_t preference;
int err = 0;
if (!PyArg_ParseTuple(args, "O|z",
&py_their_head,
&our_ref_name))
return NULL;
err = git_reference_lookup(&our_ref, self->repo, our_ref_name);
if (err < 0) {
PyObject *py_err = Error_set_str(err, our_ref_name);
return py_err;
}
err = py_oid_to_git_oid_expand(self->repo, py_their_head, &head_id);
if (err < 0)
goto out;
err = git_annotated_commit_lookup(&commit, self->repo, &head_id);
if (err < 0) {
py_result = Error_set(err);
goto out;
}
err = git_merge_analysis_for_ref(&analysis, &preference, self->repo, our_ref, (const git_annotated_commit **) &commit, 1);
git_annotated_commit_free(commit);
if (err < 0) {
py_result = Error_set(err);
goto out;
}
// Convert analysis to MergeAnalysis enum
PyObject *analysis_enum = pygit2_enum(MergeAnalysisEnum, analysis);
if (!analysis_enum) {
py_result = NULL;
goto out;
}
// Convert preference to MergePreference enum
PyObject *preference_enum = pygit2_enum(MergePreferenceEnum, preference);
if (!preference_enum) {
py_result = NULL;
Py_DECREF(analysis_enum);
goto out;
}
py_result = Py_BuildValue("(OO)", analysis_enum, preference_enum);
out:
git_reference_free(our_ref);
return py_result;
}
PyDoc_STRVAR(Repository_cherrypick__doc__,
"cherrypick(id: Oid)\n"
"\n"
"Cherry-pick the given oid, producing changes in the index and working directory.\n"
"\n"
"Merges the given commit into HEAD as a cherrypick, writing the results into the\n"
"working directory. Any changes are staged for commit and any conflicts\n"
"are written to the index. Callers should inspect the repository's\n"
"index after this completes, resolve any conflicts and prepare a\n"
"commit.");
PyObject *
Repository_cherrypick(Repository *self, PyObject *py_oid)
{
git_commit *commit;
git_oid oid;
int err;
size_t len;
git_cherrypick_options cherrypick_opts = GIT_CHERRYPICK_OPTIONS_INIT;
len = py_oid_to_git_oid(py_oid, &oid);
if (len == 0)
return NULL;
err = git_commit_lookup(&commit, self->repo, &oid);
if (err < 0)
return Error_set(err);
cherrypick_opts.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
err = git_cherrypick(self->repo,
commit,
(const git_cherrypick_options *)&cherrypick_opts);
git_commit_free(commit);
if (err < 0)
return Error_set(err);
Py_RETURN_NONE;
}
PyDoc_STRVAR(Repository_walk__doc__,
"walk(oid: Oid | None, sort_mode: enums.SortMode = enums.SortMode.NONE) -> Walker\n"
"\n"
"Start traversing the history from the given commit.\n"
"The following SortMode values can be used to control the walk:\n"
"\n"
"* NONE. Sort the output with the same default method from\n"
" `git`: reverse chronological order. This is the default sorting for\n"
" new walkers.\n"
"* TOPOLOGICAL. Sort the repository contents in topological order\n"
" (no parents before all of its children are shown); this sorting mode\n"
" can be combined with time sorting to produce `git`'s `--date-order``.\n"
"* TIME. Sort the repository contents by commit time; this sorting\n"
" mode can be combined with topological sorting.\n"
"* REVERSE. Iterate through the repository contents in reverse\n"
" order; this sorting mode can be combined with any of the above.\n"
"\n"
"Example:\n"
"\n"
" >>> from pygit2 import Repository\n"
" >>> from pygit2.enums import SortMode\n"
" >>> repo = Repository('.git')\n"
" >>> for commit in repo.walk(repo.head.target, SortMode.TOPOLOGICAL):\n"
" ... print(commit.message)\n"
" >>> for commit in repo.walk(repo.head.target, SortMode.TOPOLOGICAL | SortMode.REVERSE):\n"
" ... print(commit.message)\n"
" >>>\n");
PyObject *
Repository_walk(Repository *self, PyObject *args)
{
PyObject *value;
unsigned int sort = GIT_SORT_NONE;
int err;
git_oid oid;
git_revwalk *walk;
Walker *py_walker;
if (!PyArg_ParseTuple(args, "O|I", &value, &sort))
return NULL;
err = git_revwalk_new(&walk, self->repo);
if (err < 0)
return Error_set(err);
/* Sort */
git_revwalk_sorting(walk, sort);
/* Push */
if (value != Py_None) {
err = py_oid_to_git_oid_expand(self->repo, value, &oid);
if (err < 0)
goto error;
err = git_revwalk_push(walk, &oid);
if (err < 0) {
Error_set(err);
goto error;
}
}
py_walker = PyObject_New(Walker, &WalkerType);
if (py_walker) {
Py_INCREF(self);
py_walker->repo = self;
py_walker->walk = walk;
return (PyObject*)py_walker;
}
error:
git_revwalk_free(walk);
return NULL;
}
PyDoc_STRVAR(Repository_create_blob__doc__,
"create_blob(data: bytes) -> Oid\n"
"\n"
"Create a new blob from a bytes string. The blob is added to the Git\n"
"object database. Returns the oid of the blob.");
PyObject *
Repository_create_blob(Repository *self, PyObject *args)
{
git_oid oid;
const char *raw;
Py_ssize_t size;
int err;
if (!PyArg_ParseTuple(args, "s#", &raw, &size))
return NULL;
err = git_blob_create_frombuffer(&oid, self->repo, (const void*)raw, size);
if (err < 0)
return Error_set(err);
return git_oid_to_python(&oid);
}
PyDoc_STRVAR(Repository_create_blob_fromworkdir__doc__,
"create_blob_fromworkdir(path: str) -> Oid\n"
"\n"
"Create a new blob from a file within the working directory. The given\n"
"path must be relative to the working directory, if it is not an error\n"
"is raised.");
PyObject *
Repository_create_blob_fromworkdir(Repository *self, PyObject *value)
{
PyObject *tvalue;
char *path = pgit_borrow_fsdefault(value, &tvalue);
if (path == NULL)
return NULL;
git_oid oid;
int err = git_blob_create_fromworkdir(&oid, self->repo, path);
Py_DECREF(tvalue);
if (err < 0)
return Error_set(err);
return git_oid_to_python(&oid);
}
PyDoc_STRVAR(Repository_create_blob_fromdisk__doc__,
"create_blob_fromdisk(path: str) -> Oid\n"
"\n"
"Create a new blob from a file anywhere (no working directory check).");
PyObject *
Repository_create_blob_fromdisk(Repository *self, PyObject *value)
{
PyObject *tvalue;
char *path = pgit_borrow_fsdefault(value, &tvalue);
if (path == NULL)
return NULL;
git_oid oid;
int err = git_blob_create_fromdisk(&oid, self->repo, path);
Py_DECREF(tvalue);
if (err < 0)
return Error_set(err);
return git_oid_to_python(&oid);
}
#define BUFSIZE 4096
PyDoc_STRVAR(Repository_create_blob_fromiobase__doc__,
"create_blob_fromiobase(io.IOBase) -> Oid\n"
"\n"
"Create a new blob from an IOBase object.");
PyObject *
Repository_create_blob_fromiobase(Repository *self, PyObject *py_file)
{
git_writestream *stream;
git_oid oid;
PyObject *py_is_readable;
int is_readable;
int err;
py_is_readable = PyObject_CallMethod(py_file, "readable", NULL);
if (!py_is_readable) {
if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_SetObject(PyExc_TypeError, py_file);
return NULL;
}
is_readable = PyObject_IsTrue(py_is_readable);
Py_DECREF(py_is_readable);
if (!is_readable) {
Py_DECREF(py_file);
PyErr_SetString(PyExc_TypeError, "expected readable IO type");
return NULL;
}
err = git_blob_create_fromstream(&stream, self->repo, NULL);
if (err < 0)
return Error_set(err);
for (;;) {
PyObject *py_bytes;
char *bytes;
Py_ssize_t size;
py_bytes = PyObject_CallMethod(py_file, "read", "i", 4096);
if (!py_bytes)
return NULL;
if (py_bytes == Py_None) {
Py_DECREF(py_bytes);
goto cleanup;
}
if (PyBytes_AsStringAndSize(py_bytes, &bytes, &size)) {
Py_DECREF(py_bytes);
return NULL;
}
if (size == 0) {
Py_DECREF(py_bytes);
break;
}
err = stream->write(stream, bytes, size);
Py_DECREF(py_bytes);
if (err < 0)
You can’t perform that action at this time.