Bzr guide in leodocs

0 views
Skip to first unread message

Ville M. Vainio

unread,
Apr 9, 2008, 9:58:26 AM4/9/08
to leo-e...@googlegroups.com
I added a short bzr guide to LeoDocs, but didn't push it yet (because
the trunk was reverted). Here is the guide
(with some hard-earned information ;-), it will be on trunk "later".

-------------------------
Many users will want to track the development version of Leo, in order to stay
on top of the latest features and bugfixes. Running the development version is
quite safe and easy, and it's also a requirement if you want to contribute to
Leo.

1. First, you need to get Bazaar (bzr) from http://bazaar-vcs.org. For windows
users we recommend the standalone installer - the python installer may have
problems pushing to Launchpad. Plain bzr installer only contains the command
line version, so you might want to augment that with a friendly GUI - qbzr is
recommended as it's the easiest one to install. It provides command like
``bzr qlog``, ``bzr qannotate`` etc.

2. Get Leo from launchpad by doing::

bzr branch lp:leo-editor

And that's it! You can run leo/src/leo.py directly. When you want to refresh the
code with latest modifications from Launchpad, run ``bzr pull``.

If you make modifications to Leo (with the interest in sharing them with the Leo
community), you can check them in to your local branch by doing ``bzr checkin``.
Now, to actually request your changes to be merged to Leo trunk, you need a
Launchpad account with RSA keys in place. There is showmedo video about how to
accomplish this on Windows using puttygen and pageant at
``http://showmedo.com/videos/video?name=1510070&fromSeriesID=151``.

After your Launchpad account is set up, go to
``https://launchpad.net/leo-editor``, choose Code tab -> Register Branch, select
Branch type "Hosted" and fill in descriptive details about the branch. After
that, go to the branch home page from Code tab again, and copy-paste the push
command line to terminal. For example, for branch::

https://code.launchpad.net/~leo-editor-team/leo-editor/mod_rclick

The push command is::

bzr push bzr+ssh://my_...@bazaar.launchpad.net/~leo-editor-team/leo-editor/mod_rclick

You may wish to add --remember command line option to bzr push, to direct all
future pushes to that location. Then, you only need to execute ``bzr push``.

After your branch is pushed, you can email the Leo mailing list and request it
to be reviewed and merged to trunk.

--
Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'

Edward K. Ream

unread,
Apr 9, 2008, 10:03:13 AM4/9/08
to leo-editor
On Apr 9, 8:58 am, "Ville M. Vainio" <vivai...@gmail.com> wrote:
> I added a short bzr guide to LeoDocs, but didn't push it yet (because
> the trunk was reverted).

Thanks *so* much for this. Feel free to push it now.

Edward
Message has been deleted

Ville M. Vainio

unread,
Apr 9, 2008, 12:23:04 PM4/9/08
to leo-e...@googlegroups.com
On Wed, Apr 9, 2008 at 7:01 PM, TL <t...@tltools.net> wrote:

> Thanks for the help! I needed it. You refer to issuing "bzr
> checkin". I think this should be "bzr commit". Correct?

checkin and ci are aliases for commit. Personally, I always use "ci"
(old habits die hard) but thought "checkin" is more explicit, for
beginner docs.

Edward K. Ream

unread,
Apr 9, 2008, 12:54:11 PM4/9/08
to leo-e...@googlegroups.com
On Wed, Apr 9, 2008 at 11:23 AM, Ville M. Vainio <viva...@gmail.com> wrote:

>  Thanks for the help!  I needed it.  You refer to issuing "bzr
>  checkin".  I think this should be "bzr commit".  Correct?

checkin and ci are aliases for commit.

I didn't know that :-)
 
Personally, I always use "ci"
(old habits die hard) but thought "checkin" is more explicit, for
beginner docs.

Note: aliases are really helpful.  Here is the present contents of my bazaar.conf file:

unlock=break-lock bzr+ssh://edre...@bazaar.launchpad.net/~edreamleo/leo-editor/trunk/
ediff=diff --using examDiff.exe
wdiff=diff --using winMergeU.exe
get-trunk=branch http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk
merge-trunk=merge http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk
up=commit -m "update aux files"
c=commit
s=status
m=merge
recommit=commit -m "commit after merge"
log=log -r -5

I use 'bzr c', 'bzr s', 'bzr up' and 'bzr recommit' a lot.

This is a local file: your preferences will not affect anyone else.

HTH.

Edward

Edward K. Ream

unread,
Apr 9, 2008, 12:57:13 PM4/9/08
to leo-e...@googlegroups.com


On Wed, Apr 9, 2008 at 11:54 AM, Edward K. Ream <edre...@gmail.com> wrote:


log=log -r -5

Oops.  This should probably by log=log -r -5..

That is, the line should end with two periods.

EKR

TL

unread,
Apr 9, 2008, 6:39:19 PM4/9/08
to leo-editor
Thanks for the information. It was very helpful.

TL
Reply all
Reply to author
Forward
0 new messages