termie / git-bzr-ng Goto Github PK

View Code? Open in Web Editor NEW

198.0 198.0 47.0 302 KB

bi-directional git to bzr bridge: never fear bzr again

License: BSD 3-Clause "New" or "Revised" License

Python 98.85% Shell 1.15%

git-bzr-ng's People

Contributors

Stargazers

Watchers

Forkers

vishvananda abourget awilkins ricky miurahr putermancer andreacrotti niemeyer sss azatoth tabletcorry yaslama sc68cal pniederlag lbssousa zskdan alexreg em- hacosta stefanor john-peterson ecarreras dm carenas sachinkeshav splbio kevin3274 morphis tribut jdsn baby-gnu benneic chihchun vauxoo mk-pmb rbouqueau gosteven pombredanne maxprofs krectra renesugar 00mjk ungtb10d iq-scm

git-bzr-ng's Issues

"WindowsError: [Error 2]"

When I use git-bzr-ng the first time, it occurs error:
(my system is win7, use the newest of git-bzr-ng source code)
git bzr clone lp:leo-editor leo-editor

Traceback (most recent call last):
File "C:\Git\bin/git-bzr", line 709, in
sys.exit(main(sys.argv))
File "C:\Git\bin/git-bzr", line 703, in main
return func(argv[2:])
File "C:\Git\bin/git-bzr", line 411, in cmd_clone
init_repo(cl)
File "C:\Git\bin/git-bzr", line 348, in init_repo
bzr(['init-repo', '--no-trees', cl.bzr_dir()])
File "C:\Git\bin/git-bzr", line 63, in bzr
return run_command(cmd, **kwargs)
File "C:\Git\bin/git-bzr", line 37, in run_command
proc = subprocess.Popen(cmd, stdout=stdout, stdin=stdin)
File "C:\Python26\lib\subprocess.py", line 633, in init
errread, errwrite)
File "C:\Python26\lib\subprocess.py", line 842, in _execute_child
startupinfo)
WindowsError: [Error 2]

git bzr push after github merge fails

15:18:02 Calculating the revisions to include ...
15:18:02 Starting export of 8615 revisions ...
15:18:02 Exported 8615 revisions in 0:00:00
warning: Not updating refs/tags/release180 (new tip 235ab930f203929d9ef3ea1482deed167f58e3b5 does not contain 508b8e6b82a1b03141ae81557f1fadb137531345)
warning: Not updating refs/tags/release181 (new tip 4dbdb8ba9475c699b9c10c4cbbf964175bf327d7 does not contain 30e2e8177e6eb4830fb48022c74b604bd4d09bb3)
warning: Not updating refs/tags/release180beta2 (new tip d088beed52ed3947df1991aeeaecdb5b26135318 does not contain 9420e89a1e840f13b37246ea82a439a3f6626d1f)
15:18:02 Starting import ...
15:18:02 Updating branch information ...
bzr: ERROR: exceptions.KeyError: '8620'

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1121, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cmds.py", line 307, in run
    user_map=user_map)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cmds.py", line 39, in _run
    return proc.process(p.iter_commands)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/processors/generic_processor.py", line 310, in process
    super(GenericProcessor, self)._process(command_iter)
  File "/usr/lib/python2.7/dist-packages/fastimport/processor.py", line 79, in _process
    self.post_process()
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/processors/generic_processor.py", line 351, in post_process
    branches_updated, branches_lost = updater.update()
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/branch_updater.py", line 61, in update
    if self._update_branch(br, tip):
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/branch_updater.py", line 153, in _update_branch
    last_rev_id = self.cache_mgr.lookup_committish(last_mark)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cache_manager.py", line 134, in lookup_committish
    return self.marks[committish.lstrip(':')]
KeyError: '8620'

bzr 2.6.0dev3 on python 2.7.4 (Linux-3.8.0-19-generic-x86_64-with-
    Ubuntu-13.04-raring)
arguments: ['/usr/bin/bzr', 'fast-import', '--import-
    marks=/home/owen/src/github/mixxx-official/mixxx/.git/bzr/map/master-bzr',
    '--export-marks=/home/owen/src/github/mixxx-official/mixxx/.git/bzr/map
    /master-bzr', '-', '/home/owen/src/github/mixxx-
    official/mixxx/.git/bzr/repo/master']
plugins: bash_completion[2.6.0dev3], bzrtools[2.5.0],
    changelog_merge[2.6.0dev3], extmerge[unknown], fastimport[0.13.0],
    grep[2.6.0dev3], launchpad[2.6.0dev3], netrc_credential_store[2.6.0dev3],
    news_merge[2.6.0dev3], pager[unknown], po_merge[2.6.0dev3],
    weave_fmt[2.6.0dev3], xmloutput[0.8.8]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'

*** Bazaar has encountered an internal error.  This probably indicates a
    bug in Bazaar.  You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.
ERROR:root:bzr import failed

My git marks file has the 8620 key:

git bzr marks |grep \:8620
:8620 2b021f70df447f08abb8a0ed298cc6fbe0948a7a

but bzr doesn't:
cat /home/owen/src/github/mixxx-official/mixxx/.git/bzr/map/master-bzr |grep 8620
(no output)

here's the log -- the last three commits are new, the fourth is lp:mixxx HEAD

commit 2b021f70df447f08abb8a0ed298cc6fbe0948a7a
Merge: 66ca850 7253f13
Author: Owen Williams <[email protected]>
Date:   Tue May 14 09:04:49 2013 -0700

    Merge pull request #1 from ywwg/loopfix

    If quantize is on, don't possibly choose the next beat because that will cause a seek

commit 7253f13051379a0170fcd1e1a43fe4962f9ac8b7
Author: Owen Williams <[email protected]>
Date:   Sat May 11 16:39:11 2013 -0400

    Add clarifying comment.

commit e0ba509009e3ef398787972f136297ddd9c00608
Author: Owen Williams <[email protected]>
Date:   Sat May 11 01:49:05 2013 -0400

    If quantize is on, don't possibly choose the next beat because that will cause a seek

commit 66ca8502ec9e01a610e3854823f1a5a7f67baba6
Author: Max Linke <[email protected]>
Date:   Sun May 12 12:15:29 2013 +0200

    remove old BPM analyser code, Fix Bug #1179038

commit 35c2bd64743f7097d7536922fa5a8ae552d5fab7
Author: jus <[email protected]>
Date:   Thu May 9 15:26:29 2013 +0200

    Update translation templates for https://translations.launchpad.net/mixxx/trunk

Possible to use existing shared bzr repository already available locally?

Doing conversions from Bazaar to Git locally.

I already have a "shared repository" at .. relative to the forest of Bazaar branches I have. This is a common pattern, and how you avoid having a full copy of the revisions inside each branch. So, we have a ["shared] Repository ["] at ~/src/project with

~/src/project/.bzr/repository/packs/*.pack

and then many Branches (with Working Trees), each with branch metadata:

~/src/project/mainline/.bzr/branch/...
~/src/project/feature/.bzr/branch/...
~/src/project/fix-64252/.bzr/branch/...

and so on.

So rather than pulling from a remote (ie launchpad) branch, I'm working locally where all the revisions are already present., Using git-bzr-ng to create a git mirror,

$ cd ~/src/project
$ git bzr clone mainline converted

works fine [awesome!], creating ~/src/project/converted with a Git tree in it as expected. However, your design for holding Bazaar revision info quietly inside its .git means that we have a second copy of the same information:

~/src/project/converted/.git/bzr/repo/.bzr/repository/packs./*.pack

Would it be possible instead to use the existing information at:

~/src/project/.bzr/repository/packs/*.pack

? This would seem morally equivalent to git clone's --shared or --reference arguments; I'd be fine with having to manually specify the location, though bzr itself searches parent directories for a repo with the required revisions, so in a way I was surprised that your code overrode that. Fair enough, but if we could share revisions then it would save a lot of disk space.

AfC

Flag to disable rebase with pull

Doing a rebase with each pull causes problems for me. There should be an option to disable this behavior.

Traceback on `git bzr push --overwrite`

$ git bzr push --overwrite
09:17:16 Starting import ...
09:17:17 Updating branch information ...
     branch cpc now has 1062 revisions and 0 tags
09:17:17 Imported 32 revisions, updating 1 branch and 0 trees in 0:00:01
To refresh the working tree for other branches, use 'bzr update' inside that branch.
Traceback (most recent call last):
  File "/usr/bin/git-bzr", line 709, in <module>
    sys.exit(main(sys.argv))
  File "/usr/bin/git-bzr", line 703, in main
    return func(argv[2:])
  File "/usr/bin/git-bzr", line 486, in cmd_push
    bzr(['push'] + params + [upstream])
  File "/usr/bin/git-bzr", line 63, in bzr
    return run_command(cmd, **kwargs)
  File "/usr/bin/git-bzr", line 33, in run_command
    logging.info(' '.join(cmd))
TypeError: sequence item 3: expected string, NoneType found

Is there an (easy) way to convert a shared bzr repository?

Hello,

I have a shared bzr repository with about 400 branches in it, is there an easy way to convert that to git? I can do this by creating a new empty git repository and "git bzr import"ing all the 400 branches one by one.

I have also tried "git bzr clone url_of_the_shared_bzr_repo test", but I get this:

bzr: ERROR: Not a branch: "url_of_the_shared_bzr_repo": location is a repository.

Thank you!

Make it a remote helper

Using the remote helper infrastructure, providing a git-remote-bzr should be relatively easy. That way, putting git-remote-bzr into the PATH would allow git clone bzr:... work out of the box, as well as git fetch and git push in the checkout.

error pushing new branches to launchpad

john@laptop:~/Documents/openswift$ bzr --version
DID YOU RUN THE TESTS
Bazaar (bzr) 2.3.1
  Python interpreter: /usr/bin/python 2.7.1
  Python standard library: /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7
  Platform: Darwin-11.0.0-x86_64-i386-64bit
  bzrlib: /Library/Python/2.7/site-packages/bzrlib
  Bazaar configuration: /Users/john/.bazaar
  Bazaar log file: /Users/john/.bzr.log

Copyright 2005-2010 Canonical Ltd.
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.

---------------------------

john@laptop:~/Documents/openswift$ git --version
git version 1.7.4.4

-------------------------

john@laptop:~/Documents/openswift$ git st
# On branch master
nothing to commit (working directory clean)
john@laptop:~/Documents/openswift$ git co -b test_change
Switched to a new branch 'test_change'
john@laptop:~/Documents/openswift$ git st
# On branch test_change
nothing to commit (working directory clean)
john@laptop:~/Documents/openswift$ echo "some change" >>AUTHORS 
john@laptop:~/Documents/openswift$ git diff
diff --git a/AUTHORS b/AUTHORS
index c70ab82..e22fd44 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,3 +37,4 @@ Kapil Thangavelu
 Conrad Weidenkeller
 Chris Wedgwood
 Cory Wright
+some change
john@laptop:~/Documents/openswift$ git commit -am "some change"
[test_change 89c8665] some change
 1 files changed, 1 insertions(+), 0 deletions(-)
john@laptop:~/Documents/openswift$ git bzr push lp:~notmyname/swift/some_change
Branched 335 revision(s).
15:41:29 Starting import ...
bzr: ERROR: exceptions.AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

Traceback (most recent call last):
  File "/Library/Python/2.7/site-packages/bzrlib/commands.py", line 926, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/Library/Python/2.7/site-packages/bzrlib/commands.py", line 1126, in run_bzr
    ret = run(*run_argv)
  File "/Library/Python/2.7/site-packages/bzrlib/commands.py", line 691, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/Library/Python/2.7/site-packages/bzrlib/commands.py", line 713, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/Library/Python/2.7/site-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/Library/Python/2.7/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/Users/john/.bazaar/plugins/fastimport/cmds.py", line 316, in run
    params, verbose, user_map=user_map)
  File "/Users/john/.bazaar/plugins/fastimport/cmds.py", line 43, in _run
    return proc.process(p.iter_commands)
  File "/Users/john/.bazaar/plugins/fastimport/processors/generic_processor.py", line 308, in process
    super(GenericProcessor, self)._process(command_iter)
  File "/Library/Python/2.7/site-packages/fastimport/processor.py", line 76, in _process
    handler(self, cmd)
  File "/Users/john/.bazaar/plugins/fastimport/processors/generic_processor.py", line 533, in commit_handler
    handler.process()
  File "/Library/Python/2.7/site-packages/fastimport/processor.py", line 159, in process
    self.post_process_files()
  File "/Users/john/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 660, in post_process_files
    self._get_inventories)
  File "/Users/john/.bazaar/plugins/fastimport/revision_store.py", line 376, in load_using_delta
    rev.parent_ids)
  File "/Library/Python/2.7/site-packages/bzrlib/decorators.py", line 140, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/Library/Python/2.7/site-packages/bzrlib/repository.py", line 2710, in get_known_graph_ancestry
    known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
  File "/Library/Python/2.7/site-packages/bzrlib/groupcompress.py", line 1314, in get_known_graph_ancestry
    parent_map, missing_keys = self._index.find_ancestry(keys)
  File "/Library/Python/2.7/site-packages/bzrlib/groupcompress.py", line 2034, in find_ancestry
    return self._graph_index.find_ancestry(keys, 0)
  File "/Library/Python/2.7/site-packages/bzrlib/index.py", line 1519, in find_ancestry
    search_keys = index._find_ancestors(search_keys,
AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

bzr 2.3.1 on python 2.7.1 (Darwin-11.0.0-x86_64-i386-64bit)
arguments: ['/usr/local/bin/bzr', 'fast-import', '--import-marks=/Users/john/Documents/openswift/.git/bzr/map/master-bzr', '--export-marks=/Users/john/Documents/openswift/.git/bzr/map/test_change-bzr', '-', '/Users/john/Documents/openswift/.git/bzr/repo/test_change']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
  bash_completion      /Library/Python/2.7/site-packages/bzrlib/plugins/bash_completion [2.3.1]
  bzrtools             /Library/Python/2.7/site-packages/bzrlib/plugins/bzrtools [2.4.0]
  fastimport           /Users/john/.bazaar/plugins/fastimport [0.10.0]
  launchpad            /Library/Python/2.7/site-packages/bzrlib/plugins/launchpad [2.3.1]
  netrc_credential_store /Library/Python/2.7/site-packages/bzrlib/plugins/netrc_credential_store [2.3.1]
  news_merge           /Library/Python/2.7/site-packages/bzrlib/plugins/news_merge [2.3.1]

*** Bazaar has encountered an internal error.  This probably indicates a
    bug in Bazaar.  You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.
ERROR:root:bzr import failed

Tags are not pushed

git bzr push doesn't seem to push tags to the Bazaar branch.

bazaar revisions numbers

Hello,

It's quite difficult at the moment to find a specific bazaar revision and pull it in git. I have to bzr clone the repo, search the log for the commit message of that revision, and search the git history to find the new revision number of that commit.

Couldn't we get an option to display the bzr revision number from git ?
Or, can we just have an option "-r" in sync/pull to get directly that revision ?

eg:

git bzr sync bzr/openobject-server -r 4965

Thanks for your help

How do I install the project?

You could leave a small info on the homepage/README.rst explaining how to install the project or pointing to somewhere where you can learn.

out of memory[tempfile problem?]

When I use this tool, it occurs error:

$ git bzr clone lp:leo-editor leo-editor
bzr: out of memory / Fetching revisions:Inserting stream:Estimate 64232/69133
Use -Dmem_dump to dump memory to a file.
ERROR:root:Command "bzr branch lp:leo-editor D:\work\leo\leo-edito

Does not work with older bzr repo formats (ie pack-0.92)

I have been trying to use git-bzr-ng to work with a BZR repo that is stuck in the dark ages using format pack-0.92. Unfortunately, when using git bzr clone (or branch, etc) it defaults to using the local bzr default -- which on modern versions of bzr is format 2a.

This does on-the-fly conversion, and then when you try to push into the repo you get an error like this:
bzr: ERROR: KnitPackRepository(PATH_TO_BZR_REPO) is not compatible with CHKInventoryRepository(PATH_TO_GIT_BZR_REPO)

Being able to specify the bzr format to use for the local repo could solve this problem. Perhaps with syntax like 'git bzr clone --format=pack-0.92 ...' which passes the --format parameter on to bzr()

Pushing back to local bzr repository causes argument error

Thanks for doing this rewrite. I was just testing with a version of my own test script (https://github.com/matthew-brett/git-bzr) and got an error pushing to bzr:

mkdir test-bzr
cd test-bzr
bzr init
echo 'text' > afile
bzr add afile
bzr commit -m 'A file'
# make git repo and import
cd ..
git bzr clone test-bzr test-git
cd test-git
# make a git commit and push
git co -b bzr-local bzr/master
echo 'more text' >> afile
git commit -am 'More text'
git bzr push ../test-bzr

This generates:

bzr: ERROR: extra argument to command fast-import: /home/mb312/tmp/tmp2/test-git/.git/bzr/repo/bzr-local

Is this expected? (I'm hoping to be able to give up my own hacked git-bzr and use your script instead).

how to generate source.changes file?

I do

bzr builddeb -- -uc -us
bzr buildeb -S

to construct .deb and generate .changes files

how can i do that with git bzr

git bzr push fails

When I try to push changes back into my shared bzr repo, I get an error message talking about bzr not able to import the reftracker module.

I am running ArchLinux with bzr 2.5.1 and git 1.7.11.4

� $ git bzr push
Doing on-the-fly conversion from RemoteRepositoryFormat(_network_name='Bazaar pack repository format 1 with rich root (needs bzr 1.0)\n') to RepositoryFormat2a().
This may take some time. Upgrade the repositories to the same format for better performance.
11:07:59 Calculating the revisions to include ...
11:07:59 Starting export of 211 revisions ...
11:07:59 Exported 211 revisions in 0:00:00
bzr: ERROR: No module named reftracker
You may need to install this Python library separately.
ERROR:root:bzr import failed

$ git branch --all
  bzr/master
* master

edited: formating

Not such a bidirectional bridge?

Hi
I have recently started using git-bzr to manually mirror a launchpad branch as a first step to migrating to git. For the moment I need to commit both on the original bzr branch (and then update git) and in the new git mirror (and then push back to bzr). Unfortunately I am continually running into problems with bazaar complaining about divergent branches etc. etc.

The bash script below illustrates the problem.
It will create a bzr repository and make an initial commit. This will then be cloned into a git repository. Then begins a cycle of:

modification of git sources + push to bzr
modification of bzr sources + pull into git

This fails after only the second git-commit on the attempt to push back to bzr:

% ./gitbzrtest $PWD 10
Created a standalone tree (format: 2a)                                                                       
adding README
Committing to: /home/john/software/git-mirror-tests/repo.bzr/                                                
added README
Committed revision 1.                                                                                        
Branched 1 revision.:Finishing stream:Done 10/10
15:57:05 Calculating the revisions to include ...
15:57:05 Starting export of 1 revisions ...
15:57:05 Exported 1 revision in 0:00:00
Already on 'master'
-------------------------------
COMMIT CHANGE IN GIT REPOSITORY
[master ebe90ee] commit b1
 1 file changed, 1 insertion(+)
-------------------------------
PUSH BACK TO BZR REPOSITORY
15:57:06 Calculating the revisions to include ...
15:57:06 Starting export of 1 revisions ...
15:57:06 Exported 1 revision in 0:00:00
15:57:06 Starting import ...
15:57:06 Updating branch information ...
     branch master now has 2 revisions and 0 tags
15:57:06 Imported 1 revision, updating 1 branch and 0 trees in 0:00:00
To refresh the working tree for other branches, use 'bzr update' inside that branch.
All changes applied successfully.ream:Done 10/10
Pushed up to revision 2.
-------------------------------
COMMIT CHANGE IN BZR REPOSITORY
Committing to: /home/john/software/git-mirror-tests/repo.bzr/                                                
modified README
Committed revision 3.                                                                                        
-------------------------------
UPDATE GIT REPOSITORY FROM BZR
15:57:08 Calculating the revisions to include ...
15:57:08 Starting export of 3 revisions ...
15:57:08 Exported 3 revisions in 0:00:00
From .
 * branch            bzr/master -> FETCH_HEAD
-------------------------------
COMMIT CHANGE IN GIT REPOSITORY
[master 2a3ef6e] commit b2
 1 file changed, 1 insertion(+)
-------------------------------
PUSH BACK TO BZR REPOSITORY
15:57:08 Calculating the revisions to include ...
15:57:08 Starting export of 3 revisions ...
15:57:08 Exported 3 revisions in 0:00:00
warning: Not updating refs/heads/bzr/master (new tip       ebe90eee69371c207a53128e4aff7c05fdbdbe25 does not contain     d3cdb76cb2f88f68b31e335ca6301a222b084c11)
15:57:08 Starting import ...
15:57:09 Updating branch information ...
     branch master now has 4 revisions and 0 tags
15:57:09 Imported 2 revisions, updating 1 branch and 0 trees in 0:00:00
To refresh the working tree for other branches, use 'bzr update' inside that branch.
bzr: ERROR: These branches have diverged.  See "bzr help diverged-branches" for more     information.
ERROR:root:Command "bzr push /home/john/software/git-mirror-tests/repo.bzr" failed.

git bzr push failure

Here is the script:

#!/bin/bash
# gitbzrtest [directory] [number]
# example: ./gitbzrtest $PWD 10

[ $# -lt 1 ] && exit 1;

bzrdir="$1/repo.bzr"
gitdir="$1/repo.git"

rm -rf "$bzrdir"
rm -rf "$gitdir"
cd `dirname "$bzrdir"`
rm -rf `basename "$bzrdir"`
bzr init `basename "$bzrdir"`
cd "$bzrdir"
touch README
bzr add
bzr ci -m"init"
cd `dirname "$gitdir"`
git bzr clone "$bzrdir" `basename "$gitdir"`

for a in `seq $2`
do
   echo '-------------------------------'
   echo 'COMMIT CHANGE IN GIT REPOSITORY'
   cd "$gitdir"
   echo b >> README
   git commit -a -m"commit b$a"
   echo '-------------------------------'
   echo 'PUSH BACK TO BZR REPOSITORY'
   git bzr push
   if [ $? -ne 0 ]; then
      echo 'git bzr push failure'
      exit 1
   fi
   echo '-------------------------------'
   echo 'COMMIT CHANGE IN BZR REPOSITORY'
   cd "$bzrdir"
   echo AA >> README
   bzr ci -m"commit AA$a"
   echo '-------------------------------'
   echo 'UPDATE GIT REPOSITORY FROM BZR'
   cd "$gitdir"
   git bzr pull
   if [ $? -ne 0 ]; then
      echo 'git bzr pull failure'
      exit 1
   fi
done

bzr seems to be able to create commits with no committers

screws up git's fast-import :/

git-bzr-ng branch tries to allocate awesome amount of memory

22:45:57 118000/122118 commits exported at 944/minute
22:50:21 119000/122118 commits exported at 919/minute
22:54:05 120000/122118 commits exported at 901/minute
22:54:05 Exported 120000 commits - adding checkpoint to output
22:56:21 121000/122118 commits exported at 893/minute
22:57:22 122000/122118 commits exported at 894/minute
22:57:29 WARNING: not creating tag u'EMACS_23_1' pointing to non-existent revision [email protected]
22:57:29 WARNING: not creating tag u'EMACS_PRETEST_23_0_96' pointing to non-existent revision [email protected]
22:57:29 Exported 122118 revisions in 2:16:35
DEBUG:root:captured output (bzr fast-export):
python(60661) malloc: *** mmap(size=140780772814848) failed (error code=12)
*** error: can't allocate region
*** set a breakpoint in malloc_error_break to debug
Traceback (most recent call last):
File "/Users/danielcolascione/bin/git-bzr", line 709, in
sys.exit(main(sys.argv))
File "/Users/danielcolascione/bin/git-bzr", line 703, in main
return func(argv[2:])
File "/Users/danielcolascione/bin/git-bzr", line 417, in cmd_clone
cmd_import(args)
File "/Users/danielcolascione/bin/git-bzr", line 589, in cmd_import
export_bzr(bzr_ref, cl=cl)
File "/Users/danielcolascione/bin/git-bzr", line 282, in export_bzr
git_proc_in.close()
File "/Users/danielcolascione/bin/git-bzr", line 150, in close
rv = self._io.read()
MemoryError

git bzr clone is not deleting some files

You can use the Bazaar branch lp:phablet-extras/libhybris to reproduce this:

bzr branch lp:phablet-extras/libhybris hybris-bzr
git bzr clone lp:phablet-extras/libhybris hybris-git
diff -rq hybris-bzr hybris-git

Results in:

Only in hybris-bzr: .bzr
Only in hybris-git: .git
Only in hybris-git/hybris/gingerbread: Android.mk
Only in hybris-git/hybris/ics: Android.mk
Only in hybris-git/hybris/jb: Android.mk
Only in hybris-git/hybris/sf: surface_flinger_compatibility_layer.h

Obviously, the first two lines are OK, but the rest must be considered a bug in git-bzr-ng.
And those files are causing real issues.

Cannot push branches with any changes to launchpad

Every time I branch in git, I can push the branch up so long as I don't make any changes first. However, if there's any kind of difference between my branch and master, it does this:

git bzr push lp:~cerberus/nova/api_tests
bzr: ERROR: exceptions.AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

Git version is 1.7.2.1
bzr is 2.2b4

bzr merges allow rewriting of commit ids

a merge in bzr can be based on a branch but can be updated if the contents of the branch update, so that when looking at trunk the commit id of the merge will change while the revision number stays the same, confusing the hell out of the git mapping

a workaround right now is blowing away the mapping files and doing a git bzr sync to get your branch back up to date

crash during fast-import

doing a git bzr clone from a bzr clone of bzr://cedet.bzr.sourceforge.net/bzrroot/cedet/code/trunk

% git bzr clone ~/.emacs.d/el-get/cedet
...
09:45:07 8000/8825 commits exported at 13417/minute 
fatal: Path semantic/ONEWS not in branch
fast-import: dumping crash report to .git/fast_import_crash_8592
bzr: broken pipe
ERROR:root:bzr export failed
pluto:~/src dave% cd cedet

Crash report:

fast-import crash report:
    fast-import process: 8592
    parent process     : 8590
    at Thu Sep 27 09:45:15 2012

fatal: Path semantic/ONEWS not in branch

Most Recent Commands Before Crash
---------------------------------
  R speedbar/sb-w3.el obsolete/lisp/speedbar/sb-w3.el
  R speedbar/speedbar.texi doc/texi/speedbar.texi
  R srecode/srecode-android.el lisp/cedet/srecode/android.el
  R srecode/srecode-args.el lisp/cedet/srecode/args.el
  R srecode/srecode-compile.el lisp/cedet/srecode/compile.el
  R srecode/srecode-cpp.el lisp/cedet/srecode/cpp.el
  R srecode/srecode-ctxt.el lisp/cedet/srecode/ctxt.el
  R srecode/srecode-dictionary.el lisp/cedet/srecode/dictionary.el
  R srecode/srecode-document.el lisp/cedet/srecode/document.el
  R srecode/srecode-el.el lisp/cedet/srecode/el.el
  R srecode/srecode-expandproto.el lisp/cedet/srecode/expandproto.el
  R srecode/srecode-extract.el lisp/cedet/srecode/extract.el
  R srecode/srecode-fields.el lisp/cedet/srecode/fields.el
  R srecode/srecode-filters.el lisp/cedet/srecode/filters.el
  R srecode/srecode-find.el lisp/cedet/srecode/find.el
  R srecode/srecode-getset.el lisp/cedet/srecode/getset.el
  R srecode/srecode-insert.el lisp/cedet/srecode/insert.el
  R srecode/srecode-java.el lisp/cedet/srecode/java.el
  R srecode/srecode-m3.el lisp/cedet/srecode/m3.el
  R srecode/srecode-map.el lisp/cedet/srecode/map.el
  R srecode/srecode-mode.el lisp/cedet/srecode/mode.el
  R srecode/srecode-semantic.el lisp/cedet/srecode/semantic.el
  R srecode/srecode-srt.el lisp/cedet/srecode/srt.el
  R srecode/srecode-table.el lisp/cedet/srecode/table.el
  R srecode/srecode-template-mode.el lisp/cedet/srecode/srt-mode.el
  R srecode/srecode-template.el lisp/cedet/srecode/template.el
  R srecode/srecode-template.wy lisp/cedet/srecode/srt.wy
  R srecode/srecode-test-getset.el tests/cedet/srecode/test-getset.el
  R srecode/srecode-test.el tests/cedet/srecode/test.el
  R srecode/srecode-texi.el lisp/cedet/srecode/texi.el
  R srecode/srecode.el lisp/cedet/srecode.el
  R srecode/srecode.texi doc/texi/srecode.texi
  R srecode/templates/Makefile etc/srecode/Makefile
  R srecode/templates/Project.ede etc/srecode/Project.ede
  R srecode/templates/android-java.srt etc/srecode/android-java.srt
  R srecode/templates/arduino-pde.srt etc/srecode/arduino-pde.srt
  R srecode/templates/default.srt etc/srecode/default.srt
  R srecode/templates/document-default.srt etc/srecode/doc-default.srt
  R srecode/templates/proj-test.srt etc/srecode/proj-test.srt
  R srecode/templates/srecode-cpp.srt etc/srecode/cpp.srt
  R srecode/templates/srecode-document-cpp.srt etc/srecode/doc-cpp.srt
  R srecode/templates/srecode-document-java.srt etc/srecode/doc-java.srt
  R srecode/templates/srecode-el.srt etc/srecode/el.srt
  R srecode/templates/srecode-getset-cpp.srt etc/srecode/getset-cpp.srt
  R srecode/templates/srecode-java.srt etc/srecode/java.srt
  R srecode/templates/srecode-make.srt etc/srecode/make.srt
  R srecode/templates/srecode-template.srt etc/srecode/template.srt
  R srecode/templates/srecode-test.srt etc/srecode/test.srt
  R srecode/templates/srecode-texi.srt etc/srecode/texi.srt
  R srecode/templates/srecode-wisent.srt etc/srecode/wisent.srt
  R cogre/.cvsignore lisp/cedet/cogre/.cvsignore
  R cogre/INSTALL lisp/cedet/cogre/INSTALL
  R cogre/Makefile lisp/cedet/cogre/Makefile
  R cogre/Project.ede lisp/cedet/cogre/Project.ede
  R cogre/cogre-load.el lisp/cedet/cogre/cogre-load.el
  R cogre/picture-hack.el lisp/cedet/cogre/picture-hack.el
  R cogre/templates/Makefile lisp/cedet/cogre/templates/Makefile
  R cogre/templates/Project.ede lisp/cedet/cogre/templates/Project.ede
  R cogre/test.dot lisp/cedet/cogre/test.dot
  R cogre/tests/Project.ede lisp/cedet/cogre/tests/Project.ede
  R cogre/wisent-dot.el lisp/cedet/cogre/wisent-dot.el
  R cogre/wisent-dot.wy lisp/cedet/cogre/wisent-dot.wy
  R ede/.cvsignore lisp/cedet/ede/.cvsignore
  R ede/Makefile lisp/cedet/ede/Makefile
  R ede/Project.ede lisp/cedet/ede/Project.ede
  R ede/README lisp/cedet/ede/README
  R ede/autoconf-edit.el lisp/cedet/ede/autoconf-edit.el
  R ede/ede-arduino.el lisp/cedet/ede/ede-arduino.el
  R ede/ede-compilers.texi lisp/cedet/ede/ede-compilers.texi
  R ede/ede-load.el lisp/cedet/ede/ede-load.el
  R ede/ede-projects.texi lisp/cedet/ede/ede-projects.texi
  R ede/ede-sourcecode.texi lisp/cedet/ede/ede-sourcecode.texi
  R ede/ede-targets.texi lisp/cedet/ede/ede-targets.texi
  R ede/makefile-edit.el lisp/cedet/ede/makefile-edit.el
  R ede/project-am.el lisp/cedet/ede/project-am.el
  R ede/templates/Makefile lisp/cedet/ede/templates/Makefile
  R ede/templates/Project.ede lisp/cedet/ede/templates/Project.ede
  R eieio/.cvsignore lisp/eieio/.cvsignore
  R eieio/INSTALL lisp/eieio/INSTALL
  R eieio/Makefile lisp/eieio/Makefile
  R eieio/Makefile.old lisp/eieio/Makefile.old
  R eieio/NEWS lisp/eieio/NEWS
  R eieio/Project.ede lisp/eieio/Project.ede
  R eieio/chart.el lisp/eieio/chart.el
  R eieio/eieio-base.el lisp/eieio/eieio-base.el
  R eieio/eieio-custom.el lisp/eieio/eieio-custom.el
  R eieio/eieio-datadebug.el lisp/eieio/eieio-datadebug.el
  R eieio/eieio-doc.el lisp/eieio/eieio-doc.el
  R eieio/eieio-load.el lisp/eieio/eieio-load.el
  R eieio/eieio-opt.el lisp/eieio/eieio-opt.el
  R eieio/eieio-speedbar.el lisp/eieio/eieio-speedbar.el
  R eieio/eieio-test-persist.el lisp/eieio/eieio-test-persist.el
  R eieio/eieio-xml.el lisp/eieio/eieio-xml.el
  R eieio/eieio.el lisp/eieio/eieio.el
  R eieio/linemark.el lisp/eieio/linemark.el
  R semantic/.cvsignore lisp/cedet/semantic/.cvsignore
  R semantic/AUTHORS lisp/cedet/semantic/AUTHORS
  R semantic/INSTALL lisp/cedet/semantic/INSTALL
  R semantic/Makefile lisp/cedet/semantic/Makefile
* R semantic/ONEWS lisp/cedet/semantic/ONEWS

Active Branch LRU
-----------------
    active_branches = 1 cur, 5 max

  pos  clock name

8704 refs/heads/bzr/master

Inactive Branches

refs/heads/bzr/master:
status : active loaded dirty
tip commit : dc551001ec6003b217552af72bc17c9c1817b55f
old tree : 1a7f364975ea6baab1f76e76f19e5dad107a5e5a
cur tree : 0000000000000000000000000000000000000000
commit clock: 8704
last pack : 0

Marks

exported to /Users/dave/src/cedet/.git/bzr/map/master-git

END OF CRASH REPORT

git bare repo not supported

seems git-bzr can't work well with bare repos, because it assumes root_dir = parent dir of git dir, which is not true for bare repos

def git_dir(self, path=None):
  if not self._git_dir:
    self._git_dir = os.path.abspath(git(['rev-parse', '--git-dir']).strip())
  if path:
    return os.path.join(self._git_dir, path)
  return self._git_dir

def root_dir(self, path=None):
  if not self._root_dir:
    self._root_dir = os.path.dirname(self.git_dir())
  if path:
    return os.path.join(self._root_dir, path)
  return self._root_dir

Moves should be detected

The fast-export command in git should include the -M option so that moves pushed are correctly processed as renames in bzr.

bzr push fails if there is no "master" bzr branch

this is the result of a relatively quick fix to make sure that we are preserving bzr history so bzr users can merge the branches we create, unfortunately if we don't have a bzr branch named 'master' (one is made if we did a git bzr clone, but not if we did a git bzr import without specifying master as the branch name, which is unlikely to happen).

A workaround if you run into such a position is to make a new git repo via bzr clone and then just pull the changes in your other repo into it, the ids should be the same.

Pushing branch with local change fails under Ubuntu 10.10

I cloned bzr repository, did some changes and can not push those changes back to launchpad.

$ git bzr clone http://bazaar.launchpad.net/~hrw/ubuntu/maverick/armel-cross-toolchain-base/binutils-no-sysroot/  test
$ git bzr push lp:~hrw/+junk/test
11:07:52 Starting import ...
Created new branch.\ Fetching revisions:Finishing stream:Estimate 7/1421

11:09 hrw@home:test$ git commit . -m"test commit"
[master 7b0d149] test commit
 1 files changed, 6 insertions(+), 0 deletions(-)
11:09 hrw@home:test$ git bzr push lp:~hrw/+junk/test
11:09:33 Calculating the revisions to include ...m source
11:09:33 Starting export of 138 revisions ...
11:09:33 Exported 138 revisions in 0:00:00
11:09:34 Starting import ...
bzr: ERROR: exceptions.IndexError: list index out of range

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 911, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1111, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 689, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 704, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/__init__.py", line 384, in run
    params, verbose, user_map=user_map)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/__init__.py", line 111, in _run
    return proc.process(p.iter_commands)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/processor.py", line 95, in process
    self._process(command_iter)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/processors/generic_processor.py", line 283, in _process
    processor.ImportProcessor._process(self, command_iter)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/processor.py", line 117, in _process
    handler(self, cmd)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/processors/generic_processor.py", line 493, in commit_handler
    handler.process()
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/processor.py", line 200, in process
    self.pre_process_files()
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/bzr_commit_handler.py", line 582, in pre_process_files
    super(InventoryDeltaCommitHandler, self).pre_process_files()
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/bzr_commit_handler.py", line 91, in pre_process_files
    self.revision = self.build_revision()
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/bzr_commit_handler.py", line 227, in build_revision
    self.branch_ref)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/fastimport/branch_mapper.py", line 39, in git_to_bzr
    name_no_ext = self._git_to_bzr_name(parts[-1])
IndexError: list index out of range

You can report this problem to Bazaar's developers by running
    apport-bug /var/crash/bzr.1000.2010-10-07T09:09.crash
if a bug-reporting window does not automatically appear.
No new revisions to push.

bzr-fastimport.patch - still required?

Hi,

I see there is a bzr-fastimport.patch included with git-bzr-ng, but no further documentation.

It won't apply cleanly to the current bzr-fastimport trunk, especially the branch_updater.py bit.

Does it need to be fixed and applied? Or is it not required anymore?

thanks,
Paul

error: Object êé³ì^äh¹fÍ"YÓñâ already has a mark

Hello,

during "git bzr push" I get this:

$ git bzr push
12:55:28 Calculating the revisions to include ...
12:55:29 Starting export of 66268 revisions ...
12:55:30 Exported 66268 revisions in 0:00:02
12:55:30 Starting import ...
error: Object êé³ì^äh¹fÍ"YÓñâ already has a mark
error: Object Ã bÖ E.bÂÕq already has a mark
error: Object Jª¬
B|áõÁ already has a mark
error: Object ±`'m蟑zbl already has a mark
bzr: ERROR: exceptions.AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

What I have done before is to clone a bzr branch, for example foo, got branches foo and bzr/foo in git, then as new changes were made directly on the bzr branch, I did several times "git bzr sync bzr/foo" and "git merge bzr/foo" (while the current branch is foo). Now I have made a new commit in foo in git and want to push it back to the bzr repo, thus I tried "git bzr push" which emits the above error. Subsequent "git bzr push" result in "No new revisions to push."

Let me know if more details should be provided.

Thanks!

Push problems with trunk bzr-fastimport

I had some problems pushing, and I narrowed them down to bzr-fastimport.

The stack trace shows an extra argument "control" being passed in cmds.py, and that looks to have been introduced in rev 310:
http://bazaar.launchpad.net/~bzr/bzr-fastimport/trunk/revision/310

Rev 307 was stamped as the 0.10 release, so I branched that and push worked (with bzr 2.3.1, as installed by pip install bzr)
bzr branch lp:bzr-fastimport -r 307

doing a bunch of git mv's seems to confuse the bzr fastexporter

I am getting the _BtreeIndex find_ancestors error again when I reorganize a bunch of directories

backtrace

git bzr push
16:21:17 Calculating the revisions to include ...
16:21:21 Starting export of 118781 revisions ...
16:21:21 WARNING: not creating tag u'EMACS_23_1' pointing to non-existent revision [email protected]
16:21:21 WARNING: not creating tag u'EMACS_PRETEST_23_0_96' pointing to non-existent revision [email protected]
16:21:22 Exported 118781 revisions in 0:00:06
16:21:24 Starting import ...
bzr: ERROR: exceptions.KeyError: '118783'

Traceback (most recent call last):
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 946, in exception_to_return_code
return the_callable(_args, *_kwargs)
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 1150, in run_bzr
ret = run(_run_argv)
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 699, in run_argv_aliases
return self.run(__all_cmd_args)
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 721, in run
return self._operation.run_simple(_args, *_kwargs)
File "/usr/lib64/python2.7/site-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, *_kwargs)
File "/usr/lib64/python2.7/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(_args, *_kwargs)
File "/home/joakim/.bazaar/plugins/fastimport/cmds.py", line 305, in run
user_map=user_map)
File "/home/joakim/.bazaar/plugins/fastimport/cmds.py", line 39, in _run
return proc.process(p.iter_commands)
File "/home/joakim/.bazaar/plugins/fastimport/processors/generic_processor.py", line 310, in process
super(GenericProcessor, self)._process(command_iter)
File "/usr/lib/python2.7/site-packages/fastimport/processor.py", line 76, in _process
handler(self, cmd)
File "/home/joakim/.bazaar/plugins/fastimport/processors/generic_processor.py", line 535, in commit_handler
handler.process()
File "/usr/lib/python2.7/site-packages/fastimport/processor.py", line 151, in process
self.pre_process_files()
File "/home/joakim/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 647, in pre_process_files
super(InventoryDeltaCommitHandler, self).pre_process_files()
File "/home/joakim/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 115, in pre_process_files
for p in parents]
File "/home/joakim/.bazaar/plugins/fastimport/cache_manager.py", line 134, in lookup_committish
return self.marks[committish.lstrip(':')]
KeyError: '118783'

bzr 2.4.2 on python 2.7.2 (Linux-3.1.9-1.fc16.x86_64-x86_64-with-
fedora-16-Verne)
arguments: ['/usr/bin/bzr', 'fast-import', '--import-
marks=/home/joakim/current/build_myprojs/emacsnew/xwidget.git-
bzr/.git/bzr/map/master-bzr', '--export-
marks=/home/joakim/current/build_myprojs/emacsnew/xwidget.git-
bzr/.git/bzr/map/master-bzr', '-',
'/home/joakim/current/build_myprojs/emacsnew/xwidget.git-
bzr/.git/bzr/repo/master']
plugins: bash_completion[2.4.2], changelog_merge[2.4.2],
fastimport[0.12.0dev], launchpad[2.4.2], loom[2.1.0],
netrc_credential_store[2.4.2], news_merge[2.4.2], weave_fmt[2.4.2]
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.utf8'

*** Bazaar has encountered an internal error. This probably indicates a
bug in Bazaar. You can help us fix it by filing a bug report at
https://bugs.launchpad.net/bzr/+filebug
including this traceback and a description of the problem.
ERROR:root:bzr import failed

"Expected committer but didn't get one"

I did the following:

$ git-bzr clone bzr://bzr.mozilla.org/bugzilla/trunk bugzilla-bzr
Branched 7716 revision(s).ing revisions:Finishing stream:Done 79526/795269526
10:22:58 Calculating the revisions to include ...
10:22:58 Starting export of 7721 revisions ...
10:23:03 1000/7721 commits exported at 11281/minute 
10:23:14 2000/7721 commits exported at 7604/minute 
10:23:26 3000/7721 commits exported at 6496/minute 
10:23:38 4000/7721 commits exported at 6090/minute 
10:23:47 5000/7721 commits exported at 6111/minute 
10:23:54 6000/7721 commits exported at 6402/minute 
 fatal: Expected committer but didn't get one
 fast-import: dumping crash report to .git/fast_import_crash_12487
 bzr: broken pipe
 ERROR:root:bzr export failed

I don't know enough about bzr to know where the problem lies or how to fix it. :-/

KeyError: 1890 at lookup_committish

I have a problem with git bzr push, after a merge in git.

it says that it cant write blob 'XXXXXX....' : Broken pipe

.....
File "/home/zakaria/.bazaar/plugins/fastimport/cache_manager.py", line 134, in lookup_committish
return self.marks[committish.lstrip(':')]
KeyError: '1890'

The complete crash report is at : https://gist.github.com/1960991

another backtrace

git bzr push
15:49:47 Calculating the revisions to include ...
15:49:51 Starting export of 118782 revisions ...
15:49:51 WARNING: not creating tag u'EMACS_23_1' pointing to non-existent revision [email protected]
15:49:51 WARNING: not creating tag u'EMACS_PRETEST_23_0_96' pointing to non-existent revision [email protected]
15:49:52 Exported 118782 revisions in 0:00:06
15:50:22 Starting import ...
bzr: ERROR: exceptions.KeyError: "key ('[email protected]',) not in nodes"

Traceback (most recent call last):
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 946, in exception_to_return_code
return the_callable(_args, *_kwargs)
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 1150, in run_bzr
ret = run(_run_argv)
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 699, in run_argv_aliases
return self.run(__all_cmd_args)
File "/usr/lib64/python2.7/site-packages/bzrlib/commands.py", line 721, in run
return self._operation.run_simple(_args, *_kwargs)
File "/usr/lib64/python2.7/site-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, *_kwargs)
File "/usr/lib64/python2.7/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(_args, *_kwargs)
File "/home/joakim/.bazaar/plugins/fastimport/cmds.py", line 305, in run
user_map=user_map)
File "/home/joakim/.bazaar/plugins/fastimport/cmds.py", line 39, in _run
return proc.process(p.iter_commands)
File "/home/joakim/.bazaar/plugins/fastimport/processors/generic_processor.py", line 310, in process
super(GenericProcessor, self)._process(command_iter)
File "/usr/lib/python2.7/site-packages/fastimport/processor.py", line 76, in _process
handler(self, cmd)
File "/home/joakim/.bazaar/plugins/fastimport/processors/generic_processor.py", line 535, in commit_handler
handler.process()
File "/usr/lib/python2.7/site-packages/fastimport/processor.py", line 159, in process
self.post_process_files()
File "/home/joakim/.bazaar/plugins/fastimport/bzr_commit_handler.py", line 672, in post_process_files
self._get_inventories)
File "/home/joakim/.bazaar/plugins/fastimport/revision_store.py", line 400, in load_using_delta
tree, basis_rev_id, changes):
File "/usr/lib64/python2.7/site-packages/bzrlib/vf_repository.py", line 693, in record_iter_changes
head_set = self._heads(change[0], set(head_candidates))
File "/home/joakim/.bazaar/plugins/fastimport/revision_store.py", line 387, in thunked_heads
res = set(self._graph.heads(revision_ids))
File "/usr/lib64/python2.7/site-packages/bzrlib/graph.py", line 1979, in heads
head_keys = self._graph.heads(as_keys)
File "_known_graph_pyx.pyx", line 444, in bzrlib._known_graph_pyx.KnownGraph.heads (bzrlib/_known_graph_pyx.c:4217)
KeyError: "key ('[email protected]',) not in nodes"

Nicer errors when I forget to install bzr?

voltagex@dream:~/src$ git bzr clone lp:windows-ssh-server windows-ssh-server
Traceback (most recent call last):
  File "/home/voltagex/bin/git-bzr", line 709, in <module>
    sys.exit(main(sys.argv))
  File "/home/voltagex/bin/git-bzr", line 703, in main
    return func(argv[2:])
  File "/home/voltagex/bin/git-bzr", line 411, in cmd_clone
    init_repo(cl)
  File "/home/voltagex/bin/git-bzr", line 348, in init_repo
    bzr(['init-repo', '--no-trees', cl.bzr_dir()])
  File "/home/voltagex/bin/git-bzr", line 63, in bzr
    return run_command(cmd, **kwargs)
  File "/home/voltagex/bin/git-bzr", line 37, in run_command
    proc = subprocess.Popen(cmd, stdout=stdout, stdin=stdin)
  File "/usr/lib/python2.7/subprocess.py", line 679, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

Do you plan to release?

Hi. I'm a happy git-bzr-ng user, and also a Debian Developer considering uploading git-bzr-ng to Debian.

Do you ever plan to do stable releases? At the moment I'm just packaging the current git HEAD, but I'd prefer to have blessed releases, it makes it easier for me to pick "good" revisions to package.

Thanks,

error creating tags

Tried to clone http://bzr.debian.org/apt/python-apt/debian-sid, and got following error:

fatal: Branch name doesn't conform to GIT standards: refs/tags/0.8.0~exp4
fast-import: dumping crash report to .git/fast_import_crash_15223

Fail earlier when bzr-fastexport is unavailable

A long export fails with ERROR:root:bzr export failed. Wouldn't it be better to check if the bzr fast-export command works before we start?

Clone error

When cloning a bzr repo, I'm left with an unusual git tree :

$ git bzr clone lp:libzeitgeist libzeitgeist
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data. See "bzr help launchpad-login".
Branched 212 revision(s).hing revisions:Finishing stream:Done 3265/32653265
bzr: ERROR: unknown command "fast-export"
ERROR:root:bzr export failed

Why do I need to provide a launchpad id just to clone a repo ?

git bzr push error

Hi, I'm working with the MySQL bazaar repository. I've been able to import the trunk and 5.5 branches (I had to apply a patch to git fast-import but that's another story). I also have a third branch on which I'm writing my changes. I've done the following:

git bzr import file:///path/to/third-branch third

which effectively creates a bzr/third branch in git and the corresponding files on .git/bzr/repo/. Then, if I do:

git checkout third
echo ... > file
git commit -m "message"
git bzr push

I get the following:

11:57:15 Calculating the revisions to include ...
11:57:16 Starting export of 69370 revisions ...
11:57:16 WARNING: not creating tag u'clone-6.0.10-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-6.3.28a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-6.3.28b' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'java-perl-split' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.19' pointing to non-existent revision sp1r-stewart@willster.(none)-20070801120209-59274
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-6.3.36-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.12' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.13' pointing to non-existent revision sp1r-tulin/[email protected]/production.mysql.com-20070615091239-51087
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.11' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.16' pointing to non-existent revision sp1r-mskold/[email protected]/production.mysql.com-20070628200031-51997
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.14' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.15' pointing to non-existent revision sp1r-tulin/[email protected]/production.mysql.com-20070620042836-53885
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-7.0.9-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-6.3.28b-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.2.4' pointing to non-existent revision sp1r-kent/[email protected]/production.mysql.com-20070706092831-55422
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-6.3.31b' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-6.3.39-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-6.3.31-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-7.0.9b' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.44-ndb-7.1.3' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-7.0.16-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.1.32-ndb-6.3.24-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'embedded_innodb-1.0.0' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/embedded-1.0:4880
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-7.0.11-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-6.3.42-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-6.3.29-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.9' pointing to non-existent revision sp1r-tulin/[email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.8' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'nuts-got-a-name' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-7.0.10-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.31-ndb-6.3.22' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.31-ndb-6.3.21' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'embedded_innodb-1.0.3.5325' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:tags/embedded_innodb-1.0.3.5325:5327
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-7.0.15-spj-preview-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.23' pointing to non-existent revision sp1r-tulin/[email protected]/production.mysql.com-20071121101136-35272
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.22' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.21' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.20' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.1.2-beta' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.6.2' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.5-no-prod-fix1' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-7.0.20-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-6.3.41-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.37-ndb-7.0.8' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.1.23a-maria-alpha-build' pointing to non-existent revision sp1r-bell@oleksandr-byelkins-powerbook-g4-15.local-20080211211315-09471
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.2.12' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.2.13' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.2.11' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.10' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.2.14' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-7.0.12a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.37-ndb-6.3.27' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'embedded_innodb-1.0.4.5940' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:tags/embedded_innodb-1.0.4.5940:5944
11:57:16 WARNING: not creating tag u'mysql-5.1.19-ndb-6.3.0' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.19-ndb-6.3.1' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.3.9' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.4-build' pointing to non-existent revision sp1r-hakank/hakan@lu0011.(none)-20071203162837-08207
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-6.3.30-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-7.1.4-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.37-ndb-7.0.8a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.3-build' pointing to non-existent revision sp1r-hakank/hakan@lu0011.(none)-20071010054605-28462
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.5' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/zip:6126
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.4' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/zip:5539
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.6' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:tags/innodb_plugin-1.0.6:6212
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.1' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/zip:2450
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.3' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:tags/innodb_plugin-1.0.3:4379
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.2' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:tags/innodb_plugin-1.0.2:3306
11:57:16 WARNING: not creating tag u'clone-5.1.32-ndb-7.0.5-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-7.0.15a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'eol-java-deploy' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-6.3.35-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.2.5-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.2.15' pointing to non-existent revision sp1r-dfischer/[email protected]/production.mysql.com-20080317111558-46667
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.13' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.11b' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-7.1.1' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.37-ndb-7.0.8a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-6.3.28-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-6.3.31a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.8-build' pointing to non-existent revision kent@kent-amd64-20081031140141-6aojn09k1rratkk9
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-7.0.10' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.1.27-ndb-6.3.17-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.9-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-6.3.31a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.28-ndb-6.2.16' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'innodb_plugin-1.0.0-5.1' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/zip:2414
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.3.8' pointing to non-existent revision sp1r-tulin/[email protected]/production.mysql.com-20080129084309-20627
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.3.7' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-6.3.28' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.2' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.6.2-m5-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.10' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-7.0.19-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.32-ndb-7.0.5' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.32-ndb-7.0.4' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.31-ndb-6.4.1' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-6.3.37-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.1.32-ndb-6.2.17-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-6.3.32-p1-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-7.0.21-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-7.0.14-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'perltidy' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-7.0.9a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.5-no-prod' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.5-build' pointing to non-existent revision sp1r-rafal@quant.(none)-20080416125305-20704
11:57:16 WARNING: not creating tag u'mysql-5.1.31-ndb-6.4.2' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.3.11' pointing to non-existent revision sp1r-mtaylor@solace.(none)-20080328103232-35532
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.3.10' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23-ndb-6.3.12' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-7.0.20-p1-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.18-ndb-6.2.2' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.27-ndb-6.3.17' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'bug11879051-base' pointing to non-existent revision rs221915@loki31-20110421201908-9bfs10lz1za9zm7f
11:57:16 WARNING: not creating tag u'mysql-5.1.37-ndb-6.3.27a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.35-ndb-6.3.26' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.14-ndb-6.1.0' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-7.0.15b-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.3.4' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.3.5' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.3.6' pointing to non-existent revision sp1r-tulin/[email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.3.7' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-6.0.10' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.6.1-m5-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-6.3.34-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.23a-maria-alpha' pointing to non-existent revision sp1r-kent/[email protected]/production.mysql.com-20080221223422-62668
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.3.2-no-prod' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-6.3.32-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.29-ndb-6.3.19' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.3.3' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-6.3.33-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.16-ndb-6.2.0' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.35-ndb-7.0.7-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-7.0.13-p1-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.37-ndb-7.0.8-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-6.3.30' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.44-ndb-6.3.34' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.44-ndb-6.3.33' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.34-ndb-6.3.25' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.12b' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.12a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.34-ndb-6.2.18' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.1.1' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-7.0.17-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.5' pointing to non-existent revision sp1r-jonas/[email protected]/production.mysql.com-20070315184253-05098
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.6' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.44-ndb-7.0.15a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.32-ndb-6.3.23' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.32-ndb-6.3.24' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.44-ndb-7.0.14' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.44-ndb-7.0.15' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.28-ndb-6.3.18' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-6.3.38-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-7.0.13-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.30-ndb-6.4.0' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.47-ndb-6.3.35' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-7.0.9' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.2.4-build' pointing to non-existent revision sp1r-kent/[email protected]/production.mysql.com-20070704111543-37808
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-7.0.11a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.37-ndb-6.3.27a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.39-ndb-6.3.29' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-6.0.8' pointing to non-existent revision bteam@astra04-20081104003216-qx8grvyxaq93gs4e
11:57:16 WARNING: not creating tag u'mysql-6.0.9' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-6.0.5' pointing to non-existent revision sp1r-jperkin/[email protected]/production.mysql.com-20080612113639-04418
11:57:16 WARNING: not creating tag u'mysql-6.0.6' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-6.0.7' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-6.0.3' pointing to non-existent revision sp1r-jperkin/[email protected]/production.mysql.com-20071122121048-41612
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-7.0.22-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.19-ndb-6.2.3' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-6.3.40-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.35-ndb-7.0.7' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.44-ndb-7.0.15-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-7.0.9b-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.11-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.39-ndb-6.3.28a-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.47-ndb-7.0.18-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.51-ndb-7.0.23-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.19-ndb-6.2.4' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-6.3.32' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-6.3.31' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.24-ndb-6.3.13' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.24-ndb-6.3.14' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.24-ndb-6.3.15' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.24-ndb-6.3.16' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'embedded_innodb-1.0.6.6750' pointing to non-existent revision svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:tags/embedded_innodb-1.0.6.6750:6752
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.37-ndb-6.3.27-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.7' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.22-ndb-6.2.6' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.6-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-mysql-5.1.41-ndb-7.0.12-src-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.32-ndb-6.4.3' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.8' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.9' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.1' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.2' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.3' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.12' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.11' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.15-ndb-6.1.7' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-6.0.7-build' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.30-ndb-6.3.20' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-6.0.4-alpha' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'clone-5.6.0-m4-build' pointing to non-existent revision alik@ibmvm-20100804091919-4jgi1ot86wove1m8
11:57:16 WARNING: not creating tag u'mysql-5.1.47-ndb-7.0.16' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.41-ndb-7.0.11a' pointing to non-existent revision [email protected]
11:57:16 WARNING: not creating tag u'mysql-5.1.34-telco-7.0.6' pointing to non-existent revision [email protected]
11:57:17 Exported 69370 revisions in 0:00:02

bzr: ERROR: exceptions.TypeError: __init__() got an unexpected keyword argument 'control'

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 923, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1123, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 688, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 710, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cmds.py", line 313, in run
    params=params, verbose=verbose, user_map=user_map)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cmds.py", line 38, in _run
    proc = processor_factory(verbose=verbose, **kwargs)
TypeError: __init__() got an unexpected keyword argument 'control'

You can report this problem to Bazaar's developers by running
    apport-bug /var/crash/bzr.1000.2011-07-28T18:40.crash
if a bug-reporting window does not automatically appear.
error: Object �����^���h�f�"Y������� already has a mark
error: Object ��    b� E.b�����q already has a mark
error: Object �J���
                   B|��� already has a mark
error: Object ��`�'�m蟑zbl� already has a mark
fatal: Could not write blob 'be703ec88a40649479ae6e9b771c94a44c2b8143': Broken pipe
ERROR:root:git export failed

I've run git bzr sync --overwrite bzr/third and the same error is reported.

Local clone of bzr repository has trees.

I can't see why the bazaar repository needs a checkout of the files for each branch.

Will push branch with (v.small) patch.

Import fails for branches with regex-special-chars in names

The branch names in import isn't escaped for regex-special-chars, an example with "++" in the branch name:

Traceback (most recent call last):
File "/usr/bin/git-bzr", line 709, in
sys.exit(main(sys.argv))
File "/usr/bin/git-bzr", line 703, in main
return func(argv[2:])
File "/usr/bin/git-bzr", line 576, in cmd_import
if branch_exists(branch):
File "/usr/bin/git-bzr", line 107, in branch_exists
matcher = re.compile(r'\s%s$' % branch)
File "/usr/lib/python2.7/re.py", line 190, in compile
return _compile(pattern, flags)
File "/usr/lib/python2.7/re.py", line 242, in _compile
raise error, v # invalid expression
sre_constants.error: multiple repeat

fast-import error: fatal: mark :0 not declared (but everything appears to work)

Hi,

operations like git bzr push and git bzr sync appear to work (i.e. after a push the contents appear on Launchpad), but produce a fast-import error message and a crash report in the ./git folder.

Example using git bzr push:

$ git bzr push 
17:00:49 Calculating the revisions to include ...m source
17:00:49 Starting export of 928 revisions ...
17:00:49 WARNING: not creating tag u'POST_KONVENS' pointing to non-existent revision svn-v4:af1a039a-194d-0410-835c-85bbf441475e:AnnisService/tags/POST_KONVENS:295
17:00:49 WARNING: not creating tag u'2.1_beta2' pointing to non-existent revision svn-v4:af1a039a-194d-0410-835c-85bbf441475e:tags/2.1_beta2:765
17:00:49 WARNING: not creating tag u'2.1_beta1' pointing to non-existent revision svn-v4:af1a039a-194d-0410-835c-85bbf441475e:tags/2.1_beta1:759
17:00:49 WARNING: not creating tag u'unknown_florian_converter' pointing to non-existent revision svn-v4:af1a039a-194d-0410-835c-85bbf441475e:relANNISConverter/tags:281
17:00:49 WARNING: not creating tag u'2.2.0' pointing to non-existent revision [email protected]
17:00:49 Exported 928 revisions in 0:00:00
fatal: mark :0 not declared
fast-import: dumping crash report to .git/fast_import_crash_14370
17:00:50 Starting import ...
17:00:50 Updating branch information ...
   branch git-bzr-test now has 725 revisions and 0 tags
17:00:50 Packing repository ...
17:01:24 Removing obsolete packs ...9
17:01:24 Imported 1 revision, updating 1 branch and 0 trees in 0:00:35
To refresh the working tree for other branches, use 'bzr update' inside that branch.
Pushed up to revision 725.ing revisions:Finishing stream:Done 10/10

And the accompanying crash report in ./git/fast_import_crash_14370:

fast-import crash report:
    fast-import process: 14279
    parent process     : 14277
    at Wed Jul 27 16:58:47 2011

fatal: mark :0 not declared

Most Recent Commands Before Crash
---------------------------------
  reset refs/tags/2.1.8
* from ::634

Active Branch LRU
-----------------
    active_branches = 0 cur, 5 max

  pos  clock name
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Inactive Branches
-----------------
refs/tags/2.1.8:
  status      : dirty
  tip commit  : 0000000000000000000000000000000000000000
  old tree    : 0000000000000000000000000000000000000000
  cur tree    : 0000000000000000000000000000000000000000
  commit clock: 0
  last pack   : 


Marks
-----
  exported to /Users/he-sk/unix/src/annis-git-bzr/.git/bzr/map/git-bzr-test-git

-------------------
END OF CRASH REPORT

Cheers,
he-sk

git-bzr should report when requirements aren't installed

I made a mistake installing the requirements. Trying to clone threw an error:

root@mist01:~# git bzr clone lp:nova nova
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data. See "bzr help launchpad-login".
Branched 706 revision(s).hing revisions:Finishing stream:Estimate 34013/39346
bzr: ERROR: unknown command "fast-export"
ERROR:root:bzr export failed

git-bzr do not support using "/" in branch name

This is a git convention, as branch names are juste files under .git/refs/heads, every parts before last element must be a directory.

I implement a fix to create the parent directories as needed.

Regards.

git pull git://git.baby-gnu.net/git-bzr-ng dad/fix-git-style-branch-name-with-slashes

Subject: [PATCH] git-bzr do not support using "/" in branch name.

* git-bzr (cmd_import): Create parent directories of the bzr branch.

---
 git-bzr |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/git-bzr b/git-bzr
index 327d935..ff204f8 100755
--- a/git-bzr
+++ b/git-bzr
@@ -579,6 +579,10 @@ def cmd_import(args):
   if branch_exists(bzr_ref):
     die('Branch already exists: %s', bzr_ref)
 
+  # Permit git-style branch name with / in them
+  if not os.path.isdir(os.path.dirname(cl.bzr_dir(branch))):
+    os.makedirs(os.path.dirname(cl.bzr_dir(branch)))
+
   # Do the actual bzr fetch
   bzr(['branch', url, cl.bzr_dir(branch)])
 
-- 
1.7.7.3

importing bugzilla fails with "expected committer but didn't get one"

$ ~/src/git-bzr-ng/git-bzr-ng/git-bzr clone bzr://bzr.mozilla.org/bugzilla/4.0Branched 7559 revision(s).ching revisions:Finishing streame
01:38:28 Calculating the revisions to include ...
01:38:28 Starting export of 7563 revisions ...
01:38:32 1000/7563 commits exported at 13501/minute 
01:38:41 2000/7563 commits exported at 9249/minute 
01:38:51 3000/7563 commits exported at 7708/minute 
01:39:02 4000/7563 commits exported at 7090/minute 
01:39:11 5000/7563 commits exported at 6973/minute 
01:39:18 6000/7563 commits exported at 7228/minute 
fatal: Expected committer but didn't get one
fast-import: dumping crash report to .git/fast_import_crash_12296
bzr: broken pipe
ERROR:root:bzr export failed

Here's the crash file:

fast-import crash report:
    fast-import process: 12296
    parent process     : 12295
    at Wed Feb 16 01:39:25 2011

fatal: Expected committer but didn't get one

Most Recent Commands Before Crash
---------------------------------
  data 88
  from :6955
  M 644 inline Bugzilla/User.pm
  data 78044
  commit refs/heads/bzr/master
  mark :6957
  committer Justin Wood <[email protected]> 1265172237 -0500
  data 55
  from :6956
  M 644 inline template/en/default/global/site-navigation.html.tmpl
  data 3985
  commit refs/heads/bzr/master
  mark :6958
  committer Max Kanat-Alexander <[email protected]> 1265228248 -0800
  data 83
  from :6957
  M 644 inline Bugzilla/Field/ChoiceInterface.pm
  data 8104
  commit refs/heads/bzr/master
  mark :6959
  committer Max Kanat-Alexander <[email protected]> 1265249050 -0800
  data 60
  from :6958
  M 644 inline .bzrignore
  data 750
  commit refs/heads/bzr/master
  mark :6960
  committer Frédéric Buclin <[email protected]> 1265313469 +0100
  data 93
  from :6959
  M 644 inline template/en/default/reports/duplicates-simple.html.tmpl
  data 1527
  commit refs/heads/bzr/master
  mark :6961
  committer Frédéric Buclin <[email protected]> 1265407137 +0100
  data 98
  from :6960
  M 644 inline Bugzilla/Object.pm
  data 30007
  commit refs/heads/bzr/master
  mark :6962
  committer Frédéric Buclin <[email protected]> 1265407481 +0100
  data 126
  from :6961
  M 644 inline Bugzilla/WebService/Server/XMLRPC.pm
  data 10743
  commit refs/heads/bzr/master
  mark :6963
  committer Frédéric Buclin <[email protected]> 1265478220 +0100
  data 117
  from :6962
  M 644 inline Bugzilla/WebService/Bug.pm
  data 55546
  commit refs/heads/bzr/master
  mark :6964
  committer Frédéric Buclin <[email protected]> 1265478812 +0100
  data 66
  from :6963
  M 644 inline Bugzilla/WebService/Constants.pm
  data 4781
  M 644 inline Bugzilla/WebService/Server.pm
  data 1082
  M 644 inline template/en/default/global/code-error.html.tmpl
  data 22083
  commit refs/heads/bzr/master
  mark :6965
  committer Max Kanat-Alexander <[email protected]> 1265577151 -0800
  data 96
  from :6964
  M 644 inline Bugzilla/Group.pm
  data 18358
  M 644 inline Bugzilla/Hook.pm
  data 23282
  M 644 inline extensions/Example/Extension.pm
  data 15846
  commit refs/heads/bzr/master
  mark :6966
  committer Max Kanat-Alexander <[email protected]> 1265585730 -0800
  data 84
  from :6965
  R skins/standard/release-notes.css skins/standard/page.css
  D template/en/default/pages/quicksearchhack.html.tmpl
  M 644 inline .bzrignore
  data 741
  M 755 inline page.cgi
  data 2868
  M 644 inline template/en/default/global/common-links.html.tmpl
  data 4747
  M 644 inline template/en/default/global/user-error.html.tmpl
  data 71690
  M 644 inline template/en/default/pages/quicksearch.html.tmpl
  data 11287
  M 644 inline template/en/default/pages/release-notes.html.tmpl
  data 108243
  M 644 inline skins/standard/page.css
  data 1605
  commit refs/heads/bzr/master
  mark :6967
  author Jesse Clark <[email protected]> 1265587389 -0800
* author Rémi Zara <[email protected]> 1265587389 -0800

Active Branch LRU
-----------------
    active_branches = 1 cur, 5 max

  pos  clock name
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   1)   6966 refs/heads/bzr/master

Inactive Branches
-----------------
refs/heads/bzr/master:
  status      : active loaded
  tip commit  : 10e9c0ce7a40358e90e0afe61c571828c48eee5d
  old tree    : 9b0fa462bca91469ac4856a29fd9343e8d4b9297
  cur tree    : 9b0fa462bca91469ac4856a29fd9343e8d4b9297
  commit clock: 6966
  last pack   : 0


Marks
-----
  exported to /home/sam/src/bugzilla/test/4.0/.git/bzr/map/master-git

-------------------
END OF CRASH REPORT

setup.py for pip install

Hi,

Could you add a setup.py that would allow us to pip install git-bzr-ng, and get the git-bzr script automatically in our venv path, ready to use ? Would be great, thanks in advance

bzr 2.4.1 - ERROR: exceptions.AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

I have no idea what I've done wrong or what this issue is, but here's a complete log of what I did...

tim@atom:/projects/communication-book
$ git bzr clone lp:tim-abell/communication/trunk
Branched 39 revision(s).ching revisions:Finishing stream:Done 3950/39503833
21:07:19 Calculating the revisions to include ...
21:07:19 Starting export of 39 revisions ...
21:07:21 Exported 39 revisions in 0:00:02
Already on 'master'
tim@atom:/projects/communication-book
$ cd trunk/
tim@atom:/projects/communication-book/trunk
$ cd ..
tim@atom:/projects/communication-book
$ mv trunk/ code
tim@atom:/projects/communication-book
$ cd code
tim@atom:~/projects/communication-book/code
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[bzr "master"]
bzr = bzr/master
[bzr "bzr/master"]
upstream = lp:tim-abell/communication/trunk
tim@atom:/projects/communication-book/code
$ git bzr marks
Marks file: /home/tim/projects/communication-book/code/.git/bzr/map/master-git
:1 f961e8145df7553f0fdeedc31afd3cb7a9531d0b
:2 d2b939c912a47b32d4c7cfccf030e57f4538a75d
:3 12a8f608e920d3dde078c3d204259c90f6676061
:4 2cfe84811f578bd5959769784635543bc0d025a6
:5 56d2fd53c6eeb636406b5f1b628e776218aae0b3
:6 3e209ed7ddefa93b050faa16eccd0fd6e77ef2ae
:7 9c2d274107311a6bbe6bfd9288253fdd8b65e99c
:8 08f3a1532ef4d71f096aaf508f8b22adc49762e1
:9 65778766a9e09c974448d2f3ca125b83b4118c02
:10 ab93b3306def11e9def9dca1a6d94c0ecff099d7
:11 da9e38f510393a74640bcc24e20ee1c200a015ac
:12 25ca011d872b05c625bbdaf2e199752088c9666d
:13 f91ca9a7de62b4d646ca04633f1084fc799b63e0
:14 929ce15434da1bb3180fbfc1a51d01dd4a0c42c9
:15 eb8a215a726db73a3c1e6f9c0cf9d8b52cb27a5c
:16 7b4e4d64666a7694f2f113cdcfd2eabc4bd48e83
:17 7380da9e3aad2b3761ebb5920adfdfe67c2bd4c7
:18 f4c40c610200192031dde2c6b0032950a9d63a27
:19 a291d935b3b90c9ba9b813a62f15b38e173d5e54
:20 54221b78ca0960e6fde77a8b05634022df5f5398
:21 cfe3cface22e3284aff09e2b85a2b8923d48f961
:22 97a4c0b14507d1bffa972e6b590bcf6446e2ea73
:23 f46bb14404debbfdf978d201347304124071a08f
:24 350614668017a8e69773442f947125d2e1c06b3c
:25 e3bf1e6eb6c587485b2c124619d13a046f0ca9ee
:26 e79ea2971c4cd8f825c17d7d566ad34257468bf7
:27 7f732be1db029a60bbeac2e5f0b5846c9a2bb275
:28 89ea5926ab5e7b5ef35f68c454871818360c9d0d
:29 dc98769d6fba1b405ce3ca1de9c8c715be36e797
:30 2286484a9bd0c9cffe4b8d0bde0684795c3f8dc3
:31 97469395572fb39895a59418733230f3ea9fd55e
:32 50d99ac7e821f73fdeef409d3be1c35c2fd93d5e
:33 107fc4bc01974b53bd7d285f6b0c0247ac7324d1
:34 e810518d9c032b23a26d37bebed14635544efa03
:35 99483df49e842435bfecef77ee789c5e92b8f3ab
:36 b33acb8f8d1c7f26e08bdc0987af401dd60815cb
:37 3788099135e9f1874d3ec5f3425fbcd2d109ccde
:38 d0f25f0891cefe6c1ca68af80c2dee58101c2775
:39 490203f0afe7668918bfd3c2e22527a35c3db908

tim@atom:/projects/communication-book/code
$ git bzr import lp:john-d-morton-o/communication/trunk john
Branched 1 revision(s).nding revisions
21:08:41 Calculating the revisions to include ...
21:08:41 Starting export of 1 revisions ...
21:08:41 Exported 1 revision in 0:00:00
tim@atom:/projects/communication-book/code
$ git bzr import lp:communication central
Branched 39 revision(s).ching revisions:Finishing stream:Estimate 10/30
21:09:22 Calculating the revisions to include ...
21:09:22 Starting export of 39 revisions ...
21:09:23 Exported 39 revisions in 0:00:01
tim@atom:/projects/communication-book/code
$ git checkout master
Already on 'master'
tim@atom:~/projects/communication-book/code
$ git pull ../codex/ master
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From ../codex

branch master -> FETCH_HEAD
Updating 490203f..848046c
Fast-forward
.classpath | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
tim@atom:/projects/communication-book/code
$ git bzr push
21:10:30 Calculating the revisions to include ...
21:10:30 Starting export of 39 revisions ...
21:10:30 Exported 39 revisions in 0:00:00
21:10:31 Starting import ...
21:10:31 Updating branch information ...
branch master now has 40 revisions and 0 tags
21:10:31 Imported 1 revision, updating 1 branch and 0 trees in 0:00:00
To refresh the working tree for other branches, use 'bzr update' inside that branch.
Pushed up to revision 40.hing revisions:Finishing stream:Done 10/10
tim@atom:/projects/communication-book/code
$ git bzr sync
21:10:52 Calculating the revisions to include ...
21:10:52 Starting export of 40 revisions ...
21:10:52 Exported 40 revisions in 0:00:00
tim@atom:~/projects/communication-book/code
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[bzr "master"]
bzr = bzr/master
[bzr "bzr/master"]
upstream = lp:~tim-abell/communication/trunk
[bzr "john"]
bzr = bzr/john
[bzr "bzr/john"]
upstream = lp:john-d-morton-o/communication/trunk
[bzr "central"]
bzr = bzr/central
[bzr "bzr/central"]
upstream = lp:communication
tim@atom:/projects/communication-book/code
$ git bzr pull
21:11:21 Calculating the revisions to include ...
21:11:21 Starting export of 40 revisions ...
21:11:21 Exported 40 revisions in 0:00:00
From .
branch bzr/master -> FETCH_HEAD
tim@atom:/projects/communication-book/code
$ git bzr sync
21:11:40 Calculating the revisions to include ...
21:11:40 Starting export of 40 revisions ...
21:11:40 Exported 40 revisions in 0:00:00
tim@atom:/projects/communication-book/code
$ git checkout central
Switched to branch 'central'
tim@atom:/projects/communication-book/code
$ git merge master
Updating 490203f..848046c
Fast-forward
.classpath | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
tim@atom:/projects/communication-book/code
$ git bzr push
21:12:16 Calculating the revisions to include ...
21:12:16 Starting export of 39 revisions ...
21:12:16 Exported 39 revisions in 0:00:00
21:12:16 Starting import ...
bzr: ERROR: exceptions.AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 946, in exception_to_return_code
return the_callable(_args, *_kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1150, in run_bzr
ret = run(_run_argv)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 699, in run_argv_aliases
return self.run(__all_cmd_args)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 721, in run
return self._operation.run_simple(_args, *_kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, *_kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(_args, *_kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cmds.py", line 314, in run
user_map=user_map)
File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/cmds.py", line 40, in _run
return proc.process(p.iter_commands)
File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/processors/generic_processor.py", line 311, in process
super(GenericProcessor, self)._process(command_iter)
File "/usr/lib/python2.7/dist-packages/fastimport/processor.py", line 76, in _process
handler(self, cmd)
File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/processors/generic_processor.py", line 536, in commit_handler
handler.process()
File "/usr/lib/python2.7/dist-packages/fastimport/processor.py", line 159, in process
self.post_process_files()
File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/bzr_commit_handler.py", line 662, in post_process_files
self._get_inventories)
File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/fastimport/revision_store.py", line 376, in load_using_delta
rev.parent_ids)
File "/usr/lib/python2.7/dist-packages/bzrlib/decorators.py", line 154, in read_locked
result = unbound(self, _args, *_kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/vf_repository.py", line 1828, in get_known_graph_ancestry
known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
File "/usr/lib/python2.7/dist-packages/bzrlib/versionedfile.py", line 1440, in get_known_graph_ancestry
parent_map, missing_keys = self._index.find_ancestry(keys)
File "/usr/lib/python2.7/dist-packages/bzrlib/groupcompress.py", line 2102, in find_ancestry
return self._graph_index.find_ancestry(keys, 0)
File "/usr/lib/python2.7/dist-packages/bzrlib/index.py", line 1527, in find_ancestry
search_keys = index._find_ancestors(search_keys,
AttributeError: 'BTreeBuilder' object has no attribute '_find_ancestors'

You can report this problem to Bazaar's developers by running
apport-bug /var/crash/bzr.1000.2012-02-06T21:12.crash
if a bug-reporting window does not automatically appear.
ERROR:root:bzr import failed
tim@atom:~/projects/communication-book/code
$ bzr --version
Bazaar (bzr) 2.4.1
Python interpreter: /usr/bin/python 2.7.2
Python standard library: /usr/lib/python2.7
Platform: Linux-3.0.0-15-generic-x86_64-with-Ubuntu-11.10-oneiric
bzrlib: /usr/lib/python2.7/dist-packages/bzrlib
Bazaar configuration: /home/tim/.bazaar
Bazaar log file: /home/tim/.bzr.log

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.

branch bzr from the most relevant branch when pushing a new bzr branch

right now we always branch from master when we push a new branch, what we should do is figure out what the bzr tracking branch for the git branch we made a new git branch from was and bzr branch from that.

In more diagrammy words, if I do:

git clone lp:nova
cd nova
git import lp:~termie/nova/test_branch
git checkout test_branch
git checkout -b branch_based_on_test_branch
git bzr push lp:~termie/nova/branch_based_on_test_branch

what will actually happen right now is that it will push a branch based on lp:nova rather than a branch based on lp:~termie/nova/test_branch

termie / git-bzr-ng Goto Github PK

git-bzr-ng's People

Contributors

Stargazers

Watchers

Forkers

git-bzr-ng's Issues

Inactive Branches

Marks

Recommend Projects

Recommend Topics

Recommend Org