Any incompatibilities between 0.6.2 and 0.7 releases?

Vincent LADEUIL v.ladeuil at alplog.fr
Thu Jan 26 14:49:41 GMT 2006


>>>>> "John" == John A Meinel <john at arbash-meinel.com> writes:

<snip/>

    John> How is this patch?
    >>  Right to the point !
    >> 
    >> It would have saved me an elephant-in-a-porcelain-shop
    >> introduction to this list just days ago.
    >> 
    >> I still have to understand what these files contains, but
    >> I keep that for another day :-)
    >> 
    >> What are the requirements to issue a '+1' ?
    >> 
    >> Vincent

    John> The primary requirement is to have actually read the
    John> patch. :)

Done of course :)

    John> It would be really nice if I could get a review of the
    John> rest of my jam-pending branch. (the Makefile fix, and
    John> the better error when missing an editor)

Well, actually, I begin using bzr  at the end of last week so I'm
a bit afraid of branching from several versions at once :-/

,----
| === modified file 'Makefile'
| --- Makefile
| +++ Makefile
| @@ -10,8 +10,7 @@
| 
|  clean:
|         ./setup.py clean
| -       -find . -name "*.pyc" | xargs rm
| -       -find . -name "*.pyo" | xargs rm
| +       -find . -name "*.pyc" -o -name "*.pyo" | xargs rm -f
|         rm -rf test????.tmp
| 
|  .PHONY: all
`----

This  one I  have  already integrated  manually  into my  running
version, so I both read it and tested it :-)

But coded like :

,----
| === modified file 'Makefile'
| --- Makefile	
| +++ Makefile	
| @@ -10,8 +10,8 @@
|  
|  clean: 
|  	./setup.py clean
| -	-find . -name "*.pyc" | xargs rm
| -	-find . -name "*.pyo" | xargs rm
| +	-find . -name "*.pyc" | xargs rm -f
| +	-find . -name "*.pyo" | xargs rm -f
|  	rm -rf test????.tmp
|  
|  .PHONY: all
`----

And I wait for it coming thru http://bazaar-ng.org/bzr/bzr.dev so
I  can  observe,  first  hand,  the  behavior  of  bzr  regarding
conflicts :-)

,----
| === modified file 'bzrlib/msgeditor.py'
| --- bzrlib/msgeditor.py
| +++ bzrlib/msgeditor.py
| @@ -20,6 +20,7 @@
|  """Commit message editor support."""
| 
|  import os
| +import errno
|  from subprocess import call
| 
|  import bzrlib.config as config
| @@ -51,7 +52,13 @@
|      """Try to execute an editor to edit the commit message."""
|      for e in _get_editor():
|          edargs = e.split(' ')
| -        x = call(edargs + [filename])
| +        try:
| +            x = call(edargs + [filename])
| +        except OSError, e:
| +           # ENOENT means no such editor
| +           if e.errno == errno.ENOENT:
| +               continue
| +           raise
|          if x == 0:
|              return True
|          elif x == 127:
`----


But this one  is far beyond my little python  knowledge (I had no
exposition to python prior to installing bzr and tailor :p ).

And anyway  I use emacs as my  primary editor and I  doubt I ever
have to run this particular code :-)

           Vincent




More information about the bazaar mailing list