equal
deleted
inserted
replaced
272 if p == oldp: |
272 if p == oldp: |
273 return None |
273 return None |
274 |
274 |
275 return p |
275 return p |
276 |
276 |
277 def bailifchanged(repo): |
277 def bailifchanged(repo, merge=True): |
278 if repo.dirstate.p2() != nullid: |
278 if merge and repo.dirstate.p2() != nullid: |
279 raise util.Abort(_('outstanding uncommitted merge')) |
279 raise util.Abort(_('outstanding uncommitted merge')) |
280 modified, added, removed, deleted = repo.status()[:4] |
280 modified, added, removed, deleted = repo.status()[:4] |
281 if modified or added or removed or deleted: |
281 if modified or added or removed or deleted: |
282 raise util.Abort(_('uncommitted changes')) |
282 raise util.Abort(_('uncommitted changes')) |
283 ctx = repo[None] |
283 ctx = repo[None] |