gmane.comp.version-control.bazaar-ng.general

[ANN] bzr-2.5.1 has been frozen !

Vincent Ladeuil — 2012-05-22T15:28:05

Now is the time for our first minor release in the 2.5 series: 2.5.1

Packagers and installers builders, it's up to you again !

See the Changelog at https://launchpad.net/bzr/2.5/2.5.1 for more
details about what is included and for the tarball.

I'll make the official announcement next Tuesday morning UTC
(2011-05-29) with... whatever packages/installers are available at this
point.

Have fun !

    Vincent

post_transform_hook syntax etc

phil wigglesworth — 2012-05-17T12:39:46

I'm trying to work around a
problem<https://bugs.launchpad.net/bzr/+bug/997933>(997933) in Bazaar
(bzrlib 2.5.0). The defect causes Bazaar to trample on
inherited file permissions on files in Win7-64, so that when anyone in the
team changes anything, everyone else gets "file permission" errors on that
changed file. That defect report is not the subject of this post, the
work-around is.

My problem working around that defect is how to create a "post transform
hook", which as far as I can
see<https://code.launchpad.net/%7Ejelmer/bzr/transform-hooks/+merge/89007>is
present in 2.5 of the bzr library (I'm using 2.5.0).

Syntax-wise I have this in my hook file:

from bzrlib import branch

def post_transform_hook():
   print "post_transform_hook"

branch.Branch.hooks.install_named_hook('post_transform',
post_transform_hook, 'My post_transform hook')

Running that garners me the message: "The BranchHooks hook 'post_transform'
is unknown in this version of bzrlib."

Does anyone know what the problem is? I've no real idea of how this stuff
works, so I may have the wrong "import" or something like that, for all I
know, although similar syntax to the above works ok for push and pull. Does
anyone have an example of a post_transform hook I can crib from?

Once I have the hook working without error, I'll need a list of the files
which have changed (been "transformed" I guess) - can anyone tell me where
I can find anything to tell me what parameters may be available to get that
list and iterate it? All I'm going to do is set the "include inheritable
permissions from this object's parent" flag for each file changed, which
solves our problem.

What is the purpose of `rmbranch` command?

Alexander Belchenko — 2012-05-15T15:20:12

I thought `rmbranch` should delete a branch from remote server.

It does delete branch (e.g. from shared repository) but leaves .bzr 
control directory there intact.

According to `rmbranch` help it should keep any working tree or 
repository in place. OK, that's good.

But if there is neither working tree nor repository, why don't delete an 
empty control directory?

bzr commit e-mail fails with bzr 2.4.x and 2.5.x on Fedora Core 14

Gaiseric Vandal — 2012-05-14T20:19:04

I am running Fedora Core 14 (X64.) I have uninstalled bzr 2.2.x
packages. I have installed bzr 2.5.0 and bzr 2.5.0 from source I have
also tried with bzr 2.6.B1 and bzr 2.4.2 + bzr plugins 2.4.1 .

I want to enable commit e-mails. I have been trying to get this to work
over the network (bzr+ssh or sftp) but with out luck. I have therefore
created a local repository on my computer.

                   /home/myname/bzr/localrepo/localrepo1

which I have now checked out to

                   /home/myname/bzr/workspace/localrepo1

I made sure that /usr/bin/mail exists (actually a sym link to /bin/mail.)

My /home/myname/.bazaar/bazaar.conf file looks like:

[DEFAULT]
email = myname< at >company.com
editor = /usr/bin/gedit
#post_commit_push_pull = True
post_commit_to=myname< at >company.com
post_commit_url=/home/myname/bzr/localrepo/localrepo1
post_commit_sender=myname< at >company.com
post_commit_mailer=smtplib
smtp_server= mail.company.com:25
#smtp_username =

I commit changes but never get any e-mail.

I have tried with an without a "post_commit_url" parameter. My
understanding is that "post_commit_to" is the only absolutely mandatory
parameter..

I have also tried without "post_commit_mailer=smtplib" enabled. My
understanding will be that then "/usr/bin/mail" will be called. I have
verified that mail is working on my PC

e.g.

mail -s "test" -a /home/myname/somefile.txt myname< at >company.com

python-mailer (which yum installed for smtplib) is installed.

-> bzr version
Bazaar (bzr) 2.4.2
  Python interpreter: /usr/bin/python 2.7.0
  Python standard library: /usr/lib64/python2.7
  Platform: Linux-2.6.35.14-106.fc14.x86_64-x86_64-with-fedora-14-Laughlin
  bzrlib: /usr/lib64/python2.7/site-packages/bzrlib
  Bazaar configuration: /home/myname/.bazaar
  Bazaar log file: /home/myname/.bzr.log

Copyright 2005-2011 Canonical Ltd.
http://bazaar.canonical.com/ <http://bazaar.canonical.com/>

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

Bazaar is part of the GNU Project to produce a free operating system.

->

-> bzr plugins
bash_completion 2.4.2
  Generate a shell function for bash command line completion.

bzrtools 2.4.1
  Various useful commands for working with bzr.

-> bzr selftest email
/usr/lib64/python2.7/site-packages/Crypto/Util/randpool.py:40:
RandomPool_DeprecationWarning: This application uses RandomPool, which
is BROKEN in older releases. See http://www.pycrypto.org/randpool-broken
<http://www.pycrypto.org/randpool-broken>
  RandomPool_DeprecationWarning)
bzr selftest: /usr/bin/bzr
   /usr/lib64/python2.7/site-packages/bzrlib
   bzr-2.4.2 python-2.7.0
Linux-2.6.35.14-106.fc14.x86_64-x86_64-with-fedora-14-Laughlin

----------------------------------------------------------------------
Ran 20 tests in 1.373s

OK
->

Any help is appreciated.

Thanks

pointers on writing a commit hook

Wichmann, Mats D — 2012-05-12T14:32:25

We've got a situation where some branches change fairly
frequently; the branches contain their own packaging information
so we'd like version information for the package to be updated
when there's a substantive change to the code, or you can't ever
keep track of what package a built version corresponds to.
People forget. Often. I've been hoping a hook could help with this.

But... I'm having trouble getting my head around this. If I
want to auto-bump the version if it hasn't been, a start_commit
hook is the only way I can change the tree because the commit
hasn't been calculated yet, but this very fact makes it hard to
see how to check if a particular file (the one containing the package
version info) has been modified or how.  While at pre_commit time,
it knows what the delta is, so easy to check, but it's already too
late to change it.

Is it a better idea to just warn out?  "hey, you made changes
but you don't seem to have bumped the version info, did you
want to abort and go back to do that"?

Are there examples somewhere of code using a start_commit
hook so I could see how one walks the MutableTree object to
find information?

hints on splitting out part of a branch

Wichmann, Mats D — 2012-05-12T14:14:36

I recall there has been discussion a few time in the past about
approaches for moving a subset of a branch out into its own
branch, but retaining some of the original context (commit history,
at least as relates to the subset).  And I can't find any of that...

We've got a branch which is watched by a job submission task
which sends it to buildbot for rebuilding when there's a commit.
One subdirectory of this branch has over the years grown apart
so it no longer has a connection with the rest of it; and it does
not contribute to the package that is built from the rest of the
branch so it's irritating when a change in this area triggers a
rebuild, needlessly (actually, a whole cascading set of events
which is a bit expensive).  People would prefer to see it split
off, but not to have all of the past history lost.

Thoughts?

memory problem during bazaar operations

2012-05-08T00:12:50

Hello,

I'm having some memory problems using bzr. When I try to commit my local
changes, or merge from upstream, an out of memory error occurs.

This is the branch:
 bzr+ssh://bzr.savannah.gnu.org/emacs/xwidget/

I'm using Fedora 17, which is not yet released, so the problem might lie
in the versions packaged in Fedora.

Here are the versions:

bzr --version
Bazaar (bzr) 2.5.0
  Python interpreter: /usr/bin/python 2.7.3
  Python standard library: /usr/lib64/python2.7
  Platform: Linux-3.3.4-3.fc17.x86_64-x86_64-with-fedora-17-Beefy_Miracle
  bzrlib: /usr/lib64/python2.7/site-packages/bzrlib

List of uncommits

Chris McCormick — 2012-05-07T10:04:14

Hi,

Through a series of deeply foolish command line invocations I managed to 
uncommit on a bound branch and then pressed ^C just after it had 
finished uncommitting on the remote bound repository successfully. I 
then pulled the uncommit from the remote which worked fine. Basically I 
now want to re-commit but because I ^C'ed out I don't know the revision 
id that I should recommit with. How can I find this out? Any way to list 
the uncommitted revisions? I can't just do a bzr commit because I had 
changed other stuff and I would like the two commits to be separate to 
properly preserve history.

Cheers,

Chris.

How to fix code that uses Merger.check_basis

Francis Devereux — 2012-05-04T12:44:10

Hi,

I use the bzr-transplant plugin, and it stopped working when I upgraded to bzr 2.5 because it uses Merger.has_changes().

I've done a fix that seems to work, but I'd appreciate a quick review from someone who understands what has_changes does before I submit a merge proposal.

Here's the change I made (http://bazaar.launchpad.net/~frankoid/bzr-transplant/bzr25-fix/revision/19):

=== modified file '__init__.py'
--- __init__.py2011-01-20 17:04:16 +0000
+++ __init__.py2012-05-04 12:39:14 +0000
< at >< at > -76,8 +76,9 < at >< at >
     if len(source_revision.parent_ids) > 1:
         raise errors.BzrCommandError("Don't know how to transplant merges.")
     base_revid = source_revision.parent_ids[0]
+    if target_wt.has_changes():
+        raise errors.UncommittedChanges(target_wt)
     m = merge.Merger.from_revision_ids(None, target_wt, source_revid, other_branch=source_branch, base=base_revid)
-    m.check_basis(True)
     m.merge_type = merge_type
     m.do_merge()
     try:

Thanks,

Francis

bzr status --short --show-ids doesn't show ids..

Marius Kruger — 2012-04-28T21:02:38

Are there any objections to changing 'bzr status --short --show-ids' to
actually show the file ids?

(I got a working patch for this will just need to write tests)

Regards
Marius

workflow advice for bzr builder + pbuilder

Tim Michelsen — 2012-04-23T07:03:19

Hello,
I am packaging some cutting edge Scipy/Numpy addon packages to a PPA.
I frequently encounter problems (build failues) because something in the 
upstream changes.

I am using recipies on LP.

Now I want to use a local environment to debug faster.

Could you please advise me on a efficient workflow that uses bzr 
builddeb and pbuilder for this?

another user apparently was in the same situation:

http://irclogs.ubuntu.com/2012/03/27/%23launchpad.txt

[20:58] <audifahrer> dobey: yes, I use a receipe. I don't use pbuilder 
localy until now.
[21:01] <dobey> audifahrer: ok, you can use bzr dailydeb to get a source 
package for a recipe, and then you would use pbuilder to build that 
source package in a local chroot
[21:01] <dobey> audifahrer: and you can debug it there, instead of 
constantly trying to rebuild it on launchpad

Looking forward to your help.

Kind regards,
Timmie

Fetching a newly created branch via bzr-git

Eli Zaretskii — 2012-04-18T16:38:18

I have a bzr repository that tracks an upstream git repository.  When
I created it, I used "bzr git-import", and after that I use "bzr
switch" to switch to some specific branch and "bzr pull" to sync that
branch with upstream.  So far so good.

Now a new branch was created in the upstream repository.  How can I
import that new branch, except by deleting everything and doing the
initial "bzr git-import" step again?

TIA

transplant revisions between unrelated projects

Lluís — 2012-04-17T16:13:32

First of all, sorry for the cross-posting, but I though this might be of
interest to people on all these lists.

I've pulled together a small bazaar plugin to transplant revisions between
totally unrelated projects, with the support to select which are these file,
together with regular expressions to rename them on the way.

You can find the code here:

    https://launchpad.net/bzr-tp/trunk

This will give some more details on how to use it:

    bzr help transplant

Right now it has no support to establish revisions to ignore during the
transplant, but it will be easy to add given the current state.

Another not-supported feature is transplanting changes into another project
(tp-to as opposed to tp-from).

Unfortunately, bzr-transplant was already taken, so I took bzr-tp as the project
name in launchapd :)

Oh! And it didn't yet have much testing on real-world projects, so look for the
TODOs and Unimplemented exceptions :)


Thanks,
  Lluis

leaving Canonical

Martin Pool — 2012-04-12T04:58:07

I'm going to be leaving Canonical on Friday, after seven years working
on Bazaar and other things.  I'm passing on the baton to John, as
interim lead of the Bazaar team here at Canonical.

It's been really fun working on Bazaar with you, and I've learned a
lot.  Thanks.

Using bzr as backend is difficult.

INADA Naoki — 2012-04-11T04:48:15

I want to write web based html editor with bazaar backend.
I found wikkid uses TransformPreview for using bazaar branch as a backend.

But TransformPreview doesn't provide any tutorial for making commit and
it's API is not easy to understand. For example, how to make trans_id
for second argument of TransformPreview.new_file? How I can rename file?

Does Bazaar provide more easy way to make commit without workingtree?

working with launchpad behind an authenticating proxy

Denys Duchier — 2012-04-10T17:51:46

at the university, my students must use a proxy for all http/https
connexions (however, I managed to put in place a forwarding gateway for
ssh connexions to launchpad.net).  the proxy is now "authenticating",
which means that they need to provide a username and password for ALL
connexions to the proxy.  since lp: urls need xmlrpc, some bzr commands
require them to enter username and password several times, and working
with bzr just becomes too bothersome.  To make things worse, their
username is their email address at university (yes, WITH an < at > inside
which doesn't work with the <user>:<password>< at ><host>:<port> syntax).

Is there a way to configure the proxy username and password in
authentication.conf or something?

Cheers,

--Denys

Getting rid of ~bzr-core ... take 2

Max Bowsher — 2012-04-09T00:01:59

Way back in June last year, I initiated a discussion about getting rid
of the ~bzr-core team, because its purpose is somewhat confusing.

We established back then that the entire existence of the team was for
people who shied away from the volume of bugmail for plugins that ~bzr
was subscribed to.

There was a slight tone of assent for getting rid of ~bzr-core, but a
final resolution wasn't reached, and I dropped the ball on herding to
discussion to a useful conclusion.

I'd like to pick this up and finish it off.

Concrete proposal:

1) Unsubscribe the following teams (which are all subteams of ~bzr) from
all their current bugmail subscriptions:

~bzr-gtk
~bzr-hg
~bzr-upload-devs
~qbzr-bugs

 [This can only be done by an administrator of the teams in question]

2) Merge the ~bzr-core team into ~bzr


I'll suffix that by mentioning that this no longer has any significant
effect on me personally, as I've now gone through and clicked all the
relevant places in Launchpad to individually mute my participation in
current structural subscriptions via ~bzr - but, I think this is still
worth doing, for the convenience of future members, and to remove the
~bzr / ~bzr-core ambiguity once and for all.

Max.

Working with co-located branches

Eli Zaretskii — 2012-04-08T06:56:34

Is there anything in the docs of bzr 2.5.0 that describes how to work
with co-located branches introduced with the 2.5 series?  The only
thing I see is this short notice in "What's New":

  Basic colocated branch support

  The UI now has basic support for colocated branches. In full URLs, a
  specific colocated branch can be specified using URL path segment
  parameters. For example a branch named stronk could be addressed using
  http://example.com/path/to/dir,branch=stronk.

  The new bzr branches command can be used to list all present branches
  in a directory, and indicates what the currently active branch is.

  Several commands also accept co-located branch names directly, such as
  bzr switch.

That's rather minimal.  It would perhaps be enough if the integration
were transparent, but it doesn't seem to be.  See, for example, my own
difficulties in this thread:

  https://lists.ubuntu.com/archives/bazaar/2012q2/074712.html

As another example, I cannot find any documentation on how to create a
branch co-located with an existing branch.

What am I missing?

TIA

"bzr git-import" and multiple branches

Eli Zaretskii — 2012-04-07T12:40:32

Previously, "bzr git-import" would create all the branches, but
without trees, so one needed to "bzr co" in any branch for which one
wanted to have a tree.

But in bzr 2.5.0, no directories are created, and "bzr co" seems to
checkout a single branch (which one?).

I thought perhaps the branches are colocated, but "bzr switch" refuses
to switch to a named branch:

  D:\gnu\bzr\gawk-branches>bzr switch gawk-stable
  bzr: ERROR: Cannot switch a branch, only a checkout.

What am I missing?  How do I checkout several branches in a repository
created by git-import?

TIA

Inconvenient behaviour difference between bazaar on linux andwindows(MinGW/Msys)

David Ingamells — 2012-04-06T08:14:24

I have a branch in a filesystem that is shared between ubuntu (NFS 
mount) and windows machines (CIFS/Samba mount).
The repository was created on the ubuntu machine, but when I go to the 
windows machine and call (e.g.) 'bzr revno' I get an error:

    bzr: ERROR: Invalid url supplied to transport:
    "file:///data/id/CmsRoot/repos/MScms/Admin/": Win32 file urls start
    with file:///x:/, where x is a valid drive letter

    $ ls -a /data/id/CmsRoot/repos/MScms/Admin
    .  ..  .bzr
    $ uname -a
    MINGW32_NT-6.1 WIN7VM03 1.0.17(0.48/3/2) 2011-04-24 23:39 i686 Msys


This may well be because the standard pre-built windows Bazaar installer 
has been used, but the windows terminal is using MinGW and Msys; bzr was 
called from MSys using 'cmd'.
If so does anyone have any advice for installing Bazaar (and by 
implication python) in this MinGW+Msys environment?

(and before anyone suggests creating checkouts or other such 
workarounds, I have very good reasons for using the same branch)
Thanks in advance

[ANN] QBzr 0.22.2 released

Alexander Belchenko — 2012-04-05T15:35:41

On behalf of QBzr developers I'd like to announce maintenance release
of QBzr 0.22.2. QBzr 0.22 series is companion to bzr 2.5 series.
Many thanks to all who sent patches.

Changes
-------
Maintenance release.

  * qrun:
    * Localized help text for selected command is shown correctly now.
      (Alexander Belchenko, Bug #963542)
  * qshelve:
    * Pressing Ctrl+Enter in message edit area triggers shelve action.
      (IWATA Hidetaka, Bug #936982)
    * Hunks are not displayed on Mac OS. (IWATA Hidetaka, Bug #955241)
  * qgetnew:
    * Ask for verification if a checkout should go to a non-empty
      directory - this may cause unwanted conflicts (AndrГ© Bachmann, 
Bug #938835)
  * qdiff
    * Fix - crashes when trying show complete diff of renamed file. (Bug 
#969055)
  * Don't use deprecated API (bzrlib.builtins.tree_files).
    (Alexander Belchenko, Bug #776241)

Downloads
---------
https://launchpad.net/qbzr/0.22/0.22.2