Merge lp://qastaging/~villemvainio/ipython/trunk-dev into lp://qastaging/ipython/0.11

Proposed by Ville M. Vainio
Status: Merged
Approved by: Brian Granger
Approved revision: no longer in the revision history of the source branch.
Merged at revision: not available
Proposed branch: lp://qastaging/~villemvainio/ipython/trunk-dev
Merge into: lp://qastaging/ipython/0.11
To merge this branch: bzr merge lp://qastaging/~villemvainio/ipython/trunk-dev
Reviewer Review Type Date Requested Status
Brian Granger Needs Fixing
Review via email: mp+1706@code.qastaging.launchpad.net
To post a comment you must log in.
1148. By Brian Granger

Merging changes in branch ~vvatsa/ipython/ipython-trunk-merge.

Revision history for this message
Brian Granger (ellisonbg) wrote :

1155: I am not familiar with the shadow history and this description still leaves me wondering exactly what it is and why it exists. Is the difference that the shadown history include *everything*, but just the current history? Are there any performance issues?

1153: when IPython.ipapi.TryNext() is raised, it should be passed a string giving a sensible error message.

1151: can we add a test for these new things? Might be tough though.

1149: can we add a test for this?

review: Needs Fixing
Revision history for this message
Ville M. Vainio (villemvainio) wrote :

On Thu, Nov 20, 2008 at 7:30 AM, Brian Granger <email address hidden> wrote:

Vote: Needs Fixing
> 1155: I am not familiar with the shadow history and this description still
> leaves me wondering exactly what it is and why it exists. Is the difference
> that the shadown history include *everything*, but just the current history?
> Are there any performance issues?

Ok, I'll add more meat to the description. So far, I haven't seen any
performance issues (apart from hist -g being taking a while if there is lots
of stuff). So far, nobody has complained ;-)

> 1153: when IPython.ipapi.TryNext() is raised, it should be passed a string
> giving a sensible error message.

This is not how trynext works. It's not an "error", but a suggestion to use
the next hook.

>
> 1151: can we add a test for these new things? Might be tough though.
>
> 1149: can we add a test for this?

Will check later.

--
Ville M. Vainio
http://tinyurl.com/vainio

1149. By Brian Granger

Merging branch: ~gael-varoquaux/ipython/ipython-sync-frontend.

Revision history for this message
Ville M. Vainio (villemvainio) wrote :

I didn't add the tests for sh profile prefilter (because the new prefilter would have to be factored out to aonther module if that was wanted).

Rev 1149 is a trivial fix that can't break anything. I can add the unit test in my another (unittest) branch, but I would want to merge this branch asap since it has a critical fix for macros.

Revision history for this message
Brian Granger (ellisonbg) wrote :

Rev 1149 may be a trivial fix - I am not worried about the fix breaking anything else. Rather, I want to make sure that we have a test in place that will ensure that the original bug doesn't creep back in at some point.

I agree that we should merge this ASAP though.

Revision history for this message
Brian Granger (ellisonbg) wrote :

Once you add a test for rev 1149, let's go ahead and merge. Looks great otherwise. Thanks for clarifying the shadow history stuff! If you want to do the test for 1149 in a different branch, please at least add a bug ticket about adding the test if you don't do that right away. With those caveats, I am marking this a ready to merge. I will let you decide how to handle the test for 1149 and do the merge yourself though.

1150. By Ville M. Vainio

Merged from my trunk-dev:
 Lukasz Pankowski's patches:
   sh profile prefilter changes (allow ~/bin/foo, /bin/foo in addition to ./foo to be directly executed)
   allow multiple dashes in demo ---stop---
   editor hook does TryNext

 shadow history docs
 Allow multiline macros in threaded shells
 Do not hang with dev version of PyGTK: do set_interactive(False)

Subscribers

People subscribed via source and target branches