Merge lp:~dvedder95/bzr/pager into lp:bzr

Proposed by veddox
Status: Needs review
Proposed branch: lp:~dvedder95/bzr/pager
Merge into: lp:bzr
Diff against target: 1634 lines (+192/-8)
6 files modified
BRANCH.TODO (+6/-2)
bzrlib/config.py (+7/-0)
bzrlib/help_topics/en/configuration.txt (+32/-0)
bzrlib/osutils.py (+74/-0)
bzrlib/ui/text.py (+69/-6)
doc/en/release-notes/bzr-2.7.txt (+4/-0)
To merge this branch: bzr merge lp:~dvedder95/bzr/pager
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+263836@code.launchpad.net

Description of the change

This is a proposed fix for bug #213718. It adds the config option 'pager' and the environmental variable '$BZR_PAGER'. If either of these is set, long text outputs are routed to the specified pager program.

To post a comment you must log in.
Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

I'm trying to get the diff to show up in the review.

In looking over the revisions in your branch code, I see some good work preceded by bzr's misunderstanding of your filesystem's capabilities. bzr is convinced that since your OS is Linux, your filesystem must support the normal *nix permissions class triad 'ugo' (user, group, other) with available control of 'rwx' (read, write, execute). Trouble is, your filesystem doesn't store that information and so when bzr creates a working tree there, that information is lost. When bzr reads back the permissions from the Linux filesystem interface, it gets whatever default value is returned from the API for every file and thus it appears you have modified the permissions of every file in the working tree whose permissions in the parent tree don't match the default value.

This revision is a phantom change that you did nothing to create and exists as a ghostly reminder of a hole in our filesystem support. I am interested in resolving this as it causes problems and doesn't look too difficult, but I am first trying to get the Bazaar Patch Queue Manager back online as that is our critical path to land new code on trunk.

Revision history for this message
veddox (dvedder95) wrote :

> I see some good work

Thanks :-)

> preceded by bzr's misunderstanding of your filesystem's capabilities.

I'm running Ubuntu 14.04, but the partition hosting my code is NTFS.

> This revision is a phantom change that you did nothing to create and exists as
> a ghostly reminder of a hole in our filesystem support.

That would be bug #248333 (https://bugs.launchpad.net/bzr/+bug/248333), right?

Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

You are correct regarding bug 248333. Now that Bazaar PQM is back,
I've got at least one of my Linux boxen running again, and the bzr
2.7.0 release dust is beginning to settle, I'm looking forward to
merging several branches and looking into 248333.

Unmerged revisions

6606. By veddox

Minor adjustments/corrections of previous changes.

6605. By veddox

Added $BZR_PAGER environment variable; TextUIOutputStream now checks the height of the current terminal before deciding whether or not to use the pager. Updated the documentation, added terminal_height() in osutils.py.

6604. By veddox

Added the 'pager' option and implemented it in TextUIOutputStream.

6603. By veddox

bzr.pager branched from parent bzr.dev

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore' (properties changed: -x to +x)
=== modified file '.rsyncexclude' (properties changed: -x to +x)
=== modified file '.testr.conf' (properties changed: -x to +x)
=== modified file 'BRANCH.TODO' (properties changed: -x to +x)
--- BRANCH.TODO 2010-07-10 21:28:56 +0000
+++ BRANCH.TODO 2015-07-21 00:48:43 +0000
@@ -1,5 +1,9 @@
1# This file is for listing TODOs for branches that are being worked on.1# This file is for listing TODOs for branches that are being worked on.
2# It should ALWAYS be empty in the mainline or in integration branches.2# It should ALWAYS be empty in the mainline or in integration branches.
3# 3#
4#4# Branch: bzr-pager
55
6This branch aims at fixing Launchpad bug #213718: "Use bzr-pager by default"
7
8TODO:
9 - write tests for the new features
610
=== modified file 'COPYING.txt' (properties changed: -x to +x)
=== modified file 'INSTALL' (properties changed: -x to +x)
=== modified file 'MANIFEST.in' (properties changed: -x to +x)
=== modified file 'Makefile' (properties changed: -x to +x)
=== modified file 'NEWS' (properties changed: -x to +x)
=== modified file 'README' (properties changed: -x to +x)
=== modified file 'README_BDIST_RPM' (properties changed: -x to +x)
=== modified file 'TODO' (properties changed: -x to +x)
=== modified file 'apport/README' (properties changed: -x to +x)
=== modified file 'apport/bzr-crashdb.conf' (properties changed: -x to +x)
=== modified file 'apport/source_bzr.py' (properties changed: -x to +x)
=== modified file 'bzr.ico' (properties changed: -x to +x)
=== modified file 'bzrlib/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_annotator_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_annotator_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_bencode_pyx.h' (properties changed: -x to +x)
=== modified file 'bzrlib/_bencode_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_btree_serializer_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_btree_serializer_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_chk_map_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_chk_map_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_chunks_to_lines_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_chunks_to_lines_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_dirstate_helpers_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_dirstate_helpers_pyx.h' (properties changed: -x to +x)
=== modified file 'bzrlib/_dirstate_helpers_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_export_c_api.h' (properties changed: -x to +x)
=== modified file 'bzrlib/_groupcompress_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_groupcompress_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_import_c_api.h' (properties changed: -x to +x)
=== modified file 'bzrlib/_knit_load_data_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_knit_load_data_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_known_graph_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_known_graph_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_patiencediff_c.c' (properties changed: -x to +x)
=== modified file 'bzrlib/_readdir_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_readdir_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_rio_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_rio_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_simple_set_pyx.pxd' (properties changed: -x to +x)
=== modified file 'bzrlib/_simple_set_pyx.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/_static_tuple_c.c' (properties changed: -x to +x)
=== modified file 'bzrlib/_static_tuple_c.h' (properties changed: -x to +x)
=== modified file 'bzrlib/_static_tuple_c.pxd' (properties changed: -x to +x)
=== modified file 'bzrlib/_static_tuple_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_termcolor.py' (properties changed: -x to +x)
=== modified file 'bzrlib/_walkdirs_win32.pyx' (properties changed: -x to +x)
=== modified file 'bzrlib/add.py' (properties changed: -x to +x)
=== modified file 'bzrlib/annotate.py' (properties changed: -x to +x)
=== modified file 'bzrlib/api.py' (properties changed: -x to +x)
=== modified file 'bzrlib/atomicfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bencode.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bisect_multi.py' (properties changed: -x to +x)
=== modified file 'bzrlib/branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/branchbuilder.py' (properties changed: -x to +x)
=== modified file 'bzrlib/branchfmt/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/branchfmt/fullhistory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/breakin.py' (properties changed: -x to +x)
=== modified file 'bzrlib/btree_index.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bugtracker.py' (properties changed: -x to +x)
=== modified file 'bzrlib/builtins.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/apply_bundle.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/bundle_data.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/commands.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/serializer/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/serializer/v08.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/serializer/v09.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bundle/serializer/v4.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bzr_distutils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/bzrdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/cache_utf8.py' (properties changed: -x to +x)
=== modified file 'bzrlib/cethread.py' (properties changed: -x to +x)
=== modified file 'bzrlib/check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/chk_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/chk_serializer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/chunk_writer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/clean_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/cleanup.py' (properties changed: -x to +x)
=== modified file 'bzrlib/cmd_test_script.py' (properties changed: -x to +x)
=== modified file 'bzrlib/cmd_version_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/cmdline.py' (properties changed: -x to +x)
=== modified file 'bzrlib/commands.py' (properties changed: -x to +x)
=== modified file 'bzrlib/commit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/commit_signature_commands.py' (properties changed: -x to +x)
=== modified file 'bzrlib/config.py' (properties changed: -x to +x)
--- bzrlib/config.py 2014-06-19 09:42:08 +0000
+++ bzrlib/config.py 2015-07-21 00:48:43 +0000
@@ -24,6 +24,7 @@
24In bazaar.conf the following options may be set:24In bazaar.conf the following options may be set:
25[DEFAULT]25[DEFAULT]
26editor=name-of-program26editor=name-of-program
27pager=name-of-program
27email=Your Name <your@email.address>28email=Your Name <your@email.address>
28check_signatures=require|ignore|check-available(default)29check_signatures=require|ignore|check-available(default)
29create_signatures=always|never|when-required(default)30create_signatures=always|never|when-required(default)
@@ -48,6 +49,7 @@
48explanation of options49explanation of options
49----------------------50----------------------
50editor - this option sets the pop up editor to use during commits.51editor - this option sets the pop up editor to use during commits.
52pager - this option sets the pager that will be used to display long help texts.
51email - this option sets the user id bzr will use when committing.53email - this option sets the user id bzr will use when committing.
52check_signatures - this option will control whether bzr will require good gpg54check_signatures - this option will control whether bzr will require good gpg
53 signatures, ignore them, or check them if they are55 signatures, ignore them, or check them if they are
@@ -2810,6 +2812,11 @@
2810 help= 'Unicode encoding for output'2812 help= 'Unicode encoding for output'
2811 ' (terminal encoding if not specified).'))2813 ' (terminal encoding if not specified).'))
2812option_registry.register(2814option_registry.register(
2815 Option('pager',
2816 default=None,
2817 help='''\
2818The command called to launch a pager when displaying help texts.'''))
2819option_registry.register(
2813 Option('parent_location',2820 Option('parent_location',
2814 default=None,2821 default=None,
2815 help="""\2822 help="""\
28162823
=== modified file 'bzrlib/conflicts.py' (properties changed: -x to +x)
=== modified file 'bzrlib/controldir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/counted_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/crash.py' (properties changed: -x to +x)
=== modified file 'bzrlib/debug.py' (properties changed: -x to +x)
=== modified file 'bzrlib/decorators.py' (properties changed: -x to +x)
=== modified file 'bzrlib/delta.h' (properties changed: -x to +x)
=== modified file 'bzrlib/delta.py' (properties changed: -x to +x)
=== modified file 'bzrlib/diff-delta.c' (properties changed: -x to +x)
=== modified file 'bzrlib/diff.py' (properties changed: -x to +x)
=== modified file 'bzrlib/directory_service.py' (properties changed: -x to +x)
=== modified file 'bzrlib/dirstate.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc/api/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc/api/branch.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/doc/api/transport.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/doc_generate/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc_generate/autodoc_bash_completion.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc_generate/autodoc_man.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc_generate/autodoc_rstx.py' (properties changed: -x to +x)
=== modified file 'bzrlib/doc_generate/conf.py' (properties changed: -x to +x)
=== modified file 'bzrlib/email_message.py' (properties changed: -x to +x)
=== modified file 'bzrlib/errors.py' (properties changed: -x to +x)
=== modified file 'bzrlib/estimate_compressed_size.py' (properties changed: -x to +x)
=== modified file 'bzrlib/export/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/export/dir_exporter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/export/tar_exporter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/export/zip_exporter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/export_pot.py' (properties changed: -x to +x)
=== modified file 'bzrlib/externalcommand.py' (properties changed: -x to +x)
=== modified file 'bzrlib/fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/fifo_cache.py' (properties changed: -x to +x)
=== modified file 'bzrlib/filter_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/filters/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/filters/eol.py' (properties changed: -x to +x)
=== modified file 'bzrlib/foreign.py' (properties changed: -x to +x)
=== modified file 'bzrlib/generate_ids.py' (properties changed: -x to +x)
=== modified file 'bzrlib/globbing.py' (properties changed: -x to +x)
=== modified file 'bzrlib/gpg.py' (properties changed: -x to +x)
=== modified file 'bzrlib/graph.py' (properties changed: -x to +x)
=== modified file 'bzrlib/groupcompress.py' (properties changed: -x to +x)
=== modified file 'bzrlib/hashcache.py' (properties changed: -x to +x)
=== modified file 'bzrlib/help.py' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/authentication.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/configuration.txt' (properties changed: -x to +x)
--- bzrlib/help_topics/en/configuration.txt 2012-10-10 18:29:39 +0000
+++ bzrlib/help_topics/en/configuration.txt 2015-07-21 00:48:43 +0000
@@ -61,6 +61,11 @@
6161
62Path to the editor Bazaar should use for commit messages, etc.62Path to the editor Bazaar should use for commit messages, etc.
6363
64BZR_PAGER
65~~~~~~~~~
66
67Path to the pager that Bazaar should use when outputting long texts.
68
64BZR_LOG69BZR_LOG
65~~~~~~~70~~~~~~~
6671
@@ -73,6 +78,26 @@
73Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms78Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms
74will disable logging.79will disable logging.
7580
81BZR_COLUMNS
82~~~~~~~~~~~
83
84Width of the current terminal in characters. By default, this information
85is obtained from the operating system, but can be overriden by the user
86via this variable.
87
88It is used when formatting texts (such as the branch history) for output.
89
90BZR_HEIGHT
91~~~~~~~~~~
92
93Height of the current terminal in lines. By default, this information is
94obtained from the operating system, but can be overriden by the user via
95this variable.
96
97The height is needed to determine whether an output is long enough to
98merit the use of a pager (if the user has set the BZR_PAGER variable or
99'pager' option in bazaar.conf).
100
76101
77BZR_PLUGIN_PATH102BZR_PLUGIN_PATH
78~~~~~~~~~~~~~~~103~~~~~~~~~~~~~~~
@@ -427,6 +452,13 @@
427``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment452``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment
428variables.453variables.
429454
455pager
456~~~~~
457
458The path of the pager that Bazaar will use when *bzr help* is invoked, as help
459texts are often too long to be shown in one screenful. By default, no pager is
460used. The environment variable ``BZR_PAGER`` overrides this option.
461
430log_format462log_format
431~~~~~~~~~~463~~~~~~~~~~
432464
433465
=== modified file 'bzrlib/help_topics/en/conflict-types.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/content-filters.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/debug-flags.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/diverged-branches.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/eol.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/log-formats.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/patterns.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/rules.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/en/url-special-chars.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/help_topics/es/conflict-types.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/hooks.py' (properties changed: -x to +x)
=== modified file 'bzrlib/i18n.py' (properties changed: -x to +x)
=== modified file 'bzrlib/identitymap.py' (properties changed: -x to +x)
=== modified file 'bzrlib/ignores.py' (properties changed: -x to +x)
=== modified file 'bzrlib/index.py' (properties changed: -x to +x)
=== modified file 'bzrlib/info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/inspect_for_copy.py' (properties changed: -x to +x)
=== modified file 'bzrlib/inter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/intset.py' (properties changed: -x to +x)
=== modified file 'bzrlib/inventory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/inventory_delta.py' (properties changed: -x to +x)
=== modified file 'bzrlib/iterablefile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/knit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lazy_import.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lazy_regex.py' (properties changed: -x to +x)
=== modified file 'bzrlib/library_state.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lockable_files.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lockdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/log.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lru_cache.py' (properties changed: -x to +x)
=== modified file 'bzrlib/lsprof.py' (properties changed: -x to +x)
=== modified file 'bzrlib/mail_client.py' (properties changed: -x to +x)
=== modified file 'bzrlib/memorytree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/merge3.py' (properties changed: -x to +x)
=== modified file 'bzrlib/merge_directive.py' (properties changed: -x to +x)
=== modified file 'bzrlib/mergetools.py' (properties changed: -x to +x)
=== modified file 'bzrlib/missing.py' (properties changed: -x to +x)
=== modified file 'bzrlib/msgeditor.py' (properties changed: -x to +x)
=== modified file 'bzrlib/multiparent.py' (properties changed: -x to +x)
=== modified file 'bzrlib/mutabletree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/option.py' (properties changed: -x to +x)
=== modified file 'bzrlib/osutils.py' (properties changed: -x to +x)
--- bzrlib/osutils.py 2013-06-24 12:03:12 +0000
+++ bzrlib/osutils.py 2015-07-21 00:48:43 +0000
@@ -1619,6 +1619,80 @@
1619 return None1619 return None
16201620
16211621
1622# Repeat the more or less same as above, except now take the height
1623
1624default_terminal_height = 24
1625"""The default terminal height for ttys.
1626
1627This is defined so that higher levels can share a common fallback value when
1628terminal_height() returns None.
1629
1630Used when deciding whether or not to output to a pager in ui/text.py
1631"""
1632
1633def terminal_height():
1634 """Return terminal height.
1635
1636 None is returned if the height can't established precisely.
1637
1638 The rules are:
1639 - if BZR_HEIGHT is set, returns its value
1640 - if there is no controlling terminal, returns None
1641 - query the OS, if the queried size has changed since the last query,
1642 return its value,
1643 - if the OS has a value (even though it's never changed), return its value.
1644
1645 From there, we need to query the OS to get the size of the controlling
1646 terminal.
1647
1648 On Unices we query the OS by:
1649 - get termios.TIOCGWINSZ
1650 - if an error occurs or a negative value is obtained, returns None
1651
1652 On Windows we query the OS by:
1653 - win32utils.get_console_size() decides,
1654 - returns None on error (provided default value)
1655 """
1656 try:
1657 height = int(os.environ['BZR_HEIGHT'])
1658 except (KeyError, ValueError):
1659 height = None
1660 if height is not None:
1661 if height > 0:
1662 return height
1663 else:
1664 return None
1665
1666 isatty = getattr(sys.stdout, 'isatty', None)
1667 if isatty is None or not isatty():
1668 # Don't guess, setting BZR_HEIGHT is the recommended way to override.
1669 return None
1670
1671 # Query the OS
1672 width, height = os_size = _terminal_size(None, None)
1673 global _first_terminal_size, _terminal_size_state
1674 if _terminal_size_state == 'no_data':
1675 _first_terminal_size = os_size
1676 _terminal_size_state = 'unchanged'
1677 elif (_terminal_size_state == 'unchanged' and
1678 _first_terminal_size != os_size):
1679 _terminal_size_state = 'changed'
1680
1681 # If the OS claims to know how wide the terminal is, and this value has
1682 # ever changed, use that.
1683 if _terminal_size_state == 'changed':
1684 if height is not None and height > 0:
1685 return height
1686
1687 # Finally, use an unchanged size from the OS, if we have one.
1688 if _terminal_size_state == 'unchanged':
1689 if height is not None and height > 0:
1690 return height
1691
1692 # The height could not be determined.
1693 return None
1694
1695
1622def _win32_terminal_size(width, height):1696def _win32_terminal_size(width, height):
1623 width, height = win32utils.get_console_size(defaultx=width, defaulty=height)1697 width, height = win32utils.get_console_size(defaultx=width, defaulty=height)
1624 return width, height1698 return width, height
16251699
=== modified file 'bzrlib/pack.py' (properties changed: -x to +x)
=== modified file 'bzrlib/patch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/patches.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugin.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/bash_completion/README.txt' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/bash_completion/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/bash_completion/bashcomp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/bash_completion/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/bash_completion/tests/test_bashcomp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/changelog_merge/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/changelog_merge/changelog_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/changelog_merge/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/grep/.bzrignore' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/grep/NEWS' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/grep/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/grep/cmds.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/grep/grep.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/grep/test_grep.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/account.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/cmds.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/lp_api.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/lp_api_lite.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/lp_directory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/lp_propose.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/lp_registration.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_account.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_lp_api.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_lp_api_lite.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_lp_login.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_lp_open.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/launchpad/test_register.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/netrc_credential_store/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/netrc_credential_store/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/netrc_credential_store/tests/test_netrc.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/news_merge/README' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/news_merge/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/news_merge/news_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/news_merge/parser.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/news_merge/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/news_merge/tests/test_news_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/po_merge/README' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/po_merge/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/po_merge/po_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/po_merge/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/po_merge/tests/test_po_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/bzrdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/test_bzrdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/test_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/test_workingtree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/workingtree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/plugins/weave_fmt/xml4.py' (properties changed: -x to +x)
=== modified file 'bzrlib/progress.py' (properties changed: -x to +x)
=== modified file 'bzrlib/push.py' (properties changed: -x to +x)
=== modified file 'bzrlib/python-compat.h' (properties changed: -x to +x)
=== modified file 'bzrlib/pyutils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/readdir.h' (properties changed: -x to +x)
=== modified file 'bzrlib/reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/reconfigure.py' (properties changed: -x to +x)
=== modified file 'bzrlib/recordcounter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/registry.py' (properties changed: -x to +x)
=== modified file 'bzrlib/remote.py' (properties changed: -x to +x)
=== modified file 'bzrlib/rename_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/repofmt/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/repofmt/groupcompress_repo.py' (properties changed: -x to +x)
=== modified file 'bzrlib/repofmt/knitpack_repo.py' (properties changed: -x to +x)
=== modified file 'bzrlib/repofmt/knitrepo.py' (properties changed: -x to +x)
=== modified file 'bzrlib/repofmt/pack_repo.py' (properties changed: -x to +x)
=== modified file 'bzrlib/repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/revision.py' (properties changed: -x to +x)
=== modified file 'bzrlib/revisionspec.py' (properties changed: -x to +x)
=== modified file 'bzrlib/revisiontree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/rio.py' (properties changed: -x to +x)
=== modified file 'bzrlib/rules.py' (properties changed: -x to +x)
=== modified file 'bzrlib/send.py' (properties changed: -x to +x)
=== modified file 'bzrlib/serializer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/shelf.py' (properties changed: -x to +x)
=== modified file 'bzrlib/shelf_ui.py' (properties changed: -x to +x)
=== modified file 'bzrlib/shellcomplete.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/bzrdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/client.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/medium.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/message.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/packrepository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/ping.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/protocol.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/request.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/server.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/signals.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smart/vfs.py' (properties changed: -x to +x)
=== modified file 'bzrlib/smtp_connection.py' (properties changed: -x to +x)
=== modified file 'bzrlib/static_tuple.py' (properties changed: -x to +x)
=== modified file 'bzrlib/status.py' (properties changed: -x to +x)
=== modified file 'bzrlib/store/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/store/text.py' (properties changed: -x to +x)
=== modified file 'bzrlib/store/versioned/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/strace.py' (properties changed: -x to +x)
=== modified file 'bzrlib/switch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/symbol_versioning.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tag.py' (properties changed: -x to +x)
=== modified file 'bzrlib/testament.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/EncodingAdapter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/TestUtil.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_add.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_added.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_alias.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_aliases.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_ancestry.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_annotate.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_branches.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_break_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_bundle_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_cat.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_cat_revision.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_checkout.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_clean_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_command_encoding.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_commit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_config.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_conflicts.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_debug.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_deleted.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_diff.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_dpush.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_dump_btree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_exceptions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_export.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_export_pot.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_filesystem_cicp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_filtered_view_ops.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_find_merge_base.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_help.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_hooks.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_ignore.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_ignored.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_init.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_inventory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_join.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_locale.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_log.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_logformats.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_lookup_revision.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_ls.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_lsprof.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_merge_directive.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_missing.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_mkdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_modified.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_mv.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_nick.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_non_ascii.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_outside_wt.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_pack.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_ping.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_pull.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_push.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_re_sign.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_reference.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_remember_option.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_remerge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_remove.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_remove_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_repair_workingtree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_resolve.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_revert.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_revision_history.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_revision_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_revno.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_rmbranch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_script.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_selftest.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_send.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_serve.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_shared_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_shell_complete.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_shelve.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_sign_my_commits.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_split.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_status.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_switch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_tags.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_testament.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_too_much.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_uncommit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_unknowns.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_update.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_verify_signatures.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_version.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_version_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_versioning.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_view.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/blackbox/test_whoami.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_cat.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_checkout.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_commit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_init.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_init_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_missing.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_pull.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_push.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_revert.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/commands/test_update.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/fake_command.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/features.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/file_utils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/fixtures.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ftp_server/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ftp_server/medusa_based.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ftp_server/pyftpdlib_based.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/http_server.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/http_utils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/https_server.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/lock_helpers.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/matchers.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_break_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_commit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_config.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_create_checkout.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_create_clone.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_dotted_revno_to_revision_id.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_get_revision_id_to_revno_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_hooks.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_http.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_last_revision_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_locking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_parent.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_permissions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_pull.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_push.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_revision_id_to_revno.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_sprout.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_stacking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_tags.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_uncommit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_branch/test_update.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_bzrdir/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir/test_controldir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir/test_format.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir/test_push.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir_colo/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir_colo/test_supported.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_controldir_colo/test_unsupported.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_foreign_vcs/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_foreign_vcs/test_branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_foreign_vcs/test_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interbranch/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interbranch/test_copy_content_into.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interbranch/test_fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interbranch/test_get.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interbranch/test_pull.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interbranch/test_push.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interrepository/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interrepository/test_fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_interrepository/test_interrepository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_intertree/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_intertree/test_compare.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_intertree/test_file_content_matches.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_inventory/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_inventory/basics.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_lock/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_lock/test_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_lock/test_temporary_write_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_merger.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_pack_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_add_fallback_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_break_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_file_graph.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_get_parent_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_has_revisions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_has_same_location.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_locking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_pack.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_refresh_data.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_revision.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_signatures.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_statistics.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository/test_write_group.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_chk/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_chk/test_supported.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_chk/test_unsupported.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test__make_parents_provider.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_add_inventory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_add_revision.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_add_signature_text.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_all_revision_ids.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_break_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_commit_with_stacking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_default_stacking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_get_record_stream.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_graph.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_initialize.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_reference/test_unlock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/helpers.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test__generate_text_key_index.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_check_reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_fileid_involved.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_find_text_key_references.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_merge_directive.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_refresh_data.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_repository_vf/test_write_group.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_annotate_iter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_export.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_get_file_mtime.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_get_file_with_stat.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_get_root_id.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_get_symlink_target.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_ids.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_inv.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_is_executable.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_iter_search_rules.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_list_files.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_locking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_path_content_summary.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_revision_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_test_trees.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_tree/test_walkdirs.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_uifactory/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_versionedfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_add.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_add_reference.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_annotate_iter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_basis_inventory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_basis_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_break_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_changes_from.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_check.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_check_state.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_commit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_content_filters.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_eol_conversion.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_executable.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_flush.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_get_file_mtime.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_get_parent_ids.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_inv.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_is_control_filename.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_is_ignored.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_locking.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_merge_from_branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_mkdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_move.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_nested_specifics.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_parents.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_paths2ids.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_pull.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_put_file.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_read_working_inventory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_readonly.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_remove.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_rename_one.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_revision_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_set_root_id.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_symlinks.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_uncommit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_unversion.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_views.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_walkdirs.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/scenarios.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/script.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/ca.crt' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/ca.key' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/server.crt' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/server.csr' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/server_with_pass.key' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/ssl_certs/server_without_pass.key' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/stub_sftp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__annotator.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__bencode.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__btree_serializer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__chk_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__chunks_to_lines.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__dirstate_helpers.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__groupcompress.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__known_graph.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__rio.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__simple_set.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__static_tuple.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test__walkdirs_win32.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_ancestry.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_annotate.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_api.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_atomicfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_bad_files.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_bisect_multi.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_branch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_branchbuilder.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_btree_index.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_bugtracker.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_bundle.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_bzrdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_cache_utf8.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_cethread.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_chk_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_chk_serializer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_chunk_writer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_clean_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_cleanup.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_cmdline.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_commands.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_commit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_commit_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_config.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_conflicts.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_controldir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_counted_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_crash.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_debug.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_decorators.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_delta.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_diff.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_directory_service.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_dirstate.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_email_message.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_eol_filters.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_errors.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_estimate_compressed_size.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_export.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_export_pot.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_extract.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_features.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_fetch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_fifo_cache.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_filter_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_filters.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_fixtures.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_foreign.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_ftp_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_generate_docs.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_generate_ids.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_globbing.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_gpg.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_graph.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_groupcompress.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_hashcache.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_help.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_hooks.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_http.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_http_response.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_https_ca_bundle.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_https_urllib.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_i18n.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_identitymap.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_ignores.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_import_tariff.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_index.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_inv.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_inventory_delta.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_knit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lazy_import.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lazy_regex.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_library_state.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lock.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lockable_files.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lockdir.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_log.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lru_cache.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_lsprof.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_mail_client.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_matchers.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_memorytree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_merge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_merge3.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_merge_core.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_merge_directive.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_mergetools.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_missing.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_msgeditor.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_multiparent.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_mutabletree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_nonascii.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_options.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_osutils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_osutils_encodings.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_pack.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/binary-after-normal.patch' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/binary.patch' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff-2' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff-3' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff-4' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff-5' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff-6' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/diff-7' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/insert_top.patch' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod-2' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod-3' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod-4' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod-5' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod-6' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/mod-7' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig-2' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig-3' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig-4' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig-5' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig-6' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/orig-7' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_patches_data/patchtext.patch' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_permissions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_plugins.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_progress.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_pyutils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_read_bundle.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_reconcile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_reconfigure.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_registry.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_remote.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_rename_map.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_revert.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_revision.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_revisionspec.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_revisiontree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_rio.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_rules.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_sampler.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_scenarios.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_script.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_selftest.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_serializer.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_server.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_setup.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_sftp_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_shelf.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_shelf_ui.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_smart.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_smart_add.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_smart_request.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_smart_signals.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_smart_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_smtp_connection.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_source.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_ssh_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_status.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_store.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_strace.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_subsume.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_switch.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_symbol_versioning.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_tag.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_test_server.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_testament.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_textfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_textmerge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_timestamp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_trace.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_transactions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_transform.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_transport_log.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_treebuilder.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_treeshape.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_tsort.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_tuned_gzip.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_ui.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_uncommit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_upgrade.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_upgrade_stacked.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_url_policy_open.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_urlutils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_utextwrap.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_version.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_version_info.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_versionedfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_vf_search.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_weave.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_whitebox.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_win32utils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_workingtree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_workingtree_4.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_wsgi.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/test_xml.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/testui.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/transport_util.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tests/treeshape.py' (properties changed: -x to +x)
=== modified file 'bzrlib/textfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/textinv.py' (properties changed: -x to +x)
=== modified file 'bzrlib/textmerge.py' (properties changed: -x to +x)
=== modified file 'bzrlib/timestamp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/trace.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transactions.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transform.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/brokenrename.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/chroot.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/decorator.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/fakenfs.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/fakevfat.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/ftp/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/ftp/_gssapi.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/gio_transport.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/_pycurl.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/_urllib.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/ca_bundle.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/response.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/http/wsgi.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/local.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/log.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/memory.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/nosmart.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/pathfilter.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/readonly.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/remote.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/sftp.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/ssh.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/trace.py' (properties changed: -x to +x)
=== modified file 'bzrlib/transport/unlistable.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/treebuilder.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tsort.py' (properties changed: -x to +x)
=== modified file 'bzrlib/tuned_gzip.py' (properties changed: -x to +x)
=== modified file 'bzrlib/ui/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/ui/text.py' (properties changed: -x to +x)
--- bzrlib/ui/text.py 2012-12-04 14:21:42 +0000
+++ bzrlib/ui/text.py 2015-07-21 00:48:43 +0000
@@ -673,19 +673,82 @@
673 def __init__(self, ui_factory, wrapped_stream):673 def __init__(self, ui_factory, wrapped_stream):
674 self.ui_factory = ui_factory674 self.ui_factory = ui_factory
675 self.wrapped_stream = wrapped_stream675 self.wrapped_stream = wrapped_stream
676 # Set up a pager if the user wants to use one
677 p = os.environ.get('BZR_PAGER')
678 if not p:
679 p = config.GlobalStack().get('pager')
680 if p is not None:
681 self.use_pager = True
682 # A pager is used when the output is longer than pager_cutoff
683 # lines. This value is one less than the actual height of the
684 # terminal to account for the command prompt.
685 self.pager_cutoff = osutils.terminal_height()
686 if not self.pager_cutoff:
687 self.pager_cutoff = osutils.default_terminal_height
688 self.pager_cutoff = self.pager_cutoff-1
689 self.pager = PagerUIOutputStream(p)
690 else:
691 self.use_pager = False
676 # this does no transcoding, but it must expose the underlying encoding692 # this does no transcoding, but it must expose the underlying encoding
677 # because some callers need to know what can be written - see for693 # because some callers need to know what can be written - see for
678 # example unescape_for_display.694 # example unescape_for_display.
679 self.encoding = getattr(wrapped_stream, 'encoding', None)695 self.encoding = getattr(wrapped_stream, 'encoding', None)
680696
681 def flush(self):697 def flush(self):
698 # No flush done on the pager, since it is never left open
682 self.ui_factory.clear_term()699 self.ui_factory.clear_term()
683 self.wrapped_stream.flush()700 self.wrapped_stream.flush()
684701
685 def write(self, to_write):702 def write(self, to_write):
686 self.ui_factory.clear_term()703 if self.use_pager and self._is_long(to_write):
687 self.wrapped_stream.write(to_write)704 self.pager.write(to_write)
688705 else:
689 def writelines(self, lines):706 self.ui_factory.clear_term()
690 self.ui_factory.clear_term()707 self.wrapped_stream.write(to_write)
691 self.wrapped_stream.writelines(lines)708
709 def writelines(self, lines):
710 if self.use_pager and self._is_long(lines):
711 self.pager.writelines(lines)
712 else:
713 self.ui_factory.clear_term()
714 self.wrapped_stream.writelines(lines)
715
716 def _is_long(self, text):
717 if isinstance(text, list):
718 return len(text) > self.pager_cutoff
719 else:
720 number_of_lines = 1
721 start = text.find("\n")
722 while start > -1:
723 start = text.find("\n", start+1)
724 number_of_lines = number_of_lines + 1
725 if number_of_lines > self.pager_cutoff:
726 return True
727 return False
728
729
730class PagerUIOutputStream(object):
731 """Pipe the output to the user-specified pager.
732
733 This is used by TextUIOutputStream when printing long outputs.
734 Thanks to the authors of pydoc.py for the template for this code!
735 """
736
737 def __init__(self, pager_cmd):
738 self.pager_cmd = pager_cmd
739
740 def write(self, to_write):
741 try:
742 pager = os.popen(self.pager_cmd, 'w')
743 pager.write(to_write)
744 pager.close()
745 except IOError:
746 pass # Ignore broken pipes caused by quitting the pager program.
747
748 def writelines(self, lines):
749 try:
750 pager = os.popen(self.pager_cmd, 'w')
751 pager.writelines(lines)
752 pager.close()
753 except IOError:
754 pass
692755
=== modified file 'bzrlib/uncommit.py' (properties changed: -x to +x)
=== modified file 'bzrlib/upgrade.py' (properties changed: -x to +x)
=== modified file 'bzrlib/url_policy_open.py' (properties changed: -x to +x)
=== modified file 'bzrlib/urlutils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/utextwrap.py' (properties changed: -x to +x)
=== modified file 'bzrlib/util/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/util/_bencode_py.py' (properties changed: -x to +x)
=== modified file 'bzrlib/util/configobj/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/util/configobj/configobj.py' (properties changed: -x to +x)
=== modified file 'bzrlib/util/simplemapi.py' (properties changed: -x to +x)
=== modified file 'bzrlib/util/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/version.py' (properties changed: -x to +x)
=== modified file 'bzrlib/version_info_formats/__init__.py' (properties changed: -x to +x)
=== modified file 'bzrlib/version_info_formats/format_custom.py' (properties changed: -x to +x)
=== modified file 'bzrlib/version_info_formats/format_python.py' (properties changed: -x to +x)
=== modified file 'bzrlib/version_info_formats/format_rio.py' (properties changed: -x to +x)
=== modified file 'bzrlib/versionedfile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/vf_repository.py' (properties changed: -x to +x)
=== modified file 'bzrlib/vf_search.py' (properties changed: -x to +x)
=== modified file 'bzrlib/views.py' (properties changed: -x to +x)
=== modified file 'bzrlib/weavefile.py' (properties changed: -x to +x)
=== modified file 'bzrlib/win32utils.py' (properties changed: -x to +x)
=== modified file 'bzrlib/workingtree.py' (properties changed: -x to +x)
=== modified file 'bzrlib/workingtree_3.py' (properties changed: -x to +x)
=== modified file 'bzrlib/workingtree_4.py' (properties changed: -x to +x)
=== modified file 'bzrlib/xml5.py' (properties changed: -x to +x)
=== modified file 'bzrlib/xml6.py' (properties changed: -x to +x)
=== modified file 'bzrlib/xml7.py' (properties changed: -x to +x)
=== modified file 'bzrlib/xml8.py' (properties changed: -x to +x)
=== modified file 'bzrlib/xml_serializer.py' (properties changed: -x to +x)
=== modified file 'contrib/bash/bzr' (properties changed: -x to +x)
=== modified file 'contrib/convert_to_1.9.py' (properties changed: -x to +x)
=== modified file 'contrib/create_bzr_rollup.py' (properties changed: -x to +x)
=== modified file 'contrib/debian/default' (properties changed: -x to +x)
=== modified file 'contrib/emacs/bzr-mode.el' (properties changed: -x to +x)
=== modified file 'contrib/upload-bzr.dev' (properties changed: -x to +x)
=== modified file 'contrib/zsh/README' (properties changed: -x to +x)
=== modified file 'doc/Bazaar-Logo-For-Manuals.png' (properties changed: -x to +x)
=== modified file 'doc/default.css' (properties changed: -x to +x)
=== modified file 'doc/developers/HACKING.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/_static/bzr icon 16.png' (properties changed: -x to +x)
=== modified file 'doc/developers/_static/bzr-doc.css' (properties changed: -x to +x)
=== modified file 'doc/developers/_static/bzr.ico' (properties changed: -x to +x)
=== modified file 'doc/developers/_templates/layout.html' (properties changed: -x to +x)
=== modified file 'doc/developers/add.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/annotate.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/api-versioning.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/apport.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/authentication-ring.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/btree_index_prefetch.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/bug-handling.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/bundle-creation.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/bundle-format4.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/bundles.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/case-insensitive-file-systems.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/check.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/code-review.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/code-style.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/colocated-branches.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/commit.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/conf.py' (properties changed: -x to +x)
=== modified file 'doc/developers/configuration.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/container-format.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/content-filtering.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/contribution-quickstart.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/cycle.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/development-repo.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/diff.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/directory-fingerprints.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/dirstate.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/documenting-changes.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/ec2.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/feature-flags.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/fetch.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/gc.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/groupcompress-design.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/implementation-notes.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/improved_chk_index.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/incremental-push-pull.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/index-plain.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/index.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/indices.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/initial-push-pull.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/integration.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/inventory.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/last-modified.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/lca-merge.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/lca_tree_merging.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/merge-scaling.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/miscellaneous-notes.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/missing.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/nested-trees.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/network-protocol.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/new-config-rationale.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/overview.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/packrepo.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/performance-roadmap-rationale.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/performance-roadmap.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/performance-use-case-analysis.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/performance.dot' (properties changed: -x to +x)
=== modified file 'doc/developers/planned-change-integration.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/planned-performance-changes.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/plans.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/plugin-api.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/ppa.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/principles.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/profiling.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/releasing.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/repository-stream.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/repository.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/revert.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/revision-properties.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/specifications.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/status.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/testing.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/tortoise-strategy.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/transports.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/ui.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/uncommit.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/update.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/win32_build_setup.txt' (properties changed: -x to +x)
=== modified file 'doc/developers/xdg_config_spec.txt' (properties changed: -x to +x)
=== modified file 'doc/en/Makefile' (properties changed: -x to +x)
=== modified file 'doc/en/_static/bzr icon 16.png' (properties changed: -x to +x)
=== modified file 'doc/en/_static/bzr.ico' (properties changed: -x to +x)
=== modified file 'doc/en/_static/en/Makefile' (properties changed: -x to +x)
=== modified file 'doc/en/_static/en/bzr-en-quick-reference.pdf' (properties changed: -x to +x)
=== modified file 'doc/en/_static/en/bzr-en-quick-reference.png' (properties changed: -x to +x)
=== modified file 'doc/en/_static/en/bzr-en-quick-reference.svg' (properties changed: -x to +x)
=== modified file 'doc/en/_templates/index.html' (properties changed: -x to +x)
=== modified file 'doc/en/_templates/layout.html' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/advanced.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/backup.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/code-browsing.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/hooks-plugins.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/index-plain.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/integration.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/introduction.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/licence.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/migration.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/other-setups.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/security.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/simple-setups.txt' (properties changed: -x to +x)
=== modified file 'doc/en/admin-guide/upgrade.txt' (properties changed: -x to +x)
=== modified file 'doc/en/conf.py' (properties changed: -x to +x)
=== modified file 'doc/en/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/make.bat' (properties changed: -x to +x)
=== modified file 'doc/en/mini-tutorial/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/quick-reference/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.1.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.10.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.11.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.12.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.13.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.14.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.15.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.16.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.17.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.18.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.6.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.7.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.8.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.9.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.90.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.91.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-0.92.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.0.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.1.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.10.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.11.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.12.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.13.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.14.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.15.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.16.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.17.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.18.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.2.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.3.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.4.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.5.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.6.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.7.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.8.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-1.9.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.0.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.1.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.2.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.3.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.4.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.5.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.6.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/bzr-2.7.txt' (properties changed: -x to +x)
--- doc/en/release-notes/bzr-2.7.txt 2014-12-15 20:24:42 +0000
+++ doc/en/release-notes/bzr-2.7.txt 2015-07-21 00:48:43 +0000
@@ -20,6 +20,10 @@
2020
21.. New commands, options, etc that users may wish to try out.21.. New commands, options, etc that users may wish to try out.
2222
23* New configuration option 'pager' and environment variable BZR_PAGER
24 tells Bazaar to use a pager when outputting help texts.
25 (Daniel Vedder, #213718)
26
23Improvements27Improvements
24************28************
2529
2630
=== modified file 'doc/en/release-notes/release-template.txt' (properties changed: -x to +x)
=== modified file 'doc/en/release-notes/series-template.txt' (properties changed: -x to +x)
=== modified file 'doc/en/tutorials/centralized_workflow.txt' (properties changed: -x to +x)
=== modified file 'doc/en/tutorials/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/tutorials/licence.txt' (properties changed: -x to +x)
=== modified file 'doc/en/tutorials/tutorial.txt' (properties changed: -x to +x)
=== modified file 'doc/en/tutorials/using_bazaar_with_launchpad.txt' (properties changed: -x to +x)
=== modified file 'doc/en/upgrade-guide/data_migration.txt' (properties changed: -x to +x)
=== modified file 'doc/en/upgrade-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/upgrade-guide/licence.txt' (properties changed: -x to +x)
=== modified file 'doc/en/upgrade-guide/overview.txt' (properties changed: -x to +x)
=== modified file 'doc/en/upgrade-guide/tips_and_tricks.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/adv_merging.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/annotating_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/bazaar_workflows.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/branching_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/browsing_history.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/bug_trackers.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/bzrtools_plugin.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/central_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/configuring_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/controlling_registration.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/core_concepts.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/distributed_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/entering_commands.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/filtered_views.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/getting_help.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/gpg_signatures.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/hooks.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/http_smart_server.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_centralized.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_centralized.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_gatekeeper.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_gatekeeper.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_localcommit.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_localcommit.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_peer.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_peer.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_pqm.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_pqm.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_shared.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_shared.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_single.png' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/images/workflows_single.svg' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/index-plain.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/installing_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/introducing_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/licence.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/merging_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/organizing_branches.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/organizing_your_workspace.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/part2_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/partner_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/plugins.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/publishing_a_branch.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/recording_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/releasing_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/resolving_conflicts.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/reusing_a_checkout.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/reviewing_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/sending_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/server.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/setting_up_email.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/shared_repository_layouts.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/shelving_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/solo_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/specifying_revisions.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/stacked.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/starting_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/svn_plugin.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/switch_store.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/undoing_mistakes.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/using_aliases.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/using_checkouts.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/using_gatekeepers.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/version_info.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/web_browsing.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/working_offline_central.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/writing_a_plugin.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-guide/zen.txt' (properties changed: -x to +x)
=== modified file 'doc/en/user-reference/readme.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/template.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.1.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.2.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.5.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.6.txt' (properties changed: -x to +x)
=== modified file 'doc/en/whats-new/whats-new-in-2.7.txt' (properties changed: -x to +x)
=== modified file 'doc/es/_static/bzr icon 16.png' (properties changed: -x to +x)
=== modified file 'doc/es/_static/bzr.ico' (properties changed: -x to +x)
=== modified file 'doc/es/_static/es/Makefile' (properties changed: -x to +x)
=== modified file 'doc/es/_static/es/bzr-es-quick-reference.pdf' (properties changed: -x to +x)
=== modified file 'doc/es/_static/es/bzr-es-quick-reference.png' (properties changed: -x to +x)
=== modified file 'doc/es/_static/es/bzr-es-quick-reference.svg' (properties changed: -x to +x)
=== modified file 'doc/es/_templates/layout.html' (properties changed: -x to +x)
=== modified file 'doc/es/conf.py' (properties changed: -x to +x)
=== modified file 'doc/es/index.txt' (properties changed: -x to +x)
=== modified file 'doc/es/mini-tutorial/index.txt' (properties changed: -x to +x)
=== modified file 'doc/es/quick-reference/index.txt' (properties changed: -x to +x)
=== modified file 'doc/es/user-guide/index-plain.txt' (properties changed: -x to +x)
=== modified file 'doc/es/user-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/es/user-guide/version_info.txt' (properties changed: -x to +x)
=== modified file 'doc/index.es.txt' (properties changed: -x to +x)
=== modified file 'doc/index.ja.txt' (properties changed: -x to +x)
=== modified file 'doc/index.ru.txt' (properties changed: -x to +x)
=== modified file 'doc/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/_static/bzr icon 16.png' (properties changed: -x to +x)
=== modified file 'doc/ja/_static/bzr.ico' (properties changed: -x to +x)
=== modified file 'doc/ja/conf.py' (properties changed: -x to +x)
=== modified file 'doc/ja/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/mini-tutorial/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/tutorials/centralized_workflow.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/tutorials/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/tutorials/licence.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/tutorials/tutorial.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/tutorials/using_bazaar_with_launchpad.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/upgrade-guide/data_migration.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/upgrade-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/upgrade-guide/overview.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/upgrade-guide/tips_and_tricks.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/adv_merging.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/annotating_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/bazaar_workflows.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/branching_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/browsing_history.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/bug_trackers.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/bzrtools_plugin.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/central_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/configuring_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/controlling_registration.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/core_concepts.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/distributed_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/entering_commands.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/filtered_views.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/getting_help.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/hooks.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/http_smart_server.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_centralized.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_centralized.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_gatekeeper.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_gatekeeper.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_localcommit.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_localcommit.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_peer.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_peer.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_pqm.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_pqm.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_shared.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_shared.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_single.png' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/images/workflows_single.svg' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/index-plain.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/installing_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/introducing_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/licence.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/merging_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/organizing_branches.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/organizing_your_workspace.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/part2_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/partner_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/plugins.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/publishing_a_branch.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/recording_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/releasing_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/resolving_conflicts.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/reusing_a_checkout.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/reviewing_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/sending_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/server.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/setting_up_email.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/shared_repository_layouts.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/shelving_changes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/solo_intro.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/specifying_revisions.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/stacked.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/starting_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/svn_plugin.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/undoing_mistakes.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/using_aliases.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/using_checkouts.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/using_gatekeepers.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/version_info.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/web_browsing.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/working_offline_central.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/writing_a_plugin.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-guide/zen.txt' (properties changed: -x to +x)
=== modified file 'doc/ja/user-reference/index.txt' (properties changed: -x to +x)
=== modified file 'doc/news-template.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/_static/bzr icon 16.png' (properties changed: -x to +x)
=== modified file 'doc/ru/_static/bzr.ico' (properties changed: -x to +x)
=== modified file 'doc/ru/_static/ru/Makefile' (properties changed: -x to +x)
=== modified file 'doc/ru/_static/ru/bzr-ru-quick-reference.pdf' (properties changed: -x to +x)
=== modified file 'doc/ru/_static/ru/bzr-ru-quick-reference.png' (properties changed: -x to +x)
=== modified file 'doc/ru/_static/ru/bzr-ru-quick-reference.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/_templates/layout.html' (properties changed: -x to +x)
=== modified file 'doc/ru/conf.py' (properties changed: -x to +x)
=== modified file 'doc/ru/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/mini-tutorial/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/quick-reference/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/tutorials/centralized_workflow.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/tutorials/tutorial.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/tutorials/using_bazaar_with_launchpad.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/branching_a_project.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/core_concepts.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_centralized.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_centralized.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_gatekeeper.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_gatekeeper.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_localcommit.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_localcommit.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_peer.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_peer.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_pqm.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_pqm.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_shared.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_shared.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_single.png' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/images/workflows_single.svg' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/index-plain.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/index.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/introducing_bazaar.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/specifying_revisions.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/stacked.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/using_checkouts.txt' (properties changed: -x to +x)
=== modified file 'doc/ru/user-guide/zen.txt' (properties changed: -x to +x)
=== modified file 'po/ar.po' (properties changed: -x to +x)
=== modified file 'po/ast.po' (properties changed: -x to +x)
=== modified file 'po/bs.po' (properties changed: -x to +x)
=== modified file 'po/bzr.pot' (properties changed: -x to +x)
=== modified file 'po/ca.po' (properties changed: -x to +x)
=== modified file 'po/cs.po' (properties changed: -x to +x)
=== modified file 'po/de.po' (properties changed: -x to +x)
=== modified file 'po/el.po' (properties changed: -x to +x)
=== modified file 'po/en_AU.po' (properties changed: -x to +x)
=== modified file 'po/en_GB.po' (properties changed: -x to +x)
=== modified file 'po/es.po' (properties changed: -x to +x)
=== modified file 'po/fa.po' (properties changed: -x to +x)
=== modified file 'po/fo.po' (properties changed: -x to +x)
=== modified file 'po/fr.po' (properties changed: -x to +x)
=== modified file 'po/gl.po' (properties changed: -x to +x)
=== modified file 'po/he.po' (properties changed: -x to +x)
=== modified file 'po/id.po' (properties changed: -x to +x)
=== modified file 'po/it.po' (properties changed: -x to +x)
=== modified file 'po/ja.po' (properties changed: -x to +x)
=== modified file 'po/ko.po' (properties changed: -x to +x)
=== modified file 'po/ms.po' (properties changed: -x to +x)
=== modified file 'po/my.po' (properties changed: -x to +x)
=== modified file 'po/nb.po' (properties changed: -x to +x)
=== modified file 'po/nl.po' (properties changed: -x to +x)
=== modified file 'po/oc.po' (properties changed: -x to +x)
=== modified file 'po/pl.po' (properties changed: -x to +x)
=== modified file 'po/pt_BR.po' (properties changed: -x to +x)
=== modified file 'po/ro.po' (properties changed: -x to +x)
=== modified file 'po/ru.po' (properties changed: -x to +x)
=== modified file 'po/sco.po' (properties changed: -x to +x)
=== modified file 'po/si.po' (properties changed: -x to +x)
=== modified file 'po/sk.po' (properties changed: -x to +x)
=== modified file 'po/sr.po' (properties changed: -x to +x)
=== modified file 'po/sv.po' (properties changed: -x to +x)
=== modified file 'po/tr.po' (properties changed: -x to +x)
=== modified file 'po/ug.po' (properties changed: -x to +x)
=== modified file 'po/uk.po' (properties changed: -x to +x)
=== modified file 'po/vi.po' (properties changed: -x to +x)
=== modified file 'po/zh_CN.po' (properties changed: -x to +x)
=== modified file 'profile_imports.py' (properties changed: -x to +x)
=== modified file 'tools/__init__.py' (properties changed: -x to +x)
=== modified file 'tools/bzr_epydoc' (properties changed: -x to +x)
=== modified file 'tools/bzr_epydoc_uid.py' (properties changed: -x to +x)
=== modified file 'tools/capture_tree.py' (properties changed: -x to +x)
=== modified file 'tools/generate_release_notes.py' (properties changed: -x to +x)
=== modified file 'tools/package_docs.py' (properties changed: -x to +x)
=== modified file 'tools/package_mf.py' (properties changed: -x to +x)
=== modified file 'tools/prepare_for_latex.py' (properties changed: -x to +x)
=== modified file 'tools/riodemo.py' (properties changed: -x to +x)
=== modified file 'tools/time_graph.py' (properties changed: -x to +x)
=== modified file 'tools/weavemerge.sh' (properties changed: -x to +x)
=== modified file 'tools/win32/__init__.py' (properties changed: -x to +x)
=== modified file 'tools/win32/bazaar.url' (properties changed: -x to +x)
=== modified file 'tools/win32/bootstrap.py' (properties changed: -x to +x)
=== modified file 'tools/win32/build_release.py' (properties changed: -x to +x)
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in' (properties changed: -x to +x)
=== modified file 'tools/win32/buildout.cfg' (properties changed: -x to +x)
=== modified file 'tools/win32/bzr-win32-bdist-postinstall.py' (properties changed: -x to +x)
=== modified file 'tools/win32/bzr.iss.cog' (properties changed: -x to +x)
=== modified file 'tools/win32/bzr_postinstall.py' (properties changed: -x to +x)
=== modified file 'tools/win32/file_version.py' (properties changed: -x to +x)
=== modified file 'tools/win32/info.txt' (properties changed: -x to +x)
=== modified file 'tools/win32/ostools.py' (properties changed: -x to +x)
=== modified file 'tools/win32/py2exe_boot_common.py' (properties changed: -x to +x)
=== modified file 'tools/win32/run_script.py' (properties changed: -x to +x)
=== modified file 'tools/win32/start_bzr.bat' (properties changed: -x to +x)