equal
deleted
inserted
replaced
276 # This walker is sure to visit all the revisions in history, but |
276 # This walker is sure to visit all the revisions in history, but |
277 # only once. |
277 # only once. |
278 for pos, commit in enumerate(walker): |
278 for pos, commit in enumerate(walker): |
279 if prog is not None: |
279 if prog is not None: |
280 prog.update(pos) |
280 prog.update(pos) |
281 p1 = p2 = sha1nodeconstants.nullhex |
281 p1 = p2 = gitutil.nullgit |
282 if len(commit.parents) > 2: |
282 if len(commit.parents) > 2: |
283 raise error.ProgrammingError( |
283 raise error.ProgrammingError( |
284 ( |
284 ( |
285 b"git support can't handle octopus merges, " |
285 b"git support can't handle octopus merges, " |
286 b"found a commit with %d parents :(" |
286 b"found a commit with %d parents :(" |