/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/annotating_changes.txt

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/annotating_changes.txt
1
 
Annotating changes
2
 
==================
3
 
 
4
 
Seeing the origin of content
5
 
----------------------------
6
 
 
7
 
When two or more people are working on files, it can be highly
8
 
useful at times to see who created or last changed certain content.
9
 
To do this, using the annotate command like this::
10
 
 
11
 
  bzr annotate readme.txt
12
 
 
13
 
If you are a pessimist or an optimist, you might prefer to use
14
 
one of built-in aliases for ``annotate``: ``blame`` or ``praise``.
15
 
Either way, this displays each line of the file together with
16
 
information such as:
17
 
 
18
 
 * who changed it last
19
 
 * when it was last changed
20
 
 * the commit message.
21
 
 
22
 
GUI tools
23
 
---------
24
 
 
25
 
The various GUI plugins for Bazaar provide graphical tools for
26
 
viewing annotation information. For example, the bzr-gtk plugin
27
 
provides a GUI tool for this that can be launched using the
28
 
``gannotate`` command::
29
 
 
30
 
  bzr gannotate readme.txt
31
 
 
32
 
The GUI tools typically provide a much richer display of
33
 
interesting information (e.g. all the changes in each commit)
34
 
so you may prefer them over the text-based command.
35