1160 excsuffix = ', qrefresh first' |
1160 excsuffix = ', qrefresh first' |
1161 # plain versions for i18n tool to detect them |
1161 # plain versions for i18n tool to detect them |
1162 _("local changes found, qrefresh first") |
1162 _("local changes found, qrefresh first") |
1163 _("local changed subrepos found, qrefresh first") |
1163 _("local changed subrepos found, qrefresh first") |
1164 |
1164 |
1165 cmdutil.checkunfinished(repo) |
|
1166 s = repo.status() |
1165 s = repo.status() |
1167 if not force: |
1166 if not force: |
1168 if len(repo[None].parents()) > 1: |
1167 cmdutil.checkunfinished(repo) |
1169 _("outstanding uncommitted merge") #i18 tool detection |
|
1170 raise error.Abort(_("outstanding uncommitted merge"+ excsuffix)) |
|
1171 if s.modified or s.added or s.removed or s.deleted: |
1168 if s.modified or s.added or s.removed or s.deleted: |
1172 _("local changes found") # i18n tool detection |
1169 _("local changes found") # i18n tool detection |
1173 raise error.Abort(_("local changes found" + excsuffix)) |
1170 raise error.Abort(_("local changes found" + excsuffix)) |
1174 if checksubstate(repo): |
1171 if checksubstate(repo): |
1175 _("local changed subrepos found") # i18n tool detection |
1172 _("local changed subrepos found") # i18n tool detection |
1176 raise error.Abort(_("local changed subrepos found" + excsuffix)) |
1173 raise error.Abort(_("local changed subrepos found" + excsuffix)) |
|
1174 else: |
|
1175 cmdutil.checkunfinished(repo, skipmerge=True) |
1177 return s |
1176 return s |
1178 |
1177 |
1179 _reserved = ('series', 'status', 'guards', '.', '..') |
1178 _reserved = ('series', 'status', 'guards', '.', '..') |
1180 def checkreservedname(self, name): |
1179 def checkreservedname(self, name): |
1181 if name in self._reserved: |
1180 if name in self._reserved: |