Show More
@@ -1153,7 +1153,7 b' class queue:' | |||||
1153 | sortedseries.append((idx, p)) |
|
1153 | sortedseries.append((idx, p)) | |
1154 |
|
1154 | |||
1155 | sortedseries.sort(reverse=True) |
|
1155 | sortedseries.sort(reverse=True) | |
1156 |
for |
|
1156 | for i, p in sortedseries: | |
1157 | if i != -1: |
|
1157 | if i != -1: | |
1158 | del self.fullseries[i] |
|
1158 | del self.fullseries[i] | |
1159 | else: |
|
1159 | else: | |
@@ -1177,7 +1177,6 b' class queue:' | |||||
1177 | firstrev = repo[self.applied[0].node].rev() |
|
1177 | firstrev = repo[self.applied[0].node].rev() | |
1178 | patches = [] |
|
1178 | patches = [] | |
1179 | for i, rev in enumerate(revs): |
|
1179 | for i, rev in enumerate(revs): | |
1180 |
|
||||
1181 | if rev < firstrev: |
|
1180 | if rev < firstrev: | |
1182 | raise error.Abort(_(b'revision %d is not managed') % rev) |
|
1181 | raise error.Abort(_(b'revision %d is not managed') % rev) | |
1183 |
|
1182 | |||
@@ -3225,6 +3224,8 b' def fold(ui, repo, *files, **opts):' | |||||
3225 | raise error.Abort(_(b'qfold requires at least one patch name')) |
|
3224 | raise error.Abort(_(b'qfold requires at least one patch name')) | |
3226 | if not q.checktoppatch(repo)[0]: |
|
3225 | if not q.checktoppatch(repo)[0]: | |
3227 | raise error.Abort(_(b'no patches applied')) |
|
3226 | raise error.Abort(_(b'no patches applied')) | |
|
3227 | ||||
|
3228 | with repo.wlock(): | |||
3228 | q.checklocalchanges(repo) |
|
3229 | q.checklocalchanges(repo) | |
3229 |
|
3230 | |||
3230 | message = cmdutil.logmessage(ui, opts) |
|
3231 | message = cmdutil.logmessage(ui, opts) | |
@@ -3263,7 +3264,6 b' def fold(ui, repo, *files, **opts):' | |||||
3263 | message = b'\n'.join(message) |
|
3264 | message = b'\n'.join(message) | |
3264 |
|
3265 | |||
3265 | diffopts = q.patchopts(q.diffopts(), *patches) |
|
3266 | diffopts = q.patchopts(q.diffopts(), *patches) | |
3266 | with repo.wlock(): |
|
|||
3267 | q.refresh( |
|
3267 | q.refresh( | |
3268 | repo, |
|
3268 | repo, | |
3269 | msg=message, |
|
3269 | msg=message, |
General Comments 0
You need to be logged in to leave comments.
Login now