equal
deleted
inserted
replaced
76 if p == oldp: |
76 if p == oldp: |
77 return None |
77 return None |
78 |
78 |
79 return p |
79 return p |
80 |
80 |
81 def bail_if_changed(repo): |
81 def bailifchanged(repo): |
82 if repo.dirstate.p2() != nullid: |
82 if repo.dirstate.p2() != nullid: |
83 raise util.Abort(_('outstanding uncommitted merge')) |
83 raise util.Abort(_('outstanding uncommitted merge')) |
84 modified, added, removed, deleted = repo.status()[:4] |
84 modified, added, removed, deleted = repo.status()[:4] |
85 if modified or added or removed or deleted: |
85 if modified or added or removed or deleted: |
86 raise util.Abort(_("outstanding uncommitted changes")) |
86 raise util.Abort(_("outstanding uncommitted changes")) |