# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1234827443 21600
# Node ID 140429276b63d0b6268a1975601911900227044a
# Parent  a45206455d85d41fbd674bd35e634d552de2b5bf
mq: handle empty patches more gracefully (issue1501)

diff -r a45206455d85 -r 140429276b63 hgext/mq.py
--- 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:
diff -r a45206455d85 -r 140429276b63 tests/test-mq-qdelete.out
--- a/tests/test-mq-qdelete.out	Mon Feb 16 17:37:23 2009 -0600
+++ b/tests/test-mq-qdelete.out	Mon Feb 16 17:37:23 2009 -0600
@@ -30,6 +30,7 @@
 now at: b
 abort: unknown revision 'c'!
 applying c
+patch c is empty
 now at: c
 c
 3 imported patch c
diff -r a45206455d85 -r 140429276b63 tests/test-mq.out
--- a/tests/test-mq.out	Mon Feb 16 17:37:23 2009 -0600
+++ b/tests/test-mq.out	Mon Feb 16 17:37:23 2009 -0600
@@ -486,8 +486,6 @@
 abort: local changes found, refresh first
 % apply force, should not discard changes with empty patch
 applying empty
-patch: **** Only garbage was found in the patch input.
-patch failed, unable to continue (try -v)
 patch empty is empty
 now at: empty
 diff -r bf5fc3f07a0a hello.txt