Show More
@@ -577,7 +577,7 b' def collapse(repo, firstctx, lastctx, co' | |||||
577 | Commit message is edited in all cases. |
|
577 | Commit message is edited in all cases. | |
578 |
|
578 | |||
579 | This function works in memory.""" |
|
579 | This function works in memory.""" | |
580 | ctxs = list(repo.set('%d::%d', firstctx, lastctx)) |
|
580 | ctxs = list(repo.set('%d::%d', firstctx.rev(), lastctx.rev())) | |
581 | if not ctxs: |
|
581 | if not ctxs: | |
582 | return None |
|
582 | return None | |
583 | for c in ctxs: |
|
583 | for c in ctxs: | |
@@ -730,8 +730,9 b' class fold(histeditaction):' | |||||
730 | return ctx, [(self.node, (parentctxnode,))] |
|
730 | return ctx, [(self.node, (parentctxnode,))] | |
731 |
|
731 | |||
732 | parentctx = repo[parentctxnode] |
|
732 | parentctx = repo[parentctxnode] | |
733 |
newcommits = set(c.node() for c in repo.set('(%d::. - %d)', |
|
733 | newcommits = set(c.node() for c in repo.set('(%d::. - %d)', | |
734 |
parentctx) |
|
734 | parentctx.rev(), | |
|
735 | parentctx.rev())) | |||
735 | if not newcommits: |
|
736 | if not newcommits: | |
736 | repo.ui.warn(_('%s: cannot fold - working copy is not a ' |
|
737 | repo.ui.warn(_('%s: cannot fold - working copy is not a ' | |
737 | 'descendant of previous commit %s\n') % |
|
738 | 'descendant of previous commit %s\n') % |
General Comments 0
You need to be logged in to leave comments.
Login now