Show More
@@ -106,11 +106,11 b' def get_log_child(fp, url, paths, start,' | |||||
106 | discover_changed_paths, |
|
106 | discover_changed_paths, | |
107 | strict_node_history, |
|
107 | strict_node_history, | |
108 | receiver) |
|
108 | receiver) | |
109 | except SubversionException, (inst, num): |
|
|||
110 | pickle.dump(num, fp, protocol) |
|
|||
111 | except IOError: |
|
109 | except IOError: | |
112 | # Caller may interrupt the iteration |
|
110 | # Caller may interrupt the iteration | |
113 | pickle.dump(None, fp, protocol) |
|
111 | pickle.dump(None, fp, protocol) | |
|
112 | except Exception, inst: | |||
|
113 | pickle.dump(str(inst), fp, protocol) | |||
114 | else: |
|
114 | else: | |
115 | pickle.dump(None, fp, protocol) |
|
115 | pickle.dump(None, fp, protocol) | |
116 | fp.close() |
|
116 | fp.close() | |
@@ -145,7 +145,7 b' class logstream(object):' | |||||
145 | except: |
|
145 | except: | |
146 | if entry is None: |
|
146 | if entry is None: | |
147 | break |
|
147 | break | |
148 |
raise |
|
148 | raise util.Abort(_("log stream exception '%s'") % entry) | |
149 | yield entry |
|
149 | yield entry | |
150 |
|
150 | |||
151 | def close(self): |
|
151 | def close(self): |
@@ -83,7 +83,7 b" def fetch(ui, repo, source='default', **" | |||||
83 | # Is this a simple fast-forward along the current branch? |
|
83 | # Is this a simple fast-forward along the current branch? | |
84 | newheads = repo.branchheads(branch) |
|
84 | newheads = repo.branchheads(branch) | |
85 | newchildren = repo.changelog.nodesbetween([parent], newheads)[2] |
|
85 | newchildren = repo.changelog.nodesbetween([parent], newheads)[2] | |
86 | if len(newheads) == 1: |
|
86 | if len(newheads) == 1 and len(newchildren): | |
87 | if newchildren[0] != parent: |
|
87 | if newchildren[0] != parent: | |
88 | return hg.clean(repo, newchildren[0]) |
|
88 | return hg.clean(repo, newchildren[0]) | |
89 | else: |
|
89 | else: | |
@@ -102,6 +102,9 b" def fetch(ui, repo, source='default', **" | |||||
102 | (len(newheads) - 1)) |
|
102 | (len(newheads) - 1)) | |
103 | return 1 |
|
103 | return 1 | |
104 |
|
104 | |||
|
105 | if not newheads: | |||
|
106 | return 0 | |||
|
107 | ||||
105 | # Otherwise, let's merge. |
|
108 | # Otherwise, let's merge. | |
106 | err = False |
|
109 | err = False | |
107 | if newheads: |
|
110 | if newheads: |
General Comments 0
You need to be logged in to leave comments.
Login now