Mercurial > hg
comparison hgext/mq.py @ 14591:b49099712d30
mq: rename guards_dirty to guardsdirty
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Mon, 13 Jun 2011 13:43:03 +0200 |
| parents | dbb80f03d4ae |
| children | fc94add69d9f |
comparison
equal
deleted
inserted
replaced
| 14590:dbb80f03d4ae | 14591:b49099712d30 |
|---|---|
| 272 self.added = [] | 272 self.added = [] |
| 273 self.seriespath = "series" | 273 self.seriespath = "series" |
| 274 self.statuspath = "status" | 274 self.statuspath = "status" |
| 275 self.guardspath = "guards" | 275 self.guardspath = "guards" |
| 276 self.activeguards = None | 276 self.activeguards = None |
| 277 self.guards_dirty = False | 277 self.guardsdirty = False |
| 278 # Handle mq.git as a bool with extended values | 278 # Handle mq.git as a bool with extended values |
| 279 try: | 279 try: |
| 280 gitmode = ui.configbool('mq', 'git', None) | 280 gitmode = ui.configbool('mq', 'git', None) |
| 281 if gitmode is None: | 281 if gitmode is None: |
| 282 raise error.ConfigError() | 282 raise error.ConfigError() |
| 321 for a in 'applied fullseries series seriesguards'.split(): | 321 for a in 'applied fullseries series seriesguards'.split(): |
| 322 if a in self.__dict__: | 322 if a in self.__dict__: |
| 323 delattr(self, a) | 323 delattr(self, a) |
| 324 self.applied_dirty = 0 | 324 self.applied_dirty = 0 |
| 325 self.series_dirty = 0 | 325 self.series_dirty = 0 |
| 326 self.guards_dirty = False | 326 self.guardsdirty = False |
| 327 self.activeguards = None | 327 self.activeguards = None |
| 328 | 328 |
| 329 def diffopts(self, opts={}, patchfn=None): | 329 def diffopts(self, opts={}, patchfn=None): |
| 330 diffopts = patchmod.diffopts(self.ui, opts) | 330 diffopts = patchmod.diffopts(self.ui, opts) |
| 331 if self.gitmode == 'auto': | 331 if self.gitmode == 'auto': |
| 410 if bad: | 410 if bad: |
| 411 raise util.Abort(bad) | 411 raise util.Abort(bad) |
| 412 guards = sorted(set(guards)) | 412 guards = sorted(set(guards)) |
| 413 self.ui.debug('active guards: %s\n' % ' '.join(guards)) | 413 self.ui.debug('active guards: %s\n' % ' '.join(guards)) |
| 414 self.activeguards = guards | 414 self.activeguards = guards |
| 415 self.guards_dirty = True | 415 self.guardsdirty = True |
| 416 | 416 |
| 417 def active(self): | 417 def active(self): |
| 418 if self.activeguards is None: | 418 if self.activeguards is None: |
| 419 self.activeguards = [] | 419 self.activeguards = [] |
| 420 try: | 420 try: |
| 497 fp.close() | 497 fp.close() |
| 498 if self.applied_dirty: | 498 if self.applied_dirty: |
| 499 write_list(map(str, self.applied), self.statuspath) | 499 write_list(map(str, self.applied), self.statuspath) |
| 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.guardsdirty: |
| 503 write_list(self.activeguards, self.guardspath) | 503 write_list(self.activeguards, self.guardspath) |
| 504 if self.added: | 504 if self.added: |
| 505 qrepo = self.qrepo() | 505 qrepo = self.qrepo() |
| 506 if qrepo: | 506 if qrepo: |
| 507 qrepo[None].add(f for f in self.added if f not in qrepo[None]) | 507 qrepo[None].add(f for f in self.added if f not in qrepo[None]) |