Mercurial > hg
diff hgext/mq.py @ 7782:140429276b63
mq: handle empty patches more gracefully (issue1501)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 16 Feb 2009 17:37:23 -0600 |
| parents | 88887054d277 |
| children | d812029cda85 73d80d5bf478 |
line wrap: on
line diff
--- a/hgext/mq.py Mon Feb 16 17:37:23 2009 -0600 +++ b/hgext/mq.py Mon Feb 16 17:37:23 2009 -0600 @@ -551,9 +551,13 @@ message.append(_("\nimported patch %s") % patchname) message = '\n'.join(message) - (patcherr, files, fuzz) = self.patch(repo, pf) - all_files.update(files) - patcherr = not patcherr + if ph.haspatch: + (patcherr, files, fuzz) = self.patch(repo, pf) + all_files.update(files) + patcherr = not patcherr + else: + self.ui.warn(_("patch %s is empty\n") % patchname) + patcherr, files, fuzz = 0, [], 0 if merge and files: # Mark as removed/merged and update dirstate parent info @@ -583,12 +587,8 @@ self.applied.append(statusentry(hex(n), patchname)) if patcherr: - if not ph.haspatch: - self.ui.warn(_("patch %s is empty\n") % patchname) - err = 0 - else: - self.ui.warn(_("patch failed, rejects left in working dir\n")) - err = 1 + self.ui.warn(_("patch failed, rejects left in working dir\n")) + err = 1 break if fuzz and strict: