413
256
end. Checkouts also work on the local file system, so that all that matters is
414
257
file permissions.
416
You can change the master of a checkout by using the "switch" command (see
417
"help switch"). This will change the location that the commits are sent to.
418
The "bind" command can also be used to turn a normal branch into a heavy
419
checkout. If you would like to convert your heavy checkout into a normal
420
branch so that every commit is local, you can use the "unbind" command. To see
421
whether or not a branch is bound or not you can use the "info" command. If the
422
branch is bound it will tell you the location of the bound branch.
259
You can change the master of a checkout by using the "bind" command (see "help
260
bind"). This will change the location that the commits are sent to. The bind
261
command can also be used to turn a branch into a heavy checkout. If you
262
would like to convert your heavy checkout into a normal branch so that every
263
commit is local, you can use the "unbind" command.
426
267
checkout Create a checkout. Pass --lightweight to get a lightweight
428
269
update Pull any changes in the master branch in to your checkout
429
270
commit Make a commit that is sent to the master branch. If you have
430
a heavy checkout then the --local option will commit to the
271
a heavy checkout then the --local option will commit to the
431
272
checkout without sending the commit to the master
432
switch Change the master branch that the commits in the checkout will
273
bind Change the master branch that the commits in the checkout will
434
bind Turn a standalone branch into a heavy checkout so that any
435
commits will be sent to the master branch
436
275
unbind Turn a heavy checkout into a standalone branch so that any
437
276
commits are only made locally
438
info Displays whether a branch is bound or unbound. If the branch is
439
bound, then it will also display the location of the bound branch
445
Repositories in Bazaar are where committed information is stored. There is
446
a repository associated with every branch.
448
Repositories are a form of database. Bzr will usually maintain this for
449
good performance automatically, but in some situations (e.g. when doing
450
very many commits in a short time period) you may want to ask bzr to
451
optimise the database indices. This can be done by the 'bzr pack' command.
453
By default just running 'bzr init' will create a repository within the new
454
branch but it is possible to create a shared repository which allows multiple
455
branches to share their information in the same location. When a new branch is
456
created it will first look to see if there is a containing shared repository it
459
When two branches of the same project share a repository, there is
460
generally a large space saving. For some operations (e.g. branching
461
within the repository) this translates in to a large time saving.
463
To create a shared repository use the init-repository command (or the alias
464
init-repo). This command takes the location of the repository to create. This
465
means that 'bzr init-repository repo' will create a directory named 'repo',
466
which contains a shared repository. Any new branches that are created in this
467
directory will then use it for storage.
469
It is a good idea to create a repository whenever you might create more
470
than one branch of a project. This is true for both working areas where you
471
are doing the development, and any server areas that you use for hosting
472
projects. In the latter case, it is common to want branches without working
473
trees. Since the files in the branch will not be edited directly there is no
474
need to use up disk space for a working tree. To create a repository in which
475
the branches will not have working trees pass the '--no-trees' option to
480
init-repository Create a shared repository. Use --no-trees to create one
481
in which new branches won't get a working tree.
488
A working tree is the contents of a branch placed on disk so that you can
489
see the files and edit them. The working tree is where you make changes to a
490
branch, and when you commit the current state of the working tree is the
491
snapshot that is recorded in the commit.
493
When you push a branch to a remote system, a working tree will not be
494
created. If one is already present the files will not be updated. The
495
branch information will be updated and the working tree will be marked
496
as out-of-date. Updating a working tree remotely is difficult, as there
497
may be uncommitted changes or the update may cause content conflicts that are
498
difficult to deal with remotely.
500
If you have a branch with no working tree you can use the 'checkout' command
501
to create a working tree. If you run 'bzr checkout .' from the branch it will
502
create the working tree. If the branch is updated remotely, you can update the
503
working tree by running 'bzr update' in that directory.
505
If you have a branch with a working tree that you do not want the 'remove-tree'
506
command will remove the tree if it is safe. This can be done to avoid the
507
warning about the remote working tree not being updated when pushing to the
508
branch. It can also be useful when working with a '--no-trees' repository
509
(see 'bzr help repositories').
511
If you want to have a working tree on a remote machine that you push to you
512
can either run 'bzr update' in the remote branch after each push, or use some
513
other method to update the tree during the push. There is an 'rspush' plugin
514
that will update the working tree using rsync as well as doing a push. There
515
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
520
checkout Create a working tree when a branch does not have one.
521
remove-tree Removes the working tree from a branch when it is safe to do so.
522
update When a working tree is out of sync with its associated branch
523
this will update the tree to match the branch.
530
A branch consists of the state of a project, including all of its
531
history. All branches have a repository associated (which is where the
532
branch history is stored), but multiple branches may share the same
533
repository (a shared repository). Branches can be copied and merged.
535
In addition, one branch may be bound to another one. Binding to another
536
branch indicates that commits which happen in this branch must also
537
happen in the other branch. Bazaar ensures consistency by not allowing
538
commits when the two branches are out of date. In order for a commit
539
to succeed, it may be necessary to update the current branch using
544
init Change a directory into a versioned branch.
545
branch Create a new branch that is a copy of an existing branch.
546
merge Perform a three-way merge.
547
bind Bind a branch to another one.
551
_standalone_trees = \
554
A standalone tree is a working tree with an associated repository. It
555
is an independently usable branch, with no dependencies on any other.
556
Creating a standalone tree (via bzr init) is the quickest way to put
557
an existing project under version control.
561
init Make a directory into a versioned branch.
568
Status flags are used to summarise changes to the working tree in a concise
569
manner. They are in the form::
573
where the columns' meanings are as follows.
575
Column 1 - versioning/renames::
581
X File nonexistent (and unknown to bzr)
583
P Entry for a pending merge (not a file)
585
Column 2 - contents::
594
* The execute bit was changed
598
known_env_variables = [
599
("BZRPATH", "Path where bzr is to look for shell plugin external commands."),
600
("BZR_EMAIL", "E-Mail address of the user. Overrides EMAIL."),
601
("EMAIL", "E-Mail address of the user."),
602
("BZR_EDITOR", "Editor for editing commit messages. Overrides EDITOR."),
603
("EDITOR", "Editor for editing commit messages."),
604
("BZR_PLUGIN_PATH", "Paths where bzr should look for plugins."),
605
("BZR_DISABLE_PLUGINS", "Plugins that bzr should not load."),
606
("BZR_PLUGINS_AT", "Plugins to load from a directory not in BZR_PLUGIN_PATH."),
607
("BZR_HOME", "Directory holding .bazaar config dir. Overrides HOME."),
608
("BZR_HOME (Win32)", "Directory holding bazaar config dir. Overrides APPDATA and HOME."),
609
("BZR_REMOTE_PATH", "Full name of remote 'bzr' command (for bzr+ssh:// URLs)."),
610
("BZR_SSH", "Path to SSH client, or one of paramiko, openssh, sshcorp, plink or lsh."),
611
("BZR_LOG", "Location of .bzr.log (use '/dev/null' to suppress log)."),
612
("BZR_LOG (Win32)", "Location of .bzr.log (use 'NUL' to suppress log)."),
613
("BZR_COLUMNS", "Override implicit terminal width."),
614
("BZR_CONCURRENCY", "Number of processes that can be run concurrently (selftest)"),
615
("BZR_PROGRESS_BAR", "Override the progress display. Values are 'none' or 'text'."),
616
("BZR_PDB", "Control whether to launch a debugger on error."),
617
("BZR_SIGQUIT_PDB", "Control whether SIGQUIT behaves normally or invokes a breakin debugger."),
618
("BZR_TEXTUI_INPUT", "Force console input mode for prompts to line-based (instead of char-based)."),
621
def _env_variables(topic):
623
ret = ["Environment Variables\n\n"
624
"See bzr help configuration for more details.\n\n"]
625
max_key_len = max([len(k[0]) for k in known_env_variables])
626
desc_len = (80 - max_key_len - 2)
627
ret.append("=" * max_key_len + " " + "=" * desc_len + "\n")
628
for k, desc in known_env_variables:
629
ret.append(k + (max_key_len + 1 - len(k)) * " ")
630
ret.append("\n".join(textwrap.wrap(
631
desc, width=desc_len, subsequent_indent=" " * (max_key_len + 1))))
633
ret += "=" * max_key_len + " " + "=" * desc_len + "\n"
639
:On Unix: ~/.bazaar/bazaar.conf
640
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
642
Contains the user's default configuration. The section ``[DEFAULT]`` is
643
used to define general configuration that will be applied everywhere.
644
The section ``[ALIASES]`` can be used to create command aliases for
645
commonly used options.
647
A typical config file might look something like::
650
email=John Doe <jdoe@isp.com>
653
commit = commit --strict
654
log10 = log --short -r -10..-1
660
A criss-cross in the branch history can cause the default merge technique
661
to emit more conflicts than would normally be expected.
663
In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
664
better results. You may wish to ``bzr revert`` the working tree and merge
665
again. Alternatively, use ``bzr remerge`` on particular conflicted files.
667
Criss-crosses occur in a branch's history if two branches merge the same thing
668
and then merge one another, or if two branches merge one another at the same
669
time. They can be avoided by having each branch only merge from or into a
670
designated central branch (a "star topology").
672
Criss-crosses cause problems because of the way merge works. Bazaar's default
673
merge is a three-way merger; in order to merge OTHER into THIS, it must
674
find a basis for comparison, BASE. Using BASE, it can determine whether
675
differences between THIS and OTHER are due to one side adding lines, or
676
from another side removing lines.
678
Criss-crosses mean there is no good choice for a base. Selecting the recent
679
merge points could cause one side's changes to be silently discarded.
680
Selecting older merge points (which Bazaar does) mean that extra conflicts
683
The ``weave`` merge type is not affected by this problem because it uses
684
line-origin detection instead of a basis revision to determine the cause of
688
_branches_out_of_sync = """Branches Out of Sync
690
When reconfiguring a checkout, tree or branch into a lightweight checkout,
691
a local branch must be destroyed. (For checkouts, this is the local branch
692
that serves primarily as a cache.) If the branch-to-be-destroyed does not
693
have the same last revision as the new reference branch for the lightweight
694
checkout, data could be lost, so Bazaar refuses.
696
How you deal with this depends on *why* the branches are out of sync.
698
If you have a checkout and have done local commits, you can get back in sync
699
by running "bzr update" (and possibly "bzr commit").
701
If you have a branch and the remote branch is out-of-date, you can push
702
the local changes using "bzr push". If the local branch is out of date, you
703
can do "bzr pull". If both branches have had changes, you can merge, commit
704
and then push your changes. If you decide that some of the changes aren't
705
useful, you can "push --overwrite" or "pull --overwrite" instead.
712
To ensure that older clients do not access data incorrectly,
713
Bazaar's policy is to introduce a new storage format whenever
714
new features requiring new metadata are added. New storage
715
formats may also be introduced to improve performance and
718
The newest format, 2a, is highly recommended. If your
719
project is not using 2a, then you should suggest to the
720
project owner to upgrade.
725
Some of the older formats have two variants:
726
a plain one and a rich-root one. The latter include an additional
727
field about the root of the tree. There is no performance cost
728
for using a rich-root format but you cannot easily merge changes
729
from a rich-root format into a plain format. As a consequence,
730
moving a project to a rich-root format takes some co-ordination
731
in that all contributors need to upgrade their repositories
732
around the same time. 2a and all future formats will be
733
implicitly rich-root.
735
See :doc:`current-formats-help` for the complete list of
736
currently supported formats. See :doc:`other-formats-help` for
737
descriptions of any available experimental and deprecated formats.
741
# Register help topics
742
280
topic_registry.register("revisionspec", _help_on_revisionspec,
743
281
"Explain how to use --revision")
744
topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
745
topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
746
def get_current_formats_topic(topic):
747
from bzrlib import controldir
748
return "Current Storage Formats\n\n" + \
749
controldir.format_registry.help_topic(topic)
750
def get_other_formats_topic(topic):
751
from bzrlib import controldir
752
return "Other Storage Formats\n\n" + \
753
controldir.format_registry.help_topic(topic)
754
topic_registry.register('current-formats', get_current_formats_topic,
755
'Current storage formats')
756
topic_registry.register('other-formats', get_other_formats_topic,
757
'Experimental and deprecated storage formats')
758
topic_registry.register('standard-options', _standard_options,
282
topic_registry.register('basic', _basic_help, "Basic commands")
283
topic_registry.register('topics', _help_on_topics, "Topics list")
284
def get_format_topic(topic):
285
from bzrlib import bzrdir
286
return bzrdir.format_registry.help_topic(topic)
287
topic_registry.register('formats', get_format_topic, 'Directory formats')
288
topic_registry.register('global-options', _global_options,
759
289
'Options that can be used with any command')
760
topic_registry.register('global-options', _global_options,
761
'Options that control how Bazaar runs')
290
topic_registry.register('checkouts', _checkouts,
291
'Information on what a checkout is')
762
292
topic_registry.register('urlspec', _help_on_transport,
763
293
"Supported transport protocols")
764
topic_registry.register('status-flags', _status_flags,
765
"Help on status flags")
766
294
def get_bugs_topic(topic):
767
295
from bzrlib import bugtracker
768
return ("Bug Tracker Settings\n\n" +
769
bugtracker.tracker_registry.help_topic(topic))
770
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
771
topic_registry.register('env-variables', _env_variables,
772
'Environment variable names and values')
773
topic_registry.register('files', _files,
774
'Information on configuration and log files')
775
topic_registry.register_lazy('hooks', 'bzrlib.hooks', 'hooks_help_text',
776
'Points at which custom processing can be added')
777
topic_registry.register_lazy('location-alias', 'bzrlib.directory_service',
778
'AliasDirectory.help_text',
779
'Aliases for remembered locations')
781
# Load some of the help topics from files. Note that topics which reproduce API
782
# details will tend to skew (quickly usually!) so please seek other solutions
784
topic_registry.register('authentication', _load_from_file,
785
'Information on configuring authentication')
786
topic_registry.register('configuration', _load_from_file,
787
'Details on the configuration settings available')
788
topic_registry.register('conflict-types', _load_from_file,
789
'Types of conflicts and what to do about them')
790
topic_registry.register('debug-flags', _load_from_file,
791
'Options to show or record debug information')
792
topic_registry.register('log-formats', _load_from_file,
793
'Details on the logging formats available')
794
topic_registry.register('url-special-chars', _load_from_file,
795
'Special character handling in URLs')
798
# Register concept topics.
799
# Note that we might choose to remove these from the online help in the
800
# future or implement them via loading content from files. In the meantime,
801
# please keep them concise.
802
topic_registry.register('branches', _branches,
803
'Information on what a branch is', SECT_CONCEPT)
804
topic_registry.register('checkouts', _checkouts,
805
'Information on what a checkout is', SECT_CONCEPT)
806
topic_registry.register('content-filters', _load_from_file,
807
'Conversion of content into/from working trees',
809
topic_registry.register('diverged-branches', _load_from_file,
810
'How to fix diverged branches',
812
topic_registry.register('eol', _load_from_file,
813
'Information on end-of-line handling',
815
topic_registry.register('formats', _storage_formats,
816
'Information on choosing a storage format',
818
topic_registry.register('patterns', _load_from_file,
819
'Information on the pattern syntax',
821
topic_registry.register('repositories', _repositories,
822
'Basic information on shared repositories.',
824
topic_registry.register('rules', _load_from_file,
825
'Information on defining rule-based preferences',
827
topic_registry.register('standalone-trees', _standalone_trees,
828
'Information on what a standalone tree is',
830
topic_registry.register('working-trees', _working_trees,
831
'Information on working trees', SECT_CONCEPT)
832
topic_registry.register('criss-cross', _criss_cross,
833
'Information on criss-cross merging', SECT_CONCEPT)
834
topic_registry.register('sync-for-reconfigure', _branches_out_of_sync,
835
'Steps to resolve "out-of-sync" when reconfiguring',
296
return bugtracker.tracker_registry.help_topic(topic)
297
topic_registry.register('bugs', get_bugs_topic, 'Bug tracker support')
839
300
class HelpTopicIndex(object):
added
removed
bzrlib/help_topics.py
