##// END OF EJS Templates
mq: rename guards_path to guardspath
Adrian Buehlmann -
r14589:7d59ee9e default
parent child Browse files
Show More
@@ -272,7 +272,7 b' class queue(object):'
272 self.added = []
272 self.added = []
273 self.seriespath = "series"
273 self.seriespath = "series"
274 self.statuspath = "status"
274 self.statuspath = "status"
275 self.guards_path = "guards"
275 self.guardspath = "guards"
276 self.active_guards = None
276 self.active_guards = None
277 self.guards_dirty = False
277 self.guards_dirty = False
278 # Handle mq.git as a bool with extended values
278 # Handle mq.git as a bool with extended values
@@ -418,7 +418,7 b' class queue(object):'
418 if self.active_guards is None:
418 if self.active_guards is None:
419 self.active_guards = []
419 self.active_guards = []
420 try:
420 try:
421 guards = self.opener.read(self.guards_path).split()
421 guards = self.opener.read(self.guardspath).split()
422 except IOError, err:
422 except IOError, err:
423 if err.errno != errno.ENOENT:
423 if err.errno != errno.ENOENT:
424 raise
424 raise
@@ -427,7 +427,7 b' class queue(object):'
427 bad = self.checkguard(guard)
427 bad = self.checkguard(guard)
428 if bad:
428 if bad:
429 self.ui.warn('%s:%d: %s\n' %
429 self.ui.warn('%s:%d: %s\n' %
430 (self.join(self.guards_path), i + 1, bad))
430 (self.join(self.guardspath), i + 1, bad))
431 else:
431 else:
432 self.active_guards.append(guard)
432 self.active_guards.append(guard)
433 return self.active_guards
433 return self.active_guards
@@ -500,7 +500,7 b' class queue(object):'
500 if self.series_dirty:
500 if self.series_dirty:
501 write_list(self.fullseries, self.seriespath)
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.guardspath)
504 if self.added:
504 if self.added:
505 qrepo = self.qrepo()
505 qrepo = self.qrepo()
506 if qrepo:
506 if qrepo:
@@ -1594,7 +1594,7 b' class queue(object):'
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.statuspath, self.seriespath,
1596 fl not in (self.statuspath, self.seriespath,
1597 self.guards_path)
1597 self.guardspath)
1598 and not fl.startswith('.')):
1598 and not fl.startswith('.')):
1599 msng_list.append(fl)
1599 msng_list.append(fl)
1600 for x in sorted(msng_list):
1600 for x in sorted(msng_list):
General Comments 0
You need to be logged in to leave comments. Login now