Changeset 2bcbc61672e5…
Parent 9039abf82c4a…
by
Changes to 2 files · Browse files at 2bcbc61672e5 Showing diff from parent 9039abf82c4a Diff from another changeset...
@@ -228,7 +228,8 @@ :param tree_id: The SHA of the merge tree.
:param rename_detector: RenameDetector object for detecting renames.
- :yield: Lists of TreeChange objects, one per conflicted path in the merge.
+ :return: Iterator over lists of TreeChange objects, one per conflicted path
+ in the merge.
Each list contains one element per parent, with the TreeChange for that
path relative to that parent. An element may be None if it never existed
|
@@ -341,8 +341,8 @@ order, e.g. in commit time order.
:param entries: An iterable of WalkEntry objects.
- :yield: WalkEntry objects from entries in FIFO order, except where a parent
- would be yielded before any of its children.
+ :return: iterator over WalkEntry objects from entries in FIFO order, except
+ where a parent would be yielded before any of its children.
"""
todo = collections.deque()
pending = {}
|
Loading...