Kiln » Dependencies » Dulwich Read More
Clone URL:  
Pushed to one repository · View In Graph Contained in master

Merge fix for cloning repositories without HEAD set.

Changeset 25250c1694da

Parents 2bcbc61672e5

Parents 06fbcb6ae8a6

by Jelmer Vernooij

Changes to 3 files · Browse files at 25250c1694da Showing diff from parent 2bcbc61672e5 06fbcb6ae8a6 Diff from another changeset...

Change 1 of 2 Show Entire File NEWS Stacked
 
27
28
29
 
 
 
 
 
30
31
32
 
80
81
82
83
 
84
85
86
 
27
28
29
30
31
32
33
34
35
36
37
 
85
86
87
 
88
89
90
91
@@ -27,6 +27,11 @@
    * Commit._deserialize now actually deserializes the current state rather than   the previous one. (Yifan Zhang, issue #59) + + * Handle None elements in lists of TreeChange objects. (Alex Holmes) + + * Support cloning repositories without HEAD set. + (D-Key, Jelmer Vernooij, issue #69)    0.8.5 2012-03-29   @@ -80,7 +85,7 @@
    * ``Repo.do_commit`` will now use the user identity from   .git/config or ~/.gitconfig if none was explicitly specified. - (Jelmer Vernooij) + (Jelmer Vernooij)     BUG FIXES  
 
228
229
230
231
 
 
232
233
234
 
228
229
230
 
231
232
233
234
235
@@ -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
Change 1 of 2 Show Entire File dulwich/​walk.py Stacked
 
255
256
257
 
 
 
258
259
260
 
338
339
340
341
342
 
 
343
344
345
 
255
256
257
258
259
260
261
262
263
 
341
342
343
 
 
344
345
346
347
348
@@ -255,6 +255,9 @@
  return False     def _change_matches(self, change): + if not change: + return False +   old_path = change.old.path   new_path = change.new.path   if self._path_matches(new_path): @@ -338,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 = {}