equal
deleted
inserted
replaced
150 hg.clean(repo, ctx.node(), show_stats=False) |
150 hg.clean(repo, ctx.node(), show_stats=False) |
151 with repo.dirstate.parentchange(): |
151 with repo.dirstate.parentchange(): |
152 scmutil.movedirstate(repo, ctx.p1()) |
152 scmutil.movedirstate(repo, ctx.p1()) |
153 |
153 |
154 # Any modified, added, removed, deleted result means split is incomplete |
154 # Any modified, added, removed, deleted result means split is incomplete |
155 incomplete = lambda repo: any(repo.status()[:4]) |
155 def incomplete(repo): |
|
156 st = repo.status() |
|
157 return any((st.modified, st.added, st.removed, st.deleted)) |
156 |
158 |
157 # Main split loop |
159 # Main split loop |
158 while incomplete(repo): |
160 while incomplete(repo): |
159 if committed: |
161 if committed: |
160 header = _( |
162 header = _( |