diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -148,8 +148,23 @@ def _makefpartparamsizes(nbparams):
     """
     return '>'+('BB'*nbparams)
 
+parthandlermapping = {}
 
-parthandlermapping = {}
+def parthandler(parttype):
+    """decorator that register a function as a bundle2 part handler
+
+    eg::
+
+        @parthandler('myparttype')
+        def myparttypehandler(...):
+            '''process a part of type "my part".'''
+            ...
+    """
+    def _decorator(func):
+        assert parttype not in parthandlermapping
+        parthandlermapping[parttype] = func
+        return func
+    return _decorator
 
 def processbundle(repo, stream):
     """This function process a bundle, apply effect to/from a repo
diff --git a/tests/test-bundle2.t b/tests/test-bundle2.t
--- a/tests/test-bundle2.t
+++ b/tests/test-bundle2.t
@@ -20,14 +20,13 @@ Create an extension to test bundle2 API
   > Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko."""
   > assert len(ELEPHANTSSONG) == 178 # future test say 178 bytes, trust it.
   > 
+  > @bundle2.parthandler('test:song')
   > def songhandler(repo, part):
   >     """handle a "test:song" bundle2 part, printing the lyrics on stdin"""
   >     repo.ui.write('The choir start singing:\n')
   >     for line in part.data.split('\n'):
   >         repo.ui.write('    %s\n' % line)
   > 
-  > bundle2.parthandlermapping['test:song'] = songhandler
-  > 
   > @command('bundle2',
   >          [('', 'param', [], 'stream level parameter'),
   >           ('', 'parts', False, 'include some arbitrary parts to the bundle'),],