openstack/deb-python-pygit2
Code Issues Proposed changes
1,318 Commits 7 Branches 58 Tags
f5cd6da307
Commit Graph

50 Commits

Author SHA1 Message Date
Chason Chaffin
a5cfea21a7 Fix broken binary diff test 
In a recent commit to libgit2, binary diffs were changed to have a
trailing empty line. This broke a test in test_diff because it compares
it directly against the string. I've added the extra line to the
expected output and the test now passes correctly.
 2015-12-15 17:20:50 -08:00
J. David Ibáñez
70edbf256a Update copyright years 2015-10-11 18:48:59 +02:00
Guille -bisho-
802976535a Add support for GIT_DIFF_SHOW_BINARY 
Adding the binary diff flag GIT_DIFF_SHOW_BINARY to pygit2.
libgit2 0.23.0 already supports this constant to be used in diff
flags and produces properly formated binary diffs.
 2015-09-23 16:30:19 -07:00
Carlos Martín Nieto
42d81e33ec Add DiffStats 
This wraps git_diff_stats and can be retrieved through a Diff. It
includes a formatting method.
 2015-04-28 16:21:56 +02:00
J. David Ibáñez
8b05b296c2 New DiffDelta.status_char() 2015-03-16 19:12:20 +01:00
J. David Ibáñez
3d896769d0 New DiffLine 
Comes from PR #346

One difference, DiffLine.origin is a T_CHAR instead of T_OBJECT
 2015-02-12 16:56:34 +01:00
J. David Ibáñez
909e03d8fc New DiffDelta and DiffFile 
Comes from PR #346
 2015-01-29 18:34:47 +01:00
Carlos Martín Nieto
11eea2d574 Get rid of allocfmt() 
It is not possible to know how we can free the results of this
allocation, so we shouldn't be using this function.

We have a convention of returning Oid objects in pygit2, so let's keep
to that in these places.
 2014-11-09 12:10:45 +01:00
Carlos Martín Nieto
e5f6798f67 Adjust to oid -> id renaming 2014-04-01 19:47:48 +02:00
J. David Ibáñez
d7071b88cd Update copyright year 2014-02-04 08:02:12 +01:00
J. David Ibáñez
145646a73b Merge remote-tracking branch 'alexband/size' 2013-11-01 10:26:12 +01:00
Huang Huang
c0b1ab9024 add len(diff) instead of diff.size 2013-11-01 14:32:49 +08:00
J. David Ibáñez
50744352d7 Rename Patch.binary to Patch.is_binary for consistency 2013-10-31 09:24:00 +01:00
Huang Huang
9730564c73 the number of deltas/patches in one diff 2013-10-30 15:48:29 +08:00
XTao
d0b366e866 Add binary for patch. 2013-10-30 15:06:40 +08:00
J. David Ibáñez
0c86307eb5 Coding style: Silent pep8 2013-05-26 14:39:12 +02:00
J. David Ibáñez
74a1fdab60 Fixing coding style with the help of pep8 (wip) 2013-05-26 10:32:05 +02:00
Nico von Geyso
77b5cdce5b Refactored: get rid of type check for treeish_to_tree in Diff 2013-05-20 14:58:54 +02:00
Nico von Geyso
0fc7a4fbad Refactored Index.diff() into Index.diff_to_tree()/diff_to_workdir() 2013-05-18 15:29:28 +02:00
Nico von Geyso
196d0595b0 Added: Repository.diff() - porcelain method similiar to 2013-05-18 14:48:05 +02:00
Nico von Geyso
8c76a14a99 added reorder trees possibility for diff_to_tree() 2013-05-09 14:40:45 +02:00
Nico von Geyso
ae6cd8a0ca refactoring Tree.diff() into seperate methods 
* Tree.diff_to_tree()
* Tree.diff_to_workdir()
* Tree.diff-to_index()
 2013-05-07 14:06:20 +02:00
Nico von Geyso
2d812b671a fixed line_origin in Hunks 
every line in a hunk has a origin like '+','-' or ' '.
 2013-05-07 13:23:17 +02:00
J. David Ibáñez
d5e28c0f96 Merge remote-tracking branch 'cholin/features/diff_line_origin' 2013-05-06 19:36:57 +02:00
Nico von Geyso
b7b9728115 support for diffing the empty tree 
added missing support for diffing tree-to-tree with NULL as argument.
(see issue #222)
 2013-05-06 14:41:08 +02:00
Nico von Geyso
f572a8fb00 use chars like +,-,... for diff_delta_t in Patch.status 2013-05-06 13:29:37 +02:00
Nico von Geyso
f972d99d5f Added line origins for Hunks in Pygit2.Patch 2013-05-06 13:22:48 +02:00
J. David Ibáñez
979cda9a9a refs: improve API (#213) 
Changes:

- Reference.oid and Reference.hex removed
- Now Reference.target can be assigned an oid
 2013-04-21 10:46:04 +02:00
Nico von Geyso
d8bb184a31 diff refactorization 2013-03-11 18:10:29 +01:00
Nico von Geyso
86b063fbd0 fixed assert for diff.find_similiar test 2013-03-04 19:32:12 +01:00
Nico von Geyso
da4abb78cb added test data for diff.find_similiar 2013-03-04 18:37:45 +01:00
Nico von Geyso
204fbd9cbb diff - use generator instead of list 2013-03-04 16:37:59 +01:00
Nico von Geyso
a19a3d2515 diff - use old fashioned iterators instead of callback based ones 2013-03-04 10:39:44 +01:00
J. David Ibáñez
29ce23c0d5 Update copyright 2013-03-02 12:16:16 +01:00
J. David Ibáñez
a96d494747 Coding style 
Including:

- Lines longer than 79 chars
- Spaces at the end of line
- Wrong indentation
- Comma not followed by an space
- C++ style comments: //
 2013-03-02 11:40:42 +01:00
delanne
0406841533 - thanks to Martin R. Hufsky for the patch for git_diff_find_similar 
- I updated the unittest (they failed with the patch), and added a short unittest which emulates --find-copies-harder
 2012-11-26 12:18:57 +01:00
delanne
783025d327 Fix: "The opt variable is not used in the loop" 2012-11-09 14:55:20 +01:00
delanne
0b537bf780 - add option flags for tree.diff 
- add a testcase test_diff_tree_opts
 - update testrepo.git
 - update existing testcases
 2012-10-31 12:11:18 +01:00
W. Trevor King
477e48ef6c test_diff: hunk.old_lines should be 1 in test_diff_tree and test_diff_merge. 
In both cases, the file contents change from 'X contents\n' to 'X
contents 2\n' (where 'X' is 'a' or 'b').  This means were removing one
line and adding another.

I'm not sure how this test was passing against libgit2 v0.17.0, so I
may be missing something important.
 2012-09-13 16:30:21 -04:00
Carlos Martín Nieto
f3dab28082 diff: add old and new OID values to Hunk 
These can be important, and are necessary to create a patch from this
data.
 2012-08-15 20:37:43 +02:00
Carlos Martín Nieto
11d0c9a30f diff: expose the hunk header 
We can rebuild it from the data we already have, but this will allow
us to get the function headers in it once the library supports it.
 2012-08-15 20:07:49 +02:00
J. David Ibáñez
edcd803e7e Remove the __authors__ var from py files 2012-07-18 12:12:04 +02:00
J. David Ibáñez
6195491596 Add/update copyright header of each file 
And update my email address.
 2012-07-18 12:07:17 +02:00
J. David Ibáñez
ec8047a8c5 Fix errors detected by pyflakes 2012-06-18 11:36:27 -03:00
Christian Boos
38d5bf03ad tests: new fancy asserts are for Python 2.7 only 2012-06-06 15:58:07 +02:00
Petr Hosek
d054788d19 Synchronized with upstream 2012-05-30 20:43:26 +01:00
Nico von Geyso
ade2e5812c support for diff against workdir or index 
Added missing support for a diff against workdir or an index.
The latter one differs from `git diff HEAD` because git itself
does a merge of workdir and index (see docs of git_diff_workdir_to_tree).
 2012-05-30 07:58:31 +02:00
Petr Hosek
c06e10e67e Support for diff merge operation added 2012-05-29 17:41:07 +01:00
Nico von Geyso
3bb00107d2 added old and new file path for hunks 2012-05-25 10:35:39 +02:00
Nico von Geyso
2a49eadc57 added some tests for diff 2012-05-24 19:10:00 +02:00