[Pkg-bazaar-commits] ./bzrtools/experimental r670: New upstream release.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:14:36 UTC 2009
------------------------------------------------------------
revno: 670
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian-experimental
timestamp: Tue 2009-01-13 16:29:22 +0100
message:
New upstream release.
modified:
NEWS
__init__.py
command_classes.py
debian/changelog
debian/control
graph.py
tests/shelf_tests.py
version.py
------------------------------------------------------------
revno: 659.1.29
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Fri 2008-11-28 17:32:58 -0500
message:
Update version number to 1.11.0
modified:
version.py
------------------------------------------------------------
revno: 659.1.30
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Mon 2009-01-05 08:47:08 -0500
message:
Clarify distinction between shelf1/shelf2 commands
modified:
__init__.py
command_classes.py
------------------------------------------------------------
revno: 659.1.31
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Wed 2009-01-07 19:40:57 -0500
message:
Get tests running correctly.
modified:
graph.py
tests/shelf_tests.py
------------------------------------------------------------
revno: 659.1.32
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzrtools
timestamp: Mon 2009-01-12 08:57:06 -0500
message:
Update NEWS
modified:
NEWS
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-11-28 14:41:37 +0000
+++ b/NEWS 2009-01-12 13:57:06 +0000
@@ -1,3 +1,9 @@
+January 12 2009
+* RELEASE: bzrtools 1.11.0
+
+January 7 2009
+* Rename shelf command to shelf1, to match others & reduce confusion.
+
November 28 2008
* RELEASE: bzrtools 1.10.0
=== modified file '__init__.py'
--- a/__init__.py 2008-11-23 21:05:55 +0000
+++ b/__init__.py 2009-01-05 13:47:08 +0000
@@ -39,7 +39,7 @@
'cmd_multi_pull': [],
'cmd_patch': [],
'cmd_rspush': [],
- 'cmd_shelf': [],
+ 'cmd_shelf1': [],
'cmd_shell': [],
'cmd_shelve1': ['shelve'],
'cmd_trees': [],
=== modified file 'command_classes.py'
--- a/command_classes.py 2008-11-23 20:32:52 +0000
+++ b/command_classes.py 2009-01-05 13:47:08 +0000
@@ -199,10 +199,9 @@
don't depend on each other.
While you have patches on the shelf you can view and manipulate them with
- the 'shelf' command. Run 'bzr shelf -h' for more info.
+ the 'shelf1' command. Run 'bzr shelf1 -h' for more info.
"""
- aliases = ['shelve']
takes_args = ['file*']
takes_options = [Option('message',
help='A message to associate with the shelved changes.',
@@ -226,7 +225,7 @@
return 0
-# The following classes are only used as subcommands for 'shelf', they're
+# The following classes are only used as subcommands for 'shelf1', they're
# not to be registered directly with bzr.
class cmd_shelf_list(bzrlib.commands.Command):
@@ -268,7 +267,7 @@
self.shelf.upgrade()
-class cmd_shelf(BzrToolsCommand):
+class cmd_shelf1(BzrToolsCommand):
"""Perform various operations on your shelved patches. See also shelve1."""
takes_args = ['subcommand', 'args*']
@@ -342,7 +341,6 @@
See 'shelve1' for more information.
"""
- aliases = ['unshelve']
takes_options = [
Option('all', help='Unshelve all changes without prompting.'),
Option('force', help='Force unshelving even if errors occur.'),
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-11-28 15:34:07 +0000
+++ b/debian/changelog 2009-01-13 15:29:22 +0000
@@ -1,3 +1,9 @@
+bzrtools (1.11.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org> Tue, 13 Jan 2009 16:28:02 +0100
+
bzrtools (1.10.0-1) experimental; urgency=low
* New upstream release.
=== modified file 'debian/control'
--- a/debian/control 2008-11-28 15:34:07 +0000
+++ b/debian/control 2009-01-13 15:29:22 +0000
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Gustavo Franco <stratus at debian.org>, Arnaud Fontaine <arnau at debian.org>, Reinhard Tartler <siretart at tauware.de>, Adeodato Sim? <dato at net.com.org.es>, Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Gustavo Franco <stratus at debian.org>, Arnaud Fontaine <arnau at debian.org>, Reinhard Tartler <siretart at tauware.de>, Adeodato Sim? <dato at net.com.org.es>, Jelmer Vernooij <jelmer at debian.org>
Build-Depends: cdbs, debhelper, python, python-central
Build-Depends-Indep: bzr (>= 1.9~), rsync
Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzrtools/unstable
@@ -13,7 +13,7 @@
Package: bzrtools
Architecture: all
-Depends: ${python:Depends}, bzr (>= 1.10~), bzr (<< 1.11~), patch
+Depends: ${python:Depends}, bzr (>= 1.11~), bzr (<< 1.12~), patch
Recommends: rsync, graphviz
Suggests: librsvg2-bin
XB-Python-Version: ${python:Versions}
@@ -26,7 +26,6 @@
bzrtools actually includes:
* rspush: Push local changes to a remote server using rsync instead
sftp.
- * shelve/unshelve: Provide a fine-grained 'undo' facility.
* clean-tree: Remove unknown, ignored-junk, or all unversioned files
from the current tree.
* graph-ancestry: Use graphviz to produce graphs of branch ancestry.
=== modified file 'graph.py'
--- a/graph.py 2008-05-23 03:42:17 +0000
+++ b/graph.py 2009-01-08 00:40:57 +0000
@@ -20,7 +20,7 @@
from bzrlib.branch import Branch
from bzrlib.errors import BzrCommandError, NoSuchRevision
-from bzrlib.graph import node_distances, select_farthest
+from bzrlib.deprecated_graph import node_distances, select_farthest
from bzrlib.revision import NULL_REVISION
from bzrtools import short_committer
=== modified file 'tests/shelf_tests.py'
--- a/tests/shelf_tests.py 2008-11-11 15:55:32 +0000
+++ b/tests/shelf_tests.py 2009-01-08 00:40:57 +0000
@@ -7,7 +7,7 @@
UnshelveHunkSelector,
)
from bzrlib.plugins.bzrtools.errors import NoColor
-from bzrlib.plugins.bzrtools.command_classes import cmd_shelf
+from bzrlib.plugins.bzrtools.command_classes import cmd_shelf1
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
@@ -188,7 +188,7 @@
self.assertTrue('patch %s' % patch in shelf)
# Check the shown output is right
- shown = self.run_bzr('shelf show %s' % patch, retcode=0)[0]
+ shown = self.run_bzr('shelf1 show %s' % patch, retcode=0)[0]
self.assertEqual(shown, shelf)
def test_shelf_show_multi(self):
@@ -204,7 +204,7 @@
self.assertTrue('patch 00' in shelf)
# Check the shown output is right
- shown = self.run_bzr('shelf show 00', retcode=0)[0]
+ shown = self.run_bzr('shelf1 show 00', retcode=0)[0]
self.assertEqual(shown, shelf)
def test_shelf_show_unspecified(self):
@@ -220,12 +220,12 @@
self.assertTrue('patch 02' in shelf)
# Check the shown output is right
- shown = self.run_bzr('shelf show', retcode=0)[0]
+ shown = self.run_bzr('shelf1 show', retcode=0)[0]
self.assertEqual(shown, shelf)
def test_shelf_show_with_no_patch(self):
self.tree = self.make_branch_and_tree('.')
- stderr = self.run_bzr('shelf show 00', retcode=None)[1]
+ stderr = self.run_bzr('shelf1 show 00', retcode=None)[1]
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
def test_shelf_unshelve_failure(self):
@@ -308,7 +308,7 @@
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
# Check ls works
- lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
+ lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
for line in lines:
self.assertFalse(line.startswith(' 01'))
@@ -342,7 +342,7 @@
self._check_shelf('00', new_date=new_date)
# Delete 00
- self.run_bzr('shelf delete 00', retcode=0)
+ self.run_bzr('shelf1 delete 00', retcode=0)
# We should now have 01 but not 00, but we should have 00~
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
@@ -353,7 +353,7 @@
self._check_shelf('00~', new_date=new_date)
# Check ls works
- lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
+ lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
for line in lines:
self.assertFalse(line.startswith(' 00'))
@@ -370,7 +370,7 @@
self.run_bzr('shelve1 --all test_file', retcode=0)
# Now delete 00, leaving 01, next shelve should go into 02
- self.run_bzr('shelf delete 0', retcode=0)
+ self.run_bzr('shelf1 delete 0', retcode=0)
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
file('test_file', 'w').write(self.MODIFIED)
@@ -400,7 +400,7 @@
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
# Upgrade, make sure it worked
- self.run_bzr('shelf upgrade', retcode=0)
+ self.run_bzr('shelf1 upgrade', retcode=0)
self.assertEqual(open('.shelf/shelves/default/01').read(),
'First old shelf')
self.assertEqual(open('.shelf/shelves/default/02').read(),
@@ -425,7 +425,7 @@
self.__create_and_add_test_file()
# Run a benign shelf command to setup .shelf for us
- self.run_bzr('shelf ls', retcode=0)
+ self.run_bzr('shelf1 ls', retcode=0)
old_tree = self.tree.basis_tree()
old_tree.lock_read()
@@ -484,7 +484,7 @@
def test_shelf_shelf_bogus_subcommand(self):
self.tree = self.make_branch_and_tree('.')
- self.run_bzr('shelf foo', retcode=3) # <- retcode == 3
+ self.run_bzr('shelf1 foo', retcode=3) # <- retcode == 3
def test_shelf_OOO_unshelve(self):
self.tree = self.make_branch_and_tree('.')
@@ -513,7 +513,7 @@
self.assertEqual(file('test_file1').read(), self.MODIFIED)
# Check ls works
- lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
+ lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
for line in lines:
self.assertFalse(line.startswith(' 00'))
@@ -523,7 +523,7 @@
self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
# Check ls works
- text = self.run_bzr('shelf ls', retcode=0)[0]
+ text = self.run_bzr('shelf1 ls', retcode=0)[0]
for line in text.split('\n'):
self.assertFalse(line.startswith(' 00'))
@@ -545,7 +545,7 @@
self.run_bzr('shelve1 --all test_file', retcode=0)
# Switch to "other"
- self.run_bzr('shelf switch other', retcode=0)
+ self.run_bzr('shelf1 switch other', retcode=0)
file('test_file', 'w').write(self.MODIFIED)
self.run_bzr('shelve1 --all test_file', retcode=0)
@@ -555,7 +555,7 @@
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
# Switch back
- self.run_bzr('shelf switch default', retcode=0)
+ self.run_bzr('shelf1 switch default', retcode=0)
file('test_file', 'w').write(self.MODIFIED)
self.run_bzr('shelve1 --all test_file', retcode=0)
@@ -622,9 +622,9 @@
stdout, error = self.run_bzr('unshelve1 --all --no-color')
def test_shelf_help(self):
- self.assertContainsRe(cmd_shelf().help(),
+ self.assertContainsRe(cmd_shelf1().help(),
'list\n.*List the patches on the current shelf')
def test_show_empty_shelf(self):
self.tree = self.make_branch_and_tree('.')
- self.run_bzr_error(('No patches on shelf.',), 'shelf show')
+ self.run_bzr_error(('No patches on shelf.',), 'shelf1 show')
=== modified file 'version.py'
--- a/version.py 2008-11-05 14:02:52 +0000
+++ b/version.py 2008-11-28 22:32:58 +0000
@@ -1,2 +1,2 @@
-__version__ = '1.10.0'
+__version__ = '1.11.0'
version_info = tuple(int(n) for n in __version__.split('.'))
More information about the Pkg-bazaar-commits
mailing list