Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Dmitry Gutov]

Stefan Monnier <monnier@iro.umontreal.ca> wrote:

>> message:
>>   company: Release 0.6.2
>
>Please include the usual description of changes in your ELPA commit
>messages: there is no ChangeLog file, but the "bzr log" should give the
>same information.

What's the recommended way to automatically pull commit messages from 
Git to Bazaar? What if the Git repo has some files that Bazaar doesn't?

At the moment there are two such files: Makefile and NEWS.md, the first 
of them doesn't seem right to be included in the package tar, and the 
second one doesn't have any license header, AFAIK there's no place to 
put it, but I expect that without it, the package won't build.

I'd also like to know if it's a new requirement: I've been "merging" 
changes from the upstream js2-mode repo for a while, and most of those 
commits also didn't have descriptive messages.

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Stefan Monnier]

> What's the recommended way to automatically pull commit messages from Git to
> Bazaar? What if the Git repo has some files that Bazaar doesn't?

Install bzr-git, and then "bzr merge git:<blabla>"?
The first time needs extra work (because of the lack of a common
ancestor) but I can do that part if it's not done yet.


        Stefan

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Dmitry Gutov]

On 24.03.2013 18:14, Stefan Monnier wrote:
>> What's the recommended way to automatically pull commit messages from Git to
>> Bazaar? What if the Git repo has some files that Bazaar doesn't?
>
> Install bzr-git, and then "bzr merge git:<blabla>"?
> The first time needs extra work (because of the lack of a common
> ancestor) but I can do that part if it's not done yet.

Please go head. It would be also helpful if you document the exact 
sequence of commands you use.

The repository URL: git@github.com:company-mode/company-mode.git

My achievement so far:

C:\Users\gutov\vc\emacs-bzr\elpa\packages\company>bzr merge 
git://github.com/company-mode/company-mode.git
bzr: ERROR: exceptions.AssertionError: Invalid sha for <Commit 
6aea960adb30c66faa14e4bd57a4e62e94eacd94>: 
2a59ce05bd0a86db1911f07adb942f10b8540614

Traceback (most recent call last):
   File "bzrlib\commands.pyo", line 920, in exception_to_return_code
   File "bzrlib\commands.pyo", line 1131, in run_bzr
   File "bzrlib\commands.pyo", line 673, in run_argv_aliases
   File "bzrlib\commands.pyo", line 695, in run
   File "bzrlib\cleanup.pyo", line 136, in run_simple
   File "bzrlib\cleanup.pyo", line 166, in _do_with_cleanups
   File "bzrlib\builtins.pyo", line 4425, in run
   File "bzrlib\builtins.pyo", line 4571, in _get_merger_from_branch
   File "bzrlib\merge.pyo", line 423, in from_revision_ids
   File "bzrlib\merge.pyo", line 517, in set_other_revision
   File "bzrlib\merge.pyo", line 534, in _maybe_fetch
   File "bzrlib\decorators.pyo", line 218, in write_locked
   File "bzrlib\branch.pyo", line 698, in fetch
   File "C:/Users/gutov/bazaar/2.0/plugins\git\branch.py", line 722, in 
fetch
   File "C:/Users/gutov/bazaar/2.0/plugins\git\branch.py", line 745, in 
fetch_objects
   File "C:/Users/gutov/bazaar/2.0/plugins\git\fetch.py", line 706, in 
fetch_objects
   File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
580, in _lookup_revision_sha1
   File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
384, in _update_sha_map
   File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
484, in _update_sha_map_revision
   File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
473, in _revision_to_objects
   File "C:/Users/gutov/bazaar/2.0/plugins\git\object_store.py", line 
154, in _check_expected_sha
AssertionError: Invalid sha for <Commit 
6aea960adb30c66faa14e4bd57a4e62e94eacd94>: 
2a59ce05bd0a86db1911f07adb942f10b8540614

bzr 2.5.1 on python 2.6.6 (Windows-7-6.1.7601-SP1)
arguments: ['bzr', 'merge', 
'git://github.com/company-mode/company-mode.git']
plugins: bisect[1.1.0dev], bzrtools[2.5.0], changelog_merge[2.5.1],
     colo[0.4.0], fastimport[0.14.0dev], git[0.6.8], launchpad[2.5.1],
     loom[2.3.0dev], netrc_credential_store[2.5.1], news_merge[2.5.1],
     pipeline[1.4.0], qbzr[0.22.3], rewrite[0.6.4dev], svn[1.2.2],
     upload[1.2.0dev], xmloutput[0.8.8]
encoding: 'cp1251', fsenc: 'mbcs', lang: 'RU'

*** 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.

Looks similar to this: https://bugs.launchpad.net/bzr-git/+bug/753155

I've no idea where to go from here.

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Dmitry Gutov]

Stefan,

Do you mind if, while ELPA transition to Git is still is progress, I 
commit the latest version in the same manner as before?

It has a couple of important fixes, among other things.

--Dmitry

On 25.03.2013 15:20, Dmitry Gutov wrote:> On 24.03.2013 18:14, Stefan 
Monnier wrote:
 >>> What's the recommended way to automatically pull commit messages from
 >>> Git to
 >>> Bazaar? What if the Git repo has some files that Bazaar doesn't?
 >>
 >> Install bzr-git, and then "bzr merge git:<blabla>"?
 >> The first time needs extra work (because of the lack of a common
 >> ancestor) but I can do that part if it's not done yet.
 >
 > Please go head. It would be also helpful if you document the exact
 > sequence of commands you use.

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Stefan Monnier]

> My achievement so far:

> C:\Users\gutov\vc\emacs-bzr\elpa\packages\company>bzr merge
> git://github.com/company-mode/company-mode.git
> bzr: ERROR: exceptions.AssertionError: Invalid sha for <Commit
> 6aea960adb30c66faa14e4bd57a4e62e94eacd94>:
> 2a59ce05bd0a86db1911f07adb942f10b8540614

In my experience bzr-git works significantly better on a local branch, so
I always first make a local Git clone.  More specifically I normally do:

   git clone <giturl>   # Done because bzr-git works better locally
   bzr branch <localgit> tmp
   cd tmp
   bzr mkdir .newroot
   bzr mv * .newroot/
   ... maybe other bzr mv .<blabla> .newroot/ ...
   bzr split .newroot
   mv .newroot .../elpa/packages/<package>
   cd .../elpa/packages/
   bzr join <package>

the "bzr mv+bzr split" dance is necessary to work around a limitation of
bzr-git where all the root directories have the same "id", so the first
"bzr join" worked (tho it introduced the all too famous commit that then
triggers a bug in "bzr checkout"), but ever since we first need to do
this dance that moves all the files to another root directory (hence
with a different "id").

This said, I just tried it and the "bzr join" failed with "inventory
already contains entry with id {README.md}": apparently there are more
problems of id-collisions than the root directory.

> Do you mind if, while ELPA transition to Git is still is progress, I commit
> the latest version in the same manner as before?

No, please do.  Just please try and preserve some of the info, e.g. by
copying the "git log" or at the the revision id from which you merged.


        Stefan

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Dmitry Gutov]

On 30.03.2013 21:12, Stefan Monnier wrote:
>> My achievement so far:
>
>> C:\Users\gutov\vc\emacs-bzr\elpa\packages\company>bzr merge
>> git://github.com/company-mode/company-mode.git
>> bzr: ERROR: exceptions.AssertionError: Invalid sha for <Commit
>> 6aea960adb30c66faa14e4bd57a4e62e94eacd94>:
>> 2a59ce05bd0a86db1911f07adb942f10b8540614
>
> In my experience bzr-git works significantly better on a local branch, so
> I always first make a local Git clone.  More specifically I normally do:
>
>     git clone <giturl>   # Done because bzr-git works better locally
>     bzr branch <localgit> tmp
>     cd tmp
>     bzr mkdir .newroot
>     bzr mv * .newroot/
>     ... maybe other bzr mv .<blabla> .newroot/ ...
>     bzr split .newroot
>     mv .newroot .../elpa/packages/<package>
>     cd .../elpa/packages/
>     bzr join <package>
>
> the "bzr mv+bzr split" dance is necessary to work around a limitation of
> bzr-git where all the root directories have the same "id", so the first
> "bzr join" worked (tho it introduced the all too famous commit that then
> triggers a bug in "bzr checkout"), but ever since we first need to do
> this dance that moves all the files to another root directory (hence
> with a different "id").

Thank you, I think I even understood what that sequence of commands is 
supposed to do.

> This said, I just tried it and the "bzr join" failed with "inventory
> already contains entry with id {README.md}": apparently there are more
> problems of id-collisions than the root directory.

That's weird. It breaks on files with the same name? It unlikely the 
other file has the same contents.

But suppose that went fine. Would cd elpa/packages/company && bzr merge 
git://... work after that?

>> Do you mind if, while ELPA transition to Git is still is progress, I commit
>> the latest version in the same manner as before?
>
> No, please do.  Just please try and preserve some of the info, e.g. by
> copying the "git log" or at the the revision id from which you merged.

Copying git log manually is exactly the kind of activity I'd like to 
avoid, hence the original question about merging.
Not sure I understand the alternative (two extra prepositions there), 
but if it's just pasting Git commit hash into the message, that works 
for me.

I already try to make corresponding version tags in the Git repo, 
though, so tracking which commit was merged last is not a problem.

That aside, almost all of company-mode change history is missing in 
elpa, so when the transition to Git is done, there's no reason not to 
fully re-import the directory from the upstream repo.

Re: [ELPA-diffs] /srv/bzr/emacs/elpa r374: company: Release 0.6.2

[Stefan Monnier]

> But suppose that went fine. Would cd elpa/packages/company && bzr merge
> git://... work after that?

Yes (modulo spurious conflicts when a file is added to that git branch,
since the "bzr mv" we did before the "bzr split" only affects the file
that existed back then).

> Not sure I understand the alternative (two extra prepositions there), but

Sorry about "the the" it should read "least the".

> if it's just pasting Git commit hash into the message, that works for me.

Yes, just adding that hash is what I meant.  It is the least amount of
info from which the rest can be reconstructed.

> That aside, almost all of company-mode change history is missing in elpa, so
> when the transition to Git is done, there's no reason not to fully re-import
> the directory from the upstream repo.

Agreed.


        Stefan