Mercurial > hg
comparison hgext/mq.py @ 16929:4b02d7006169
mq: lowercase warning messages
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Tue, 12 Jun 2012 14:18:18 +0200 |
| parents | 1093ad1e8903 |
| children | 54295c87eefc |
comparison
equal
deleted
inserted
replaced
| 16928:73b9286e667c | 16929:4b02d7006169 |
|---|---|
| 1771 if n: | 1771 if n: |
| 1772 applied.append(statusentry(bin(n), name)) | 1772 applied.append(statusentry(bin(n), name)) |
| 1773 else: | 1773 else: |
| 1774 series.append(l) | 1774 series.append(l) |
| 1775 if datastart is None: | 1775 if datastart is None: |
| 1776 self.ui.warn(_("No saved patch data found\n")) | 1776 self.ui.warn(_("no saved patch data found\n")) |
| 1777 return 1 | 1777 return 1 |
| 1778 self.ui.warn(_("restoring status: %s\n") % lines[0]) | 1778 self.ui.warn(_("restoring status: %s\n") % lines[0]) |
| 1779 self.fullseries = series | 1779 self.fullseries = series |
| 1780 self.applied = applied | 1780 self.applied = applied |
| 1781 self.parseseries() | 1781 self.parseseries() |
| 1798 (short(qpp[0]), short(qpp[1]))) | 1798 (short(qpp[0]), short(qpp[1]))) |
| 1799 if qupdate: | 1799 if qupdate: |
| 1800 self.ui.status(_("updating queue directory\n")) | 1800 self.ui.status(_("updating queue directory\n")) |
| 1801 r = self.qrepo() | 1801 r = self.qrepo() |
| 1802 if not r: | 1802 if not r: |
| 1803 self.ui.warn(_("Unable to load queue repository\n")) | 1803 self.ui.warn(_("unable to load queue repository\n")) |
| 1804 return 1 | 1804 return 1 |
| 1805 hg.clean(r, qpp[0]) | 1805 hg.clean(r, qpp[0]) |
| 1806 | 1806 |
| 1807 def save(self, repo, msg=None): | 1807 def save(self, repo, msg=None): |
| 1808 if not self.applied: | 1808 if not self.applied: |
| 2512 patches = [] | 2512 patches = [] |
| 2513 messages = [] | 2513 messages = [] |
| 2514 for f in files: | 2514 for f in files: |
| 2515 p = q.lookup(f) | 2515 p = q.lookup(f) |
| 2516 if p in patches or p == parent: | 2516 if p in patches or p == parent: |
| 2517 ui.warn(_('Skipping already folded patch %s\n') % p) | 2517 ui.warn(_('skipping already folded patch %s\n') % p) |
| 2518 if q.isapplied(p): | 2518 if q.isapplied(p): |
| 2519 raise util.Abort(_('qfold cannot fold already applied patch %s') | 2519 raise util.Abort(_('qfold cannot fold already applied patch %s') |
| 2520 % p) | 2520 % p) |
| 2521 patches.append(p) | 2521 patches.append(p) |
| 2522 | 2522 |
| 3418 mqtags.append((mqtags[0][0], 'qbase')) | 3418 mqtags.append((mqtags[0][0], 'qbase')) |
| 3419 mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) | 3419 mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) |
| 3420 tags = result[0] | 3420 tags = result[0] |
| 3421 for patch in mqtags: | 3421 for patch in mqtags: |
| 3422 if patch[1] in tags: | 3422 if patch[1] in tags: |
| 3423 self.ui.warn(_('Tag %s overrides mq patch of the same ' | 3423 self.ui.warn(_('tag %s overrides mq patch of the same ' |
| 3424 'name\n') % patch[1]) | 3424 'name\n') % patch[1]) |
| 3425 else: | 3425 else: |
| 3426 tags[patch[1]] = patch[0] | 3426 tags[patch[1]] = patch[0] |
| 3427 | 3427 |
| 3428 return result | 3428 return result |