equal
deleted
inserted
replaced
974 raise util.Abort(_("local changes found, refresh first")) |
974 raise util.Abort(_("local changes found, refresh first")) |
975 else: |
975 else: |
976 raise util.Abort(_("local changes found")) |
976 raise util.Abort(_("local changes found")) |
977 |
977 |
978 def checklocalchanges(self, repo, force=False, refresh=True): |
978 def checklocalchanges(self, repo, force=False, refresh=True): |
|
979 cmdutil.checkunfinished(repo) |
979 m, a, r, d = repo.status()[:4] |
980 m, a, r, d = repo.status()[:4] |
980 if (m or a or r or d) and not force: |
981 if (m or a or r or d) and not force: |
981 self.localchangesfound(refresh) |
982 self.localchangesfound(refresh) |
982 return m, a, r, d |
983 return m, a, r, d |
983 |
984 |