3 files changed, 34 insertions, 25 deletions

diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 965349ec11c9..d87f22fb828d 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bzrtools
-PORTVERSION=	0.7
+PORTVERSION=	0.8.1
 CATEGORIES=	devel
 MASTER_SITES=	http://panoramicfeedback.com/opensource/
 
diff --git a/devel/bzrtools/distinfo b/devel/bzrtools/distinfo
index 67fa9c9b752b..ba401997370f 100644
--- a/devel/bzrtools/distinfo
+++ b/devel/bzrtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzrtools-0.7.tar.gz) = e2f7dd2a60443829360b349b30b3aada
-SHA256 (bzrtools-0.7.tar.gz) = a0d18e963cc7eed804b8faa801bf825c384f9b06cb979b0257845b5cc5d99985
-SIZE (bzrtools-0.7.tar.gz) = 87811
+MD5 (bzrtools-0.8.1.tar.gz) = d1b913b55d5249d3ff007c756042b0df
+SHA256 (bzrtools-0.8.1.tar.gz) = 959a54598fc06b1b614fbb417085b86dbc83c53c0b358eeb7a0b5d534aa6cdd5
+SIZE (bzrtools-0.8.1.tar.gz) = 111029
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index 94da474f3dcc..ae37349c5e2f 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -1,70 +1,79 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/annotate.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/blackbox.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/diffstat.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patches.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/reweave_inventory.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf_tests.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/annotate.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/blackbox.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/diffstat.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patches.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/push.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/reweave_inventory.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf_tests.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/annotate.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/baz_import.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/blackbox.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branch_mark.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/branchhistory.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/diffstat.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patches.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/reweave_inventory.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf_tests.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools