Rev 4034: Track down a few more files that have trailing whitespace. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration
John Arbash Meinel
john at arbash-meinel.com
Mon Feb 23 15:43:10 GMT 2009
At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 4034
revision-id: john at arbash-meinel.com-20090223154247-has31lzprui21glu
parent: john at arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2009-02-23 09:42:47 -0600
message:
Track down a few more files that have trailing whitespace.
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/bzrdir.py 2009-02-23 15:42:47 +0000
@@ -531,7 +531,7 @@
# already exists, but it should instead either remove it or make
# a new backup directory.
#
- # FIXME: bug 262450 -- the backup directory should have the same
+ # FIXME: bug 262450 -- the backup directory should have the same
# permissions as the .bzr directory (probably a bug in copy_tree)
old_path = self.root_transport.abspath('.bzr')
new_path = self.root_transport.abspath('backup.bzr')
@@ -1725,7 +1725,7 @@
def _initialize_on_transport_vfs(self, transport):
"""Initialize a new bzrdir using VFS calls.
-
+
:param transport: The transport to create the .bzr directory in.
:return: A
"""
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/commands.py 2009-02-23 15:42:47 +0000
@@ -934,7 +934,7 @@
# but because pdb.post_mortem gives bad results for tracebacks
# from inside generators, we do it manually.
# (http://bugs.python.org/issue4150, fixed in Python 2.6)
-
+
# Setup pdb on the traceback
p = pdb.Pdb()
p.reset()
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/errors.py 2009-02-23 15:42:47 +0000
@@ -2970,7 +2970,7 @@
class NoSuchView(BzrError):
"""A view does not exist.
"""
-
+
_fmt = u"No such view: %(view_name)s."
def __init__(self, view_name):
@@ -2980,7 +2980,7 @@
class ViewsNotSupported(BzrError):
"""Views are not supported by a tree format.
"""
-
+
_fmt = ("Views are not supported by %(tree)s;"
" use 'bzr upgrade' to change your tree to a later format.")
@@ -2999,7 +2999,7 @@
class UnresumableWriteGroup(BzrError):
-
+
_fmt = ("Repository %(repository)s cannot resume write group "
"%(write_groups)r: %(reason)s")
@@ -3012,7 +3012,7 @@
class UnsuspendableWriteGroup(BzrError):
-
+
_fmt = ("Repository %(repository)s cannot suspend a write group.")
internal_error = True
=== modified file 'bzrlib/progress.py'
--- a/bzrlib/progress.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/progress.py 2009-02-23 15:42:47 +0000
@@ -158,7 +158,7 @@
class ProgressBarStack(object):
"""A stack of progress bars.
-
+
This class is deprecated: instead, ask the ui factory for a new progress
task and finish it when it's done.
"""
=== modified file 'bzrlib/repofmt/weaverepo.py'
--- a/bzrlib/repofmt/weaverepo.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/repofmt/weaverepo.py 2009-02-23 15:42:47 +0000
@@ -399,7 +399,7 @@
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
return "Weave repository format 5"
-
+
def network_name(self):
"""The network name for this format is the control dirs disk label."""
return self._matchingbzrdir.get_format_string()
=== modified file 'bzrlib/smart/bzrdir.py'
--- a/bzrlib/smart/bzrdir.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/smart/bzrdir.py 2009-02-23 15:42:47 +0000
@@ -73,9 +73,9 @@
def do(self, path, network_name, shared):
"""Create a repository in the bzr dir at path.
-
+
This operates precisely like 'bzrdir.create_repository'.
-
+
If a bzrdir is not present, an exception is propogated
rather than 'no branch' because these are different conditions (and
this method should only be called after establishing that a bzr dir
=== modified file 'bzrlib/smart/protocol.py'
--- a/bzrlib/smart/protocol.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/smart/protocol.py 2009-02-23 15:42:47 +0000
@@ -655,7 +655,7 @@
if 'hpss' in debug.debug_flags:
mutter(' %d bytes in readv request', len(readv_bytes))
self._last_verb = args[0]
-
+
def call_with_body_stream(self, args, stream):
# Protocols v1 and v2 don't support body streams. So it's safe to
# assume that a v1/v2 server doesn't support whatever method we're
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py 2009-02-05 20:03:29 +0000
+++ b/bzrlib/tests/blackbox/test_log.py 2009-02-23 15:42:47 +0000
@@ -600,7 +600,7 @@
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
@@ -0,0 +1,1 @@
+contents of parent/file1
-
+\x20\x20\x20\x20\x20\x20
=== added file 'file2'
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/blackbox/test_status.py 2009-02-23 15:42:47 +0000
@@ -296,7 +296,7 @@
wt.commit('Create five empty files.')
open('FILE_B', 'w').write('Modification to file FILE_B.')
open('FILE_C', 'w').write('Modification to file FILE_C.')
- unlink('FILE_E') # FILE_E will be versioned but missing
+ unlink('FILE_E') # FILE_E will be versioned but missing
open('FILE_Q', 'w').write('FILE_Q is added but not committed.')
wt.add('FILE_Q') # FILE_Q will be added but not committed
open('UNVERSIONED_BUT_EXISTING', 'w')
@@ -347,7 +347,7 @@
self.assertContainsRe(err,
r'.*ERROR: Path\(s\) do not exist: '
'NONEXISTENT.*')
-
+
def test_status_nonexistent_file_with_others(self):
# bzr st [--short] NONEXISTENT ...others..
wt = self._prepare_nonexistent()
@@ -380,7 +380,7 @@
self.assertContainsRe(err,
r'.*ERROR: Path\(s\) do not exist: '
'NONEXISTENT.*')
-
+
def test_status_multiple_nonexistent_files(self):
# bzr st [--short] NONEXISTENT ... ANOTHER_NONEXISTENT ...
wt = self._prepare_nonexistent()
@@ -415,7 +415,7 @@
self.assertContainsRe(err,
r'.*ERROR: Path\(s\) do not exist: '
'ANOTHER_NONEXISTENT NONEXISTENT.*')
-
+
def test_status_nonexistent_file_with_unversioned(self):
# bzr st [--short] NONEXISTENT A B UNVERSIONED_BUT_EXISTING C D E Q
wt = self._prepare_nonexistent()
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2009-02-23 15:42:47 +0000
@@ -844,7 +844,7 @@
repo = self.make_repository('repo')
sink = repo._get_sink()
self.assertIsInstance(sink, repository.StreamSink)
-
+
def test__make_parents_provider(self):
"""Repositories must have a _make_parents_provider method that returns
an object with a get_parent_map method.
=== modified file 'bzrlib/tests/per_repository/test_write_group.py'
--- a/bzrlib/tests/per_repository/test_write_group.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/per_repository/test_write_group.py 2009-02-23 15:42:47 +0000
@@ -350,8 +350,8 @@
# Make a source repository with a delta record in it.
source_repo = self.make_write_locked_repo('source')
source_repo.start_write_group()
- key_base = ('file-id', 'base')
- key_delta = ('file-id', 'delta')
+ key_base = ('file-id', 'base')
+ key_delta = ('file-id', 'delta')
source_repo.texts.add_lines(key_base, (), ['lines\n'])
source_repo.texts.add_lines(
key_delta, (key_base,), ['more\n', 'lines\n'])
@@ -362,8 +362,8 @@
self.require_suspendable_write_groups(
'Cannot test resume on repo that does not support suspending')
source_repo = self.make_source_with_delta_record()
- key_base = ('file-id', 'base')
- key_delta = ('file-id', 'delta')
+ key_base = ('file-id', 'base')
+ key_delta = ('file-id', 'delta')
# Start a write group, insert just a delta.
repo = self.make_write_locked_repo()
repo.start_write_group()
@@ -385,8 +385,8 @@
self.require_suspendable_write_groups(
'Cannot test resume on repo that does not support suspending')
source_repo = self.make_source_with_delta_record()
- key_base = ('file-id', 'base')
- key_delta = ('file-id', 'delta')
+ key_base = ('file-id', 'base')
+ key_delta = ('file-id', 'delta')
# Start a write group.
repo = self.make_write_locked_repo()
repo.start_write_group()
@@ -412,8 +412,8 @@
self.require_suspendable_write_groups(
'Cannot test resume on repo that does not support suspending')
source_repo = self.make_source_with_delta_record()
- key_base = ('file-id', 'base')
- key_delta = ('file-id', 'delta')
+ key_base = ('file-id', 'base')
+ key_delta = ('file-id', 'delta')
# Start a write group, insert just a delta.
repo = self.make_write_locked_repo()
repo.start_write_group()
@@ -448,5 +448,5 @@
repo = self.make_write_locked_repo()
repo.resume_write_group([])
repo.abort_write_group()
-
+
=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/test_knit.py 2009-02-23 15:42:47 +0000
@@ -1618,7 +1618,7 @@
[(('tip', ), ' 100 78',
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
return graph_index
-
+
def make_g_index_no_external_refs(self):
graph_index = self.make_g_index('no_external_refs', 2,
[(('rev', ), ' 100 78',
@@ -1687,7 +1687,7 @@
index.scan_unvalidated_index(graph_index_b)
self.assertEqual(
frozenset([]), index.get_missing_compression_parents())
-
+
class TestNoParentsGraphIndexKnit(KnitTests):
"""Tests for knits using _KnitGraphIndex with no parents."""
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/test_log.py 2009-02-23 15:42:47 +0000
@@ -736,7 +736,7 @@
sio.getvalue())
def test_properties_in_short_log(self):
- """Log includes the custom properties returned by the registered
+ """Log includes the custom properties returned by the registered
handlers.
"""
wt = self.make_branch_and_tree('.')
@@ -837,7 +837,7 @@
def test_long_verbose_log(self):
"""Verbose log includes changed files
-
+
bug #4676
"""
wt = self.make_branch_and_tree('.')
@@ -976,7 +976,7 @@
sio.getvalue())
def test_long_properties_in_log(self):
- """Log includes the custom properties returned by the registered
+ """Log includes the custom properties returned by the registered
handlers.
"""
wt = self.make_branch_and_tree('.')
@@ -1109,7 +1109,7 @@
def test_line_merge_revs_log(self):
"""Line log should show revno
-
+
bug #5162
"""
wt = self.make_branch_and_tree('.')
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/test_remote.py 2009-02-23 15:42:47 +0000
@@ -18,7 +18,7 @@
These are proxy objects which act on remote objects by sending messages
through a smart client. The proxies are to be created when attempting to open
-the object given a transport that supports smartserver rpc operations.
+the object given a transport that supports smartserver rpc operations.
These tests correspond to tests.test_smart, which exercises the server side.
"""
=== modified file 'bzrlib/tests/test_versionedfile.py'
--- a/bzrlib/tests/test_versionedfile.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/test_versionedfile.py 2009-02-23 15:42:47 +0000
@@ -1751,7 +1751,7 @@
def assertStreamMetaEqual(self, records, expected, stream):
"""Assert that streams expected and stream have the same records.
-
+
:param records: A list to collect the seen records.
:return: A generator of the records in stream.
"""
@@ -1770,7 +1770,7 @@
:param skipped_records: A list with one element to increment when a
record is skipped.
- :param full_texts: A dict from key->fulltext representation, for
+ :param full_texts: A dict from key->fulltext representation, for
checking chunked or fulltext stored records.
:param stream: A record_stream.
:return: An iterator over the bytes of each record.
@@ -2453,7 +2453,7 @@
self._lines["B"] = ["HEY"]
self._lines["C"] = ["Alberta"]
it = self.texts.iter_lines_added_or_present_in_keys([("A",), ("B",)])
- self.assertEquals(sorted([("FOO", "A"), ("BAR", "A"), ("HEY", "B")]),
+ self.assertEquals(sorted([("FOO", "A"), ("BAR", "A"), ("HEY", "B")]),
sorted(list(it)))
=== modified file 'bzrlib/tests/workingtree_implementations/test_views.py'
--- a/bzrlib/tests/workingtree_implementations/test_views.py 2009-02-21 05:17:18 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_views.py 2009-02-23 15:42:47 +0000
@@ -157,7 +157,7 @@
% fmt)
# it's covered by TestTreeViews
TestCaseWithWorkingTree.setUp(self)
-
+
def test_view_methods_raise(self):
wt = self.make_branch_and_tree('wt')
self.assertRaises(errors.ViewsNotSupported,
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/transport/__init__.py 2009-02-23 15:42:47 +0000
@@ -1881,5 +1881,5 @@
'RemoteSSHTransport')
register_transport_proto('ssh:')
-register_lazy_transport('ssh:', 'bzrlib.transport.remote',
+register_lazy_transport('ssh:', 'bzrlib.transport.remote',
'HintingSSHTransport')
=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/transport/remote.py 2009-02-23 15:42:47 +0000
@@ -584,7 +584,7 @@
"""Simple transport that handles ssh:// and points out bzr+ssh://."""
def __init__(self, url):
- raise errors.UnsupportedProtocol(url,
+ raise errors.UnsupportedProtocol(url,
'bzr supports bzr+ssh to operate over ssh, use "bzr+%s".' % url)
=== modified file 'bzrlib/ui/__init__.py'
--- a/bzrlib/ui/__init__.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/ui/__init__.py 2009-02-23 15:42:47 +0000
@@ -87,7 +87,7 @@
warnings.warn("%r finished but nothing is active"
% (task,))
elif task != self._task_stack[-1]:
- warnings.warn("%r is not the active task %r"
+ warnings.warn("%r is not the active task %r"
% (task, self._task_stack[-1]))
else:
del self._task_stack[-1]
@@ -100,7 +100,7 @@
def _progress_updated(self, task):
"""Called by the ProgressTask when it changes.
-
+
Should be specialized to draw the progress.
"""
pass
=== modified file 'bzrlib/views.py'
--- a/bzrlib/views.py 2009-02-21 05:17:18 +0000
+++ b/bzrlib/views.py 2009-02-23 15:42:47 +0000
@@ -104,7 +104,7 @@
def lookup_view(self, view_name=None):
"""Return the contents of a view.
-
+
:param view_Name: name of the view or None to lookup the current view
:return: the list of files/directories in the requested view
"""
@@ -121,7 +121,7 @@
def set_view(self, view_name, view_files, make_current=True):
"""Add or update a view definition.
-
+
:param view_name: the name of the view
:param view_files: the list of files/directories in the view
:param make_current: make this view the current one or not
More information about the bazaar-commits
mailing list