# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1174421619 25200
# Node ID e76e52145c3ddca4f05c95c0ccc1003c7fd78d12
# Parent  ca639faa38a263f4cbcf89a3b6b85a4a9d634114
transplant: fix ignoring empty changesets (eg after filter)

diff -r ca639faa38a2 -r e76e52145c3d hgext/transplant.py
--- a/hgext/transplant.py	Mon Mar 19 19:16:35 2007 -0300
+++ b/hgext/transplant.py	Tue Mar 20 13:13:39 2007 -0700
@@ -151,10 +151,10 @@
                                           log=opts.get('log'),
                                           filter=opts.get('filter'),
                                           lock=lock, wlock=wlock)
-                        if domerge:
+                        if n and domerge:
                             self.ui.status(_('%s merged at %s\n') % (revstr,
                                       revlog.short(n)))
-                        else:
+                        elif n:
                             self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node),
                                                                        revlog.short(n)))
                     finally:
@@ -217,7 +217,7 @@
                                        files=files)
                     if not files:
                         self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
-                        return
+                        return None
                 finally:
                     files = patch.updatedir(self.ui, repo, files, wlock=wlock)
             except Exception, inst: