bzr shelve/unshelve should test the availability of diffstat before running it

Michael Ellerman michael at ellerman.id.au
Wed Oct 26 11:49:02 BST 2005


On Tue, 25 Oct 2005 23:19, Aaron Bentley wrote:
> Michael Ellerman wrote:
> > On Tue, 25 Oct 2005 03:41, Aaron Bentley wrote:
> >>Michael Ellerman wrote:
> >>>Sweet. Actually if you want to pull my new code into bzrtools every now
> >>>and then that'd be fine too, whatever's easiest.
> >>
> >>I'll be glad to.  Right now, it's not passing the selftest for a variety
> >>of reasons, but let me know when it's ready.
> >
> > Hmm, works for me?
> >
> > concordia ~$ bzr selftest test_shelf
> > running tests...
> > bzr binary                     /home/michael/src/bzr/mine/bzr
>
> The test it was failing was a blackbox test.  Maybe your internals are
> fine, but you're not testing the commandline.
>
> $ bzr shelve -r -1
> bzr: ERROR: 'tuple' object has no attribute 'revision_history'
>   command: '/home/abentley/bin/bzr' 'shelve' '-r' '-1'
>   pwd: /home/abentley/bzrplugins/shelf_v2
>   at /home/abentley/bzr.ab/bzrlib/revisionspec.py line 151, in in_history()
>   see ~/.bzr.log for debug information

Oops. I wasn't testing the -r stuff at all in fact.

I've updated it to test that code and fixed it so it works :)

http://michael.ellerman.id.au/files/shelf_v2

------------------------------------------------------------
revno: 40
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:45:38 +1000
message:
  Update test with revision to actually test the shelf worked properly.
  
------------------------------------------------------------
revno: 39
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 19:50:14 +1000
message:
  Fix shelve and unshelve to pass location to Shelf().
  Fix revision handling in shelve.
  
------------------------------------------------------------
revno: 38
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 19:49:08 +1000
message:
  Shelf() takes a location which specifies where to open the branch.
  
------------------------------------------------------------
revno: 37
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 19:48:16 +1000
message:
  Add (failing) tests of revision argument for shelve.
  

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051026/d1a6c594/attachment.pgp 


More information about the bazaar mailing list