Show More
@@ -270,7 +270,7 b' class queue(object):' | |||||
270 | self.applied_dirty = 0 |
|
270 | self.applied_dirty = 0 | |
271 | self.series_dirty = 0 |
|
271 | self.series_dirty = 0 | |
272 | self.added = [] |
|
272 | self.added = [] | |
273 |
self.series |
|
273 | self.seriespath = "series" | |
274 | self.status_path = "status" |
|
274 | self.status_path = "status" | |
275 | self.guards_path = "guards" |
|
275 | self.guards_path = "guards" | |
276 | self.active_guards = None |
|
276 | self.active_guards = None | |
@@ -303,8 +303,8 b' class queue(object):' | |||||
303 |
|
303 | |||
304 | @util.propertycache |
|
304 | @util.propertycache | |
305 | def fullseries(self): |
|
305 | def fullseries(self): | |
306 |
if os.path.exists(self.join(self.series |
|
306 | if os.path.exists(self.join(self.seriespath)): | |
307 |
return self.opener.read(self.series |
|
307 | return self.opener.read(self.seriespath).splitlines() | |
308 | return [] |
|
308 | return [] | |
309 |
|
309 | |||
310 | @util.propertycache |
|
310 | @util.propertycache | |
@@ -388,7 +388,7 b' class queue(object):' | |||||
388 | if patch: |
|
388 | if patch: | |
389 | if patch in self.series: |
|
389 | if patch in self.series: | |
390 | raise util.Abort(_('%s appears more than once in %s') % |
|
390 | raise util.Abort(_('%s appears more than once in %s') % | |
391 |
(patch, self.join(self.series |
|
391 | (patch, self.join(self.seriespath))) | |
392 | self.series.append(patch) |
|
392 | self.series.append(patch) | |
393 | self.seriesguards.append(self.guard_re.findall(comment)) |
|
393 | self.seriesguards.append(self.guard_re.findall(comment)) | |
394 |
|
394 | |||
@@ -498,7 +498,7 b' class queue(object):' | |||||
498 | if self.applied_dirty: |
|
498 | if self.applied_dirty: | |
499 | write_list(map(str, self.applied), self.status_path) |
|
499 | write_list(map(str, self.applied), self.status_path) | |
500 | if self.series_dirty: |
|
500 | if self.series_dirty: | |
501 |
write_list(self.fullseries, self.series |
|
501 | write_list(self.fullseries, self.seriespath) | |
502 | if self.guards_dirty: |
|
502 | if self.guards_dirty: | |
503 | write_list(self.active_guards, self.guards_path) |
|
503 | write_list(self.active_guards, self.guards_path) | |
504 | if self.added: |
|
504 | if self.added: | |
@@ -1593,7 +1593,7 b' class queue(object):' | |||||
1593 | for f in files: |
|
1593 | for f in files: | |
1594 | fl = os.path.join(d, f) |
|
1594 | fl = os.path.join(d, f) | |
1595 | if (fl not in self.series and |
|
1595 | if (fl not in self.series and | |
1596 |
fl not in (self.status_path, self.series |
|
1596 | fl not in (self.status_path, self.seriespath, | |
1597 | self.guards_path) |
|
1597 | self.guards_path) | |
1598 | and not fl.startswith('.')): |
|
1598 | and not fl.startswith('.')): | |
1599 | msng_list.append(fl) |
|
1599 | msng_list.append(fl) |
General Comments 0
You need to be logged in to leave comments.
Login now