/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 contrib/fortune

  • Committer: Vincent Ladeuil
  • Date: 2009-01-23 21:06:48 UTC
  • mto: (3966.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3967.
  • Revision ID: v.ladeuil+lp@free.fr-20090123210648-yfb39g22yyo83d3y
Slight refactoring and test fixing.

* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.

* bzrlib/merge.py:
(Merge3Merger._lca_multi_way): Fix doc reference.
(Merge3Merger.merge_contents.contents_conflict): Try to delay
this_pair evaulation to avoid unnecessary sha1 (impyling file read
from disk) calculation. Also slightly refactor to avoid repeated
file_id in trees calculations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/fortune
 
1
#! /bin/sh
 
2
 
 
3
# Put this on your $BZRPATH to use it to demonstrate bzr external plugins
 
4
 
 
5
 
 
6
if [ x$1 == x--bzr-usage ]
 
7
then
 
8
    # options
 
9
    echo ""
 
10
    # arguments
 
11
    echo ""
 
12
    exit 0
 
13
elif [ x$1 == x--bzr-help ]
 
14
then
 
15
    echo "display a fortune cookie"
 
16
    echo 
 
17
    exit 0
 
18
else
 
19
    /usr/games/fortune
 
20
fi