Mercurial > hg
comparison hgext/histedit.py @ 32057:e5ffc91a2276 stable
histedit: make check for unresolved conflicts explicit (issue5545)
Previously, we'd rely on the implicit check that `localrepo.commit` did.
The problem is that that check only happened when the working copy was
dirty. With a "clean" working copy but unresolved conflicts we'd get
into a broken state.
To fix that, do what rebase does and check for unresolved conflicts at
the start of histedit --continue.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 20 Apr 2017 17:18:08 -0700 |
parents | 259e5dc21c1d |
children | bd872f64a8ba |
comparison
equal
deleted
inserted
replaced
32056:59afb0750aec | 32057:e5ffc91a2276 |
---|---|
196 exchange, | 196 exchange, |
197 extensions, | 197 extensions, |
198 hg, | 198 hg, |
199 lock, | 199 lock, |
200 merge as mergemod, | 200 merge as mergemod, |
201 mergeutil, | |
201 node, | 202 node, |
202 obsolete, | 203 obsolete, |
203 repair, | 204 repair, |
204 scmutil, | 205 scmutil, |
205 util, | 206 util, |
1295 summary = summary.splitlines()[0] | 1296 summary = summary.splitlines()[0] |
1296 return summary | 1297 return summary |
1297 | 1298 |
1298 def bootstrapcontinue(ui, state, opts): | 1299 def bootstrapcontinue(ui, state, opts): |
1299 repo = state.repo | 1300 repo = state.repo |
1301 | |
1302 ms = mergemod.mergestate.read(repo) | |
1303 mergeutil.checkunresolved(ms) | |
1304 | |
1300 if state.actions: | 1305 if state.actions: |
1301 actobj = state.actions.pop(0) | 1306 actobj = state.actions.pop(0) |
1302 | 1307 |
1303 if _isdirtywc(repo): | 1308 if _isdirtywc(repo): |
1304 actobj.continuedirty() | 1309 actobj.continuedirty() |