J. David Ibáñez
3ccba38725
Fix regression in v0.21.1, IndexEntry.path returns str
...
And str in Python 2 means bytes. Recall, we are supposed to give a
native experience to both Python 2 and 3 users.
2014-07-28 18:02:24 +02:00
J. David Ibáñez
be807a1dfc
internal: split code for Python 2/3 compatibility
2014-07-28 17:51:51 +02:00
J. David Ibáñez
7df11bf817
internal: rename "to_str" to "to_bytes" for clarity
2014-07-28 17:30:38 +02:00
J. David Ibáñez
9882044a87
Merge remote-tracking branch 'ArnoVanLumig/master'
2014-07-28 12:07:11 +02:00
Carlos Martín Nieto
612639a50f
oid: do not load the object when expanding
...
We now have a function which lets us expand an id prefix by checking for
existence and uniqueness instead of loading the object with that id.
2014-07-26 15:03:37 +02:00
Arno van Lumig
e31f0acf97
Parsed parameters directly passed into options object
2014-07-25 11:40:03 +02:00
Arno van Lumig
eb001f0b98
Implemented parameters for Diff.find_similar()
...
Diff.find_similar now supports the parameters that are exposed by
libgit2's git_diff_find_similar.
Parameters supported are rename_threshold, copy_threshold,
rename_from_rewrite_threshold, break_rewrite_threshold and rename_limit
2014-07-25 08:29:16 +02:00
Carlos Martín Nieto
2a429aae98
config: only return the config key in iteration
...
At its core, the config is a key-value storage with peculiar key
equality rules. Make it behave more like a python dictionary and return
the key on iteration.
2014-07-24 18:43:54 +02:00
Carlos Martín Nieto
e437e13182
config: decode the string with utf-8 on getitem
...
This is what we do elsewhere, but this was missed.
2014-07-24 18:43:18 +02:00
J. David Ibáñez
9109ba099c
Update list of authors
2014-07-22 18:57:16 +02:00
J. David Ibáñez
a0a70c3264
Get ready for 0.21.1 release
2014-07-22 18:15:20 +02:00
J. David Ibáñez
5d01300956
Testing a docstring formating that's nice with pydoc
2014-07-22 17:35:23 +02:00
J. David Ibáñez
57e25c1a4a
index: replace has_conflicts by conflicts returning None
2014-07-22 10:50:30 +02:00
J. David Ibáñez
bcce5c13ba
Start changelog for the upcoming release
2014-07-19 13:00:35 +02:00
J. David Ibáñez
c51165e379
Add Repository.state_cleanup to the docs
2014-07-19 12:59:26 +02:00
J. David Ibáñez
4c375907c5
Make checkout to fail on unexpected options
2014-07-19 12:22:34 +02:00
J. David Ibáñez
fdfda17121
docs: review the installation documentation
2014-07-18 20:01:20 +02:00
J. David Ibáñez
794e82c799
Add some error checks
2014-07-15 21:10:51 +02:00
J. David Ibáñez
b65d3e6db5
Merge remote-tracking branch 'vtemian/more-pep8'
2014-07-15 21:00:58 +02:00
Carlos Martín Nieto
172cf8e9aa
Update the README for libgit2's change in master branch
...
Provide instructions to use the release, rather than the master branch,
which is now where development happens.
2014-07-14 19:56:28 +02:00
vtemian
93369b0a7c
Cleanup a little bit the code
2014-07-14 20:21:24 +03:00
Carlos Martín Nieto
763b571c84
checkout: add support for overriding the target directory
2014-07-11 14:49:56 +02:00
Carlos Martín Nieto
af38211d0c
checkout: move the code to cffi
...
As part of this, make the strategy part of **kwargs, in preparation for
supporting more options.
2014-07-11 14:42:29 +02:00
J. David Ibáñez
d2a62c5268
Merge remote-tracking branch 'carlos/cffi-index'
2014-07-10 15:52:30 +02:00
J. David Ibáñez
5fad06acff
Merge remote-tracking branch 'vtemian/sphinx'
2014-07-10 12:47:34 +02:00
J. David Ibáñez
986128aa47
Merge remote-tracking branch 'carlos/doc-fixup'
2014-07-10 12:37:32 +02:00
Carlos Martín Nieto
7f922ae9d9
Make python3 happy
2014-07-10 11:29:03 +02:00
Carlos Martín Nieto
ae32ad12ee
Support del in ConflictCollection
2014-07-10 11:27:10 +02:00
Carlos Martín Nieto
5ed9eb4228
Add documentation for conflicts and fixup Index
...
Add documentation for the conflicts, and add some for IndexEntry and
Index which went missing during the conversion to cffi.
2014-07-10 09:08:16 +02:00
Carlos Martín Nieto
15576fcbdc
Add tests for Index conflict access
2014-07-10 09:08:16 +02:00
Carlos Martín Nieto
78d80147ab
Move merge tests to their own file
...
The method is in Repository, but the merge functionality is separate. We
will introduce more tests in this area later.
2014-07-10 09:08:16 +02:00
Carlos Martín Nieto
1985a95b6b
Add looking up conflicts in an Index
2014-07-10 09:08:16 +02:00
Carlos Martín Nieto
97ee7ab179
Move Index to cffi
...
This commit gives us feature-parity with the version in C.
2014-07-10 09:08:16 +02:00
Carlos Martín Nieto
31fc235b59
Fix sphinx complaints about the docs
...
Use the right namespace so Refspec and TransferProgress show up. These
classes are not instantiated by the user, so they were not promoted to
the pygit2 module. Use autoclass so it lists everything for us.
Also use autoclass for the reflog. We had a difference is oid vs id
between the docs and the code.
2014-07-10 08:25:54 +02:00
vtemian
6f438ad173
Added sphinx rtd theme
2014-07-09 18:13:49 +03:00
vtemian
d8864bdf02
Added docs
2014-07-09 16:50:17 +03:00
vtemian
19dd7629d3
Proper naming
2014-07-09 16:46:52 +03:00
vtemian
02fd05baae
Added clean_state_files
2014-07-09 16:39:34 +03:00
J. David Ibáñez
7e41bd4af3
Merge remote-tracking branch 'carlos/merge-docs'
2014-07-08 14:07:56 +02:00
Carlos Martín Nieto
9a7348a9d0
Update docs for merging
...
Remove references to MergeResult and put merge_analysis in the docs.
2014-07-08 13:55:18 +02:00
Carlos Martín Nieto
0bfead36b2
branch: correct notion of remote-tracking branch and upstream
...
The current documentation text seems to be very confused about what a
remote-tracking branch is and what the relationship to an upstream is.
Correct the text to talk about the upstream branch when dealing with the
upstream configuration, instead of implying that it's related to the
setup of remote-tracking branches.
2014-07-06 16:11:27 +02:00
Jasper Lievisse Adriaanse
b0bf223276
Tweak include/lib dir detection in ffi.py
...
Joint work with @carlosmn
2014-07-03 10:51:32 +02:00
Carlos Martín Nieto
1d509c1109
travis: download a tag instead of master
...
libgit2's development now happens on the master branch, which means we
can't use it to refer to the latest release. Download v0.21.0 explicitly
instead.
2014-07-03 08:57:47 +02:00
J. David Ibáñez
3cbc9b6c33
README, tell to install cffi first
2014-07-01 16:36:05 +02:00
J. David Ibáñez
7b3201d868
Get ready to release 0.21.0
2014-06-27 17:28:01 +02:00
J. David Ibáñez
bf3db3183c
Merge remote-tracking branch 'michaeljones/documentation'
2014-06-27 11:16:13 +02:00
Michael Jones
b96b285cea
Improve diff & diff_to_buffer doc formatting
...
We switch to a parameter list for both functions and add a return type.
We also remove the indentation from the second line of the explanation
which was causing Sphinx to return it as two lines instead of one
continuous one.
We also added return types.
I am not sure of the type of the GIT_DIFF* flags so I have not included
that.
2014-06-26 23:30:47 +01:00
Michael Jones
9811123922
Fix docstrings for Blob.diff & diff_to_buffer
...
They were both missing a closing parenthesis which stop Sphinx from
interpreting and formatting them properly.
2014-06-26 23:27:23 +01:00
Jack O'Connor
b190169f5e
support setting a detatched HEAD
2014-06-22 19:11:04 -07:00
Jack O'Connor
a063867fe0
Index: add a setter for workdir
2014-06-22 18:57:09 -07:00
