Show More
@@ -145,8 +145,6 b' except KeyError:' | |||
|
145 | 145 | |
|
146 | 146 | strip = stripext.strip |
|
147 | 147 | checksubstate = stripext.checksubstate |
|
148 | checklocalchanges = stripext.checklocalchanges | |
|
149 | ||
|
150 | 148 | |
|
151 | 149 | # Patch names looks like unix-file names. |
|
152 | 150 | # They must be joinable with queue directory and result in the patch path. |
@@ -1149,7 +1147,20 b' class queue(object):' | |||
|
1149 | 1147 | # plain versions for i18n tool to detect them |
|
1150 | 1148 | _("local changes found, qrefresh first") |
|
1151 | 1149 | _("local changed subrepos found, qrefresh first") |
|
1152 | return checklocalchanges(repo, force, excsuffix) | |
|
1150 | ||
|
1151 | cmdutil.checkunfinished(repo) | |
|
1152 | s = repo.status() | |
|
1153 | if not force: | |
|
1154 | if len(repo[None].parents()) > 1: | |
|
1155 | _("outstanding uncommitted merge") #i18 tool detection | |
|
1156 | raise error.Abort(_("outstanding uncommitted merge"+ excsuffix)) | |
|
1157 | if s.modified or s.added or s.removed or s.deleted: | |
|
1158 | _("local changes found") # i18n tool detection | |
|
1159 | raise error.Abort(_("local changes found" + excsuffix)) | |
|
1160 | if checksubstate(repo): | |
|
1161 | _("local changed subrepos found") # i18n tool detection | |
|
1162 | raise error.Abort(_("local changed subrepos found" + excsuffix)) | |
|
1163 | return s | |
|
1153 | 1164 | |
|
1154 | 1165 | _reserved = ('series', 'status', 'guards', '.', '..') |
|
1155 | 1166 | def checkreservedname(self, name): |
General Comments 0
You need to be logged in to leave comments.
Login now